[spyder] 02/04: New upstream version 3.0.0+dfsg1

Frédéric-Emmanuel Picca picca at moszumanska.debian.org
Sun Sep 25 18:56:15 UTC 2016


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

picca pushed a commit to branch experimental
in repository spyder.

commit b006ee1315986b695345e3e3a87047e6466bff73
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Sun Sep 25 12:33:39 2016 +0200

    New upstream version 3.0.0+dfsg1
---
 LICENSE                                            |  512 +-
 MANIFEST.in                                        |    7 +-
 PKG-INFO                                           |    6 +-
 README.md                                          |    9 +-
 app_example/create_exe.py                          |   31 -
 app_example/example.pyw                            |   77 -
 bootstrap.py                                       |   12 +-
 doc/conf.py                                        |    2 +-
 doc/options.rst                                    |    8 +-
 doc/overview.rst                                   |    2 +-
 scripts/spyder                                     |    2 +-
 scripts/spyder3                                    |    2 +-
 scripts/spyder_win_post_install.py                 |    2 +-
 setup.py                                           |   16 +-
 {spyderlib => spyder}/__init__.py                  |    8 +-
 {spyderlib => spyder}/app/__init__.py              |    8 +-
 {spyderlib => spyder}/app/cli_options.py           |    6 +-
 {spyderlib => spyder}/app/mac_stylesheet.qss       |    2 +-
 .../app/spyder.py => spyder/app/mainwindow.py      |  423 +-
 {spyderlib => spyder}/app/restart.py               |   20 +-
 {spyderlib => spyder}/app/start.py                 |   35 +-
 {spyderlib => spyder}/app/tour.py                  |   13 +-
 {spyderlib => spyder}/config/__init__.py           |    0
 {spyderlib => spyder}/config/base.py               |   28 +-
 {spyderlib => spyder}/config/fonts.py              |    6 +-
 {spyderlib => spyder}/config/gui.py                |   14 +-
 {spyderlib => spyder}/config/ipython.py            |   12 +-
 {spyderlib => spyder}/config/main.py               |   35 +-
 {spyderlib => spyder}/config/user.py               |   74 +-
 {spyderlib => spyder}/config/utils.py              |    8 +-
 {spyderlib => spyder}/defaults/Readme.txt          |    4 +-
 {spyderlib => spyder}/defaults/defaults-2.4.0.ini  |    0
 {spyderlib => spyder}/defaults/defaults-3.0.0.ini  |    0
 {spyderlib => spyder}/dependencies.py              |    6 +-
 {spyderlib => spyder}/fonts/spyder-charmap.json    |    0
 {spyderlib => spyder}/fonts/spyder.ttf             |  Bin
 .../images/actions/1downarrow.png                  |  Bin
 {spyderlib => spyder}/images/actions/1uparrow.png  |  Bin
 .../images/actions/2downarrow.png                  |  Bin
 {spyderlib => spyder}/images/actions/2uparrow.png  |  Bin
 .../images/actions/arrow-continue.png              |  Bin
 .../images/actions/arrow-step-in.png               |  Bin
 .../images/actions/arrow-step-out.png              |  Bin
 .../images/actions/arrow-step-over.png             |  Bin
 .../images/actions/auto_reload.png                 |  Bin
 .../images/actions/browse_tab.png                  |  Bin
 {spyderlib => spyder}/images/actions/check.png     |  Bin
 {spyderlib => spyder}/images/actions/cmdprompt.png |  Bin
 {spyderlib => spyder}/images/actions/collapse.png  |  Bin
 .../images/actions/collapse_selection.png          |  Bin
 {spyderlib => spyder}/images/actions/configure.png |  Bin
 {spyderlib => spyder}/images/actions/copywop.png   |  Bin
 {spyderlib => spyder}/images/actions/delete.png    |  Bin
 {spyderlib => spyder}/images/actions/edit.png      |  Bin
 {spyderlib => spyder}/images/actions/edit24.png    |  Bin
 {spyderlib => spyder}/images/actions/edit_add.png  |  Bin
 .../images/actions/edit_remove.png                 |  Bin
 {spyderlib => spyder}/images/actions/editcopy.png  |  Bin
 {spyderlib => spyder}/images/actions/editcut.png   |  Bin
 .../images/actions/editdelete.png                  |  Bin
 {spyderlib => spyder}/images/actions/editpaste.png |  Bin
 {spyderlib => spyder}/images/actions/eraser.png    |  Bin
 {spyderlib => spyder}/images/actions/exit.png      |  Bin
 {spyderlib => spyder}/images/actions/expand.png    |  Bin
 .../images/actions/expand_selection.png            |  Bin
 {spyderlib => spyder}/images/actions/filter.png    |  Bin
 {spyderlib => spyder}/images/actions/find.png      |  Bin
 {spyderlib => spyder}/images/actions/findf.png     |  Bin
 {spyderlib => spyder}/images/actions/findnext.png  |  Bin
 .../images/actions/findprevious.png                |  Bin
 .../images/actions/folder_new.png                  |  Bin
 {spyderlib => spyder}/images/actions/hide.png      |  Bin
 {spyderlib => spyder}/images/actions/hist.png      |  Bin
 {spyderlib => spyder}/images/actions/home.png      |  Bin
 {spyderlib => spyder}/images/actions/imshow.png    |  Bin
 {spyderlib => spyder}/images/actions/insert.png    |  Bin
 {spyderlib => spyder}/images/actions/lock.png      |  Bin
 {spyderlib => spyder}/images/actions/lock_open.png |  Bin
 {spyderlib => spyder}/images/actions/magnifier.png |  Bin
 {spyderlib => spyder}/images/actions/maximize.png  |  Bin
 {spyderlib => spyder}/images/actions/next.png      |  Bin
 .../images/actions/options_less.png                |  Bin
 .../images/actions/options_more.png                |  Bin
 {spyderlib => spyder}/images/actions/plot.png      |  Bin
 {spyderlib => spyder}/images/actions/previous.png  |  Bin
 {spyderlib => spyder}/images/actions/redo.png      |  Bin
 {spyderlib => spyder}/images/actions/reload.png    |  Bin
 {spyderlib => spyder}/images/actions/rename.png    |  Bin
 {spyderlib => spyder}/images/actions/replace.png   |  Bin
 {spyderlib => spyder}/images/actions/restore.png   |  Bin
 {spyderlib => spyder}/images/actions/show.png      |  Bin
 .../images/actions/special_paste.png               |  Bin
 {spyderlib => spyder}/images/actions/stop.png      |  Bin
 .../images/actions/stop_debug.png                  |  Bin
 .../images/actions/synchronize.png                 |  Bin
 .../images/actions/tooloptions.png                 |  Bin
 {spyderlib => spyder}/images/actions/undo.png      |  Bin
 .../images/actions/unmaximize.png                  |  Bin
 {spyderlib => spyder}/images/actions/up.png        |  Bin
 .../images/actions/window_fullscreen.png           |  Bin
 .../images/actions/window_nofullscreen.png         |  Bin
 {spyderlib => spyder}/images/actions/zoom_in.png   |  Bin
 {spyderlib => spyder}/images/actions/zoom_out.png  |  Bin
 {spyderlib => spyder}/images/advanced.png          |  Bin
 {spyderlib => spyder}/images/arredit.png           |  Bin
 {spyderlib => spyder}/images/arrow.png             |  Bin
 {spyderlib => spyder}/images/bold.png              |  Bin
 {spyderlib => spyder}/images/browser.png           |  Bin
 {spyderlib => spyder}/images/chevron-left.png      |  Bin
 {spyderlib => spyder}/images/chevron-right.png     |  Bin
 .../images/console/cmdprompt_t.png                 |  Bin
 {spyderlib => spyder}/images/console/console.png   |  Bin
 {spyderlib => spyder}/images/console/editclear.png |  Bin
 {spyderlib => spyder}/images/console/environ.png   |  Bin
 {spyderlib => spyder}/images/console/history.png   |  Bin
 {spyderlib => spyder}/images/console/history24.png |  Bin
 .../images/console/ipython_console.png             |  Bin
 .../images/console/ipython_console_t.png           |  Bin
 {spyderlib => spyder}/images/console/kill.png      |  Bin
 .../images/console/loading_sprites.png             |  Bin
 {spyderlib => spyder}/images/console/prompt.png    |  Bin
 {spyderlib => spyder}/images/console/python.png    |  Bin
 {spyderlib => spyder}/images/console/python_t.png  |  Bin
 {spyderlib => spyder}/images/console/restart.png   |  Bin
 {spyderlib => spyder}/images/console/run_small.png |  Bin
 {spyderlib => spyder}/images/console/syspath.png   |  Bin
 .../images/console/terminated.png                  |  Bin
 {spyderlib => spyder}/images/dictedit.png          |  Bin
 {spyderlib => spyder}/images/editor/attribute.png  |  Bin
 .../images/editor/blockcomment.png                 |  Bin
 .../images/editor/breakpoint_big.png               |  Bin
 .../images/editor/breakpoint_cond_big.png          |  Bin
 .../images/editor/breakpoint_cond_small.png        |  Bin
 .../images/editor/breakpoint_small.png             |  Bin
 {spyderlib => spyder}/images/editor/bug.png        |  Bin
 {spyderlib => spyder}/images/editor/cell.png       |  Bin
 {spyderlib => spyder}/images/editor/class.png      |  Bin
 .../images/editor/close_panel.png                  |  Bin
 {spyderlib => spyder}/images/editor/comment.png    |  Bin
 {spyderlib => spyder}/images/editor/convention.png |  Bin
 {spyderlib => spyder}/images/editor/debug.png      |  Bin
 {spyderlib => spyder}/images/editor/error.png      |  Bin
 {spyderlib => spyder}/images/editor/file.png       |  Bin
 {spyderlib => spyder}/images/editor/filelist.png   |  Bin
 {spyderlib => spyder}/images/editor/fromcursor.png |  Bin
 {spyderlib => spyder}/images/editor/function.png   |  Bin
 {spyderlib => spyder}/images/editor/gotoline.png   |  Bin
 {spyderlib => spyder}/images/editor/highlight.png  |  Bin
 {spyderlib => spyder}/images/editor/horsplit.png   |  Bin
 {spyderlib => spyder}/images/editor/indent.png     |  Bin
 .../images/editor/last_edit_location.png           |  Bin
 {spyderlib => spyder}/images/editor/method.png     |  Bin
 {spyderlib => spyder}/images/editor/module.png     |  Bin
 {spyderlib => spyder}/images/editor/newwindow.png  |  Bin
 .../images/editor/next_cursor.png                  |  Bin
 {spyderlib => spyder}/images/editor/next_wng.png   |  Bin
 {spyderlib => spyder}/images/editor/no_match.png   |  Bin
 .../images/editor/outline_explorer.png             |  Bin
 .../images/editor/outline_explorer_vis.png         |  Bin
 .../images/editor/prev_cursor.png                  |  Bin
 {spyderlib => spyder}/images/editor/prev_wng.png   |  Bin
 {spyderlib => spyder}/images/editor/private1.png   |  Bin
 {spyderlib => spyder}/images/editor/private2.png   |  Bin
 {spyderlib => spyder}/images/editor/refactor.png   |  Bin
 {spyderlib => spyder}/images/editor/run.png        |  Bin
 {spyderlib => spyder}/images/editor/run_again.png  |  Bin
 {spyderlib => spyder}/images/editor/run_cell.png   |  Bin
 .../images/editor/run_cell_advance.png             |  Bin
 .../images/editor/run_selection.png                |  Bin
 .../images/editor/run_settings.png                 |  Bin
 {spyderlib => spyder}/images/editor/select.png     |  Bin
 {spyderlib => spyder}/images/editor/selectall.png  |  Bin
 {spyderlib => spyder}/images/editor/todo.png       |  Bin
 {spyderlib => spyder}/images/editor/todo_list.png  |  Bin
 {spyderlib => spyder}/images/editor/uncomment.png  |  Bin
 {spyderlib => spyder}/images/editor/unindent.png   |  Bin
 {spyderlib => spyder}/images/editor/versplit.png   |  Bin
 {spyderlib => spyder}/images/editor/warning.png    |  Bin
 {spyderlib => spyder}/images/editor/wng_list.png   |  Bin
 {spyderlib => spyder}/images/eyedropper.png        |  Bin
 {spyderlib => spyder}/images/file/fileclose.png    |  Bin
 {spyderlib => spyder}/images/file/filecloseall.png |  Bin
 {spyderlib => spyder}/images/file/fileimport.png   |  Bin
 {spyderlib => spyder}/images/file/filenew.png      |  Bin
 {spyderlib => spyder}/images/file/fileopen.png     |  Bin
 {spyderlib => spyder}/images/file/filesave.png     |  Bin
 {spyderlib => spyder}/images/file/filesaveas.png   |  Bin
 {spyderlib => spyder}/images/file/print.png        |  Bin
 {spyderlib => spyder}/images/file/save_all.png     |  Bin
 {spyderlib => spyder}/images/filetypes/bat.png     |  Bin
 {spyderlib => spyder}/images/filetypes/bmp.png     |  Bin
 {spyderlib => spyder}/images/filetypes/c.png       |  Bin
 {spyderlib => spyder}/images/filetypes/cc.png      |  Bin
 {spyderlib => spyder}/images/filetypes/cfg.png     |  Bin
 {spyderlib => spyder}/images/filetypes/chm.png     |  Bin
 {spyderlib => spyder}/images/filetypes/cl.png      |  Bin
 {spyderlib => spyder}/images/filetypes/cmd.png     |  Bin
 {spyderlib => spyder}/images/filetypes/cpp.png     |  Bin
 {spyderlib => spyder}/images/filetypes/css.png     |  Bin
 {spyderlib => spyder}/images/filetypes/cxx.png     |  Bin
 {spyderlib => spyder}/images/filetypes/diff.png    |  Bin
 {spyderlib => spyder}/images/filetypes/doc.png     |  Bin
 {spyderlib => spyder}/images/filetypes/enaml.png   |  Bin
 {spyderlib => spyder}/images/filetypes/exe.png     |  Bin
 {spyderlib => spyder}/images/filetypes/f.png       |  Bin
 {spyderlib => spyder}/images/filetypes/f77.png     |  Bin
 {spyderlib => spyder}/images/filetypes/f90.png     |  Bin
 {spyderlib => spyder}/images/filetypes/gif.png     |  Bin
 {spyderlib => spyder}/images/filetypes/h.png       |  Bin
 {spyderlib => spyder}/images/filetypes/hh.png      |  Bin
 {spyderlib => spyder}/images/filetypes/hpp.png     |  Bin
 {spyderlib => spyder}/images/filetypes/htm.png     |  Bin
 {spyderlib => spyder}/images/filetypes/html.png    |  Bin
 {spyderlib => spyder}/images/filetypes/hxx.png     |  Bin
 {spyderlib => spyder}/images/filetypes/inf.png     |  Bin
 {spyderlib => spyder}/images/filetypes/ini.png     |  Bin
 {spyderlib => spyder}/images/filetypes/jl.png      |  Bin
 {spyderlib => spyder}/images/filetypes/jpeg.png    |  Bin
 {spyderlib => spyder}/images/filetypes/jpg.png     |  Bin
 {spyderlib => spyder}/images/filetypes/js.png      |  Bin
 {spyderlib => spyder}/images/filetypes/log.png     |  Bin
 {spyderlib => spyder}/images/filetypes/nsh.png     |  Bin
 {spyderlib => spyder}/images/filetypes/nsi.png     |  Bin
 {spyderlib => spyder}/images/filetypes/nt.png      |  Bin
 {spyderlib => spyder}/images/filetypes/patch.png   |  Bin
 {spyderlib => spyder}/images/filetypes/pdf.png     |  Bin
 {spyderlib => spyder}/images/filetypes/png.png     |  Bin
 {spyderlib => spyder}/images/filetypes/po.png      |  Bin
 {spyderlib => spyder}/images/filetypes/pot.png     |  Bin
 {spyderlib => spyder}/images/filetypes/pps.png     |  Bin
 .../images/filetypes/properties.png                |  Bin
 {spyderlib => spyder}/images/filetypes/ps.png      |  Bin
 {spyderlib => spyder}/images/filetypes/pxd.png     |  Bin
 {spyderlib => spyder}/images/filetypes/pxi.png     |  Bin
 {spyderlib => spyder}/images/filetypes/py.png      |  Bin
 {spyderlib => spyder}/images/filetypes/pyc.png     |  Bin
 {spyderlib => spyder}/images/filetypes/pyw.png     |  Bin
 {spyderlib => spyder}/images/filetypes/pyx.png     |  Bin
 {spyderlib => spyder}/images/filetypes/rar.png     |  Bin
 {spyderlib => spyder}/images/filetypes/readme.png  |  Bin
 {spyderlib => spyder}/images/filetypes/reg.png     |  Bin
 {spyderlib => spyder}/images/filetypes/rej.png     |  Bin
 {spyderlib => spyder}/images/filetypes/scss.png    |  Bin
 {spyderlib => spyder}/images/filetypes/session.png |  Bin
 {spyderlib => spyder}/images/filetypes/tar.png     |  Bin
 {spyderlib => spyder}/images/filetypes/tex.png     |  Bin
 {spyderlib => spyder}/images/filetypes/tgz.png     |  Bin
 {spyderlib => spyder}/images/filetypes/tif.png     |  Bin
 {spyderlib => spyder}/images/filetypes/tiff.png    |  Bin
 {spyderlib => spyder}/images/filetypes/ts.png      |  Bin
 {spyderlib => spyder}/images/filetypes/txt.png     |  Bin
 {spyderlib => spyder}/images/filetypes/ui.png      |  Bin
 {spyderlib => spyder}/images/filetypes/xls.png     |  Bin
 {spyderlib => spyder}/images/filetypes/xml.png     |  Bin
 {spyderlib => spyder}/images/filetypes/zip.png     |  Bin
 {spyderlib => spyder}/images/font.png              |  Bin
 {spyderlib => spyder}/images/genprefs.png          |  Bin
 {spyderlib => spyder}/images/help.png              |  Bin
 {spyderlib => spyder}/images/italic.png            |  Bin
 {spyderlib => spyder}/images/keyboard.png          |  Bin
 {spyderlib => spyder}/images/matplotlib.png        |  Bin
 {spyderlib => spyder}/images/none.png              |  Bin
 {spyderlib => spyder}/images/not_found.png         |  Bin
 {spyderlib => spyder}/images/options.svg           |    0
 .../images/projects/add_to_path.png                |  Bin
 {spyderlib => spyder}/images/projects/folder.png   |  Bin
 {spyderlib => spyder}/images/projects/package.png  |  Bin
 .../images/projects/pp_folder.png                  |  Bin
 .../images/projects/pp_package.png                 |  Bin
 .../images/projects/pp_project.png                 |  Bin
 {spyderlib => spyder}/images/projects/project.png  |  Bin
 .../images/projects/project_closed.png             |  Bin
 {spyderlib => spyder}/images/projects/pydev.png    |  Bin
 .../images/projects/pythonpath.png                 |  Bin
 .../images/projects/remove_from_path.png           |  Bin
 {spyderlib => spyder}/images/projects/show_all.png |  Bin
 {spyderlib => spyder}/images/pythonpath.png        |  Bin
 {spyderlib => spyder}/images/pythonxy.png          |  Bin
 {spyderlib => spyder}/images/qt.png                |  Bin
 {spyderlib => spyder}/images/qtassistant.png       |  Bin
 {spyderlib => spyder}/images/qtdesigner.png        |  Bin
 {spyderlib => spyder}/images/qtlinguist.png        |  Bin
 {spyderlib => spyder}/images/scipy.png             |  Bin
 {spyderlib => spyder}/images/set_workdir.png       |  Bin
 {spyderlib => spyder}/images/splash.svg            |    0
 {spyderlib => spyder}/images/spyder.png            |  Bin
 {spyderlib => spyder}/images/spyder.svg            |    0
 {spyderlib => spyder}/images/tour-spyder-logo.png  |  Bin
 {spyderlib => spyder}/images/upper_lower.png       |  Bin
 {spyderlib => spyder}/images/vcs_browse.png        |  Bin
 {spyderlib => spyder}/images/vcs_commit.png        |  Bin
 {spyderlib => spyder}/images/vitables.png          |  Bin
 {spyderlib => spyder}/images/whole_words.png       |  Bin
 {spyderlib => spyder}/images/win_env.png           |  Bin
 {spyderlib => spyder}/images/winpython.svg         |    0
 {spyderlib => spyder}/interpreter.py               |   12 +-
 spyder/locale/es/LC_MESSAGES/spyder.mo             |  Bin 0 -> 108257 bytes
 .../locale/es/LC_MESSAGES/spyder.po                | 8528 ++++++++++----------
 spyder/locale/fr/LC_MESSAGES/spyder.mo             |  Bin 0 -> 79432 bytes
 .../locale/fr/LC_MESSAGES/spyder.po                | 8486 +++++++++----------
 spyder/locale/ja/LC_MESSAGES/spyder.mo             |  Bin 0 -> 106996 bytes
 .../locale/ja/LC_MESSAGES/spyder.po                | 7682 +++++++++---------
 spyder/locale/pt_BR/LC_MESSAGES/spyder.mo          |  Bin 0 -> 106145 bytes
 .../locale/pt_BR/LC_MESSAGES/spyder.po             | 7759 +++++++++---------
 spyder/locale/ru/LC_MESSAGES/spyder.mo             |  Bin 0 -> 134819 bytes
 .../locale/ru/LC_MESSAGES/spyder.po                | 7771 +++++++++---------
 spyder/locale/spyder.pot                           | 4624 +++++++++++
 {spyderlib => spyder}/otherplugins.py              |    8 +-
 {spyderlib => spyder}/pil_patch.py                 |    4 +-
 {spyderlib => spyder}/plugins/__init__.py          |   47 +-
 {spyderlib => spyder}/plugins/configdialog.py      |   64 +-
 {spyderlib => spyder}/plugins/console.py           |   28 +-
 {spyderlib => spyder}/plugins/editor.py            |  204 +-
 {spyderlib => spyder}/plugins/explorer.py          |   12 +-
 {spyderlib => spyder}/plugins/externalconsole.py   |  506 +-
 {spyderlib => spyder}/plugins/findinfiles.py       |   20 +-
 {spyderlib => spyder}/plugins/help.py              |   91 +-
 {spyderlib => spyder}/plugins/history.py           |   36 +-
 {spyderlib => spyder}/plugins/ipythonconsole.py    | 1068 ++-
 {spyderlib => spyder}/plugins/layoutdialog.py      |   10 +-
 spyder/plugins/maininterpreter.py                  |  204 +
 {spyderlib => spyder}/plugins/onlinehelp.py        |   12 +-
 {spyderlib => spyder}/plugins/outlineexplorer.py   |   16 +-
 spyder/plugins/projects.py                         |  395 +
 {spyderlib => spyder}/plugins/runconfig.py         |   16 +-
 {spyderlib => spyder}/plugins/shortcuts.py         |   24 +-
 {spyderlib => spyder}/plugins/variableexplorer.py  |   21 +-
 {spyderlib => spyder}/plugins/workingdirectory.py  |   19 +-
 {spyderlib => spyder}/py3compat.py                 |    8 +-
 {spyderlib => spyder}/pyplot.py                    |    0
 {spyderlib => spyder}/requirements.py              |    5 +-
 {spyderlib => spyder}/rope_patch.py                |   14 +-
 {spyderlib => spyder}/scientific_startup.py        |    4 +-
 spyder/utils/__init__.py                           |   12 +
 {spyderlib => spyder}/utils/bsdsocket.py           |    8 +-
 {spyderlib => spyder}/utils/codeanalysis.py        |   16 +-
 {spyderlib => spyder}/utils/debug.py               |    7 +-
 {spyderlib => spyder}/utils/dochelpers.py          |   12 +-
 {spyderlib => spyder}/utils/encoding.py            |    8 +-
 {spyderlib => spyder}/utils/environ.py             |   14 +-
 {spyderlib => spyder}/utils/external/__init__.py   |   10 +-
 {spyderlib => spyder}/utils/external/lockfile.py   |    4 +-
 {spyderlib => spyder}/utils/fixtures.py            |    6 +-
 {spyderlib => spyder}/utils/help/__init__.py       |    8 +-
 {spyderlib => spyder}/utils/help/conf.py           |    8 +-
 .../utils/help/js/collapse_sections.js             |    0
 {spyderlib => spyder}/utils/help/js/copy_button.js |    0
 .../utils/help/js/fix_image_paths.js               |    2 +-
 {spyderlib => spyder}/utils/help/js/math_config.js |    2 +-
 .../utils/help/js/move_outline.js                  |    2 +-
 {spyderlib => spyder}/utils/help/js/utils.js       |    2 +-
 {spyderlib => spyder}/utils/help/sphinxify.py      |   20 +-
 .../utils/help/static/css/default.css              |    0
 .../utils/help/static/css/pygments.css             |    0
 .../utils/help/static/images/collapse_expand.png   |  Bin
 .../utils/help/static/images/debug-continue.png    |  Bin
 .../utils/help/static/images/debug-step-in.png     |  Bin
 .../utils/help/static/images/debug-step-out.png    |  Bin
 .../utils/help/static/images/debug-step-over.png   |  Bin
 .../help/static/images/spyder-hello-docstring.png  |  Bin
 .../images/spyder-nice-docstring-rendering.png     |  Bin
 .../help/static/images/spyder-sympy-example.png    |  Bin
 .../utils/help/templates/layout.html               |    2 +-
 .../utils/help/templates/usage.html                |    2 +-
 spyder/utils/help/templates/warning.html           |   26 +
 {spyderlib => spyder}/utils/help/tutorial.rst      |    0
 {spyderlib => spyder}/utils/icon_manager.py        |    9 +-
 .../externalshell => spyder/utils}/inputhooks.py   |    0
 .../utils/introspection/__init__.py                |    4 +-
 .../utils/introspection/fallback_plugin.py         |   18 +-
 .../utils/introspection/jedi_plugin.py             |   20 +-
 .../utils/introspection/manager.py                 |   14 +-
 .../utils/introspection/module_completion.py       |    6 +-
 .../utils/introspection/plugin_client.py           |    8 +-
 .../utils/introspection/plugin_server.py           |    6 +-
 .../utils/introspection/rope_plugin.py             |   26 +-
 {spyderlib => spyder}/utils/introspection/utils.py |    8 +-
 {spyderlib => spyder}/utils/iofuncs.py             |   93 +-
 spyder/utils/ipython/__init__.py                   |    9 +
 spyder/utils/ipython/spyder_kernel.py              |  330 +
 .../utils/ipython/start_kernel.py                  |  198 +-
 .../utils/ipython/templates/blank.html             |    2 +-
 .../utils/ipython/templates/kernel_error.html      |    2 +-
 .../utils/ipython/templates/loading.html           |    2 +-
 {spyderlib => spyder}/utils/misc.py                |   53 +-
 {spyderlib => spyder}/utils/programs.py            |   12 +-
 {spyderlib => spyder}/utils/qthelpers.py           |   20 +-
 spyder/utils/site/__init__.py                      |   16 +
 .../utils/site}/osx_app_site.py                    |    0
 .../utils/site}/sitecustomize.py                   |  160 +-
 {spyderlib => spyder}/utils/sourcecode.py          |    6 +-
 {spyderlib => spyder}/utils/stringmatching.py      |    4 +-
 {spyderlib => spyder}/utils/syntaxhighlighters.py  |   14 +-
 {spyderlib => spyder}/utils/system.py              |    6 +-
 {spyderlib => spyder}/utils/vcs.py                 |   10 +-
 {spyderlib => spyder}/utils/windows.py             |    6 +-
 {spyderlib => spyder}/widgets/__init__.py          |   10 +-
 {spyderlib => spyder}/widgets/arraybuilder.py      |   12 +-
 {spyderlib => spyder}/widgets/browser.py           |   20 +-
 {spyderlib => spyder}/widgets/calltip.py           |    2 +-
 {spyderlib => spyder}/widgets/colors.py            |    6 +-
 {spyderlib => spyder}/widgets/comboboxes.py        |   10 +-
 {spyderlib => spyder}/widgets/dependencies.py      |   18 +-
 {spyderlib => spyder}/widgets/editor.py            |   69 +-
 {spyderlib => spyder}/widgets/editortools.py       |   16 +-
 {spyderlib => spyder}/widgets/explorer.py          |   81 +-
 .../widgets/externalshell/__init__.py              |    8 +-
 .../widgets/externalshell/baseshell.py             |   34 +-
 .../widgets/externalshell/introspection.py         |   17 +-
 .../widgets/externalshell/monitor.py               |  123 +-
 .../widgets/externalshell/pythonshell.py           |   99 +-
 .../widgets/externalshell/systemshell.py           |   24 +-
 {spyderlib => spyder}/widgets/fileswitcher.py      |   63 +-
 {spyderlib => spyder}/widgets/findinfiles.py       |   24 +-
 {spyderlib => spyder}/widgets/findreplace.py       |   18 +-
 {spyderlib => spyder}/widgets/formlayout.py        |    6 +-
 {spyderlib => spyder}/widgets/helperwidgets.py     |   34 +-
 {spyderlib => spyder}/widgets/internalshell.py     |   39 +-
 spyder/widgets/ipythonconsole/__init__.py          |   19 +
 spyder/widgets/ipythonconsole/client.py            |  398 +
 spyder/widgets/ipythonconsole/control.py           |  109 +
 spyder/widgets/ipythonconsole/debugging.py         |  140 +
 spyder/widgets/ipythonconsole/help.py              |  126 +
 spyder/widgets/ipythonconsole/namespacebrowser.py  |  209 +
 spyder/widgets/ipythonconsole/shell.py             |  263 +
 {spyderlib => spyder}/widgets/mixins.py            |   28 +-
 {spyderlib => spyder}/widgets/onecolumntree.py     |   12 +-
 {spyderlib => spyder}/widgets/pathmanager.py       |   18 +-
 spyder/widgets/projects/__init__.py                |   96 +
 spyder/widgets/projects/config.py                  |   98 +
 spyder/widgets/projects/configdialog.py            |  190 +
 spyder/widgets/projects/explorer.py                |  262 +
 spyder/widgets/projects/projectdialog.py           |  199 +
 spyder/widgets/projects/type/__init__.py           |  215 +
 spyder/widgets/projects/type/python.py             |   88 +
 {spyderlib => spyder}/widgets/pydocgui.py          |   14 +-
 {spyderlib => spyder}/widgets/shell.py             |   32 +-
 .../widgets/sourcecode/__init__.py                 |    8 +-
 {spyderlib => spyder}/widgets/sourcecode/base.py   |   18 +-
 .../widgets/sourcecode/codeeditor.py               |   52 +-
 .../widgets/sourcecode/kill_ring.py                |    0
 .../widgets/sourcecode/terminal.py                 |    4 +-
 {spyderlib => spyder}/widgets/status.py            |   20 +-
 {spyderlib => spyder}/widgets/tabs.py              |   24 +-
 {spyderlib => spyder}/widgets/tests/__init__.py    |    0
 .../widgets/tests/test_array_builder.py            |    4 +-
 {spyderlib => spyder}/widgets/tests/test_editor.py |    4 +-
 spyder/widgets/variableexplorer/__init__.py        |   12 +
 .../widgets/variableexplorer/arrayeditor.py        |   21 +-
 .../widgets/variableexplorer/collectionseditor.py  |   72 +-
 .../widgets/variableexplorer/dataframeeditor.py    |   20 +-
 .../widgets/variableexplorer/importwizard.py       |   20 +-
 .../widgets/variableexplorer/namespacebrowser.py   |  391 +-
 .../widgets/variableexplorer/objecteditor.py       |   22 +-
 .../widgets/variableexplorer/texteditor.py         |   16 +-
 .../widgets/variableexplorer/utils.py              |   69 +-
 {spyderlib => spyder}/workers/__init__.py          |    0
 {spyderlib => spyder}/workers/updates.py           |   13 +-
 spyder_breakpoints/breakpoints.py                  |   14 +-
 spyder_breakpoints/locale/breakpoints.pot          |   18 +-
 .../locale/es/LC_MESSAGES/breakpoints.mo           |  Bin 772 -> 772 bytes
 .../locale/es/LC_MESSAGES/breakpoints.po           |   18 +-
 .../locale/fr/LC_MESSAGES/breakpoints.mo           |  Bin 835 -> 835 bytes
 .../locale/fr/LC_MESSAGES/breakpoints.po           |   18 +-
 .../locale/pt_BR/LC_MESSAGES/breakpoints.mo        |  Bin 863 -> 863 bytes
 .../locale/pt_BR/LC_MESSAGES/breakpoints.po        |   18 +-
 .../locale/ru/LC_MESSAGES/breakpoints.mo           |  Bin 1068 -> 1067 bytes
 .../locale/ru/LC_MESSAGES/breakpoints.po           |   22 +-
 spyder_breakpoints/widgets/breakpointsgui.py       |   12 +-
 spyder_io_hdf5/hdf5.py                             |    4 +-
 spyder_profiler/locale/es/LC_MESSAGES/profiler.mo  |  Bin 794 -> 794 bytes
 spyder_profiler/locale/es/LC_MESSAGES/profiler.po  |   91 +-
 spyder_profiler/locale/fr/LC_MESSAGES/profiler.mo  |  Bin 2736 -> 2342 bytes
 spyder_profiler/locale/fr/LC_MESSAGES/profiler.po  |   92 +-
 spyder_profiler/locale/profiler.pot                |   91 +-
 .../locale/pt_BR/LC_MESSAGES/profiler.mo           |  Bin 2317 -> 2317 bytes
 .../locale/pt_BR/LC_MESSAGES/profiler.po           |   92 +-
 spyder_profiler/locale/ru/LC_MESSAGES/profiler.mo  |  Bin 3844 -> 3935 bytes
 spyder_profiler/locale/ru/LC_MESSAGES/profiler.po  |   97 +-
 spyder_profiler/profiler.py                        |   16 +-
 spyder_profiler/widgets/profilergui.py             |   30 +-
 spyder_pylint/locale/es/LC_MESSAGES/pylint.mo      |  Bin 1137 -> 1137 bytes
 spyder_pylint/locale/es/LC_MESSAGES/pylint.po      |   77 +-
 spyder_pylint/locale/fr/LC_MESSAGES/pylint.mo      |  Bin 2427 -> 2594 bytes
 spyder_pylint/locale/fr/LC_MESSAGES/pylint.po      |   77 +-
 spyder_pylint/locale/pt_BR/LC_MESSAGES/pylint.mo   |  Bin 2607 -> 2607 bytes
 spyder_pylint/locale/pt_BR/LC_MESSAGES/pylint.po   |   77 +-
 spyder_pylint/locale/pylint.pot                    |   77 +-
 spyder_pylint/locale/ru/LC_MESSAGES/pylint.mo      |  Bin 3190 -> 3189 bytes
 spyder_pylint/locale/ru/LC_MESSAGES/pylint.po      |   81 +-
 spyder_pylint/pylint.py                            |   13 +-
 spyder_pylint/widgets/pylintgui.py                 |   28 +-
 spyderlib/locale/es/LC_MESSAGES/spyderlib.mo       |  Bin 97535 -> 0 bytes
 spyderlib/locale/fr/LC_MESSAGES/spyderlib.mo       |  Bin 97704 -> 0 bytes
 spyderlib/locale/ja/LC_MESSAGES/spyderlib.mo       |  Bin 120090 -> 0 bytes
 spyderlib/locale/pt_BR/LC_MESSAGES/spyderlib.mo    |  Bin 91400 -> 0 bytes
 spyderlib/locale/ru/LC_MESSAGES/spyderlib.mo       |  Bin 139794 -> 0 bytes
 spyderlib/locale/spyderlib.pot                     | 5117 ------------
 spyderlib/plugins/projectexplorer.py               |  159 -
 spyderlib/utils/__init__.py                        |   12 -
 spyderlib/utils/help/templates/warning.html        |   12 -
 spyderlib/widgets/ipython.py                       |  792 --
 spyderlib/widgets/projectexplorer.py               | 1379 ----
 spyderlib/widgets/variableexplorer/__init__.py     |   12 -
 504 files changed, 31759 insertions(+), 31147 deletions(-)

diff --git a/LICENSE b/LICENSE
index 650c4ff..aae9261 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,7 +1,7 @@
 Spyder License Agreement (MIT License)
 --------------------------------------
 
-Copyright (c) 2009- The Spyder Development Team
+Copyright (c) Spyder Project Contributors
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation
@@ -31,38 +31,38 @@ Included software
 License terms are included in any software used inside Spyder's source code.
 
 
-Included images (spyderlib/images)
+Included images (spyder/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/attribute.png
-spyderlib/images/editor/filelist.png
-spyderlib/images/editor/function.png
-spyderlib/images/editor/method.png
-spyderlib/images/editor/module.png
-spyderlib/images/editor/no_match.png
-spyderlib/images/editor/private1.png
-spyderlib/images/editor/private2.png
-spyderlib/images/editor/cell.png
-spyderlib/images/editor/blockcomment.png
-spyderlib/images/editor/refactor.png
-spyderlib/images/console/ipython_console.png
-spyderlib/images/console/ipython_console_t.png
+spyder/images/arredit.png
+spyder/images/dictedit.png
+spyder/images/none.png
+spyder/images/not_found.png
+spyder/images/matplotlib.png
+spyder/images/options.svg
+spyder/images/set_workdir.png
+spyder/images/splash.png
+spyder/images/spyder.svg
+spyder/images/spyder_light.svg
+spyder/images/whole_words.png
+spyder/images/win_env.png
+spyder/images/actions/hist.png
+spyder/images/actions/window_nofullscreen.png
+spyder/images/editor/attribute.png
+spyder/images/editor/filelist.png
+spyder/images/editor/function.png
+spyder/images/editor/method.png
+spyder/images/editor/module.png
+spyder/images/editor/no_match.png
+spyder/images/editor/private1.png
+spyder/images/editor/private2.png
+spyder/images/editor/cell.png
+spyder/images/editor/blockcomment.png
+spyder/images/editor/refactor.png
+spyder/images/console/ipython_console.png
+spyder/images/console/ipython_console_t.png
 
 
 [2] Crystal Project Icons
@@ -71,276 +71,276 @@ spyderlib/images/console/ipython_console_t.png
     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/help.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/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/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
+spyder/images/advanced.png
+spyder/images/arrow.png
+spyder/images/bold.png
+spyder/images/browser.png
+spyder/images/ext_tools.png
+spyder/images/font.png
+spyder/images/genprefs.png
+spyder/images/help.png
+spyder/images/italic.png
+spyder/images/pythonpath_mgr.png
+spyder/images/upper_lower.png
+spyder/images/vcs_browse.png
+spyder/images/vcs_commit.png
+spyder/images/actions/1downarrow.png
+spyder/images/actions/1uparrow.png
+spyder/images/actions/2downarrow.png
+spyder/images/actions/2uparrow.png
+spyder/images/actions/auto_reload.png
+spyder/images/actions/browse_tab.png
+spyder/images/actions/check.png
+spyder/images/actions/cmdprompt.png
+spyder/images/actions/configure.png
+spyder/images/actions/copywop.png
+spyder/images/actions/delete.png
+spyder/images/actions/edit.png
+spyder/images/actions/edit24.png
+spyder/images/actions/editcopy.png
+spyder/images/actions/editcut.png
+spyder/images/actions/editdelete.png
+spyder/images/actions/editpaste.png
+spyder/images/actions/edit_add.png
+spyder/images/actions/edit_remove.png
+spyder/images/actions/eraser.png
+spyder/images/actions/exit.png
+spyder/images/actions/filter.png
+spyder/images/actions/find.png
+spyder/images/actions/findf.png
+spyder/images/actions/findnext.png
+spyder/images/actions/findprevious.png
+spyder/images/actions/folder_new.png
+spyder/images/actions/hide.png
+spyder/images/actions/home.png
+spyder/images/actions/imshow.png
+spyder/images/actions/insert.png
+spyder/images/actions/lock.png
+spyder/images/actions/lock_open.png
+spyder/images/actions/magnifier.png
+spyder/images/actions/next.png
+spyder/images/actions/options_less.png
+spyder/images/actions/options_more.png
+spyder/images/actions/plot.png
+spyder/images/actions/previous.png
+spyder/images/actions/redo.png
+spyder/images/actions/reload.png
+spyder/images/actions/rename.png
+spyder/images/actions/replace.png
+spyder/images/actions/show.png
+spyder/images/actions/special_paste.png
+spyder/images/actions/synchronize.png
+spyder/images/actions/tooloptions.png
+spyder/images/actions/undo.png
+spyder/images/actions/up.png
+spyder/images/actions/zoom_in.png
+spyder/images/actions/zoom_out.png
+spyder/images/console/clear.png
+spyder/images/console/cmdprompt_t.png
+spyder/images/console/console.png
+spyder/images/console/environ.png
+spyder/images/console/history.png
+spyder/images/console/history24.png
+spyder/images/console/kill.png
+spyder/images/console/prompt.png
+spyder/images/console/restart.png
+spyder/images/console/syspath.png
+spyder/images/editor/bug.png
+spyder/images/editor/close_panel.png
+spyder/images/editor/comment.png
+spyder/images/editor/error.png
+spyder/images/editor/file.png
+spyder/images/editor/fromcursor.png
+spyder/images/editor/gotoline.png
+spyder/images/editor/highlight.png
+spyder/images/editor/horsplit.png
+spyder/images/editor/indent.png
+spyder/images/editor/last_edit_location.png
+spyder/images/editor/newwindow.png
+spyder/images/editor/next_cursor.png
+spyder/images/editor/next_wng.png
+spyder/images/editor/outline_explorer.png
+spyder/images/editor/outline_explorer_vis.png
+spyder/images/editor/prev_cursor.png
+spyder/images/editor/prev_wng.png
+spyder/images/editor/select.png
+spyder/images/editor/selectall.png
+spyder/images/editor/todo_list.png
+spyder/images/editor/uncomment.png
+spyder/images/editor/unindent.png
+spyder/images/editor/versplit.png
+spyder/images/editor/wng_list.png
+spyder/images/file/fileclose.png
+spyder/images/file/filecloseall.png
+spyder/images/file/fileimport.png
+spyder/images/file/filenew.png
+spyder/images/file/fileopen.png
+spyder/images/file/filesave.png
+spyder/images/file/filesaveas.png
+spyder/images/file/print.png
+spyder/images/file/save_all.png
+spyder/images/filetypes/bat.png
+spyder/images/filetypes/bmp.png
+spyder/images/filetypes/c.png
+spyder/images/filetypes/cc.png
+spyder/images/filetypes/cfg.png
+spyder/images/filetypes/chm.png
+spyder/images/filetypes/cl.png
+spyder/images/filetypes/cmd.png
+spyder/images/filetypes/cpp.png
+spyder/images/filetypes/css.png
+spyder/images/filetypes/cxx.png
+spyder/images/filetypes/diff.png
+spyder/images/filetypes/doc.png
+spyder/images/filetypes/exe.png
+spyder/images/filetypes/f.png
+spyder/images/filetypes/f77.png
+spyder/images/filetypes/f90.png
+spyder/images/filetypes/gif.png
+spyder/images/filetypes/h.png
+spyder/images/filetypes/hh.png
+spyder/images/filetypes/hpp.png
+spyder/images/filetypes/htm.png
+spyder/images/filetypes/html.png
+spyder/images/filetypes/hxx.png
+spyder/images/filetypes/inf.png
+spyder/images/filetypes/ini.png
+spyder/images/filetypes/jpeg.png
+spyder/images/filetypes/jpg.png
+spyder/images/filetypes/js.png
+spyder/images/filetypes/log.png
+spyder/images/filetypes/nt.png
+spyder/images/filetypes/patch.png
+spyder/images/filetypes/pdf.png
+spyder/images/filetypes/png.png
+spyder/images/filetypes/pps.png
+spyder/images/filetypes/properties.png
+spyder/images/filetypes/ps.png
+spyder/images/filetypes/pxd.png
+spyder/images/filetypes/pxi.png
+spyder/images/filetypes/pyx.png
+spyder/images/filetypes/rar.png
+spyder/images/filetypes/readme.png
+spyder/images/filetypes/reg.png
+spyder/images/filetypes/rej.png
+spyder/images/filetypes/session.png
+spyder/images/filetypes/tar.png
+spyder/images/filetypes/tex.png
+spyder/images/filetypes/tgz.png
+spyder/images/filetypes/tif.png
+spyder/images/filetypes/tiff.png
+spyder/images/filetypes/txt.png
+spyder/images/filetypes/xls.png
+spyder/images/filetypes/xml.png
+spyder/images/filetypes/zip.png
+spyder/images/projects/add_to_path.png
+spyder/images/projects/folder.png
+spyder/images/projects/package.png
+spyder/images/projects/pp_folder.png
+spyder/images/projects/pp_package.png
+spyder/images/projects/pp_project.png
+spyder/images/projects/project.png
+spyder/images/projects/project_closed.png
+spyder/images/projects/pythonpath.png
+spyder/images/projects/remove_from_path.png
+spyder/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
+spyder/images/qt.png
+spyder/images/qtassistant.png
+spyder/images/qtdesigner.png
+spyder/images/qtlinguist.png
+spyder/images/filetypes/ts.png
+spyder/images/filetypes/ui.png
 
 
 [4] GNU General Public License version 3 
 
-spyderlib/images/pythonxy.png
-spyderlib/images/vitables.png
+spyder/images/pythonxy.png
+spyder/images/vitables.png
 
 
 [5] MIT License
 
-spyderlib/images/winpython.svg
-spyderlib/images/chevron-left.png
-spyderlib/images/chevron-right.png
+spyder/images/winpython.svg
+spyder/images/chevron-left.png
+spyder/images/chevron-right.png
 
 
 [6] BSD License
 
-spyderlib/images/scipy.png
+spyder/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
+spyder/images/actions/collapse.png
+spyder/images/actions/collapse_selection.png
+spyder/images/actions/expand.png
+spyder/images/actions/expand_selection.png
+spyder/images/actions/restore.png
+spyder/images/editor/class.png
+spyder/images/editor/convention.png
+spyder/images/editor/todo.png
+spyder/images/editor/warning.png
+spyder/images/filetypes/po.png
+spyder/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
+spyder/images/console/python.png
+spyder/images/console/python_t.png
+spyder/images/filetypes/py.png
+spyder/images/filetypes/pyc.png
+spyder/images/filetypes/pyw.png
 
 
 [9] zlib/libpng license
-spyderlib/images/filetypes/nsh.png
-spyderlib/images/filetypes/nsi.png
+spyder/images/filetypes/nsh.png
+spyder/images/filetypes/nsi.png
 
 
 [10] Eclipse Public License
-spyderlib/images/projects/pydev.png
+spyder/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
-spyderlib/images/actions/stop.png
+spyder/images/actions/arrow-continue.png
+spyder/images/actions/arrow-step-in.png
+spyder/images/actions/arrow-step-out.png
+spyder/images/actions/arrow-step-over.png
+spyder/images/actions/maximize.png
+spyder/images/actions/stop_debug.png
+spyder/images/actions/unmaximize.png
+spyder/images/actions/window_fullscreen.png
+spyder/images/editor/breakpoint_big.png
+spyder/images/editor/breakpoint_cond_big.png
+spyder/images/editor/breakpoint_cond_small.png
+spyder/images/editor/breakpoint_small.png
+spyder/images/editor/debug.png
+spyder/images/console/terminated.png
+spyder/images/actions/stop.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
+spyder/images/editor/run.png
+spyder/images/editor/run_again.png
+spyder/images/editor/run_cell.png
+spyder/images/editor/run_cell_advance.png
+spyder/images/editor/run_selection.png
+spyder/images/editor/run_settings.png
+spyder/images/console/run_small.png
 
 [13] http://preloaders.net/
 (According to the website: "All animated GIF and APNG images are completely
 free to use in all projects (web and desktop applications, freeware and
 commercial projects)")
 
-spyderlib/images/console/loading_sprites.png
+spyder/images/console/loading_sprites.png
diff --git a/MANIFEST.in b/MANIFEST.in
index c7e564a..df2aa25 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,11 +1,10 @@
-recursive-include spyderlib *.pot *.po *.svg *.png *.css *.qss
+recursive-include spyder *.pot *.po *.svg *.png *.css *.qss
 recursive-include spyder_breakpoints *.pot *.po *.svg *.png
 recursive-include spyder_profiler *.pot *.po *.svg *.png
 recursive-include spyder_pylint *.pot *.po *.svg *.png
 recursive-include doc *.py *.rst *.png *.ico *.
-recursive-include app_example *.py *.pyw *.bat *.qm *.svg *.png
-include spyderlib/fonts/spyder.ttf
-include spyderlib/fonts/spyder-charmap.json
+include spyder/fonts/spyder.ttf
+include spyder/fonts/spyder-charmap.json
 include scripts/*
 include img_src/*.ico
 include img_src/spyder.png
diff --git a/PKG-INFO b/PKG-INFO
index b392847..46ad7d1 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: spyder
-Version: 3.0.0b5
+Version: 3.0.0
 Summary: Scientific PYthon Development EnviRonment
 Home-page: https://github.com/spyder-ide/spyder
-Author: The Spyder Development Team
+Author: The Spyder Project Contributors
 Author-email: UNKNOWN
 License: MIT
-Download-URL: https://github.com/spyder-ide/spyder/files/spyder-3.0.0b5.zip
+Download-URL: https://github.com/spyder-ide/spyder/files/spyder-3.0.0.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 PyQt5 or
diff --git a/README.md b/README.md
index 2f492a8..c460b43 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Spyder - The Scientific PYthon Development EnviRonment
 
-Copyright © 2009- The Spyder Development Team.
+Copyright © Spyder Project Contributors.
 
 ## Project details
 [![license](https://img.shields.io/pypi/l/spyder.svg)](./LICENSE)
@@ -11,7 +11,6 @@ Copyright © 2009- The Spyder Development Team.
 [![Travis status](https://travis-ci.org/spyder-ide/spyder.svg?branch=master)](https://travis-ci.org/spyder-ide/spyder)
 [![AppVeyor status](https://ci.appveyor.com/api/projects/status/awb92if4tl555fuy/branch/master?svg=true)](https://ci.appveyor.com/project/ccordoba12/spyder/branch/master)
 [![Coverage Status](https://coveralls.io/repos/github/spyder-ide/spyder/badge.svg?branch=master)](https://coveralls.io/github/spyder-ide/spyder?branch=master)
-[![Code Issues](https://www.quantifiedcode.com/api/v1/project/bc88bbc67a4a4c34b58d65070be4fa9e/badge.svg)](https://www.quantifiedcode.com/app/project/bc88bbc67a4a4c34b58d65070be4fa9e)
 
 ## Overview
 
@@ -50,8 +49,8 @@ Spyder is a Python development environment with a lot of features:
 
 * **History log**
 
-Spyder may also be used as a PyQt5/PyQt4 extension library (module 
-`spyderlib`). For example, the Python interactive shell widget used in
+Spyder may also be used as a PyQt5/PyQt4 extension library (module
+`spyder`). For example, the Python interactive shell widget used in
 Spyder may be embedded in your own PyQt5/PyQt4 application.
 
 
@@ -75,7 +74,7 @@ The easiest way to install Spyder is:
 - Or using one of these scientific Python distributions:
   1. [Anaconda](http://continuum.io/downloads)
   2. [WinPython](https://winpython.github.io/)
-  3. [Python(x,y)](http://pythonxy.googlecode.com)
+  3. [Python(x,y)](http://python-xy.github.io)
 - Using one of our executable installers, which can be found
   [here](https://github.com/spyder-ide/spyder/releases).
 
diff --git a/app_example/create_exe.py b/app_example/create_exe.py
deleted file mode 100644
index f370df7..0000000
--- a/app_example/create_exe.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright © 2011 Pierre Raybaut
-# Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
-
-"""Create a stand-alone executable"""
-
-try:
-    from guidata.disthelpers import Distribution
-except ImportError:
-    raise ImportError("This script requires guidata 1.4+")
-
-import spyderlib
-
-
-def create_executable():
-    """Build executable using ``guidata.disthelpers``"""
-    dist = Distribution()
-    dist.setup(name="Example", version="1.1",
-               description="Embedding Spyder Qt shell",
-               script="example.pyw", target_name="example.exe")
-    spyderlib.add_to_distribution(dist)
-    #dist.add_modules('matplotlib')  # Uncomment if you need matplotlib
-    dist.excludes += ['IPython']
-    # Building executable
-    dist.build('cx_Freeze')
-
-
-if __name__ == '__main__':
-    create_executable()
diff --git a/app_example/example.pyw b/app_example/example.pyw
deleted file mode 100644
index 38d3802..0000000
--- a/app_example/example.pyw
+++ /dev/null
@@ -1,77 +0,0 @@
-
-# Third party imports
-from qtpy.QtCore import Qt
-from qtpy.QtGui import QFont
-from qtpy.QtWidgets import (QApplication, QDockWidget, QHBoxLayout, QLabel,
-                            QLineEdit, QMainWindow, QWidget)
-
-# Local imports
-from spyderlib.widgets.internalshell import InternalShell
-
-
-class MyWidget(QWidget):
-    def __init__(self):
-        QWidget.__init__(self)
-        label = QLabel("Imagine an extraordinary complex widget right here...")
-        self.edit = QLineEdit("Text")
-        layout = QHBoxLayout()
-        layout.addWidget(label)
-        layout.addWidget(self.edit)
-        self.setLayout(layout)
-
-    def get_text(self):
-        """Return sample edit text"""
-        return self.edit.text()
-
-    def set_text(self, text):
-        """Set sample edit text"""
-        self.edit.setText(text)
-
-
-class MyWindow(QMainWindow):
-    def __init__(self):
-        QMainWindow.__init__(self)
-
-        # Set this very simple widget as central widget
-        widget = MyWidget()
-        self.setCentralWidget(widget)
-
-        # Create the console widget
-        font = QFont("Courier new")
-        font.setPointSize(10)
-        ns = {'win': self, 'widget': widget}
-        msg = "Try for example: widget.set_text('foobar') or win.close()"
-        # Note: by default, the internal shell is multithreaded which is safer
-        # but not compatible with graphical user interface creation.
-        # For example, if you need to plot data with Matplotlib, you will need
-        # to pass the option: multithreaded=False
-        self.console = cons = InternalShell(self, namespace=ns, message=msg)
-
-        # Setup the console widget
-        cons.set_font(font)
-        cons.set_codecompletion_auto(True)
-        cons.set_calltips(True)
-        cons.setup_calltips(size=600, font=font)
-        cons.setup_completion(size=(300, 180), font=font)
-        console_dock = QDockWidget("Console", self)
-        console_dock.setWidget(cons)
-
-        # Add the console widget to window as a dockwidget
-        self.addDockWidget(Qt.BottomDockWidgetArea, console_dock)
-
-        self.resize(800, 600)
-
-    def closeEvent(self, event):
-        self.console.exit_interpreter()
-        event.accept()
-
-
-def main():
-    app = QApplication([])
-    win = MyWindow()
-    win.show()
-    app.exec_()
-
-
-if __name__ == "__main__":
-    main()
diff --git a/bootstrap.py b/bootstrap.py
index 7ce8188..54be278 100755
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """
 Bootstrapping Spyder
@@ -97,7 +97,7 @@ if sys.excepthook != sys.__excepthook__:
 
 # --- Continue
 
-from spyderlib.utils.vcs import get_git_revision
+from spyder.utils.vcs import get_git_revision
 print("Revision %s, Branch: %s" % get_git_revision(DEVPATH))
 
 sys.path.insert(0, DEVPATH)
@@ -126,7 +126,7 @@ else:
 
 if options.debug:
     # safety check - Spyder config should not be imported at this point
-    if "spyderlib.config.base" in sys.modules:
+    if "spyder.config.base" in sys.modules:
         sys.exit("ERROR: Can't enable debug mode - Spyder is already imported")
     print("0x. Switching debug mode on")
     os.environ["SPYDER_DEBUG"] = "True"
@@ -136,7 +136,7 @@ if options.debug:
 
 # Checking versions (among other things, this has the effect of setting the
 # QT_API environment variable if this has not yet been done just above)
-from spyderlib import get_versions
+from spyder import get_versions
 versions = get_versions(reporev=False)
 print("03. Imported Spyder %s" % versions['spyder'])
 print("    [Python %s %dbits, Qt %s, %s %s on %s]" % \
@@ -145,7 +145,7 @@ print("    [Python %s %dbits, Qt %s, %s %s on %s]" % \
 
 
 # Check that we have the right qtpy version
-from spyderlib.utils import programs
+from spyder.utils import programs
 if not programs.is_module_installed('qtpy', '>=1.1.0'):
     print("")
     sys.exit("ERROR: Your qtpy version is outdated. Please install qtpy "
@@ -159,7 +159,7 @@ if not options.hide_console and os.name == 'nt':
     sys.argv.append("--show-console")  # Windows only: show parent console
 
 print("04. Running Spyder")
-from spyderlib.app import start
+from spyder.app import start
 
 time_lapse = time.time()-time_start
 print("Bootstrap completed in " +
diff --git a/doc/conf.py b/doc/conf.py
index 79b2981..38399c2 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -38,7 +38,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = 'Spyder'
-copyright = '2009, Pierre Raybaut'
+copyright = 'The Spyder Project Contributors'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
diff --git a/doc/options.rst b/doc/options.rst
index 9e92232..469e9b5 100644
--- a/doc/options.rst
+++ b/doc/options.rst
@@ -2,14 +2,11 @@ Command line options
 ====================
 
 Spyder's command line options are the following:
-(type 'python spyder.py --help' to show the text below)
 
 Options:
   -h, --help            show this help message and exit
   --new-instance        Run a new instance of Spyder, even if the single
                         instance mode has been turned on (default)
-  --session=STARTUP_SESSION
-                        Startup session
   --defaults            Reset configuration settings to defaults
   --reset               Remove all configuration files!
   --optimize            Optimize Spyder bytecode (this may require
@@ -19,4 +16,7 @@ Options:
   --show-console        Do not hide parent console window (Windows)
   --multithread         Internal console is executed in another thread
                         (separate from main application thread)
-  --profile             Profile mode (internal test, not related with Python
\ No newline at end of file
+  --profile             Profile mode (internal test, not related with Python
+                        profiling)
+  --window-title=WINDOW_TITLE
+                        String to show in the main window title
diff --git a/doc/overview.rst b/doc/overview.rst
index 0c9b540..028fa25 100644
--- a/doc/overview.rst
+++ b/doc/overview.rst
@@ -76,5 +76,5 @@ Key features:
 
 
 Spyder may also be used as a PyQt5 or PyQt4 extension library 
-(module 'spyderlib'). For example, the Python interactive shell widget
+(module 'spyder'). For example, the Python interactive shell widget
 used in Spyder may be embedded in your own PyQt5 or PyQt4 application.
diff --git a/scripts/spyder b/scripts/spyder
index d1034bd..ebd4669 100755
--- a/scripts/spyder
+++ b/scripts/spyder
@@ -1,3 +1,3 @@
 #!/usr/bin/env python
-from spyderlib.app import start
+from spyder.app import start
 start.main()
diff --git a/scripts/spyder3 b/scripts/spyder3
index 06da50e..c726cb6 100755
--- a/scripts/spyder3
+++ b/scripts/spyder3
@@ -1,3 +1,3 @@
 #! /usr/bin/python3
-from spyderlib.app import start
+from spyder.app import start
 start.main()
diff --git a/scripts/spyder_win_post_install.py b/scripts/spyder_win_post_install.py
index 128a9d8..33f83ca 100644
--- a/scripts/spyder_win_post_install.py
+++ b/scripts/spyder_win_post_install.py
@@ -136,7 +136,7 @@ def install():
     workdir = "%HOMEDRIVE%%HOMEPATH%"
     import distutils.sysconfig
     lib_dir = distutils.sysconfig.get_python_lib(plat_specific=1)
-    ico_dir = osp.join(lib_dir, 'spyderlib', 'windows')
+    ico_dir = osp.join(lib_dir, 'spyder', 'windows')
     # if user is running -install manually then icons are in Scripts/
     if not osp.isdir(ico_dir):
         ico_dir = osp.dirname(osp.abspath(__file__))
diff --git a/setup.py b/setup.py
index 949a82b..feff6f2 100644
--- a/setup.py
+++ b/setup.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """
 Spyder
@@ -46,8 +46,8 @@ if v[:2] < (2,7) or (v[0] >= 3 and v[:2] < (3,3)):
 # Constants
 #==============================================================================
 NAME = 'spyder'
-LIBNAME = 'spyderlib'
-from spyderlib import __version__, __project_url__
+LIBNAME = 'spyder'
+from spyder import __version__, __project_url__
 
 
 #==============================================================================
@@ -164,7 +164,7 @@ try:
             build = self.get_finalized_command('build')
             sys.path.insert(0, os.path.abspath(build.build_lib))
             dirname = self.distribution.get_command_obj('build').build_purelib
-            self.builder_target_dir = osp.join(dirname, 'spyderlib', 'doc')
+            self.builder_target_dir = osp.join(dirname, 'spyder', 'doc')
 
             if not osp.exists(self.builder_target_dir):
                 os.mkdir(self.builder_target_dir)
@@ -187,7 +187,7 @@ try:
                 fname = osp.join(self.builder_target_dir, 'Spyderdoc.chm')
                 subprocess.call('"%s" %s' % (hhc_exe, fname), shell=True)
                 if osp.isfile(fname):
-                    dest = osp.join(dirname, 'spyderlib')
+                    dest = osp.join(dirname, 'spyder')
                     try:
                         shutil.move(fname, dest)
                     except shutil.Error:
@@ -236,7 +236,7 @@ PyQt4 application: source code editor with syntax highlighting and
 code introspection/analysis features, NumPy array editor, dictionary
 editor, Python console, etc.""",
       download_url='%s/files/%s-%s.zip' % (__project_url__, NAME, __version__),
-      author="The Spyder Development Team",
+      author="The Spyder Project Contributors",
       url=__project_url__,
       license='MIT',
       keywords='PyQt5 PyQt4 editor shell console widgets IDE',
@@ -291,7 +291,7 @@ if 'setuptools' in sys.modules:
 
     setup_args['entry_points'] = {
         'gui_scripts': [
-            'spyder = spyderlib.app.start:main'
+            'spyder = spyder.app.start:main'
         ]
     }
 
diff --git a/spyderlib/__init__.py b/spyder/__init__.py
similarity index 94%
rename from spyderlib/__init__.py
rename to spyder/__init__.py
index a6f37db..5b50d32 100644
--- a/spyderlib/__init__.py
+++ b/spyder/__init__.py
@@ -3,7 +3,7 @@
 Spyder License Agreement (MIT License)
 --------------------------------------
 
-Copyright (c) 2009- The Spyder Development Team
+Copyright (c) Spyder Project Contributors
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation
@@ -27,7 +27,7 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
 """
 
-version_info = (3, 0, "0b5")
+version_info = (3, 0, 0)
 
 __version__ = '.'.join(map(str, version_info))
 __license__ = __doc__
@@ -51,7 +51,7 @@ def add_to_distribution(dist):
         dist.add_qt_bindings()
     except AttributeError:
         raise ImportError("This script requires guidata 1.5+")
-    for _modname in ('spyderlib', 'spyderplugins'):
+    for _modname in ('spyder', 'spyderplugins'):
         dist.add_module_data_files(_modname, ("", ),
                                    ('.png', '.svg', '.html', '.png', '.txt',
                                     '.js', '.inv', '.ico', '.css', '.doctree',
@@ -69,7 +69,7 @@ def get_versions(reporev=True):
 
     revision = None
     if reporev:
-        from spyderlib.utils import vcs
+        from spyder.utils import vcs
         revision, branch = vcs.get_git_revision(os.path.dirname(__dir__))
 
     if not sys.platform == 'darwin':  # To avoid a crash with our Mac app
diff --git a/spyderlib/app/__init__.py b/spyder/app/__init__.py
similarity index 55%
rename from spyderlib/app/__init__.py
rename to spyder/app/__init__.py
index 15d8b6e..a7eb6b0 100644
--- a/spyderlib/app/__init__.py
+++ b/spyder/app/__init__.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- The Spyder Development team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """
-spyderlib.app
-=============
+spyder.app
+==========
 
 Modules related to starting and restarting the Spyder application
 """
diff --git a/spyderlib/app/cli_options.py b/spyder/app/cli_options.py
similarity index 90%
rename from spyderlib/app/cli_options.py
rename to spyder/app/cli_options.py
index d864ae3..44ad516 100644
--- a/spyderlib/app/cli_options.py
+++ b/spyder/app/cli_options.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- The Spyder development team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 import optparse
 
@@ -15,8 +15,6 @@ def get_options():
     parser.add_option('--new-instance', action='store_true', default=False,
                       help="Run a new instance of Spyder, even if the single "
                            "instance mode has been turned on (default)")
-    parser.add_option('--session', dest="startup_session", default='',
-                      help="Startup session")
     parser.add_option('--defaults', dest="reset_to_defaults",
                       action='store_true', default=False,
                       help="Reset configuration settings to defaults")
diff --git a/spyderlib/app/mac_stylesheet.qss b/spyder/app/mac_stylesheet.qss
similarity index 98%
rename from spyderlib/app/mac_stylesheet.qss
rename to spyder/app/mac_stylesheet.qss
index 89b21c5..0d9a9e6 100644
--- a/spyderlib/app/mac_stylesheet.qss
+++ b/spyder/app/mac_stylesheet.qss
@@ -1,6 +1,6 @@
 /*
 * Qt Stylesheet for MacOS X
-* Copyright (c) 2015- The Spyder Development Team
+* Copyright (c) Spyder Project Contributors
 */
 
 
diff --git a/spyderlib/app/spyder.py b/spyder/app/mainwindow.py
similarity index 87%
rename from spyderlib/app/spyder.py
rename to spyder/app/mainwindow.py
index ff4c66a..a5b62c8 100644
--- a/spyderlib/app/spyder.py
+++ b/spyder/app/mainwindow.py
@@ -1,25 +1,26 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """
 Spyder, the Scientific PYthon Development EnviRonment
 =====================================================
 
-Developped and maintained by the Spyder Development
-Team
+Developped and maintained by the Spyder Project
+Contributors
 
-Copyright © 2009- The Spyder Development Team
+Copyright © Spyder Project Contributors
 Licensed under the terms of the MIT License
-(see spyderlib/__init__.py for details)
+(see spyder/__init__.py for details)
 """
 
 # =============================================================================
 # Stdlib imports
 # =============================================================================
 from __future__ import print_function
+
 import atexit
 import errno
 import os
@@ -43,7 +44,7 @@ ORIGINAL_SYS_EXIT = sys.exit
 #==============================================================================
 # Check requirements
 #==============================================================================
-from spyderlib import requirements
+from spyder import requirements
 requirements.check_path()
 requirements.check_qt()
 
@@ -55,14 +56,14 @@ set_attached_console_visible = None
 is_attached_console_visible = None
 set_windows_appusermodelid = None
 if os.name == 'nt':
-    from spyderlib.utils.windows import (set_attached_console_visible,
-                                         is_attached_console_visible,
-                                         set_windows_appusermodelid)
+    from spyder.utils.windows import (set_attached_console_visible,
+                                      is_attached_console_visible,
+                                      set_windows_appusermodelid)
 
 
 #==============================================================================
 # Workaround: importing rope.base.project here, otherwise this module can't
-# be imported if Spyder was executed from another folder than spyderlib
+# be imported if Spyder was executed from another folder than spyder
 #==============================================================================
 try:
     import rope.base.project  # analysis:ignore
@@ -74,7 +75,7 @@ except ImportError:
 # Qt imports
 #==============================================================================
 from qtpy import API, PYQT5
-from qtpy.compat import from_qvariant, getopenfilename, getsavefilename
+from qtpy.compat import from_qvariant
 from qtpy.QtCore import (QByteArray, QCoreApplication, QPoint, QSize, Qt,
                          QThread, QTimer, QUrl, Signal, Slot)
 from qtpy.QtGui import QColor, QDesktopServices, QKeySequence, QPixmap
@@ -103,14 +104,14 @@ if hasattr(Qt, 'AA_EnableHighDpiScaling'):
 # Create our QApplication instance here because it's needed to render the
 # splash screen created below
 #==============================================================================
-from spyderlib.utils.qthelpers import qapplication
+from spyder.utils.qthelpers import qapplication
 MAIN_APP = qapplication()
 
 
 #==============================================================================
 # Create splash screen out of MainWindow to reduce perceived startup time. 
 #==============================================================================
-from spyderlib.config.base import _, get_image_path, DEV
+from spyder.config.base import _, get_image_path, DEV
 SPLASH = QSplashScreen(QPixmap(get_image_path('splash.svg'), 'svg'))
 SPLASH_FONT = SPLASH.font()
 SPLASH_FONT.setPixelSize(10)
@@ -124,25 +125,24 @@ QApplication.processEvents()
 #==============================================================================
 # Local utility imports
 #==============================================================================
-from spyderlib import __version__, __project_url__, __forum_url__, get_versions
-from spyderlib.config.base import (get_conf_path, get_module_data_path,
-                                   get_module_source_path, STDERR, DEBUG,
-                                   debug_print, MAC_APP_NAME,
-                                   running_in_mac_app, get_module_path,
-                                   reset_config_files)
-from spyderlib.config.main import CONF, OPEN_FILES_PORT
-from spyderlib.config.utils import IMPORT_EXT, is_gtk_desktop
-from spyderlib.app.cli_options import get_options
-from spyderlib import dependencies
-from spyderlib.config.ipython import QTCONSOLE_INSTALLED
-from spyderlib.py3compat import (getcwd, is_text_string, to_text_string,
-                                 PY3, qbytearray_to_str, u, configparser as cp)
-from spyderlib.utils import encoding, programs
-from spyderlib.utils import icon_manager as ima
-from spyderlib.utils.introspection import module_completion
-from spyderlib.utils.iofuncs import load_session, save_session
-from spyderlib.utils.programs import is_module_installed
-from spyderlib.utils.misc import select_port
+from spyder import __version__, __project_url__, __forum_url__, get_versions
+from spyder.config.base import (get_conf_path, get_module_data_path,
+                                get_module_source_path, STDERR, DEBUG,
+                                debug_print, MAC_APP_NAME, get_home_dir,
+                                running_in_mac_app, get_module_path,
+                                reset_config_files)
+from spyder.config.main import CONF, OPEN_FILES_PORT
+from spyder.config.utils import IMPORT_EXT, is_gtk_desktop
+from spyder.app.cli_options import get_options
+from spyder import dependencies
+from spyder.config.ipython import QTCONSOLE_INSTALLED
+from spyder.py3compat import (getcwd, is_text_string, to_text_string,
+                              PY3, qbytearray_to_str, configparser as cp)
+from spyder.utils import encoding, programs
+from spyder.utils import icon_manager as ima
+from spyder.utils.introspection import module_completion
+from spyder.utils.programs import is_module_installed
+from spyder.utils.misc import select_port
 
 #==============================================================================
 # Local gui imports
@@ -151,24 +151,18 @@ from spyderlib.utils.misc import select_port
 # are needed in MainWindow to speed up perceived startup time (i.e. the time
 # from clicking the Spyder icon to showing the splash screen).
 try:
-    from spyderlib.utils.environ import WinUserEnvDialog
+    from spyder.utils.environ import WinUserEnvDialog
 except ImportError:
     WinUserEnvDialog = None  # analysis:ignore
 
-from spyderlib.utils.qthelpers import (create_action, add_actions, get_icon,
-                                       add_shortcut_to_tooltip,
-                                       create_module_bookmark_actions,
-                                       create_program_action, DialogManager,
-                                       create_python_script_action, file_uri)
-from spyderlib.config.gui import get_shortcut
-from spyderlib.otherplugins import get_spyderplugins_mods
-from spyderlib.app import tour
-
-
-#==============================================================================
-# To save and load temp sessions
-#==============================================================================
-TEMP_SESSION_PATH = get_conf_path('temp.session.tar')
+from spyder.utils.qthelpers import (create_action, add_actions, get_icon,
+                                    add_shortcut_to_tooltip,
+                                    create_module_bookmark_actions,
+                                    create_program_action, DialogManager,
+                                    create_python_script_action, file_uri)
+from spyder.config.gui import get_shortcut
+from spyder.otherplugins import get_spyderplugins_mods
+from spyder.app import tour
 
 
 #==============================================================================
@@ -206,8 +200,8 @@ def get_focus_python_shell():
     """Extract and return Python shell from widget
     Return None if *widget* is not a Python shell (e.g. IPython kernel)"""
     widget = QApplication.focusWidget()
-    from spyderlib.widgets.shell import PythonShellWidget
-    from spyderlib.widgets.externalshell.pythonshell import ExternalPythonShell
+    from spyder.widgets.shell import PythonShellWidget
+    from spyder.widgets.externalshell.pythonshell import ExternalPythonShell
     if isinstance(widget, PythonShellWidget):
         return widget
     elif isinstance(widget, ExternalPythonShell):
@@ -219,8 +213,8 @@ def get_focus_widget_properties():
     Returns tuple (widget, properties) where properties is a tuple of
     booleans: (is_console, not_readonly, readwrite_editor)"""
     widget = QApplication.focusWidget()
-    from spyderlib.widgets.shell import ShellBaseWidget
-    from spyderlib.widgets.editor import TextEditBaseWidget
+    from spyder.widgets.shell import ShellBaseWidget
+    from spyder.widgets.editor import TextEditBaseWidget
     textedit_properties = None
     if isinstance(widget, (ShellBaseWidget, TextEditBaseWidget)):
         console = isinstance(widget, ShellBaseWidget)
@@ -296,7 +290,7 @@ class MainWindow(QMainWindow):
 
         # Use a custom Qt stylesheet
         if sys.platform == 'darwin':
-            spy_path = get_module_source_path('spyderlib')
+            spy_path = get_module_source_path('spyder')
             img_path = osp.join(spy_path, 'images')
             mac_style = open(osp.join(spy_path, 'app', 'mac_stylesheet.qss')).read()
             mac_style = mac_style.replace('$IMAGE_PATH', img_path)
@@ -313,21 +307,6 @@ class MainWindow(QMainWindow):
             self.path = [name for name in self.path if osp.isdir(name)]
         self.remove_path_from_sys_path()
         self.add_path_to_sys_path()
-        self.load_temp_session_action = create_action(self,
-                                        _("Reload last session"),
-                                        triggered=lambda:
-                                        self.load_session(TEMP_SESSION_PATH))
-        self.load_session_action = create_action(self,
-                                        _("Load session..."),
-                                        None, ima.icon('fileopen'),
-                                        triggered=self.load_session,
-                                        tip=_("Load Spyder session"))
-        self.save_session_action = create_action(self,
-                                        _("Save session..."),
-                                        None, ima.icon('filesaveas'),
-                                        triggered=self.save_session,
-                                        tip=_("Save current session "
-                                              "and quit application"))
 
         # Plugins
         self.console = None
@@ -336,7 +315,7 @@ class MainWindow(QMainWindow):
         self.explorer = None
         self.help = None
         self.onlinehelp = None
-        self.projectexplorer = None
+        self.projects = None
         self.outlineexplorer = None
         self.historylog = None
         self.extconsole = None
@@ -357,18 +336,20 @@ class MainWindow(QMainWindow):
         self.give_updates_feedback = True
 
         # Preferences
-        from spyderlib.plugins.configdialog import (MainConfigPage,
-                                                    ColorSchemeConfigPage)
-        from spyderlib.plugins.shortcuts import ShortcutsConfigPage
-        from spyderlib.plugins.runconfig import RunConfigPage
+        from spyder.plugins.configdialog import (MainConfigPage, 
+                                                 ColorSchemeConfigPage)
+        from spyder.plugins.shortcuts import ShortcutsConfigPage
+        from spyder.plugins.runconfig import RunConfigPage
+        from spyder.plugins.maininterpreter import MainInterpreterConfigPage
         self.general_prefs = [MainConfigPage, ShortcutsConfigPage,
-                              ColorSchemeConfigPage, RunConfigPage]
+                              ColorSchemeConfigPage, MainInterpreterConfigPage,
+                              RunConfigPage]
         self.prefs_index = None
         self.prefs_dialog_size = None
 
         # Quick Layouts and Dialogs
-        from spyderlib.plugins.layoutdialog import (LayoutSaveDialog,
-                                                    LayoutSettingsDialog)
+        from spyder.plugins.layoutdialog import (LayoutSaveDialog,
+                                                 LayoutSettingsDialog)
         self.dialog_layout_save = LayoutSaveDialog
         self.dialog_layout_settings = LayoutSettingsDialog
 
@@ -400,6 +381,8 @@ class MainWindow(QMainWindow):
         self.debug_menu_actions = []
         self.consoles_menu = None
         self.consoles_menu_actions = []
+        self.projects_menu = None
+        self.projects_menu_actions = []
         self.tools_menu = None
         self.tools_menu_actions = []
         self.external_tools_menu = None # We must keep a reference to this,
@@ -450,7 +433,8 @@ class MainWindow(QMainWindow):
         if options.window_title is not None:
             title += ' -- ' + options.window_title
 
-        self.setWindowTitle(title)
+        self.base_title = title
+        self.update_window_title()
         resample = os.name != 'nt'
         icon = ima.icon('spyder', resample=resample)
         # Resampling SVG icon only on non-Windows platforms (see Issue 1314):
@@ -497,10 +481,6 @@ class MainWindow(QMainWindow):
         # the window is in fullscreen mode:
         self.maximized_flag = None
 
-        # Session manager
-        self.next_session_name = None
-        self.save_session_name = None
-
         # Track which console plugin type had last focus
         # True: Console plugin
         # False: IPython console plugin
@@ -593,7 +573,6 @@ class MainWindow(QMainWindow):
         self.debug_print("  ..toolbars")
         # File menu/toolbar
         self.file_menu = self.menuBar().addMenu(_("&File"))
-        self.file_menu.aboutToShow.connect(self.update_file_menu)
         self.file_toolbar = self.create_toolbar(_("File toolbar"),
                                                 "file_toolbar")
 
@@ -625,6 +604,9 @@ class MainWindow(QMainWindow):
         # Consoles menu/toolbar
         self.consoles_menu = self.menuBar().addMenu(_("C&onsoles"))
 
+        # Projects menu
+        self.projects_menu = self.menuBar().addMenu(_("&Projects"))
+
         # Tools menu
         self.tools_menu = self.menuBar().addMenu(_("&Tools"))
 
@@ -786,7 +768,7 @@ class MainWindow(QMainWindow):
 
         # Internal console plugin
         self.debug_print("  ..plugin: internal console")
-        from spyderlib.plugins.console import Console
+        from spyder.plugins.console import Console
         self.console = Console(self, namespace, exitfunc=self.closing,
                             profile=self.profile,
                             multithreaded=self.multithreaded,
@@ -800,7 +782,7 @@ class MainWindow(QMainWindow):
 
         # Working directory plugin
         self.debug_print("  ..plugin: working directory")
-        from spyderlib.plugins.workingdirectory import WorkingDirectory
+        from spyder.plugins.workingdirectory import WorkingDirectory
         self.workingdirectory = WorkingDirectory(self, self.init_workdir, main=self)
         self.workingdirectory.register_plugin()
         self.toolbarslist.append(self.workingdirectory)
@@ -808,14 +790,14 @@ class MainWindow(QMainWindow):
         # Help plugin
         if CONF.get('help', 'enable'):
             self.set_splash(_("Loading help..."))
-            from spyderlib.plugins.help import Help
+            from spyder.plugins.help import Help
             self.help = Help(self)
             self.help.register_plugin()
 
         # Outline explorer widget
         if CONF.get('outline_explorer', 'enable'):
             self.set_splash(_("Loading outline explorer..."))
-            from spyderlib.plugins.outlineexplorer import OutlineExplorer
+            from spyder.plugins.outlineexplorer import OutlineExplorer
             fullpath_sorting = CONF.get('editor', 'fullpath_sorting', True)
             self.outlineexplorer = OutlineExplorer(self,
                                         fullpath_sorting=fullpath_sorting)
@@ -823,7 +805,7 @@ class MainWindow(QMainWindow):
 
         # Editor plugin
         self.set_splash(_("Loading editor..."))
-        from spyderlib.plugins.editor import Editor
+        from spyder.plugins.editor import Editor
         self.editor = Editor(self)
         self.editor.register_plugin()
 
@@ -841,36 +823,33 @@ class MainWindow(QMainWindow):
                                        context=Qt.ApplicationShortcut)
         self.register_shortcut(restart_action, "_", "Restart")
 
-        self.file_menu_actions += [self.load_temp_session_action,
-                                    self.load_session_action,
-                                    self.save_session_action,
-                                    None, restart_action, quit_action]
+        self.file_menu_actions += [None, restart_action, quit_action]
         self.set_splash("")
 
         self.debug_print("  ..widgets")
         # Find in files
         if CONF.get('find_in_files', 'enable'):
-            from spyderlib.plugins.findinfiles import FindInFiles
+            from spyder.plugins.findinfiles import FindInFiles
             self.findinfiles = FindInFiles(self)
             self.findinfiles.register_plugin()
 
         # Explorer
         if CONF.get('explorer', 'enable'):
             self.set_splash(_("Loading file explorer..."))
-            from spyderlib.plugins.explorer import Explorer
+            from spyder.plugins.explorer import Explorer
             self.explorer = Explorer(self)
             self.explorer.register_plugin()
 
         # History log widget
         if CONF.get('historylog', 'enable'):
             self.set_splash(_("Loading history plugin..."))
-            from spyderlib.plugins.history import HistoryLog
+            from spyder.plugins.history import HistoryLog
             self.historylog = HistoryLog(self)
             self.historylog.register_plugin()
 
         # Online help widget
         try:    # Qt >= v4.4
-            from spyderlib.plugins.onlinehelp import OnlineHelp
+            from spyder.plugins.onlinehelp import OnlineHelp
         except ImportError:    # Qt < v4.4
             OnlineHelp = None  # analysis:ignore
         if CONF.get('onlinehelp', 'enable') and OnlineHelp is not None:
@@ -881,33 +860,30 @@ class MainWindow(QMainWindow):
         # Project explorer widget
         if CONF.get('project_explorer', 'enable'):
             self.set_splash(_("Loading project explorer..."))
-            from spyderlib.plugins.projectexplorer import ProjectExplorer
-            self.projectexplorer = ProjectExplorer(self)
-            self.projectexplorer.register_plugin()
+            from spyder.plugins.projects import Projects
+            self.projects = Projects(self)
+            self.projects.register_plugin()
+            self.project_path = self.projects.get_pythonpath(at_start=True)
 
         # External console
         self.set_splash(_("Loading external console..."))
-        from spyderlib.plugins.externalconsole import ExternalConsole
-        self.extconsole = ExternalConsole(self, light_mode=False)
+        from spyder.plugins.externalconsole import ExternalConsole
+        self.extconsole = ExternalConsole(self)
         self.extconsole.register_plugin()
 
         # Namespace browser
         self.set_splash(_("Loading namespace browser..."))
-        from spyderlib.plugins.variableexplorer import VariableExplorer
+        from spyder.plugins.variableexplorer import VariableExplorer
         self.variableexplorer = VariableExplorer(self)
         self.variableexplorer.register_plugin()
 
         # IPython console
         if QTCONSOLE_INSTALLED:
             self.set_splash(_("Loading IPython console..."))
-            from spyderlib.plugins.ipythonconsole import IPythonConsole
+            from spyder.plugins.ipythonconsole import IPythonConsole
             self.ipyconsole = IPythonConsole(self)
             self.ipyconsole.register_plugin()
 
-        nsb = self.variableexplorer.add_shellwidget(self.console.shell)
-        self.console.shell.refresh.connect(nsb.refresh_table)
-        nsb.auto_refresh_button.setEnabled(False)
-
         self.set_splash(_("Setting up main window..."))
 
         # Help menu
@@ -926,7 +902,7 @@ class MainWindow(QMainWindow):
                                                 triggered=self.check_updates)
 
         # Spyder documentation
-        doc_path = get_module_data_path('spyderlib', relpath="doc",
+        doc_path = get_module_data_path('spyder', relpath="doc",
                                         attr_name='DOCPATH')
         # * Trying to find the chm doc
         spyder_doc = osp.join(doc_path, "Spyderdoc.chm")
@@ -937,8 +913,8 @@ class MainWindow(QMainWindow):
             spyder_doc = osp.join(doc_path, "index.html")
         # * Trying to find the development-version html doc
         if not osp.isfile(spyder_doc):
-            spyder_doc = osp.join(get_module_source_path('spyderlib'),
-                                    os.pardir, 'build', 'lib', 'spyderlib',
+            spyder_doc = osp.join(get_module_source_path('spyder'),
+                                    os.pardir, 'build', 'lib', 'spyder',
                                     'doc', "index.html")
         # * If we totally fail, point to our web build
         if not osp.isfile(spyder_doc):
@@ -1087,7 +1063,7 @@ class MainWindow(QMainWindow):
         self.help_menu_actions += [None, about_action]
 
         # Status bar widgets
-        from spyderlib.widgets.status import MemoryStatus, CPUStatus
+        from spyder.widgets.status import MemoryStatus, CPUStatus
         self.mem_status = MemoryStatus(self, status)
         self.cpu_status = CPUStatus(self, status)
         self.apply_statusbar_settings()
@@ -1151,6 +1127,7 @@ class MainWindow(QMainWindow):
         add_actions(self.run_menu, self.run_menu_actions)
         add_actions(self.debug_menu, self.debug_menu_actions)
         add_actions(self.consoles_menu, self.consoles_menu_actions)
+        add_actions(self.projects_menu, self.projects_menu_actions)
         add_actions(self.tools_menu, self.tools_menu_actions)
         add_actions(self.external_tools_menu,
                     self.external_tools_menu_actions)
@@ -1208,9 +1185,6 @@ class MainWindow(QMainWindow):
         was triggered"""
         self.restore_scrollbar_position.emit()
 
-        if self.projectexplorer is not None:
-            self.projectexplorer.check_for_io_errors()
-
         # Remove our temporary dir
         atexit.register(self.remove_tmpdir)
 
@@ -1281,12 +1255,18 @@ class MainWindow(QMainWindow):
         if not self.extconsole.isvisible and not ipy_visible:
             self.historylog.add_history(get_conf_path('history.py'))
 
-        # Give focus to the Editor
-        if self.editor.dockwidget.isVisible():
-            try:
-                self.editor.get_focus_widget().setFocus()
-            except AttributeError:
-                pass
+        if self.projects is not None:
+            # Load last project (if a project was active when Spyder
+            # was closed)
+            self.projects.reopen_last_project()
+
+            # Open last session files and give focus to the Editor
+            if self.editor.dockwidget.isVisible():
+                self.editor.setup_open_files()
+                try:
+                    self.editor.get_focus_widget().setFocus()
+                except AttributeError:
+                    pass
 
         # Check for spyder updates
         if DEV is None and CONF.get('main', 'check_updates_on_startup'):
@@ -1297,6 +1277,16 @@ class MainWindow(QMainWindow):
 
         self.is_setting_up = False
 
+    def update_window_title(self):
+        """Update main spyder window title based on projects."""
+        title = self.base_title
+        if self.projects is not None:
+            path = self.projects.get_active_project_path()
+            if path:
+                path = path.replace(get_home_dir(), '~')
+                title = '{0} - {1}'.format(path, title)
+        self.setWindowTitle(title)
+
     def report_missing_dependencies(self):
         """Show a QMessageBox with a list of missing hard dependencies"""
         missing_deps = dependencies.missing_dependencies()
@@ -1475,7 +1465,7 @@ class MainWindow(QMainWindow):
         console_ext = self.extconsole
         console_int = self.console
         outline = self.outlineexplorer
-        explorer_project = self.projectexplorer
+        explorer_project = self.projects
         explorer_file = self.explorer
         explorer_variable = self.variableexplorer
         history = self.historylog
@@ -1962,39 +1952,14 @@ class MainWindow(QMainWindow):
         self.update_search_menu()
 
         # Now deal with Python shell and IPython plugins
-        shell = get_focus_python_shell()
-        if shell is not None:
-            # A Python shell widget has focus
-            self.last_console_plugin_focus_was_python = True
-            if self.help is not None:
-                #  Help may be disabled in .spyder.ini
-                self.help.set_shell(shell)
-            from spyderlib.widgets.externalshell import pythonshell
-            if isinstance(shell, pythonshell.ExtPythonShellWidget):
-                shell = shell.parent()
-            self.variableexplorer.set_shellwidget_from_id(id(shell))
-        elif self.ipyconsole is not None:
+        if self.ipyconsole is not None:
             focus_client = self.ipyconsole.get_focus_client()
             if focus_client is not None:
                 self.last_console_plugin_focus_was_python = False
-                kwid = focus_client.kernel_widget_id
-                if kwid is not None:
-                    idx = self.extconsole.get_shell_index_from_id(kwid)
-                    if idx is not None:
-                        kw = self.extconsole.shellwidgets[idx]
-                        if self.help is not None:
-                            self.help.set_shell(kw)
-                        self.variableexplorer.set_shellwidget_from_id(kwid)
-                        # Setting the kernel widget as current widget for the
-                        # external console's tabwidget: this is necessary for
-                        # the editor/console link to be working (otherwise,
-                        # features like "Execute in current interpreter" will
-                        # not work with IPython clients unless the associated
-                        # IPython kernel has been selected in the external
-                        # console... that's not brilliant, but it works for
-                        # now: we shall take action on this later
-                        self.extconsole.tabwidget.setCurrentWidget(kw)
-                        focus_client.get_control().setFocus()
+        else:
+            shell = get_focus_python_shell()
+            if shell is not None:
+                self.last_console_plugin_focus_was_python = True
 
     def show_shortcuts(self, menu):
         """Show action shortcuts in menu"""
@@ -2010,10 +1975,6 @@ class MainWindow(QMainWindow):
                 if element._shown_shortcut is not None:
                     element.setShortcut(QKeySequence())
 
-    def update_file_menu(self):
-        """Update file menu"""
-        self.load_temp_session_action.setEnabled(osp.isfile(TEMP_SESSION_PATH))
-
     def update_edit_menu(self):
         """Update edit menu"""
         if self.menuBar().hasFocus():
@@ -2312,18 +2273,12 @@ class MainWindow(QMainWindow):
             _("About %s") % "Spyder",
             """<b>Spyder %s</b> %s
             <br>The Scientific PYthon Development EnviRonment
-            <br>Copyright © 2009- The Spyder Development Team
+            <br>Copyright © The Spyder Project Contributors
             <br>Licensed under the terms of the MIT License
-            <p>Created by Pierre Raybaut
+            <p>Created by Pierre Raybaut.
             <br>Developed and maintained by the
-            <a href="%s/blob/master/AUTHORS">Spyder Development Team</a>
-            <br>Many thanks to all the Spyder beta-testers and regular users.
-            <p>Most of the icons come from the Crystal Project
-            (© 2006-2007 Everaldo Coelho). Other icons by
-            <a href="http://p.yusukekamiyamane.com/"> Yusuke Kamiyamane</a>
-            (all rights reserved) and by
-            <a href="http://www.oxygen-icons.org/">
-            The Oxygen icon theme</a>.
+            <a href="%s/blob/master/AUTHORS">Spyder Project Contributors</a>.
+            <br>Many thanks to all the Spyder beta testers and regular users.
             <p>For bug reports and feature requests, please go
             to our <a href="%s">Github website</a>. For discussions around the
             project, please go to our <a href="%s">Google Group</a>
@@ -2332,9 +2287,16 @@ class MainWindow(QMainWindow):
             software development. The popular Python distributions
             <a href="http://continuum.io/downloads">Anaconda</a>,
             <a href="https://winpython.github.io/">WinPython</a> and
-            <a href="http://code.google.com/p/pythonxy/">Python(x,y)</a>
+            <a href="http://python-xy.github.io/">Python(x,y)</a>
             also contribute to this plan.
-            <p>Python %s %dbits, Qt %s, %s %s on %s"""
+            <p>Python %s %dbits, Qt %s, %s %s on %s
+            <p><small>Most of the icons for the Spyder 2 theme come from the Crystal
+            Project (© 2006-2007 Everaldo Coelho). Other icons for that
+            theme come from <a href="http://p.yusukekamiyamane.com/"> Yusuke
+            Kamiyamane</a> (all rights reserved) and from
+            <a href="http://www.oxygen-icons.org/">
+            The Oxygen icon theme</a></small>.
+            """
             % (versions['spyder'], revlink, __project_url__,
                __project_url__, __forum_url__, versions['python'],
                versions['bitness'], versions['qt'], versions['qt_api'],
@@ -2343,7 +2305,7 @@ class MainWindow(QMainWindow):
     @Slot()
     def show_dependencies(self):
         """Show Spyder's Dependencies dialog box"""
-        from spyderlib.widgets.dependencies import DependenciesDialog
+        from spyder.widgets.dependencies import DependenciesDialog
         dlg = DependenciesDialog(None)
         dlg.set_data(dependencies.DEPENDENCIES)
         dlg.show()
@@ -2416,7 +2378,7 @@ class MainWindow(QMainWindow):
         widget = QApplication.focusWidget()
         action = self.sender()
         callback = from_qvariant(action.data(), to_text_string)
-        from spyderlib.widgets.editor import TextEditBaseWidget
+        from spyder.widgets.editor import TextEditBaseWidget
         if isinstance(widget, TextEditBaseWidget):
             getattr(widget, callback)()
 
@@ -2460,7 +2422,7 @@ class MainWindow(QMainWindow):
             console = self.ipyconsole
         console.visibility_changed(True)
         console.raise_()
-        console.execute_python_code(lines)
+        console.execute_code(lines)
         if focus_to_editor:
             self.editor.visibility_changed(True)
 
@@ -2472,10 +2434,10 @@ class MainWindow(QMainWindow):
         """
         fname = to_text_string(fname)
         ext = osp.splitext(fname)[1]
-        if self.variableexplorer is not None and ext in IMPORT_EXT:
-            self.variableexplorer.import_data(fname)
-        elif encoding.is_text_file(fname):
+        if encoding.is_text_file(fname):
             self.editor.load(fname)
+        elif self.variableexplorer is not None and ext in IMPORT_EXT:
+            self.variableexplorer.import_data(fname)
         elif not external:
             fname = file_uri(fname)
             programs.start_file(fname)
@@ -2510,10 +2472,10 @@ class MainWindow(QMainWindow):
     @Slot()
     def path_manager_callback(self):
         """Spyder path manager"""
-        from spyderlib.widgets.pathmanager import PathManager
+        from spyder.widgets.pathmanager import PathManager
         self.remove_path_from_sys_path()
-        project_pathlist = self.projectexplorer.get_pythonpath()
-        dialog = PathManager(self, self.path, project_pathlist, sync=True)
+        project_path = self.projects.get_pythonpath()
+        dialog = PathManager(self, self.path, project_path, sync=True)
         dialog.redirect_stdio.connect(self.redirect_internalshell_stdio)
         dialog.exec_()
         self.add_path_to_sys_path()
@@ -2521,9 +2483,9 @@ class MainWindow(QMainWindow):
         self.sig_pythonpath_changed.emit()
 
     def pythonpath_changed(self):
-        """Project Explorer PYTHONPATH contribution has changed"""
+        """Projects PYTHONPATH contribution has changed"""
         self.remove_path_from_sys_path()
-        self.project_path = self.projectexplorer.get_pythonpath()
+        self.project_path = self.projects.get_pythonpath()
         self.add_path_to_sys_path()
         self.sig_pythonpath_changed.emit()
 
@@ -2586,7 +2548,7 @@ class MainWindow(QMainWindow):
     @Slot()
     def edit_preferences(self):
         """Edit Spyder preferences"""
-        from spyderlib.plugins.configdialog import ConfigDialog
+        from spyder.plugins.configdialog import ConfigDialog
         dlg = ConfigDialog(self)
         dlg.size_change.connect(self.set_prefs_size)
         if self.prefs_dialog_size is not None:
@@ -2596,7 +2558,7 @@ class MainWindow(QMainWindow):
             widget.initialize()
             dlg.add_page(widget)
         for plugin in [self.workingdirectory, self.editor,
-                       self.projectexplorer, self.extconsole, self.ipyconsole,
+                       self.projects, self.extconsole, self.ipyconsole,
                        self.historylog, self.help, self.variableexplorer,
                        self.onlinehelp, self.explorer, self.findinfiles
                        ]+self.thirdparty_plugins:
@@ -2655,31 +2617,7 @@ class MainWindow(QMainWindow):
         for index in sorted(toberemoved, reverse=True):
             self.shortcut_data.pop(index)
 
-    #---- Sessions
-    @Slot()
-    def load_session(self, filename=None):
-        """Load session"""
-        if filename is None:
-            self.redirect_internalshell_stdio(False)
-            filename, _selfilter = getopenfilename(self, _("Open session"),
-                        getcwd(), _("Spyder sessions")+" (*.session.tar)")
-            self.redirect_internalshell_stdio(True)
-            if not filename:
-                return
-        if self.close():
-            self.next_session_name = filename
-
-    @Slot()
-    def save_session(self):
-        """Save session and quit application"""
-        self.redirect_internalshell_stdio(False)
-        filename, _selfilter = getsavefilename(self, _("Save session"),
-                        getcwd(), _("Spyder sessions")+" (*.session.tar)")
-        self.redirect_internalshell_stdio(True)
-        if filename:
-            if self.close():
-                self.save_session_name = filename
-
+    # -- Open files server
     def start_open_files_server(self):
         self.open_files_server.setsockopt(socket.SOL_SOCKET,
                                           socket.SO_REUSEADDR, 1)
@@ -2729,11 +2667,11 @@ class MainWindow(QMainWindow):
         If reset True it allows to reset spyder on restart.
         """
         # Get start path to use in restart script
-        spyder_start_directory = get_module_path('spyderlib')
+        spyder_start_directory = get_module_path('spyder')
         restart_script = osp.join(spyder_start_directory, 'app', 'restart.py')
 
         # Get any initial argument passed when spyder was started
-        # Note: Variables defined in bootstrap.py and spyderlib/app/start.py
+        # Note: Variables defined in bootstrap.py and spyder/app/start.py
         env = os.environ.copy()
         bootstrap_args = env.pop('SPYDER_BOOTSTRAP_ARGS', None)
         spyder_args = env.pop('SPYDER_ARGS')
@@ -2795,7 +2733,7 @@ class MainWindow(QMainWindow):
     # ---- Check for Spyder Updates
     def _check_updates_ready(self):
         """Called by WorkerUpdates when ready"""
-        from spyderlib.widgets.helperwidgets import MessageCheckBox
+        from spyder.widgets.helperwidgets import MessageCheckBox
 
         # feedback` = False is used on startup, so only positive feedback is
         # given. `feedback` = True is used when after startup (when using the
@@ -2863,7 +2801,7 @@ class MainWindow(QMainWindow):
         """
         Check for spyder updates on github releases using a QThread.
         """
-        from spyderlib.workers.updates import WorkerUpdates
+        from spyder.workers.updates import WorkerUpdates
 
         # Disable check_updates_action while the thread is working
         self.check_updates_action.setDisabled(True)
@@ -2904,7 +2842,7 @@ def initialize():
 
     #----Monkey patching rope
     try:
-        from spyderlib import rope_patch
+        from spyder import rope_patch
         rope_patch.apply()
     except ImportError:
         # rope is not installed
@@ -2998,17 +2936,11 @@ def run_spyder(app, options, args):
     return main
 
 
-def __remove_temp_session():
-    if osp.isfile(TEMP_SESSION_PATH):
-        os.remove(TEMP_SESSION_PATH)
-
-
 #==============================================================================
 # Main
 #==============================================================================
 def main():
-    """Session manager"""
-    __remove_temp_session()
+    """Main function"""
 
     # **** Collect command line options ****
     # Note regarding Options:
@@ -3033,11 +2965,12 @@ def main():
         return
     elif options.optimize:
         # Optimize the whole Spyder's source code directory
-        import spyderlib
+        import spyder
         programs.run_python_script(module="compileall",
-                                   args=[spyderlib.__path__[0]], p_args=['-O'])
+                                   args=[spyder.__path__[0]], p_args=['-O'])
         return
 
+    # Show crash dialog
     if CONF.get('main', 'crash', False) and not DEV:
         CONF.set('main', 'crash', False)
         SPLASH.hide()
@@ -3059,46 +2992,20 @@ def main():
             "" % (get_conf_path(), __project_url__,
                   __forum_url__, __project_url__))
 
-    next_session_name = options.startup_session
-    while is_text_string(next_session_name):
-        if next_session_name:
-            error_message = load_session(next_session_name)
-            if next_session_name == TEMP_SESSION_PATH:
-                __remove_temp_session()
-            if error_message is None:
-                CONF.load_from_ini()
-            else:
-                print(error_message)
-                QMessageBox.critical(None, "Load session",
-                    u("<b>Unable to load '%s'</b><br><br>Error message:<br>%s")
-                    % (osp.basename(next_session_name), error_message))
-        mainwindow = None
-        try:
-            mainwindow = run_spyder(app, options, args)
-        except BaseException:
-            CONF.set('main', 'crash', True)
-            import traceback
-            traceback.print_exc(file=STDERR)
-            traceback.print_exc(file=open('spyder_crash.log', 'w'))
-        if mainwindow is None:
-            # An exception occured
-            SPLASH.hide()
-            return
-        next_session_name = mainwindow.next_session_name
-        save_session_name = mainwindow.save_session_name
-        if next_session_name is not None:
-            #-- Loading session
-            # Saving current session in a temporary file
-            # but only if we are not currently trying to reopen it!
-            if next_session_name != TEMP_SESSION_PATH:
-                save_session_name = TEMP_SESSION_PATH
-        if save_session_name:
-            #-- Saving session
-            error_message = save_session(save_session_name)
-            if error_message is not None:
-                QMessageBox.critical(None, "Save session",
-                    u("<b>Unable to save '%s'</b><br><br>Error message:<br>%s")
-                    % (osp.basename(save_session_name), error_message))
+    # Create main window
+    mainwindow = None
+    try:
+        mainwindow = run_spyder(app, options, args)
+    except BaseException:
+        CONF.set('main', 'crash', True)
+        import traceback
+        traceback.print_exc(file=STDERR)
+        traceback.print_exc(file=open('spyder_crash.log', 'w'))
+    if mainwindow is None:
+        # An exception occured
+        SPLASH.hide()
+        return
+
     ORIGINAL_SYS_EXIT()
 
 
diff --git a/spyderlib/app/restart.py b/spyder/app/restart.py
similarity index 91%
rename from spyderlib/app/restart.py
rename to spyder/app/restart.py
index 1ace405..49de95f 100644
--- a/spyderlib/app/restart.py
+++ b/spyder/app/restart.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2015 The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """
 Restart Spyder
@@ -26,10 +26,10 @@ from qtpy.QtGui import QColor, QPixmap
 from qtpy.QtWidgets import QApplication, QMessageBox, QSplashScreen, QWidget
 
 # Local imports
-from spyderlib.config.base import _, get_image_path
-from spyderlib.py3compat import to_text_string
-from spyderlib.utils import icon_manager as ima
-from spyderlib.utils.qthelpers import qapplication
+from spyder.config.base import _, get_image_path
+from spyder.py3compat import to_text_string
+from spyder.utils import icon_manager as ima
+from spyder.utils.qthelpers import qapplication
 
 
 PY2 = sys.version[0] == '2'
@@ -142,7 +142,7 @@ class Restarter(QWidget):
 
         if error:
             e = error.__repr__()
-            message = messages[error_type] + _("\n\n{0}").format(e)
+            message = messages[error_type] + "\n\n{0}".format(e)
         else:
             message = messages[error_type]
 
@@ -165,7 +165,7 @@ def main():
     restarter.set_splash_message(_('Closing Spyder'))
 
     # Get variables
-    # Note: Variables defined in spyderlib\spyder.py 'restart()' method
+    # Note: Variables defined in app/spyder.py 'restart()' method
     spyder_args = os.environ.pop('SPYDER_ARGS', None)
     pid = os.environ.pop('SPYDER_PID', None)
     is_bootstrap = os.environ.pop('SPYDER_IS_BOOTSTRAP', None)
@@ -210,8 +210,8 @@ def main():
     if is_bootstrap:
         spyder = osp.join(spyder_folder, 'bootstrap.py')
     else:
-        spyderlib = osp.join(spyder_folder, 'spyderlib')
-        spyder = osp.join(spyderlib, 'app', 'start.py')
+        spyderdir = osp.join(spyder_folder, 'spyder')
+        spyder = osp.join(spyderdir, 'app', 'start.py')
 
     command = '"{0}" "{1}" {2}'.format(python, spyder, args)
 
diff --git a/spyderlib/app/start.py b/spyder/app/start.py
similarity index 76%
rename from spyderlib/app/start.py
rename to spyder/app/start.py
index 4b4848b..cedfc57 100644
--- a/spyderlib/app/start.py
+++ b/spyder/app/start.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 
 # Std imports
-import atexit
 import os
 import os.path as osp
 import random
@@ -10,11 +9,11 @@ import sys
 import time
 
 # Local imports
-from spyderlib.app.cli_options import get_options
-from spyderlib.config.base import DEV, get_conf_path, running_in_mac_app
-from spyderlib.config.main import CONF
-from spyderlib.utils.external import lockfile
-from spyderlib.py3compat import is_unicode
+from spyder.app.cli_options import get_options
+from spyder.config.base import get_conf_path, running_in_mac_app
+from spyder.config.main import CONF
+from spyder.utils.external import lockfile
+from spyder.py3compat import is_unicode
 
 
 def send_args_to_spyder(args):
@@ -53,18 +52,6 @@ def main():
     Spyder is already running, this will just parse and send command line
     options to the application.
     """
-    # Renaming old configuration files (the '.' prefix has been removed)
-    # (except for .spyder.ini --> spyder.ini, which is done in config/user.py)
-    if DEV is None:
-        cpath = get_conf_path()
-        for fname in os.listdir(cpath):
-            if fname.startswith('.'):
-                old, new = osp.join(cpath, fname), osp.join(cpath, fname[1:])
-                try:
-                    os.rename(old, new)
-                except OSError:
-                    pass
-
     # Parse command line options
     options, args = get_options()
 
@@ -107,14 +94,14 @@ def main():
             # Then start Spyder as usual and *don't* continue
             # executing this script because it doesn't make
             # sense
-            from spyderlib.app import spyder
-            spyder.main()
+            from spyder.app import mainwindow
+            mainwindow.main()
             return
 
         if lock_created:
             # Start a new instance
-            from spyderlib.app import spyder
-            spyder.main()
+            from spyder.app import mainwindow
+            mainwindow.main()
         else:
             # Pass args to Spyder or print an informative
             # message
@@ -124,8 +111,8 @@ def main():
                 print("Spyder is already running. If you want to open a new \n"
                       "instance, please pass to it the --new-instance option")
     else:
-        from spyderlib.app import spyder
-        spyder.main()
+        from spyder.app import mainwindow
+        mainwindow.main()
 
 
 if __name__ == "__main__":
diff --git a/spyderlib/app/tour.py b/spyder/app/tour.py
similarity index 96%
rename from spyderlib/app/tour.py
rename to spyder/app/tour.py
index ecf1e28..ea1789a 100644
--- a/spyderlib/app/tour.py
+++ b/spyder/app/tour.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009-2013 Pierre Raybaut
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """Spyder interactive tours"""
 
@@ -13,6 +13,7 @@
 
 # Standard library imports
 from __future__ import division
+
 import sys
 
 # Third party imports
@@ -26,9 +27,9 @@ from qtpy.QtWidgets import (QAction, QApplication, QComboBox, QDialog,
                             QSpacerItem, QToolButton, QVBoxLayout, QWidget)
 
 # Local imports
-from spyderlib.config.base import _, get_image_path
-from spyderlib.py3compat import to_binary_string
-from spyderlib.utils.qthelpers import add_actions, create_action
+from spyder.config.base import _, get_image_path
+from spyder.py3compat import to_binary_string
+from spyder.utils.qthelpers import add_actions, create_action
 
 # FIXME: Known issues
 # How to handle if an specific dockwidget does not exists/load, like ipython
@@ -1130,7 +1131,7 @@ class AnimatedTour(QWidget):
         codelines = self.run
         console = self.widgets[0]
         for codeline in codelines:
-            console.execute_python_code(codeline)
+            console.execute_code(codeline)
 
     def set_tour(self, index, frames, spy_window):
         """ """
diff --git a/spyderlib/config/__init__.py b/spyder/config/__init__.py
similarity index 100%
rename from spyderlib/config/__init__.py
rename to spyder/config/__init__.py
diff --git a/spyderlib/config/base.py b/spyder/config/base.py
similarity index 91%
rename from spyderlib/config/base.py
rename to spyder/config/base.py
index 1aaabe7..c9d1731 100644
--- a/spyderlib/config/base.py
+++ b/spyder/config/base.py
@@ -1,15 +1,15 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- The Spyder development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """
 Spyder base configuration management
 
 This file only deals with non-GUI configuration features
 (in other words, we won't import any PyQt object here, avoiding any
-sip API incompatibility issue in spyderlib's non-gui modules)
+sip API incompatibility issue in spyder's non-gui modules)
 """
 
 from __future__ import print_function
@@ -22,9 +22,9 @@ import shutil
 import sys
 
 # Local imports
-from spyderlib.utils import encoding
-from spyderlib.py3compat import (is_unicode, TEXT_TYPES, INT_TYPES, PY3,
-                                 to_text_string, is_text_string)
+from spyder.utils import encoding
+from spyder.py3compat import (is_unicode, TEXT_TYPES, INT_TYPES, PY3,
+                              to_text_string, is_text_string)
 
 
 #==============================================================================
@@ -181,11 +181,10 @@ def get_module_source_path(modname, basename=None):
 
 def is_py2exe_or_cx_Freeze():
     """Return True if this is a py2exe/cx_Freeze distribution of Spyder"""
-    return osp.isfile(osp.join(get_module_path('spyderlib'), osp.pardir))
+    return osp.isfile(osp.join(get_module_path('spyder'), osp.pardir))
 
 
-SCIENTIFIC_STARTUP = get_module_source_path('spyderlib',
-                                            'scientific_startup.py')
+SCIENTIFIC_STARTUP = get_module_source_path('spyder', 'scientific_startup.py')
 
 
 #==============================================================================
@@ -201,7 +200,7 @@ def add_image_path(path):
         for dirname in dirnames:
             IMG_PATH.append(osp.join(dirpath, dirname))
 
-add_image_path(get_module_data_path('spyderlib', relpath='images'))
+add_image_path(get_module_data_path('spyder', relpath='images'))
 
 def get_image_path(name, default="not_found.png"):
     """Return image absolute path"""
@@ -237,7 +236,7 @@ def get_available_translations():
     information that is found in the 'locale' folder to ensure that when a new
     language is added, LANGUAGE_CODES is updated.
     """
-    locale_path = get_module_data_path("spyderlib", relpath="locale",
+    locale_path = get_module_data_path("spyder", relpath="locale",
                                        attr_name='LOCALEPATH')
     listdir = os.listdir(locale_path)
     langs = [d for d in listdir if osp.isdir(osp.join(locale_path, d))]
@@ -341,7 +340,7 @@ def get_translation(modname, dirname=None):
         return translate_dumb
 
 # Translation callback
-_ = get_translation("spyderlib")
+_ = get_translation("spyder")
 
 
 #==============================================================================
@@ -354,8 +353,7 @@ def get_supported_types():
     dict(picklable=picklable_types, editable=editables_types)
          
     See:
-    get_remote_data function in spyderlib/widgets/externalshell/monitor.py
-    get_internal_shell_filter method in namespacebrowser.py
+    get_remote_data function in spyder/widgets/variableexplorer/utils/monitor.py
     
     Note:
     If you update this list, don't forget to update doc/variablexplorer.rst
@@ -375,7 +373,7 @@ def get_supported_types():
         pass
     picklable_types = editable_types[:]
     try:
-        from spyderlib.pil_patch import Image
+        from spyder.pil_patch import Image
         editable_types.append(Image.Image)
     except ImportError:
         pass
diff --git a/spyderlib/config/fonts.py b/spyder/config/fonts.py
similarity index 91%
rename from spyderlib/config/fonts.py
rename to spyder/config/fonts.py
index 294dd8d..c839356 100644
--- a/spyderlib/config/fonts.py
+++ b/spyder/config/fonts.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """
 Spyder font variables
@@ -11,7 +11,7 @@ Spyder font variables
 import os
 import sys
 
-from spyderlib.config.utils import is_ubuntu
+from spyder.config.utils import is_ubuntu
 
 
 #==============================================================================
diff --git a/spyderlib/config/gui.py b/spyder/config/gui.py
similarity index 93%
rename from spyderlib/config/gui.py
rename to spyder/config/gui.py
index a8be03d..c030e45 100644
--- a/spyderlib/config/gui.py
+++ b/spyder/config/gui.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009-2012 The Spyder development team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """
 Spyder GUI-related configuration management
-(for non-GUI configuration, see spyderlib/config/base.py)
+(for non-GUI configuration, see spyder/config/base.py)
 
 Important note regarding shortcuts:
     For compatibility with QWERTZ keyboards, one must avoid using the following
@@ -24,10 +24,10 @@ from qtpy.QtGui import QFont, QFontDatabase, QKeySequence
 from qtpy.QtWidgets import QShortcut
 
 # Local imports
-from spyderlib.config.main import CONF
-from spyderlib.config.user import NoDefault
-from spyderlib.py3compat import to_text_string
-from spyderlib.utils import syntaxhighlighters as sh
+from spyder.config.main import CONF
+from spyder.config.user import NoDefault
+from spyder.py3compat import to_text_string
+from spyder.utils import syntaxhighlighters as sh
 
 
 # Run cell shortcuts
diff --git a/spyderlib/config/ipython.py b/spyder/config/ipython.py
similarity index 78%
rename from spyderlib/config/ipython.py
rename to spyder/config/ipython.py
index 3fe5c98..4d2107f 100644
--- a/spyderlib/config/ipython.py
+++ b/spyder/config/ipython.py
@@ -1,16 +1,16 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2013 The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """
 IPython configuration variables needed by Spyder
 """
 
-from spyderlib.utils import programs
-from spyderlib import dependencies
-from spyderlib.config.base import _
+from spyder.utils import programs
+from spyder import dependencies
+from spyder.config.base import _
 
 
 # Constants
@@ -20,7 +20,7 @@ NBCONVERT_REQVER = ">=4.0"
 
 
 # Dependencies
-dependencies.add("qtconsole", _("Jupyter Qtconsole integration"),
+dependencies.add("qtconsole", _("Integrate the IPython console"),
                  required_version=QTCONSOLE_REQVER)
 dependencies.add("nbconvert", _("Manipulate Jupyter notebooks on the Editor"),
                  required_version=NBCONVERT_REQVER)
diff --git a/spyderlib/config/main.py b/spyder/config/main.py
similarity index 95%
rename from spyderlib/config/main.py
rename to spyder/config/main.py
index 8a5bae5..4aa5165 100644
--- a/spyderlib/config/main.py
+++ b/spyder/config/main.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """
 Spyder configuration options
@@ -16,12 +16,12 @@ import sys
 import os.path as osp
 
 # Local import
-from spyderlib.config.base import (CHECK_ALL, EXCLUDED_NAMES, get_home_dir,
-                                   SUBFOLDER, TEST)
-from spyderlib.config.fonts import BIG, MEDIUM, MONOSPACE, SANS_SERIF
-from spyderlib.config.user import UserConfig
-from spyderlib.config.utils import IMPORT_EXT
-from spyderlib.utils import codeanalysis
+from spyder.config.base import (CHECK_ALL, EXCLUDED_NAMES, get_home_dir,
+                                SUBFOLDER, TEST)
+from spyder.config.fonts import BIG, MEDIUM, MONOSPACE, SANS_SERIF
+from spyder.config.user import UserConfig
+from spyder.config.utils import IMPORT_EXT
+from spyder.utils import codeanalysis
 
 
 #==============================================================================
@@ -118,6 +118,14 @@ DEFAULTS = [
               'external_editor/gotoline': '-goto:',
               'light_background': True,
               }),
+            ('main_interpreter',
+             {
+              'default': True,
+              'custom': False,
+              'umr/enabled': True,
+              'umr/verbose': True,
+              'umr/namelist': [],
+              }),
             ('console',
              {
               'max_line_count': 500,
@@ -132,16 +140,11 @@ DEFAULTS = [
               'monitor/enabled': True,
               'qt/api': 'default',
               'matplotlib/backend/value': 0,
-              'umr/enabled': True,
-              'umr/verbose': True,
-              'umr/namelist': ['guidata', 'guiqwt'],
               'light_background': True,
               'merge_output_channels': os.name != 'nt',
               'colorize_sys_stderr': os.name != 'nt',
               'pythonstartup/default': True,
               'pythonstartup/custom': False,
-              'pythonexecutable/default': True,
-              'pythonexecutable/custom': False,
               'ets_backend': 'qt4'
               }),
             ('ipython_console',
@@ -150,7 +153,7 @@ DEFAULTS = [
               'completion_type': 0,
               'use_pager': False,
               'show_calltips': True,
-              'ask_before_closing': True,
+              'ask_before_closing': False,
               'buffer_size': 500,
               'pylab': True,
               'pylab/autoload': False,
@@ -264,7 +267,7 @@ DEFAULTS = [
              {
               'enable': True,
               'name_filters': NAME_FILTERS,
-              'show_all': False,
+              'show_all': True,
               'show_hscrollbar': True
               }),
             ('explorer',
@@ -585,7 +588,7 @@ DEFAULTS = [
 #    or if you want to *rename* options, then you need to do a MAJOR update in
 #    version, e.g. from 3.0.0 to 4.0.0
 # 3. You don't need to touch this value if you're just adding a new option
-CONF_VERSION = '27.2.0'
+CONF_VERSION = '28.0.0'
 
 # Main configuration instance
 CONF = UserConfig('spyder', defaults=DEFAULTS, load=(not TEST),
diff --git a/spyderlib/config/user.py b/spyder/config/user.py
similarity index 83%
rename from spyderlib/config/user.py
rename to spyder/config/user.py
index bd39009..75457f1 100644
--- a/spyderlib/config/user.py
+++ b/spyder/config/user.py
@@ -1,9 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009-2013 Pierre Raybaut
-# Copyright © 2014-2015 The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)    
+# (see spyder/__init__.py for details)    
 
 """
 This module provides user configuration file management features for Spyder
@@ -14,6 +13,7 @@ It's based on the ConfigParser module (present in the standard library).
 from __future__ import print_function
 
 # Std imports
+import ast
 import os
 import re
 import os.path as osp
@@ -21,11 +21,11 @@ import shutil
 import time
 
 # Local imports
-from spyderlib.config.base import (get_conf_path, get_home_dir,
-                                   get_module_source_path, TEST)
-from spyderlib.utils.programs import check_version
-from spyderlib.py3compat import configparser as cp
-from spyderlib.py3compat import PY2, is_text_string, to_text_string
+from spyder.config.base import (get_conf_path, get_home_dir,
+                                get_module_source_path, TEST)
+from spyder.utils.programs import check_version
+from spyder.py3compat import configparser as cp
+from spyder.py3compat import PY2, is_text_string, to_text_string
 
 # Std imports for Python 2
 if PY2:
@@ -121,8 +121,27 @@ class DefaultsConfig(cp.ConfigParser):
                 raise(e)
 
     def filename(self):
+        """Defines the name of the configuration file to use."""
+        # Needs to be done this way to be used by the project config.
+        # To fix on a later PR
+        self._filename = getattr(self, '_filename', None)
+        self._root_path = getattr(self, '_root_path', None)
+
+        if self._filename is None and self._root_path is None:
+            return self._filename_global()
+        else:
+            return self._filename_projects()
+
+    def _filename_projects(self):
+        """Create a .ini filename located in the current project directory.
+        This .ini files stores the specific project preferences for each
+        project created with spyder.
         """
-        Return the name of a .ini filename to save config settings
+        return osp.join(self._root_path, self._filename)
+
+    def _filename_global(self):
+        """Create a .ini filename located in user home directory.
+        This .ini files stores the global spyder preferences.
         """
         if self.subfolder is None:
             config_file = osp.join(get_home_dir(), '.%s.ini' % self.name)
@@ -185,7 +204,7 @@ class UserConfig(DefaultsConfig):
             _major = lambda _t: _t[:_t.find('.')]
             _minor = lambda _t: _t[:_t.rfind('.')]
             # Save new defaults
-            self.__save_new_defaults(defaults, version, subfolder)
+            self._save_new_defaults(defaults, version, subfolder)
             # Updating defaults only if major/minor version is different
             if _minor(version) != _minor(old_ver):
                 if backup:
@@ -196,10 +215,10 @@ class UserConfig(DefaultsConfig):
                 if check_version(old_ver, '2.4.0', '<'):
                     self.reset_to_defaults(save=False)
                 else:
-                    self.__update_defaults(defaults, old_ver)
+                    self._update_defaults(defaults, old_ver)
                 # Remove deprecated options if major version has changed
                 if remove_obsolete or _major(version) != _major(old_ver):
-                    self.__remove_deprecated_options(old_ver)
+                    self._remove_deprecated_options(old_ver)
                 # Set new version number
                 self.set_version(version, save=False)
             if defaults is None:
@@ -234,18 +253,18 @@ class UserConfig(DefaultsConfig):
         except cp.MissingSectionHeaderError:
             print("Warning: File contains no section headers.")
     
-    def __load_old_defaults(self, old_version):
+    def _load_old_defaults(self, old_version):
         """Read old defaults"""
         old_defaults = cp.ConfigParser()
         if check_version(old_version, '3.0.0', '<='):
-            path = get_module_source_path('spyderlib')
+            path = get_module_source_path('spyder')
         else:
             path = osp.dirname(self.filename())
         path = osp.join(path, 'defaults') 
         old_defaults.read(osp.join(path, 'defaults-'+old_version+'.ini'))
         return old_defaults
     
-    def __save_new_defaults(self, defaults, new_version, subfolder):
+    def _save_new_defaults(self, defaults, new_version, subfolder):
         """Save new defaults"""
         new_defaults = DefaultsConfig(name='defaults-'+new_version,
                                       subfolder=subfolder)
@@ -253,9 +272,9 @@ class UserConfig(DefaultsConfig):
             new_defaults.set_defaults(defaults)
             new_defaults._save()
     
-    def __update_defaults(self, defaults, old_version, verbose=False):
+    def _update_defaults(self, defaults, old_version, verbose=False):
         """Update defaults after a change in version"""
-        old_defaults = self.__load_old_defaults(old_version)
+        old_defaults = self._load_old_defaults(old_version)
         for section, options in defaults:
             for option in options:
                 new_value = options[ option ]
@@ -267,11 +286,11 @@ class UserConfig(DefaultsConfig):
                   to_text_string(new_value) != old_value:
                     self._set(section, option, new_value, verbose)
     
-    def __remove_deprecated_options(self, old_version):
+    def _remove_deprecated_options(self, old_version):
         """
         Remove options which are present in the .ini file but not in defaults
         """
-        old_defaults = self.__load_old_defaults(old_version)
+        old_defaults = self._load_old_defaults(old_version)
         for section in old_defaults.sections():
             for option, _ in old_defaults.items(section, raw=self.raw):
                 if self.get_default(section, option) is NoDefault:
@@ -311,7 +330,7 @@ class UserConfig(DefaultsConfig):
         if save:
             self._save()
         
-    def __check_section_option(self, section, option):
+    def _check_section_option(self, section, option):
         """
         Private method to check section and option types
         """
@@ -328,7 +347,7 @@ class UserConfig(DefaultsConfig):
         Get Default value for a given (section, option)
         -> useful for type checking in 'get' method
         """
-        section = self.__check_section_option(section, option)
+        section = self._check_section_option(section, option)
         for sec, options in self.defaults:
             if sec == section:
                 if option in options:
@@ -343,7 +362,7 @@ class UserConfig(DefaultsConfig):
         default: default value (if not specified, an exception
         will be raised if option doesn't exist)
         """
-        section = self.__check_section_option(section, option)
+        section = self._check_section_option(section, option)
 
         if not self.has_section(section):
             if default is NoDefault:
@@ -359,9 +378,10 @@ class UserConfig(DefaultsConfig):
                 return default
             
         value = cp.ConfigParser.get(self, section, option, raw=self.raw)
+        # Use type of default_value to parse value correctly
         default_value = self.get_default(section, option)
         if isinstance(default_value, bool):
-            value = eval(value)
+            value = ast.literal_eval(value)
         elif isinstance(default_value, float):
             value = float(value)
         elif isinstance(default_value, int):
@@ -374,8 +394,8 @@ class UserConfig(DefaultsConfig):
                     pass
             try:
                 # lists, tuples, ...
-                value = eval(value)
-            except:
+                value = ast.literal_eval(value)
+            except (SyntaxError, ValueError):
                 pass
         return value
 
@@ -384,7 +404,7 @@ class UserConfig(DefaultsConfig):
         Set Default value for a given (section, option)
         -> called when a new (section, option) is set and no default exists
         """
-        section = self.__check_section_option(section, option)
+        section = self._check_section_option(section, option)
         for sec, options in self.defaults:
             if sec == section:
                 options[ option ] = default_value
@@ -394,7 +414,7 @@ class UserConfig(DefaultsConfig):
         Set an option
         section=None: attribute a default section name
         """
-        section = self.__check_section_option(section, option)
+        section = self._check_section_option(section, option)
         default_value = self.get_default(section, option)
         if default_value is NoDefault:
             # This let us save correctly string value options with
diff --git a/spyderlib/config/utils.py b/spyder/config/utils.py
similarity index 97%
rename from spyderlib/config/utils.py
rename to spyder/config/utils.py
index da201a9..963a55f 100644
--- a/spyderlib/config/utils.py
+++ b/spyder/config/utils.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """
 Utilities to define configuration values
@@ -12,8 +12,8 @@ import os
 import os.path as osp
 import sys
 
-from spyderlib.config.base import _
-from spyderlib.utils import iofuncs
+from spyder.config.base import _
+from spyder.utils import iofuncs
 
 
 #==============================================================================
diff --git a/spyderlib/defaults/Readme.txt b/spyder/defaults/Readme.txt
similarity index 90%
rename from spyderlib/defaults/Readme.txt
rename to spyder/defaults/Readme.txt
index 62f5b51..fd05b32 100644
--- a/spyderlib/defaults/Readme.txt
+++ b/spyder/defaults/Readme.txt
@@ -1,6 +1,6 @@
-Copyright (c) 2013 The Spyder Development Team
+Copyright (c) Spyder Project Contributors
 Licensed under the terms of the MIT License
-(see spyderlib/__init__.py for details)
+(see spyder/__init__.py for details)
 
 What is the purpose of this directory?
 ======================================
diff --git a/spyderlib/defaults/defaults-2.4.0.ini b/spyder/defaults/defaults-2.4.0.ini
similarity index 100%
rename from spyderlib/defaults/defaults-2.4.0.ini
rename to spyder/defaults/defaults-2.4.0.ini
diff --git a/spyderlib/defaults/defaults-3.0.0.ini b/spyder/defaults/defaults-3.0.0.ini
similarity index 100%
rename from spyderlib/defaults/defaults-3.0.0.ini
rename to spyder/defaults/defaults-3.0.0.ini
diff --git a/spyderlib/dependencies.py b/spyder/dependencies.py
similarity index 93%
rename from spyderlib/dependencies.py
rename to spyder/dependencies.py
index 3775a50..3d8b8c0 100644
--- a/spyderlib/dependencies.py
+++ b/spyder/dependencies.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """Module checking Spyder runtime dependencies"""
 
@@ -10,7 +10,7 @@
 import os
 
 # Local imports
-from spyderlib.utils import programs
+from spyder.utils import programs
 
 
 class Dependency(object):
diff --git a/spyderlib/fonts/spyder-charmap.json b/spyder/fonts/spyder-charmap.json
similarity index 100%
rename from spyderlib/fonts/spyder-charmap.json
rename to spyder/fonts/spyder-charmap.json
diff --git a/spyderlib/fonts/spyder.ttf b/spyder/fonts/spyder.ttf
similarity index 100%
rename from spyderlib/fonts/spyder.ttf
rename to spyder/fonts/spyder.ttf
diff --git a/spyderlib/images/actions/1downarrow.png b/spyder/images/actions/1downarrow.png
similarity index 100%
rename from spyderlib/images/actions/1downarrow.png
rename to spyder/images/actions/1downarrow.png
diff --git a/spyderlib/images/actions/1uparrow.png b/spyder/images/actions/1uparrow.png
similarity index 100%
rename from spyderlib/images/actions/1uparrow.png
rename to spyder/images/actions/1uparrow.png
diff --git a/spyderlib/images/actions/2downarrow.png b/spyder/images/actions/2downarrow.png
similarity index 100%
rename from spyderlib/images/actions/2downarrow.png
rename to spyder/images/actions/2downarrow.png
diff --git a/spyderlib/images/actions/2uparrow.png b/spyder/images/actions/2uparrow.png
similarity index 100%
rename from spyderlib/images/actions/2uparrow.png
rename to spyder/images/actions/2uparrow.png
diff --git a/spyderlib/images/actions/arrow-continue.png b/spyder/images/actions/arrow-continue.png
similarity index 100%
rename from spyderlib/images/actions/arrow-continue.png
rename to spyder/images/actions/arrow-continue.png
diff --git a/spyderlib/images/actions/arrow-step-in.png b/spyder/images/actions/arrow-step-in.png
similarity index 100%
rename from spyderlib/images/actions/arrow-step-in.png
rename to spyder/images/actions/arrow-step-in.png
diff --git a/spyderlib/images/actions/arrow-step-out.png b/spyder/images/actions/arrow-step-out.png
similarity index 100%
rename from spyderlib/images/actions/arrow-step-out.png
rename to spyder/images/actions/arrow-step-out.png
diff --git a/spyderlib/images/actions/arrow-step-over.png b/spyder/images/actions/arrow-step-over.png
similarity index 100%
rename from spyderlib/images/actions/arrow-step-over.png
rename to spyder/images/actions/arrow-step-over.png
diff --git a/spyderlib/images/actions/auto_reload.png b/spyder/images/actions/auto_reload.png
similarity index 100%
rename from spyderlib/images/actions/auto_reload.png
rename to spyder/images/actions/auto_reload.png
diff --git a/spyderlib/images/actions/browse_tab.png b/spyder/images/actions/browse_tab.png
similarity index 100%
rename from spyderlib/images/actions/browse_tab.png
rename to spyder/images/actions/browse_tab.png
diff --git a/spyderlib/images/actions/check.png b/spyder/images/actions/check.png
similarity index 100%
rename from spyderlib/images/actions/check.png
rename to spyder/images/actions/check.png
diff --git a/spyderlib/images/actions/cmdprompt.png b/spyder/images/actions/cmdprompt.png
similarity index 100%
rename from spyderlib/images/actions/cmdprompt.png
rename to spyder/images/actions/cmdprompt.png
diff --git a/spyderlib/images/actions/collapse.png b/spyder/images/actions/collapse.png
similarity index 100%
rename from spyderlib/images/actions/collapse.png
rename to spyder/images/actions/collapse.png
diff --git a/spyderlib/images/actions/collapse_selection.png b/spyder/images/actions/collapse_selection.png
similarity index 100%
rename from spyderlib/images/actions/collapse_selection.png
rename to spyder/images/actions/collapse_selection.png
diff --git a/spyderlib/images/actions/configure.png b/spyder/images/actions/configure.png
similarity index 100%
rename from spyderlib/images/actions/configure.png
rename to spyder/images/actions/configure.png
diff --git a/spyderlib/images/actions/copywop.png b/spyder/images/actions/copywop.png
similarity index 100%
rename from spyderlib/images/actions/copywop.png
rename to spyder/images/actions/copywop.png
diff --git a/spyderlib/images/actions/delete.png b/spyder/images/actions/delete.png
similarity index 100%
rename from spyderlib/images/actions/delete.png
rename to spyder/images/actions/delete.png
diff --git a/spyderlib/images/actions/edit.png b/spyder/images/actions/edit.png
similarity index 100%
rename from spyderlib/images/actions/edit.png
rename to spyder/images/actions/edit.png
diff --git a/spyderlib/images/actions/edit24.png b/spyder/images/actions/edit24.png
similarity index 100%
rename from spyderlib/images/actions/edit24.png
rename to spyder/images/actions/edit24.png
diff --git a/spyderlib/images/actions/edit_add.png b/spyder/images/actions/edit_add.png
similarity index 100%
rename from spyderlib/images/actions/edit_add.png
rename to spyder/images/actions/edit_add.png
diff --git a/spyderlib/images/actions/edit_remove.png b/spyder/images/actions/edit_remove.png
similarity index 100%
rename from spyderlib/images/actions/edit_remove.png
rename to spyder/images/actions/edit_remove.png
diff --git a/spyderlib/images/actions/editcopy.png b/spyder/images/actions/editcopy.png
similarity index 100%
rename from spyderlib/images/actions/editcopy.png
rename to spyder/images/actions/editcopy.png
diff --git a/spyderlib/images/actions/editcut.png b/spyder/images/actions/editcut.png
similarity index 100%
rename from spyderlib/images/actions/editcut.png
rename to spyder/images/actions/editcut.png
diff --git a/spyderlib/images/actions/editdelete.png b/spyder/images/actions/editdelete.png
similarity index 100%
rename from spyderlib/images/actions/editdelete.png
rename to spyder/images/actions/editdelete.png
diff --git a/spyderlib/images/actions/editpaste.png b/spyder/images/actions/editpaste.png
similarity index 100%
rename from spyderlib/images/actions/editpaste.png
rename to spyder/images/actions/editpaste.png
diff --git a/spyderlib/images/actions/eraser.png b/spyder/images/actions/eraser.png
similarity index 100%
rename from spyderlib/images/actions/eraser.png
rename to spyder/images/actions/eraser.png
diff --git a/spyderlib/images/actions/exit.png b/spyder/images/actions/exit.png
similarity index 100%
rename from spyderlib/images/actions/exit.png
rename to spyder/images/actions/exit.png
diff --git a/spyderlib/images/actions/expand.png b/spyder/images/actions/expand.png
similarity index 100%
rename from spyderlib/images/actions/expand.png
rename to spyder/images/actions/expand.png
diff --git a/spyderlib/images/actions/expand_selection.png b/spyder/images/actions/expand_selection.png
similarity index 100%
rename from spyderlib/images/actions/expand_selection.png
rename to spyder/images/actions/expand_selection.png
diff --git a/spyderlib/images/actions/filter.png b/spyder/images/actions/filter.png
similarity index 100%
rename from spyderlib/images/actions/filter.png
rename to spyder/images/actions/filter.png
diff --git a/spyderlib/images/actions/find.png b/spyder/images/actions/find.png
similarity index 100%
rename from spyderlib/images/actions/find.png
rename to spyder/images/actions/find.png
diff --git a/spyderlib/images/actions/findf.png b/spyder/images/actions/findf.png
similarity index 100%
rename from spyderlib/images/actions/findf.png
rename to spyder/images/actions/findf.png
diff --git a/spyderlib/images/actions/findnext.png b/spyder/images/actions/findnext.png
similarity index 100%
rename from spyderlib/images/actions/findnext.png
rename to spyder/images/actions/findnext.png
diff --git a/spyderlib/images/actions/findprevious.png b/spyder/images/actions/findprevious.png
similarity index 100%
rename from spyderlib/images/actions/findprevious.png
rename to spyder/images/actions/findprevious.png
diff --git a/spyderlib/images/actions/folder_new.png b/spyder/images/actions/folder_new.png
similarity index 100%
rename from spyderlib/images/actions/folder_new.png
rename to spyder/images/actions/folder_new.png
diff --git a/spyderlib/images/actions/hide.png b/spyder/images/actions/hide.png
similarity index 100%
rename from spyderlib/images/actions/hide.png
rename to spyder/images/actions/hide.png
diff --git a/spyderlib/images/actions/hist.png b/spyder/images/actions/hist.png
similarity index 100%
rename from spyderlib/images/actions/hist.png
rename to spyder/images/actions/hist.png
diff --git a/spyderlib/images/actions/home.png b/spyder/images/actions/home.png
similarity index 100%
rename from spyderlib/images/actions/home.png
rename to spyder/images/actions/home.png
diff --git a/spyderlib/images/actions/imshow.png b/spyder/images/actions/imshow.png
similarity index 100%
rename from spyderlib/images/actions/imshow.png
rename to spyder/images/actions/imshow.png
diff --git a/spyderlib/images/actions/insert.png b/spyder/images/actions/insert.png
similarity index 100%
rename from spyderlib/images/actions/insert.png
rename to spyder/images/actions/insert.png
diff --git a/spyderlib/images/actions/lock.png b/spyder/images/actions/lock.png
similarity index 100%
rename from spyderlib/images/actions/lock.png
rename to spyder/images/actions/lock.png
diff --git a/spyderlib/images/actions/lock_open.png b/spyder/images/actions/lock_open.png
similarity index 100%
rename from spyderlib/images/actions/lock_open.png
rename to spyder/images/actions/lock_open.png
diff --git a/spyderlib/images/actions/magnifier.png b/spyder/images/actions/magnifier.png
similarity index 100%
rename from spyderlib/images/actions/magnifier.png
rename to spyder/images/actions/magnifier.png
diff --git a/spyderlib/images/actions/maximize.png b/spyder/images/actions/maximize.png
similarity index 100%
rename from spyderlib/images/actions/maximize.png
rename to spyder/images/actions/maximize.png
diff --git a/spyderlib/images/actions/next.png b/spyder/images/actions/next.png
similarity index 100%
rename from spyderlib/images/actions/next.png
rename to spyder/images/actions/next.png
diff --git a/spyderlib/images/actions/options_less.png b/spyder/images/actions/options_less.png
similarity index 100%
rename from spyderlib/images/actions/options_less.png
rename to spyder/images/actions/options_less.png
diff --git a/spyderlib/images/actions/options_more.png b/spyder/images/actions/options_more.png
similarity index 100%
rename from spyderlib/images/actions/options_more.png
rename to spyder/images/actions/options_more.png
diff --git a/spyderlib/images/actions/plot.png b/spyder/images/actions/plot.png
similarity index 100%
rename from spyderlib/images/actions/plot.png
rename to spyder/images/actions/plot.png
diff --git a/spyderlib/images/actions/previous.png b/spyder/images/actions/previous.png
similarity index 100%
rename from spyderlib/images/actions/previous.png
rename to spyder/images/actions/previous.png
diff --git a/spyderlib/images/actions/redo.png b/spyder/images/actions/redo.png
similarity index 100%
rename from spyderlib/images/actions/redo.png
rename to spyder/images/actions/redo.png
diff --git a/spyderlib/images/actions/reload.png b/spyder/images/actions/reload.png
similarity index 100%
rename from spyderlib/images/actions/reload.png
rename to spyder/images/actions/reload.png
diff --git a/spyderlib/images/actions/rename.png b/spyder/images/actions/rename.png
similarity index 100%
rename from spyderlib/images/actions/rename.png
rename to spyder/images/actions/rename.png
diff --git a/spyderlib/images/actions/replace.png b/spyder/images/actions/replace.png
similarity index 100%
rename from spyderlib/images/actions/replace.png
rename to spyder/images/actions/replace.png
diff --git a/spyderlib/images/actions/restore.png b/spyder/images/actions/restore.png
similarity index 100%
rename from spyderlib/images/actions/restore.png
rename to spyder/images/actions/restore.png
diff --git a/spyderlib/images/actions/show.png b/spyder/images/actions/show.png
similarity index 100%
rename from spyderlib/images/actions/show.png
rename to spyder/images/actions/show.png
diff --git a/spyderlib/images/actions/special_paste.png b/spyder/images/actions/special_paste.png
similarity index 100%
rename from spyderlib/images/actions/special_paste.png
rename to spyder/images/actions/special_paste.png
diff --git a/spyderlib/images/actions/stop.png b/spyder/images/actions/stop.png
similarity index 100%
rename from spyderlib/images/actions/stop.png
rename to spyder/images/actions/stop.png
diff --git a/spyderlib/images/actions/stop_debug.png b/spyder/images/actions/stop_debug.png
similarity index 100%
rename from spyderlib/images/actions/stop_debug.png
rename to spyder/images/actions/stop_debug.png
diff --git a/spyderlib/images/actions/synchronize.png b/spyder/images/actions/synchronize.png
similarity index 100%
rename from spyderlib/images/actions/synchronize.png
rename to spyder/images/actions/synchronize.png
diff --git a/spyderlib/images/actions/tooloptions.png b/spyder/images/actions/tooloptions.png
similarity index 100%
rename from spyderlib/images/actions/tooloptions.png
rename to spyder/images/actions/tooloptions.png
diff --git a/spyderlib/images/actions/undo.png b/spyder/images/actions/undo.png
similarity index 100%
rename from spyderlib/images/actions/undo.png
rename to spyder/images/actions/undo.png
diff --git a/spyderlib/images/actions/unmaximize.png b/spyder/images/actions/unmaximize.png
similarity index 100%
rename from spyderlib/images/actions/unmaximize.png
rename to spyder/images/actions/unmaximize.png
diff --git a/spyderlib/images/actions/up.png b/spyder/images/actions/up.png
similarity index 100%
rename from spyderlib/images/actions/up.png
rename to spyder/images/actions/up.png
diff --git a/spyderlib/images/actions/window_fullscreen.png b/spyder/images/actions/window_fullscreen.png
similarity index 100%
rename from spyderlib/images/actions/window_fullscreen.png
rename to spyder/images/actions/window_fullscreen.png
diff --git a/spyderlib/images/actions/window_nofullscreen.png b/spyder/images/actions/window_nofullscreen.png
similarity index 100%
rename from spyderlib/images/actions/window_nofullscreen.png
rename to spyder/images/actions/window_nofullscreen.png
diff --git a/spyderlib/images/actions/zoom_in.png b/spyder/images/actions/zoom_in.png
similarity index 100%
rename from spyderlib/images/actions/zoom_in.png
rename to spyder/images/actions/zoom_in.png
diff --git a/spyderlib/images/actions/zoom_out.png b/spyder/images/actions/zoom_out.png
similarity index 100%
rename from spyderlib/images/actions/zoom_out.png
rename to spyder/images/actions/zoom_out.png
diff --git a/spyderlib/images/advanced.png b/spyder/images/advanced.png
similarity index 100%
rename from spyderlib/images/advanced.png
rename to spyder/images/advanced.png
diff --git a/spyderlib/images/arredit.png b/spyder/images/arredit.png
similarity index 100%
rename from spyderlib/images/arredit.png
rename to spyder/images/arredit.png
diff --git a/spyderlib/images/arrow.png b/spyder/images/arrow.png
similarity index 100%
rename from spyderlib/images/arrow.png
rename to spyder/images/arrow.png
diff --git a/spyderlib/images/bold.png b/spyder/images/bold.png
similarity index 100%
rename from spyderlib/images/bold.png
rename to spyder/images/bold.png
diff --git a/spyderlib/images/browser.png b/spyder/images/browser.png
similarity index 100%
rename from spyderlib/images/browser.png
rename to spyder/images/browser.png
diff --git a/spyderlib/images/chevron-left.png b/spyder/images/chevron-left.png
similarity index 100%
rename from spyderlib/images/chevron-left.png
rename to spyder/images/chevron-left.png
diff --git a/spyderlib/images/chevron-right.png b/spyder/images/chevron-right.png
similarity index 100%
rename from spyderlib/images/chevron-right.png
rename to spyder/images/chevron-right.png
diff --git a/spyderlib/images/console/cmdprompt_t.png b/spyder/images/console/cmdprompt_t.png
similarity index 100%
rename from spyderlib/images/console/cmdprompt_t.png
rename to spyder/images/console/cmdprompt_t.png
diff --git a/spyderlib/images/console/console.png b/spyder/images/console/console.png
similarity index 100%
rename from spyderlib/images/console/console.png
rename to spyder/images/console/console.png
diff --git a/spyderlib/images/console/editclear.png b/spyder/images/console/editclear.png
similarity index 100%
rename from spyderlib/images/console/editclear.png
rename to spyder/images/console/editclear.png
diff --git a/spyderlib/images/console/environ.png b/spyder/images/console/environ.png
similarity index 100%
rename from spyderlib/images/console/environ.png
rename to spyder/images/console/environ.png
diff --git a/spyderlib/images/console/history.png b/spyder/images/console/history.png
similarity index 100%
rename from spyderlib/images/console/history.png
rename to spyder/images/console/history.png
diff --git a/spyderlib/images/console/history24.png b/spyder/images/console/history24.png
similarity index 100%
rename from spyderlib/images/console/history24.png
rename to spyder/images/console/history24.png
diff --git a/spyderlib/images/console/ipython_console.png b/spyder/images/console/ipython_console.png
similarity index 100%
rename from spyderlib/images/console/ipython_console.png
rename to spyder/images/console/ipython_console.png
diff --git a/spyderlib/images/console/ipython_console_t.png b/spyder/images/console/ipython_console_t.png
similarity index 100%
rename from spyderlib/images/console/ipython_console_t.png
rename to spyder/images/console/ipython_console_t.png
diff --git a/spyderlib/images/console/kill.png b/spyder/images/console/kill.png
similarity index 100%
rename from spyderlib/images/console/kill.png
rename to spyder/images/console/kill.png
diff --git a/spyderlib/images/console/loading_sprites.png b/spyder/images/console/loading_sprites.png
similarity index 100%
rename from spyderlib/images/console/loading_sprites.png
rename to spyder/images/console/loading_sprites.png
diff --git a/spyderlib/images/console/prompt.png b/spyder/images/console/prompt.png
similarity index 100%
rename from spyderlib/images/console/prompt.png
rename to spyder/images/console/prompt.png
diff --git a/spyderlib/images/console/python.png b/spyder/images/console/python.png
similarity index 100%
rename from spyderlib/images/console/python.png
rename to spyder/images/console/python.png
diff --git a/spyderlib/images/console/python_t.png b/spyder/images/console/python_t.png
similarity index 100%
rename from spyderlib/images/console/python_t.png
rename to spyder/images/console/python_t.png
diff --git a/spyderlib/images/console/restart.png b/spyder/images/console/restart.png
similarity index 100%
rename from spyderlib/images/console/restart.png
rename to spyder/images/console/restart.png
diff --git a/spyderlib/images/console/run_small.png b/spyder/images/console/run_small.png
similarity index 100%
rename from spyderlib/images/console/run_small.png
rename to spyder/images/console/run_small.png
diff --git a/spyderlib/images/console/syspath.png b/spyder/images/console/syspath.png
similarity index 100%
rename from spyderlib/images/console/syspath.png
rename to spyder/images/console/syspath.png
diff --git a/spyderlib/images/console/terminated.png b/spyder/images/console/terminated.png
similarity index 100%
rename from spyderlib/images/console/terminated.png
rename to spyder/images/console/terminated.png
diff --git a/spyderlib/images/dictedit.png b/spyder/images/dictedit.png
similarity index 100%
rename from spyderlib/images/dictedit.png
rename to spyder/images/dictedit.png
diff --git a/spyderlib/images/editor/attribute.png b/spyder/images/editor/attribute.png
similarity index 100%
rename from spyderlib/images/editor/attribute.png
rename to spyder/images/editor/attribute.png
diff --git a/spyderlib/images/editor/blockcomment.png b/spyder/images/editor/blockcomment.png
similarity index 100%
rename from spyderlib/images/editor/blockcomment.png
rename to spyder/images/editor/blockcomment.png
diff --git a/spyderlib/images/editor/breakpoint_big.png b/spyder/images/editor/breakpoint_big.png
similarity index 100%
rename from spyderlib/images/editor/breakpoint_big.png
rename to spyder/images/editor/breakpoint_big.png
diff --git a/spyderlib/images/editor/breakpoint_cond_big.png b/spyder/images/editor/breakpoint_cond_big.png
similarity index 100%
rename from spyderlib/images/editor/breakpoint_cond_big.png
rename to spyder/images/editor/breakpoint_cond_big.png
diff --git a/spyderlib/images/editor/breakpoint_cond_small.png b/spyder/images/editor/breakpoint_cond_small.png
similarity index 100%
rename from spyderlib/images/editor/breakpoint_cond_small.png
rename to spyder/images/editor/breakpoint_cond_small.png
diff --git a/spyderlib/images/editor/breakpoint_small.png b/spyder/images/editor/breakpoint_small.png
similarity index 100%
rename from spyderlib/images/editor/breakpoint_small.png
rename to spyder/images/editor/breakpoint_small.png
diff --git a/spyderlib/images/editor/bug.png b/spyder/images/editor/bug.png
similarity index 100%
rename from spyderlib/images/editor/bug.png
rename to spyder/images/editor/bug.png
diff --git a/spyderlib/images/editor/cell.png b/spyder/images/editor/cell.png
similarity index 100%
rename from spyderlib/images/editor/cell.png
rename to spyder/images/editor/cell.png
diff --git a/spyderlib/images/editor/class.png b/spyder/images/editor/class.png
similarity index 100%
rename from spyderlib/images/editor/class.png
rename to spyder/images/editor/class.png
diff --git a/spyderlib/images/editor/close_panel.png b/spyder/images/editor/close_panel.png
similarity index 100%
rename from spyderlib/images/editor/close_panel.png
rename to spyder/images/editor/close_panel.png
diff --git a/spyderlib/images/editor/comment.png b/spyder/images/editor/comment.png
similarity index 100%
rename from spyderlib/images/editor/comment.png
rename to spyder/images/editor/comment.png
diff --git a/spyderlib/images/editor/convention.png b/spyder/images/editor/convention.png
similarity index 100%
rename from spyderlib/images/editor/convention.png
rename to spyder/images/editor/convention.png
diff --git a/spyderlib/images/editor/debug.png b/spyder/images/editor/debug.png
similarity index 100%
rename from spyderlib/images/editor/debug.png
rename to spyder/images/editor/debug.png
diff --git a/spyderlib/images/editor/error.png b/spyder/images/editor/error.png
similarity index 100%
rename from spyderlib/images/editor/error.png
rename to spyder/images/editor/error.png
diff --git a/spyderlib/images/editor/file.png b/spyder/images/editor/file.png
similarity index 100%
rename from spyderlib/images/editor/file.png
rename to spyder/images/editor/file.png
diff --git a/spyderlib/images/editor/filelist.png b/spyder/images/editor/filelist.png
similarity index 100%
rename from spyderlib/images/editor/filelist.png
rename to spyder/images/editor/filelist.png
diff --git a/spyderlib/images/editor/fromcursor.png b/spyder/images/editor/fromcursor.png
similarity index 100%
rename from spyderlib/images/editor/fromcursor.png
rename to spyder/images/editor/fromcursor.png
diff --git a/spyderlib/images/editor/function.png b/spyder/images/editor/function.png
similarity index 100%
rename from spyderlib/images/editor/function.png
rename to spyder/images/editor/function.png
diff --git a/spyderlib/images/editor/gotoline.png b/spyder/images/editor/gotoline.png
similarity index 100%
rename from spyderlib/images/editor/gotoline.png
rename to spyder/images/editor/gotoline.png
diff --git a/spyderlib/images/editor/highlight.png b/spyder/images/editor/highlight.png
similarity index 100%
rename from spyderlib/images/editor/highlight.png
rename to spyder/images/editor/highlight.png
diff --git a/spyderlib/images/editor/horsplit.png b/spyder/images/editor/horsplit.png
similarity index 100%
rename from spyderlib/images/editor/horsplit.png
rename to spyder/images/editor/horsplit.png
diff --git a/spyderlib/images/editor/indent.png b/spyder/images/editor/indent.png
similarity index 100%
rename from spyderlib/images/editor/indent.png
rename to spyder/images/editor/indent.png
diff --git a/spyderlib/images/editor/last_edit_location.png b/spyder/images/editor/last_edit_location.png
similarity index 100%
rename from spyderlib/images/editor/last_edit_location.png
rename to spyder/images/editor/last_edit_location.png
diff --git a/spyderlib/images/editor/method.png b/spyder/images/editor/method.png
similarity index 100%
rename from spyderlib/images/editor/method.png
rename to spyder/images/editor/method.png
diff --git a/spyderlib/images/editor/module.png b/spyder/images/editor/module.png
similarity index 100%
rename from spyderlib/images/editor/module.png
rename to spyder/images/editor/module.png
diff --git a/spyderlib/images/editor/newwindow.png b/spyder/images/editor/newwindow.png
similarity index 100%
rename from spyderlib/images/editor/newwindow.png
rename to spyder/images/editor/newwindow.png
diff --git a/spyderlib/images/editor/next_cursor.png b/spyder/images/editor/next_cursor.png
similarity index 100%
rename from spyderlib/images/editor/next_cursor.png
rename to spyder/images/editor/next_cursor.png
diff --git a/spyderlib/images/editor/next_wng.png b/spyder/images/editor/next_wng.png
similarity index 100%
rename from spyderlib/images/editor/next_wng.png
rename to spyder/images/editor/next_wng.png
diff --git a/spyderlib/images/editor/no_match.png b/spyder/images/editor/no_match.png
similarity index 100%
rename from spyderlib/images/editor/no_match.png
rename to spyder/images/editor/no_match.png
diff --git a/spyderlib/images/editor/outline_explorer.png b/spyder/images/editor/outline_explorer.png
similarity index 100%
rename from spyderlib/images/editor/outline_explorer.png
rename to spyder/images/editor/outline_explorer.png
diff --git a/spyderlib/images/editor/outline_explorer_vis.png b/spyder/images/editor/outline_explorer_vis.png
similarity index 100%
rename from spyderlib/images/editor/outline_explorer_vis.png
rename to spyder/images/editor/outline_explorer_vis.png
diff --git a/spyderlib/images/editor/prev_cursor.png b/spyder/images/editor/prev_cursor.png
similarity index 100%
rename from spyderlib/images/editor/prev_cursor.png
rename to spyder/images/editor/prev_cursor.png
diff --git a/spyderlib/images/editor/prev_wng.png b/spyder/images/editor/prev_wng.png
similarity index 100%
rename from spyderlib/images/editor/prev_wng.png
rename to spyder/images/editor/prev_wng.png
diff --git a/spyderlib/images/editor/private1.png b/spyder/images/editor/private1.png
similarity index 100%
rename from spyderlib/images/editor/private1.png
rename to spyder/images/editor/private1.png
diff --git a/spyderlib/images/editor/private2.png b/spyder/images/editor/private2.png
similarity index 100%
rename from spyderlib/images/editor/private2.png
rename to spyder/images/editor/private2.png
diff --git a/spyderlib/images/editor/refactor.png b/spyder/images/editor/refactor.png
similarity index 100%
rename from spyderlib/images/editor/refactor.png
rename to spyder/images/editor/refactor.png
diff --git a/spyderlib/images/editor/run.png b/spyder/images/editor/run.png
similarity index 100%
rename from spyderlib/images/editor/run.png
rename to spyder/images/editor/run.png
diff --git a/spyderlib/images/editor/run_again.png b/spyder/images/editor/run_again.png
similarity index 100%
rename from spyderlib/images/editor/run_again.png
rename to spyder/images/editor/run_again.png
diff --git a/spyderlib/images/editor/run_cell.png b/spyder/images/editor/run_cell.png
similarity index 100%
rename from spyderlib/images/editor/run_cell.png
rename to spyder/images/editor/run_cell.png
diff --git a/spyderlib/images/editor/run_cell_advance.png b/spyder/images/editor/run_cell_advance.png
similarity index 100%
rename from spyderlib/images/editor/run_cell_advance.png
rename to spyder/images/editor/run_cell_advance.png
diff --git a/spyderlib/images/editor/run_selection.png b/spyder/images/editor/run_selection.png
similarity index 100%
rename from spyderlib/images/editor/run_selection.png
rename to spyder/images/editor/run_selection.png
diff --git a/spyderlib/images/editor/run_settings.png b/spyder/images/editor/run_settings.png
similarity index 100%
rename from spyderlib/images/editor/run_settings.png
rename to spyder/images/editor/run_settings.png
diff --git a/spyderlib/images/editor/select.png b/spyder/images/editor/select.png
similarity index 100%
rename from spyderlib/images/editor/select.png
rename to spyder/images/editor/select.png
diff --git a/spyderlib/images/editor/selectall.png b/spyder/images/editor/selectall.png
similarity index 100%
rename from spyderlib/images/editor/selectall.png
rename to spyder/images/editor/selectall.png
diff --git a/spyderlib/images/editor/todo.png b/spyder/images/editor/todo.png
similarity index 100%
rename from spyderlib/images/editor/todo.png
rename to spyder/images/editor/todo.png
diff --git a/spyderlib/images/editor/todo_list.png b/spyder/images/editor/todo_list.png
similarity index 100%
rename from spyderlib/images/editor/todo_list.png
rename to spyder/images/editor/todo_list.png
diff --git a/spyderlib/images/editor/uncomment.png b/spyder/images/editor/uncomment.png
similarity index 100%
rename from spyderlib/images/editor/uncomment.png
rename to spyder/images/editor/uncomment.png
diff --git a/spyderlib/images/editor/unindent.png b/spyder/images/editor/unindent.png
similarity index 100%
rename from spyderlib/images/editor/unindent.png
rename to spyder/images/editor/unindent.png
diff --git a/spyderlib/images/editor/versplit.png b/spyder/images/editor/versplit.png
similarity index 100%
rename from spyderlib/images/editor/versplit.png
rename to spyder/images/editor/versplit.png
diff --git a/spyderlib/images/editor/warning.png b/spyder/images/editor/warning.png
similarity index 100%
rename from spyderlib/images/editor/warning.png
rename to spyder/images/editor/warning.png
diff --git a/spyderlib/images/editor/wng_list.png b/spyder/images/editor/wng_list.png
similarity index 100%
rename from spyderlib/images/editor/wng_list.png
rename to spyder/images/editor/wng_list.png
diff --git a/spyderlib/images/eyedropper.png b/spyder/images/eyedropper.png
similarity index 100%
rename from spyderlib/images/eyedropper.png
rename to spyder/images/eyedropper.png
diff --git a/spyderlib/images/file/fileclose.png b/spyder/images/file/fileclose.png
similarity index 100%
rename from spyderlib/images/file/fileclose.png
rename to spyder/images/file/fileclose.png
diff --git a/spyderlib/images/file/filecloseall.png b/spyder/images/file/filecloseall.png
similarity index 100%
rename from spyderlib/images/file/filecloseall.png
rename to spyder/images/file/filecloseall.png
diff --git a/spyderlib/images/file/fileimport.png b/spyder/images/file/fileimport.png
similarity index 100%
rename from spyderlib/images/file/fileimport.png
rename to spyder/images/file/fileimport.png
diff --git a/spyderlib/images/file/filenew.png b/spyder/images/file/filenew.png
similarity index 100%
rename from spyderlib/images/file/filenew.png
rename to spyder/images/file/filenew.png
diff --git a/spyderlib/images/file/fileopen.png b/spyder/images/file/fileopen.png
similarity index 100%
rename from spyderlib/images/file/fileopen.png
rename to spyder/images/file/fileopen.png
diff --git a/spyderlib/images/file/filesave.png b/spyder/images/file/filesave.png
similarity index 100%
rename from spyderlib/images/file/filesave.png
rename to spyder/images/file/filesave.png
diff --git a/spyderlib/images/file/filesaveas.png b/spyder/images/file/filesaveas.png
similarity index 100%
rename from spyderlib/images/file/filesaveas.png
rename to spyder/images/file/filesaveas.png
diff --git a/spyderlib/images/file/print.png b/spyder/images/file/print.png
similarity index 100%
rename from spyderlib/images/file/print.png
rename to spyder/images/file/print.png
diff --git a/spyderlib/images/file/save_all.png b/spyder/images/file/save_all.png
similarity index 100%
rename from spyderlib/images/file/save_all.png
rename to spyder/images/file/save_all.png
diff --git a/spyderlib/images/filetypes/bat.png b/spyder/images/filetypes/bat.png
similarity index 100%
rename from spyderlib/images/filetypes/bat.png
rename to spyder/images/filetypes/bat.png
diff --git a/spyderlib/images/filetypes/bmp.png b/spyder/images/filetypes/bmp.png
similarity index 100%
rename from spyderlib/images/filetypes/bmp.png
rename to spyder/images/filetypes/bmp.png
diff --git a/spyderlib/images/filetypes/c.png b/spyder/images/filetypes/c.png
similarity index 100%
rename from spyderlib/images/filetypes/c.png
rename to spyder/images/filetypes/c.png
diff --git a/spyderlib/images/filetypes/cc.png b/spyder/images/filetypes/cc.png
similarity index 100%
rename from spyderlib/images/filetypes/cc.png
rename to spyder/images/filetypes/cc.png
diff --git a/spyderlib/images/filetypes/cfg.png b/spyder/images/filetypes/cfg.png
similarity index 100%
rename from spyderlib/images/filetypes/cfg.png
rename to spyder/images/filetypes/cfg.png
diff --git a/spyderlib/images/filetypes/chm.png b/spyder/images/filetypes/chm.png
similarity index 100%
rename from spyderlib/images/filetypes/chm.png
rename to spyder/images/filetypes/chm.png
diff --git a/spyderlib/images/filetypes/cl.png b/spyder/images/filetypes/cl.png
similarity index 100%
rename from spyderlib/images/filetypes/cl.png
rename to spyder/images/filetypes/cl.png
diff --git a/spyderlib/images/filetypes/cmd.png b/spyder/images/filetypes/cmd.png
similarity index 100%
rename from spyderlib/images/filetypes/cmd.png
rename to spyder/images/filetypes/cmd.png
diff --git a/spyderlib/images/filetypes/cpp.png b/spyder/images/filetypes/cpp.png
similarity index 100%
rename from spyderlib/images/filetypes/cpp.png
rename to spyder/images/filetypes/cpp.png
diff --git a/spyderlib/images/filetypes/css.png b/spyder/images/filetypes/css.png
similarity index 100%
rename from spyderlib/images/filetypes/css.png
rename to spyder/images/filetypes/css.png
diff --git a/spyderlib/images/filetypes/cxx.png b/spyder/images/filetypes/cxx.png
similarity index 100%
rename from spyderlib/images/filetypes/cxx.png
rename to spyder/images/filetypes/cxx.png
diff --git a/spyderlib/images/filetypes/diff.png b/spyder/images/filetypes/diff.png
similarity index 100%
rename from spyderlib/images/filetypes/diff.png
rename to spyder/images/filetypes/diff.png
diff --git a/spyderlib/images/filetypes/doc.png b/spyder/images/filetypes/doc.png
similarity index 100%
rename from spyderlib/images/filetypes/doc.png
rename to spyder/images/filetypes/doc.png
diff --git a/spyderlib/images/filetypes/enaml.png b/spyder/images/filetypes/enaml.png
similarity index 100%
rename from spyderlib/images/filetypes/enaml.png
rename to spyder/images/filetypes/enaml.png
diff --git a/spyderlib/images/filetypes/exe.png b/spyder/images/filetypes/exe.png
similarity index 100%
rename from spyderlib/images/filetypes/exe.png
rename to spyder/images/filetypes/exe.png
diff --git a/spyderlib/images/filetypes/f.png b/spyder/images/filetypes/f.png
similarity index 100%
rename from spyderlib/images/filetypes/f.png
rename to spyder/images/filetypes/f.png
diff --git a/spyderlib/images/filetypes/f77.png b/spyder/images/filetypes/f77.png
similarity index 100%
rename from spyderlib/images/filetypes/f77.png
rename to spyder/images/filetypes/f77.png
diff --git a/spyderlib/images/filetypes/f90.png b/spyder/images/filetypes/f90.png
similarity index 100%
rename from spyderlib/images/filetypes/f90.png
rename to spyder/images/filetypes/f90.png
diff --git a/spyderlib/images/filetypes/gif.png b/spyder/images/filetypes/gif.png
similarity index 100%
rename from spyderlib/images/filetypes/gif.png
rename to spyder/images/filetypes/gif.png
diff --git a/spyderlib/images/filetypes/h.png b/spyder/images/filetypes/h.png
similarity index 100%
rename from spyderlib/images/filetypes/h.png
rename to spyder/images/filetypes/h.png
diff --git a/spyderlib/images/filetypes/hh.png b/spyder/images/filetypes/hh.png
similarity index 100%
rename from spyderlib/images/filetypes/hh.png
rename to spyder/images/filetypes/hh.png
diff --git a/spyderlib/images/filetypes/hpp.png b/spyder/images/filetypes/hpp.png
similarity index 100%
rename from spyderlib/images/filetypes/hpp.png
rename to spyder/images/filetypes/hpp.png
diff --git a/spyderlib/images/filetypes/htm.png b/spyder/images/filetypes/htm.png
similarity index 100%
rename from spyderlib/images/filetypes/htm.png
rename to spyder/images/filetypes/htm.png
diff --git a/spyderlib/images/filetypes/html.png b/spyder/images/filetypes/html.png
similarity index 100%
rename from spyderlib/images/filetypes/html.png
rename to spyder/images/filetypes/html.png
diff --git a/spyderlib/images/filetypes/hxx.png b/spyder/images/filetypes/hxx.png
similarity index 100%
rename from spyderlib/images/filetypes/hxx.png
rename to spyder/images/filetypes/hxx.png
diff --git a/spyderlib/images/filetypes/inf.png b/spyder/images/filetypes/inf.png
similarity index 100%
rename from spyderlib/images/filetypes/inf.png
rename to spyder/images/filetypes/inf.png
diff --git a/spyderlib/images/filetypes/ini.png b/spyder/images/filetypes/ini.png
similarity index 100%
rename from spyderlib/images/filetypes/ini.png
rename to spyder/images/filetypes/ini.png
diff --git a/spyderlib/images/filetypes/jl.png b/spyder/images/filetypes/jl.png
similarity index 100%
rename from spyderlib/images/filetypes/jl.png
rename to spyder/images/filetypes/jl.png
diff --git a/spyderlib/images/filetypes/jpeg.png b/spyder/images/filetypes/jpeg.png
similarity index 100%
rename from spyderlib/images/filetypes/jpeg.png
rename to spyder/images/filetypes/jpeg.png
diff --git a/spyderlib/images/filetypes/jpg.png b/spyder/images/filetypes/jpg.png
similarity index 100%
rename from spyderlib/images/filetypes/jpg.png
rename to spyder/images/filetypes/jpg.png
diff --git a/spyderlib/images/filetypes/js.png b/spyder/images/filetypes/js.png
similarity index 100%
rename from spyderlib/images/filetypes/js.png
rename to spyder/images/filetypes/js.png
diff --git a/spyderlib/images/filetypes/log.png b/spyder/images/filetypes/log.png
similarity index 100%
rename from spyderlib/images/filetypes/log.png
rename to spyder/images/filetypes/log.png
diff --git a/spyderlib/images/filetypes/nsh.png b/spyder/images/filetypes/nsh.png
similarity index 100%
rename from spyderlib/images/filetypes/nsh.png
rename to spyder/images/filetypes/nsh.png
diff --git a/spyderlib/images/filetypes/nsi.png b/spyder/images/filetypes/nsi.png
similarity index 100%
rename from spyderlib/images/filetypes/nsi.png
rename to spyder/images/filetypes/nsi.png
diff --git a/spyderlib/images/filetypes/nt.png b/spyder/images/filetypes/nt.png
similarity index 100%
rename from spyderlib/images/filetypes/nt.png
rename to spyder/images/filetypes/nt.png
diff --git a/spyderlib/images/filetypes/patch.png b/spyder/images/filetypes/patch.png
similarity index 100%
rename from spyderlib/images/filetypes/patch.png
rename to spyder/images/filetypes/patch.png
diff --git a/spyderlib/images/filetypes/pdf.png b/spyder/images/filetypes/pdf.png
similarity index 100%
rename from spyderlib/images/filetypes/pdf.png
rename to spyder/images/filetypes/pdf.png
diff --git a/spyderlib/images/filetypes/png.png b/spyder/images/filetypes/png.png
similarity index 100%
rename from spyderlib/images/filetypes/png.png
rename to spyder/images/filetypes/png.png
diff --git a/spyderlib/images/filetypes/po.png b/spyder/images/filetypes/po.png
similarity index 100%
rename from spyderlib/images/filetypes/po.png
rename to spyder/images/filetypes/po.png
diff --git a/spyderlib/images/filetypes/pot.png b/spyder/images/filetypes/pot.png
similarity index 100%
rename from spyderlib/images/filetypes/pot.png
rename to spyder/images/filetypes/pot.png
diff --git a/spyderlib/images/filetypes/pps.png b/spyder/images/filetypes/pps.png
similarity index 100%
rename from spyderlib/images/filetypes/pps.png
rename to spyder/images/filetypes/pps.png
diff --git a/spyderlib/images/filetypes/properties.png b/spyder/images/filetypes/properties.png
similarity index 100%
rename from spyderlib/images/filetypes/properties.png
rename to spyder/images/filetypes/properties.png
diff --git a/spyderlib/images/filetypes/ps.png b/spyder/images/filetypes/ps.png
similarity index 100%
rename from spyderlib/images/filetypes/ps.png
rename to spyder/images/filetypes/ps.png
diff --git a/spyderlib/images/filetypes/pxd.png b/spyder/images/filetypes/pxd.png
similarity index 100%
rename from spyderlib/images/filetypes/pxd.png
rename to spyder/images/filetypes/pxd.png
diff --git a/spyderlib/images/filetypes/pxi.png b/spyder/images/filetypes/pxi.png
similarity index 100%
rename from spyderlib/images/filetypes/pxi.png
rename to spyder/images/filetypes/pxi.png
diff --git a/spyderlib/images/filetypes/py.png b/spyder/images/filetypes/py.png
similarity index 100%
rename from spyderlib/images/filetypes/py.png
rename to spyder/images/filetypes/py.png
diff --git a/spyderlib/images/filetypes/pyc.png b/spyder/images/filetypes/pyc.png
similarity index 100%
rename from spyderlib/images/filetypes/pyc.png
rename to spyder/images/filetypes/pyc.png
diff --git a/spyderlib/images/filetypes/pyw.png b/spyder/images/filetypes/pyw.png
similarity index 100%
rename from spyderlib/images/filetypes/pyw.png
rename to spyder/images/filetypes/pyw.png
diff --git a/spyderlib/images/filetypes/pyx.png b/spyder/images/filetypes/pyx.png
similarity index 100%
rename from spyderlib/images/filetypes/pyx.png
rename to spyder/images/filetypes/pyx.png
diff --git a/spyderlib/images/filetypes/rar.png b/spyder/images/filetypes/rar.png
similarity index 100%
rename from spyderlib/images/filetypes/rar.png
rename to spyder/images/filetypes/rar.png
diff --git a/spyderlib/images/filetypes/readme.png b/spyder/images/filetypes/readme.png
similarity index 100%
rename from spyderlib/images/filetypes/readme.png
rename to spyder/images/filetypes/readme.png
diff --git a/spyderlib/images/filetypes/reg.png b/spyder/images/filetypes/reg.png
similarity index 100%
rename from spyderlib/images/filetypes/reg.png
rename to spyder/images/filetypes/reg.png
diff --git a/spyderlib/images/filetypes/rej.png b/spyder/images/filetypes/rej.png
similarity index 100%
rename from spyderlib/images/filetypes/rej.png
rename to spyder/images/filetypes/rej.png
diff --git a/spyderlib/images/filetypes/scss.png b/spyder/images/filetypes/scss.png
similarity index 100%
rename from spyderlib/images/filetypes/scss.png
rename to spyder/images/filetypes/scss.png
diff --git a/spyderlib/images/filetypes/session.png b/spyder/images/filetypes/session.png
similarity index 100%
rename from spyderlib/images/filetypes/session.png
rename to spyder/images/filetypes/session.png
diff --git a/spyderlib/images/filetypes/tar.png b/spyder/images/filetypes/tar.png
similarity index 100%
rename from spyderlib/images/filetypes/tar.png
rename to spyder/images/filetypes/tar.png
diff --git a/spyderlib/images/filetypes/tex.png b/spyder/images/filetypes/tex.png
similarity index 100%
rename from spyderlib/images/filetypes/tex.png
rename to spyder/images/filetypes/tex.png
diff --git a/spyderlib/images/filetypes/tgz.png b/spyder/images/filetypes/tgz.png
similarity index 100%
rename from spyderlib/images/filetypes/tgz.png
rename to spyder/images/filetypes/tgz.png
diff --git a/spyderlib/images/filetypes/tif.png b/spyder/images/filetypes/tif.png
similarity index 100%
rename from spyderlib/images/filetypes/tif.png
rename to spyder/images/filetypes/tif.png
diff --git a/spyderlib/images/filetypes/tiff.png b/spyder/images/filetypes/tiff.png
similarity index 100%
rename from spyderlib/images/filetypes/tiff.png
rename to spyder/images/filetypes/tiff.png
diff --git a/spyderlib/images/filetypes/ts.png b/spyder/images/filetypes/ts.png
similarity index 100%
rename from spyderlib/images/filetypes/ts.png
rename to spyder/images/filetypes/ts.png
diff --git a/spyderlib/images/filetypes/txt.png b/spyder/images/filetypes/txt.png
similarity index 100%
rename from spyderlib/images/filetypes/txt.png
rename to spyder/images/filetypes/txt.png
diff --git a/spyderlib/images/filetypes/ui.png b/spyder/images/filetypes/ui.png
similarity index 100%
rename from spyderlib/images/filetypes/ui.png
rename to spyder/images/filetypes/ui.png
diff --git a/spyderlib/images/filetypes/xls.png b/spyder/images/filetypes/xls.png
similarity index 100%
rename from spyderlib/images/filetypes/xls.png
rename to spyder/images/filetypes/xls.png
diff --git a/spyderlib/images/filetypes/xml.png b/spyder/images/filetypes/xml.png
similarity index 100%
rename from spyderlib/images/filetypes/xml.png
rename to spyder/images/filetypes/xml.png
diff --git a/spyderlib/images/filetypes/zip.png b/spyder/images/filetypes/zip.png
similarity index 100%
rename from spyderlib/images/filetypes/zip.png
rename to spyder/images/filetypes/zip.png
diff --git a/spyderlib/images/font.png b/spyder/images/font.png
similarity index 100%
rename from spyderlib/images/font.png
rename to spyder/images/font.png
diff --git a/spyderlib/images/genprefs.png b/spyder/images/genprefs.png
similarity index 100%
rename from spyderlib/images/genprefs.png
rename to spyder/images/genprefs.png
diff --git a/spyderlib/images/help.png b/spyder/images/help.png
similarity index 100%
rename from spyderlib/images/help.png
rename to spyder/images/help.png
diff --git a/spyderlib/images/italic.png b/spyder/images/italic.png
similarity index 100%
rename from spyderlib/images/italic.png
rename to spyder/images/italic.png
diff --git a/spyderlib/images/keyboard.png b/spyder/images/keyboard.png
similarity index 100%
rename from spyderlib/images/keyboard.png
rename to spyder/images/keyboard.png
diff --git a/spyderlib/images/matplotlib.png b/spyder/images/matplotlib.png
similarity index 100%
rename from spyderlib/images/matplotlib.png
rename to spyder/images/matplotlib.png
diff --git a/spyderlib/images/none.png b/spyder/images/none.png
similarity index 100%
rename from spyderlib/images/none.png
rename to spyder/images/none.png
diff --git a/spyderlib/images/not_found.png b/spyder/images/not_found.png
similarity index 100%
rename from spyderlib/images/not_found.png
rename to spyder/images/not_found.png
diff --git a/spyderlib/images/options.svg b/spyder/images/options.svg
similarity index 100%
rename from spyderlib/images/options.svg
rename to spyder/images/options.svg
diff --git a/spyderlib/images/projects/add_to_path.png b/spyder/images/projects/add_to_path.png
similarity index 100%
rename from spyderlib/images/projects/add_to_path.png
rename to spyder/images/projects/add_to_path.png
diff --git a/spyderlib/images/projects/folder.png b/spyder/images/projects/folder.png
similarity index 100%
rename from spyderlib/images/projects/folder.png
rename to spyder/images/projects/folder.png
diff --git a/spyderlib/images/projects/package.png b/spyder/images/projects/package.png
similarity index 100%
rename from spyderlib/images/projects/package.png
rename to spyder/images/projects/package.png
diff --git a/spyderlib/images/projects/pp_folder.png b/spyder/images/projects/pp_folder.png
similarity index 100%
rename from spyderlib/images/projects/pp_folder.png
rename to spyder/images/projects/pp_folder.png
diff --git a/spyderlib/images/projects/pp_package.png b/spyder/images/projects/pp_package.png
similarity index 100%
rename from spyderlib/images/projects/pp_package.png
rename to spyder/images/projects/pp_package.png
diff --git a/spyderlib/images/projects/pp_project.png b/spyder/images/projects/pp_project.png
similarity index 100%
rename from spyderlib/images/projects/pp_project.png
rename to spyder/images/projects/pp_project.png
diff --git a/spyderlib/images/projects/project.png b/spyder/images/projects/project.png
similarity index 100%
rename from spyderlib/images/projects/project.png
rename to spyder/images/projects/project.png
diff --git a/spyderlib/images/projects/project_closed.png b/spyder/images/projects/project_closed.png
similarity index 100%
rename from spyderlib/images/projects/project_closed.png
rename to spyder/images/projects/project_closed.png
diff --git a/spyderlib/images/projects/pydev.png b/spyder/images/projects/pydev.png
similarity index 100%
rename from spyderlib/images/projects/pydev.png
rename to spyder/images/projects/pydev.png
diff --git a/spyderlib/images/projects/pythonpath.png b/spyder/images/projects/pythonpath.png
similarity index 100%
rename from spyderlib/images/projects/pythonpath.png
rename to spyder/images/projects/pythonpath.png
diff --git a/spyderlib/images/projects/remove_from_path.png b/spyder/images/projects/remove_from_path.png
similarity index 100%
rename from spyderlib/images/projects/remove_from_path.png
rename to spyder/images/projects/remove_from_path.png
diff --git a/spyderlib/images/projects/show_all.png b/spyder/images/projects/show_all.png
similarity index 100%
rename from spyderlib/images/projects/show_all.png
rename to spyder/images/projects/show_all.png
diff --git a/spyderlib/images/pythonpath.png b/spyder/images/pythonpath.png
similarity index 100%
rename from spyderlib/images/pythonpath.png
rename to spyder/images/pythonpath.png
diff --git a/spyderlib/images/pythonxy.png b/spyder/images/pythonxy.png
similarity index 100%
rename from spyderlib/images/pythonxy.png
rename to spyder/images/pythonxy.png
diff --git a/spyderlib/images/qt.png b/spyder/images/qt.png
similarity index 100%
rename from spyderlib/images/qt.png
rename to spyder/images/qt.png
diff --git a/spyderlib/images/qtassistant.png b/spyder/images/qtassistant.png
similarity index 100%
rename from spyderlib/images/qtassistant.png
rename to spyder/images/qtassistant.png
diff --git a/spyderlib/images/qtdesigner.png b/spyder/images/qtdesigner.png
similarity index 100%
rename from spyderlib/images/qtdesigner.png
rename to spyder/images/qtdesigner.png
diff --git a/spyderlib/images/qtlinguist.png b/spyder/images/qtlinguist.png
similarity index 100%
rename from spyderlib/images/qtlinguist.png
rename to spyder/images/qtlinguist.png
diff --git a/spyderlib/images/scipy.png b/spyder/images/scipy.png
similarity index 100%
rename from spyderlib/images/scipy.png
rename to spyder/images/scipy.png
diff --git a/spyderlib/images/set_workdir.png b/spyder/images/set_workdir.png
similarity index 100%
rename from spyderlib/images/set_workdir.png
rename to spyder/images/set_workdir.png
diff --git a/spyderlib/images/splash.svg b/spyder/images/splash.svg
similarity index 100%
rename from spyderlib/images/splash.svg
rename to spyder/images/splash.svg
diff --git a/spyderlib/images/spyder.png b/spyder/images/spyder.png
similarity index 100%
rename from spyderlib/images/spyder.png
rename to spyder/images/spyder.png
diff --git a/spyderlib/images/spyder.svg b/spyder/images/spyder.svg
similarity index 100%
rename from spyderlib/images/spyder.svg
rename to spyder/images/spyder.svg
diff --git a/spyderlib/images/tour-spyder-logo.png b/spyder/images/tour-spyder-logo.png
similarity index 100%
rename from spyderlib/images/tour-spyder-logo.png
rename to spyder/images/tour-spyder-logo.png
diff --git a/spyderlib/images/upper_lower.png b/spyder/images/upper_lower.png
similarity index 100%
rename from spyderlib/images/upper_lower.png
rename to spyder/images/upper_lower.png
diff --git a/spyderlib/images/vcs_browse.png b/spyder/images/vcs_browse.png
similarity index 100%
rename from spyderlib/images/vcs_browse.png
rename to spyder/images/vcs_browse.png
diff --git a/spyderlib/images/vcs_commit.png b/spyder/images/vcs_commit.png
similarity index 100%
rename from spyderlib/images/vcs_commit.png
rename to spyder/images/vcs_commit.png
diff --git a/spyderlib/images/vitables.png b/spyder/images/vitables.png
similarity index 100%
rename from spyderlib/images/vitables.png
rename to spyder/images/vitables.png
diff --git a/spyderlib/images/whole_words.png b/spyder/images/whole_words.png
similarity index 100%
rename from spyderlib/images/whole_words.png
rename to spyder/images/whole_words.png
diff --git a/spyderlib/images/win_env.png b/spyder/images/win_env.png
similarity index 100%
rename from spyderlib/images/win_env.png
rename to spyder/images/win_env.png
diff --git a/spyderlib/images/winpython.svg b/spyder/images/winpython.svg
similarity index 100%
rename from spyderlib/images/winpython.svg
rename to spyder/images/winpython.svg
diff --git a/spyderlib/interpreter.py b/spyder/interpreter.py
similarity index 95%
rename from spyderlib/interpreter.py
rename to spyder/interpreter.py
index 4074ca0..9bd3cee 100644
--- a/spyderlib/interpreter.py
+++ b/spyder/interpreter.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009-2010 Pierre Raybaut
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """Shell Interpreter"""
 
@@ -19,10 +19,10 @@ import pydoc
 from code import InteractiveConsole
 
 # Local imports:
-from spyderlib.utils.dochelpers import isdefined
-from spyderlib.utils import encoding, programs
-from spyderlib.py3compat import is_text_string, getcwd
-from spyderlib.utils.misc import remove_backslashes
+from spyder.utils.dochelpers import isdefined
+from spyder.utils import encoding, programs
+from spyder.py3compat import is_text_string, getcwd
+from spyder.utils.misc import remove_backslashes
 
 # Force Python to search modules in the current directory first:
 sys.path.insert(0, '')
diff --git a/spyder/locale/es/LC_MESSAGES/spyder.mo b/spyder/locale/es/LC_MESSAGES/spyder.mo
new file mode 100644
index 0000000..31ec34b
Binary files /dev/null and b/spyder/locale/es/LC_MESSAGES/spyder.mo differ
diff --git a/spyderlib/locale/es/LC_MESSAGES/spyderlib.po b/spyder/locale/es/LC_MESSAGES/spyder.po
similarity index 54%
rename from spyderlib/locale/es/LC_MESSAGES/spyderlib.po
rename to spyder/locale/es/LC_MESSAGES/spyder.po
index 52692f4..630f96e 100644
--- a/spyderlib/locale/es/LC_MESSAGES/spyderlib.po
+++ b/spyder/locale/es/LC_MESSAGES/spyder.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.1\n"
-"POT-Creation-Date: 2015-08-29 22:49+COT\n"
-"PO-Revision-Date: 2015-08-24 15:13-0500\n"
+"POT-Creation-Date: 2016-09-24 04:45+COT\n"
+"PO-Revision-Date: 2016-09-24 04:41-0500\n"
 "Last-Translator: Carlos Cordoba <ccordoba12 at gmail.com>\n"
 "Language-Team: Python\n"
 "Language: es\n"
@@ -15,4732 +15,5166 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: pygettext.py 1.5\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-Poedit-Basepath: ../../../../\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Poedit-Basepath: ../../../..\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
-#: spyderlib/config/base.py:241
-msgid ""
-"Update LANGUAGE_CODES (inside config/base.py) if a new translation has been "
-"added to Spyder"
-msgstr ""
+#: spyder/app/mainwindow.py:120
+msgid "Initializing..."
+msgstr "Inicializando..."
 
-#: spyderlib/config/ipython.py:23 spyderlib/config/ipython.py:25
-#: spyderlib/config/ipython.py:32
-msgid "IPython Console integration"
-msgstr "Integración con la terminal de IPython"
+#: spyder/app/mainwindow.py:236
+msgid "Numpy and Scipy documentation"
+msgstr "Documentación de Numpy y Scipy"
 
-#: spyderlib/config/main.py:29
-msgid "Python files"
-msgstr "Archivos Python"
+#: spyder/app/mainwindow.py:238 spyder/app/mainwindow.py:1022
+msgid "Matplotlib documentation"
+msgstr "Documentación de Matplotlib"
 
-#: spyderlib/config/main.py:30
-msgid "Cython/Pyrex files"
-msgstr "Archivos Cython/Pyrex"
+#: spyder/app/mainwindow.py:241
+msgid "PyQt4 Reference Guide"
+msgstr "Manual de referencia de PyQt4"
 
-#: spyderlib/config/main.py:31
-msgid "C files"
-msgstr "Archivos C"
+#: spyder/app/mainwindow.py:244
+msgid "PyQt4 API Reference"
+msgstr "Referencia del API de PyQt4"
 
-#: spyderlib/config/main.py:32
-msgid "C++ files"
-msgstr "Archivos C++"
+#: spyder/app/mainwindow.py:246
+msgid "Python(x,y)"
+msgstr "Python(x,y)"
 
-#: spyderlib/config/main.py:33
-msgid "OpenCL files"
-msgstr "Archivos OpenCL"
+#: spyder/app/mainwindow.py:248
+msgid "WinPython"
+msgstr "WinPython"
 
-#: spyderlib/config/main.py:34
-msgid "Fortran files"
-msgstr "Archivos Fortran"
+#: spyder/app/mainwindow.py:519
+msgid "Close current pane"
+msgstr "Cerrar panel actual"
 
-#: spyderlib/config/main.py:35
-msgid "IDL files"
-msgstr "Archivos IDL"
+#: spyder/app/mainwindow.py:524
+msgid "Lock panes"
+msgstr "Bloquear los paneles"
 
-#: spyderlib/config/main.py:36
-msgid "MATLAB files"
-msgstr "Archivos MATLAB"
+#: spyder/app/mainwindow.py:531
+msgid "Use next layout"
+msgstr "Utilizar la siguiente disposición"
 
-#: spyderlib/config/main.py:37
-msgid "Julia files"
-msgstr "Archivos Julia"
+#: spyder/app/mainwindow.py:535
+msgid "Use previous layout"
+msgstr "Utilizar la disposición anterior"
 
-#: spyderlib/config/main.py:38
-msgid "Yaml files"
-msgstr "Archivos Yaml"
+#: spyder/app/mainwindow.py:554 spyder/widgets/sourcecode/codeeditor.py:2464
+msgid "Undo"
+msgstr "Deshacer"
 
-#: spyderlib/config/main.py:39
-msgid "Patch and diff files"
-msgstr "Archivos Patch y diff"
+#: spyder/app/mainwindow.py:556 spyder/widgets/sourcecode/codeeditor.py:2467
+msgid "Redo"
+msgstr "Rehacer"
 
-#: spyderlib/config/main.py:40
-msgid "Batch files"
-msgstr "Archivos Batch"
+#: spyder/app/mainwindow.py:558 spyder/widgets/shell.py:121
+#: spyder/widgets/sourcecode/codeeditor.py:2473
+#: spyder/widgets/variableexplorer/arrayeditor.py:453
+#: spyder/widgets/variableexplorer/collectionseditor.py:647
+#: spyder/widgets/variableexplorer/dataframeeditor.py:445
+msgid "Copy"
+msgstr "Copiar"
 
-#: spyderlib/config/main.py:41 spyderlib/utils/iofuncs.py:500
-msgid "Text files"
-msgstr "Archivos de Texto"
+#: spyder/app/mainwindow.py:560 spyder/widgets/shell.py:117
+#: spyder/widgets/sourcecode/codeeditor.py:2470
+msgid "Cut"
+msgstr "Cortar"
 
-#: spyderlib/config/main.py:42
-msgid "reStructuredText files"
-msgstr "Archivos de Texto reStructurado"
+#: spyder/app/mainwindow.py:562 spyder/widgets/shell.py:125
+#: spyder/widgets/sourcecode/codeeditor.py:2476
+#: spyder/widgets/variableexplorer/collectionseditor.py:644
+msgid "Paste"
+msgstr "Pegar"
 
-#: spyderlib/config/main.py:43
-msgid "gettext files"
-msgstr "Archivos gettext"
+#: spyder/app/mainwindow.py:565 spyder/widgets/shell.py:138
+#: spyder/widgets/sourcecode/codeeditor.py:2479
+msgid "Select All"
+msgstr "Seleccionar todo"
 
-#: spyderlib/config/main.py:44
-msgid "NSIS files"
-msgstr "Archivos NSIS"
+#: spyder/app/mainwindow.py:575 spyder/plugins/editor.py:1342
+msgid "&File"
+msgstr "&Archivo"
 
-#: spyderlib/config/main.py:45
-msgid "Web page files"
-msgstr "Archivos de Páginas web"
+#: spyder/app/mainwindow.py:576 spyder/plugins/editor.py:1334
+msgid "File toolbar"
+msgstr "Barra de archivo"
 
-#: spyderlib/config/main.py:46
-msgid "XML files"
-msgstr "Archivos XML"
+#: spyder/app/mainwindow.py:580 spyder/plugins/editor.py:1343
+msgid "&Edit"
+msgstr "&Editar"
 
-#: spyderlib/config/main.py:47
-msgid "Javascript files"
-msgstr "Archivos Javascript"
+#: spyder/app/mainwindow.py:581 spyder/plugins/editor.py:1339
+msgid "Edit toolbar"
+msgstr "Barra de edición"
 
-#: spyderlib/config/main.py:48
-msgid "Json files"
-msgstr "Archivos Json"
+#: spyder/app/mainwindow.py:585 spyder/plugins/editor.py:1344
+msgid "&Search"
+msgstr "&Buscar"
 
-#: spyderlib/config/main.py:49
-msgid "IPython notebooks"
-msgstr "Notebooks de IPython"
+#: spyder/app/mainwindow.py:586 spyder/plugins/editor.py:1335
+msgid "Search toolbar"
+msgstr "Barra de búsqueda"
 
-#: spyderlib/config/main.py:50
-msgid "Enaml files"
-msgstr "Archivos Enaml"
+#: spyder/app/mainwindow.py:590 spyder/plugins/editor.py:1345
+msgid "Sour&ce"
+msgstr "&Código fuente"
 
-#: spyderlib/config/main.py:51
-msgid "Configuration files"
-msgstr "Archivos de Configuración"
+#: spyder/app/mainwindow.py:591 spyder/plugins/editor.py:1336
+msgid "Source toolbar"
+msgstr "Barra de código fuente"
 
-#: spyderlib/config/main.py:58 spyderlib/widgets/explorer.py:660
-msgid "All files"
-msgstr "Todos los archivos"
+#: spyder/app/mainwindow.py:595 spyder/plugins/editor.py:780
+#: spyder/plugins/editor.py:1346
+msgid "&Run"
+msgstr "E&jecutar"
 
-#: spyderlib/plugins/__init__.py:513 spyderlib/plugins/editor.py:95
-#: spyderlib/plugins/editor.py:551 spyderlib/plugins/editor.py:1600
-#: spyderlib/plugins/inspector.py:139 spyderlib/plugins/inspector.py:419
-#: spyderlib/widgets/editor.py:357
-#: spyderlib/widgets/sourcecode/codeeditor.py:95
-#: spyderlib/widgets/sourcecode/codeeditor.py:2902
-msgid "Editor"
-msgstr "Editor"
+#: spyder/app/mainwindow.py:596 spyder/plugins/editor.py:1337
+msgid "Run toolbar"
+msgstr "Barra de ejecución"
 
-#: spyderlib/plugins/configdialog.py:133
-#, fuzzy
-msgid "Reset to defaults"
-msgstr "Restaurar los valores por defecto"
+#: spyder/app/mainwindow.py:600 spyder/plugins/editor.py:739
+msgid "&Debug"
+msgstr "&Depurar"
 
-#: spyderlib/plugins/configdialog.py:145
-msgid "Preferences"
-msgstr "Preferencias"
+#: spyder/app/mainwindow.py:601 spyder/plugins/editor.py:1338
+msgid "Debug toolbar"
+msgstr "Barra de depuración"
 
-#: spyderlib/plugins/configdialog.py:473
-msgid "Invalid directory path"
-msgstr "Ruta de directorio inválida"
+#: spyder/app/mainwindow.py:605
+msgid "C&onsoles"
+msgstr "&Terminales"
 
-#: spyderlib/plugins/configdialog.py:476 spyderlib/plugins/configdialog.py:491
-#: spyderlib/plugins/runconfig.py:176 spyderlib/plugins/runconfig.py:240
-#: spyderlib/plugins/workingdirectory.py:295 spyderlib/widgets/explorer.py:574
-#: spyderlib/widgets/externalshell/pythonshell.py:640
-#: spyderlib/widgets/findinfiles.py:505 spyderlib/widgets/pathmanager.py:223
-#: spyderlib/widgets/projectexplorer.py:899
-msgid "Select directory"
-msgstr "Seleccionar directorio"
+#: spyder/app/mainwindow.py:608
+msgid "&Projects"
+msgstr "&Proyectos"
 
-#: spyderlib/plugins/configdialog.py:503
-msgid "Invalid file path"
-msgstr "Ruta de archivo inválida"
+#: spyder/app/mainwindow.py:611 spyder/plugins/editor.py:1347
+msgid "&Tools"
+msgstr "&Herramientas"
 
-#: spyderlib/plugins/configdialog.py:506 spyderlib/plugins/configdialog.py:523
-msgid "Select file"
-msgstr "Seleccionar archivo"
+#: spyder/app/mainwindow.py:614
+msgid "&View"
+msgstr "&Ver"
 
-#: spyderlib/plugins/configdialog.py:522
-msgid "All files (*)"
-msgstr "Todos los archivos (*)"
+#: spyder/app/mainwindow.py:617
+msgid "&Help"
+msgstr "A&yuda"
 
-#: spyderlib/plugins/configdialog.py:595 spyderlib/widgets/formlayout.py:214
-msgid "Bold"
-msgstr "Negrita"
+#: spyder/app/mainwindow.py:622
+msgid "Welcome to Spyder!"
+msgstr "Bienvenido a Spyder!"
 
-#: spyderlib/plugins/configdialog.py:598 spyderlib/widgets/formlayout.py:209
-msgid "Italic"
-msgstr "Cursiva"
+#: spyder/app/mainwindow.py:627
+msgid "Pre&ferences"
+msgstr "Pre&ferencias"
 
-#: spyderlib/plugins/configdialog.py:640
-msgid "Font: "
-msgstr "Tipo de letra"
+#: spyder/app/mainwindow.py:634 spyder/widgets/pathmanager.py:49
+msgid "PYTHONPATH manager"
+msgstr "Administrador del PYTHONPATH"
 
-#: spyderlib/plugins/configdialog.py:644
-msgid "Size: "
-msgstr "Tamaño:"
+#: spyder/app/mainwindow.py:637
+msgid "Python Path Manager"
+msgstr "Manejador de rutas de Python"
 
-#: spyderlib/plugins/configdialog.py:653 spyderlib/plugins/history.py:48
-msgid "Font style"
-msgstr "Fuente"
+#: spyder/app/mainwindow.py:640
+msgid "Update module names list"
+msgstr "Actualizar la lista de nombres de módulos"
 
-#: spyderlib/plugins/configdialog.py:708
-msgid "Spyder needs to restart to change the following setting:"
+#: spyder/app/mainwindow.py:643
+msgid "Refresh list of module names available in PYTHONPATH"
 msgstr ""
+"Actualiza la lista de nombres de los módulos disponibles en su PYTHONPATH"
 
-#: spyderlib/plugins/configdialog.py:711
-msgid "Spyder needs to restart to change the following settings:"
-msgstr ""
+#: spyder/app/mainwindow.py:646
+msgid "Reset Spyder to factory defaults"
+msgstr "Restaurar Spyder a su  configuración por defecto"
 
-#: spyderlib/plugins/configdialog.py:713
-msgid "Do you wish to restart now?"
-msgstr ""
+#: spyder/app/mainwindow.py:651
+msgid "Current user environment variables..."
+msgstr "Variables de entorno del usuario actual..."
 
-#: spyderlib/plugins/configdialog.py:719
-msgid "Information"
+#: spyder/app/mainwindow.py:653
+msgid ""
+"Show and edit current user environment variables in Windows registry (i.e. "
+"for all sessions)"
 msgstr ""
+"Mostrar y editar las variables de\n"
+"entorno del usuario actual en el\n"
+"registro de Windows (es decir,\n"
+"para todas las sesiones)"
 
-#: spyderlib/plugins/configdialog.py:734
-msgid "General"
-msgstr "General"
-
-#: spyderlib/plugins/configdialog.py:741 spyderlib/plugins/editor.py:104
-#: spyderlib/plugins/externalconsole.py:67
-#: spyderlib/plugins/ipythonconsole.py:162
-msgid "Interface"
-msgstr "Interfaz"
+#: spyder/app/mainwindow.py:662 spyder/app/mainwindow.py:1118
+msgid "External Tools"
+msgstr "Herramientas externas"
 
-#: spyderlib/plugins/configdialog.py:744
-msgid "Qt windows style"
-msgstr "Estilo de Qt"
+#: spyder/app/mainwindow.py:666
+msgid "Python(x,y) launcher"
+msgstr "Lanzador de Python(x,y)"
 
-#: spyderlib/plugins/configdialog.py:750
-msgid "Icon theme"
-msgstr ""
+#: spyder/app/mainwindow.py:673
+msgid "WinPython control panel"
+msgstr "Panel de control de WinPython"
 
-#: spyderlib/plugins/configdialog.py:755
-msgid "Language"
-msgstr ""
+#: spyder/app/mainwindow.py:682
+msgid "Qt Designer"
+msgstr "Diseñador de interfaces de Qt"
 
-#: spyderlib/plugins/configdialog.py:759
-msgid "Use a single instance"
-msgstr "Utilizar una única instancia"
+#: spyder/app/mainwindow.py:687
+msgid "Qt Linguist"
+msgstr "Traductor de aplicaciones de Qt"
 
-#: spyderlib/plugins/configdialog.py:761
-msgid ""
-"Set this to open external<br> Python files in an already running instance "
-"(Requires a restart)"
-msgstr ""
-"Seleccione esta opción<br> para abrir archivos externos de Python en la "
-"ventana actual (Requiere reiniciar)"
+#: spyder/app/mainwindow.py:693
+msgid "Qt examples"
+msgstr "Ejemplos de Qt"
 
-#: spyderlib/plugins/configdialog.py:764
-#, fuzzy
-msgid "Vertical title bars in panes"
-msgstr "Barras de título verticales para los componentes"
+#: spyder/app/mainwindow.py:714
+msgid "guidata examples"
+msgstr "Ejemplos de guidata"
 
-#: spyderlib/plugins/configdialog.py:766
-msgid "Vertical tabs in panes"
-msgstr ""
+#: spyder/app/mainwindow.py:725
+msgid "guiqwt examples"
+msgstr "Ejemplos de guiqwt"
 
-#: spyderlib/plugins/configdialog.py:768
-#, fuzzy
-msgid "Animated toolbars and panes"
-msgstr "Barras de herramientas y componentes animados"
+#: spyder/app/mainwindow.py:730
+msgid "Sift"
+msgstr "Sift"
 
-#: spyderlib/plugins/configdialog.py:770
-msgid "Tear off menus"
-msgstr "Separar los menús"
+#: spyder/app/mainwindow.py:740
+msgid "ViTables"
+msgstr "ViTables"
 
-#: spyderlib/plugins/configdialog.py:771
-msgid "Set this to detach any<br> menu from the main window"
-msgstr ""
-"Establezca esta opción<br> si desea separar los menús de la ventana principal"
+#: spyder/app/mainwindow.py:754
+msgid "Fullscreen mode"
+msgstr "Modo a pantalla completa"
 
-#: spyderlib/plugins/configdialog.py:773
-msgid "Custom margin for panes:"
-msgstr ""
+#: spyder/app/mainwindow.py:766
+msgid "Main toolbar"
+msgstr "Barra principal"
 
-#: spyderlib/plugins/configdialog.py:782
-msgid "Prompt when exiting"
+#: spyder/app/mainwindow.py:775
+msgid ""
+"Spyder Internal Console\n"
+"\n"
+"This console is used to report application\n"
+"internal errors and to inspect Spyder\n"
+"internals with the following commands:\n"
+"  spy.app, spy.window, dir(spy)\n"
+"\n"
+"Please don't use it to run your code\n"
+"\n"
 msgstr ""
+"Terminal interna de Spyder!\n"
+"\n"
+"Esta terminal se utiliza para reportar errores de la\n"
+"aplicación y para inspeccionar las características\n"
+"internas de Spyder con los siguientes comandos:\n"
+"  spy.app, spy.window, dir(spy)\n"
+"\n"
+"Por favor no ejecuta su código en esta terminal\n"
 
-#: spyderlib/plugins/configdialog.py:813
-msgid "Status bar"
-msgstr "Barra de estado"
+#: spyder/app/mainwindow.py:792
+msgid "Loading help..."
+msgstr "Cargando la ayuda..."
 
-#: spyderlib/plugins/configdialog.py:814
-#, fuzzy
-msgid "Show status bar"
-msgstr "Mostrar barra de pestañas"
+#: spyder/app/mainwindow.py:799
+msgid "Loading outline explorer..."
+msgstr "Cargando el explorador de código..."
 
-#: spyderlib/plugins/configdialog.py:816
-msgid "Show memory usage every"
-msgstr "Mostrar la memoria usada cada"
+#: spyder/app/mainwindow.py:807
+msgid "Loading editor..."
+msgstr "Cargando el editor..."
 
-#: spyderlib/plugins/configdialog.py:825
-msgid "Show CPU usage every"
-msgstr "Mostrar el uso de CPU cada"
+#: spyder/app/mainwindow.py:813 spyder/plugins/console.py:134
+#: spyder/widgets/ipythonconsole/client.py:278
+msgid "&Quit"
+msgstr "&Salir"
 
-#: spyderlib/plugins/configdialog.py:858
-msgid "Debugging"
-msgstr "Depurar"
+#: spyder/app/mainwindow.py:815 spyder/plugins/console.py:136
+msgid "Quit"
+msgstr "Salir"
 
-#: spyderlib/plugins/configdialog.py:859
-msgid "Pop up internal console when internal errors appear"
-msgstr "Mostrar la terminal interna cuando se produzcan errores"
+#: spyder/app/mainwindow.py:819
+msgid "&Restart"
+msgstr "&Reiniciar"
 
-#: spyderlib/plugins/configdialog.py:868
-msgid "Updates"
-msgstr ""
+#: spyder/app/mainwindow.py:821
+msgid "Restart"
+msgstr "Reiniciar"
 
-#: spyderlib/plugins/configdialog.py:869 spyderlib/spyder.py:2872
-msgid "Check for updates on startup"
-msgstr ""
+#: spyder/app/mainwindow.py:838
+msgid "Loading file explorer..."
+msgstr "Cargando el explorador de archivos..."
 
-#: spyderlib/plugins/configdialog.py:902
-msgid "Syntax coloring"
-msgstr "Coloreado de sintaxis"
+#: spyder/app/mainwindow.py:845
+msgid "Loading history plugin..."
+msgstr "Cargando el historial..."
 
-#: spyderlib/plugins/configdialog.py:911
-msgid "Background:"
-msgstr "Fondo:"
+#: spyder/app/mainwindow.py:856
+msgid "Loading online help..."
+msgstr "Cargando la ayuda en línea..."
 
-#: spyderlib/plugins/configdialog.py:912
-#: spyderlib/widgets/sourcecode/codeeditor.py:104
-msgid "Current line:"
-msgstr "Línea seleccionada:"
+#: spyder/app/mainwindow.py:862
+msgid "Loading project explorer..."
+msgstr "Cargando el explorador de proyectos..."
 
-#: spyderlib/plugins/configdialog.py:913
-msgid "Current cell:"
-msgstr "Celda seleccionada:"
+#: spyder/app/mainwindow.py:869
+msgid "Loading external console..."
+msgstr "Cargando la terminal externa..."
 
-#: spyderlib/plugins/configdialog.py:914
-msgid "Occurrence:"
-msgstr "Ocurrencia:"
+#: spyder/app/mainwindow.py:875
+msgid "Loading namespace browser..."
+msgstr "Cargando el explorador de variables..."
 
-#: spyderlib/plugins/configdialog.py:915
-msgid "Link:"
-msgstr "Enlace:"
+#: spyder/app/mainwindow.py:882
+msgid "Loading IPython console..."
+msgstr "Cargando la terminal de IPython..."
 
-#: spyderlib/plugins/configdialog.py:916
-msgid "Side areas:"
-msgstr "Áreas laterales:"
+#: spyder/app/mainwindow.py:887
+msgid "Setting up main window..."
+msgstr "Construyendo la ventana principal..."
 
-#: spyderlib/plugins/configdialog.py:917
-msgid "Matched parentheses:"
-msgstr "Paréntesis emparejados:"
+#: spyder/app/mainwindow.py:890
+msgid "Dependencies..."
+msgstr "Dependencias..."
 
-#: spyderlib/plugins/configdialog.py:918
-msgid "Unmatched parentheses:"
-msgstr "Paréntesis desemparejados:"
+#: spyder/app/mainwindow.py:894
+msgid "Report issue..."
+msgstr "Reportar un problema..."
 
-#: spyderlib/plugins/configdialog.py:919
-msgid "Normal text:"
-msgstr "Texto normal:"
+#: spyder/app/mainwindow.py:898
+msgid "Spyder support..."
+msgstr "Obtener soporte para Spyder"
 
-#: spyderlib/plugins/configdialog.py:920
-msgid "Keyword:"
-msgstr "Palabra clave:"
+#: spyder/app/mainwindow.py:901
+msgid "Check for updates..."
+msgstr "Buscar actualizaciones..."
 
-#: spyderlib/plugins/configdialog.py:921
-msgid "Builtin:"
-msgstr "Objeto integrado:"
+#: spyder/app/mainwindow.py:924
+msgid "Spyder documentation"
+msgstr "Documentación de Spyder"
 
-#: spyderlib/plugins/configdialog.py:922
-msgid "Definition:"
-msgstr "Definición:"
+#: spyder/app/mainwindow.py:929
+msgid "Spyder tutorial"
+msgstr "Tutorial de Spyder"
 
-#: spyderlib/plugins/configdialog.py:923
-msgid "Comment:"
-msgstr "Comentario:"
+#: spyder/app/mainwindow.py:936
+msgid "Interactive tours"
+msgstr "Tours interactivos"
 
-#: spyderlib/plugins/configdialog.py:924
-msgid "String:"
-msgstr "Cadena:"
+#: spyder/app/mainwindow.py:964
+msgid "Python documentation"
+msgstr "Documentación de Python"
 
-#: spyderlib/plugins/configdialog.py:925
-msgid "Number:"
-msgstr "Número:"
+#: spyder/app/mainwindow.py:970 spyder/app/mainwindow.py:1014
+msgid "IPython documentation"
+msgstr "Documentación de IPython"
 
-#: spyderlib/plugins/configdialog.py:926
-msgid "Instance:"
-msgstr "Instancia:"
+#: spyder/app/mainwindow.py:971
+msgid "Intro to IPython"
+msgstr "Ayuda básica"
 
-#: spyderlib/plugins/configdialog.py:932
-msgid "Color scheme"
-msgstr "Esquema de coloreado"
+#: spyder/app/mainwindow.py:973
+msgid "Quick reference"
+msgstr "Referencia rápida"
 
-#: spyderlib/plugins/configdialog.py:954 spyderlib/plugins/shortcuts.py:776
-msgid "Reset to default values"
-msgstr "Restaurar los valores por defecto"
+#: spyder/app/mainwindow.py:975
+msgid "Console help"
+msgstr "Ayuda de la terminal"
 
-#: spyderlib/plugins/console.py:109
-msgid "Internal console"
-msgstr "Terminal interna"
+#: spyder/app/mainwindow.py:1012
+msgid "Python(x,y) documentation folder"
+msgstr "Carpeta de documentación de Python(x,y)"
 
-#: spyderlib/plugins/console.py:129 spyderlib/spyder.py:869
-#: spyderlib/widgets/ipython.py:595
-msgid "&Quit"
-msgstr "&Salir"
+#: spyder/app/mainwindow.py:1016
+msgid "guidata documentation"
+msgstr "Documentación de guidata"
 
-#: spyderlib/plugins/console.py:131 spyderlib/spyder.py:871
-msgid "Quit"
-msgstr "Salir"
+#: spyder/app/mainwindow.py:1019
+msgid "guiqwt documentation"
+msgstr "Documentación de guiqwt"
 
-#: spyderlib/plugins/console.py:134 spyderlib/plugins/externalconsole.py:1039
-msgid "&Run..."
-msgstr "E&jecutar..."
+#: spyder/app/mainwindow.py:1025
+msgid "NumPy documentation"
+msgstr "Documentación de NumPy"
 
-#: spyderlib/plugins/console.py:136 spyderlib/plugins/externalconsole.py:1040
-msgid "Run a Python script"
-msgstr "Ejecutar un archivo de Python"
+#: spyder/app/mainwindow.py:1027
+msgid "NumPy reference guide"
+msgstr "Manual de referencia de NumPy"
 
-#: spyderlib/plugins/console.py:139
-msgid "Environment variables..."
-msgstr "Variables de entorno..."
+#: spyder/app/mainwindow.py:1029
+msgid "NumPy user guide"
+msgstr "Guía del usuario de Numpy"
 
-#: spyderlib/plugins/console.py:141
-msgid "Show and edit environment variables (for current session)"
-msgstr "Muestra y edita las variables de entorno (para la sesión actual)"
+#: spyder/app/mainwindow.py:1031
+msgid "SciPy documentation"
+msgstr "Documentación de SciPy"
 
-#: spyderlib/plugins/console.py:145
-msgid "Show sys.path contents..."
-msgstr "Contenidos del sys.path"
+#: spyder/app/mainwindow.py:1038
+msgid "Installed Python modules"
+msgstr "Módulos instalados de Python"
 
-#: spyderlib/plugins/console.py:147
-msgid "Show (read-only) sys.path"
-msgstr "Muestra los contenidos del sys.path en modo lectura"
+#: spyder/app/mainwindow.py:1042
+msgid "Online documentation"
+msgstr "Documentación en línea"
 
-#: spyderlib/plugins/console.py:150
-msgid "Buffer..."
-msgstr "Mostrar líneas..."
+#: spyder/app/mainwindow.py:1054
+msgid "Qt documentation"
+msgstr "Documentación de Qt"
 
-#: spyderlib/plugins/console.py:151 spyderlib/plugins/externalconsole.py:87
-#: spyderlib/plugins/history.py:41
-msgid "Set maximum line count"
-msgstr "Establece el máximo número de líneas a mostrar en la terminal"
+#: spyder/app/mainwindow.py:1060
+msgid "About %s..."
+msgstr "Acerca de %s..."
 
-#: spyderlib/plugins/console.py:154 spyderlib/plugins/explorer.py:67
-#: spyderlib/plugins/history.py:169 spyderlib/plugins/inspector.py:388
-#: spyderlib/plugins/projectexplorer.py:68
-msgid "&Font..."
-msgstr "&Tipo de letra..."
+#: spyder/app/mainwindow.py:1084
+msgid "Panes"
+msgstr "Paneles"
 
-#: spyderlib/plugins/console.py:155 spyderlib/plugins/history.py:170
-msgid "Set shell font style"
-msgstr "Establece el tipo de fuente de la terminal"
+#: spyder/app/mainwindow.py:1086
+msgid "Toolbars"
+msgstr "Barras de herramientas"
 
-#: spyderlib/plugins/console.py:158
-msgid "External editor path..."
-msgstr "Ruta del editor externo..."
+#: spyder/app/mainwindow.py:1087
+msgid "Window layouts"
+msgstr "Disposiciones de componentes"
 
-#: spyderlib/plugins/console.py:159
-msgid "Set external editor executable path"
-msgstr "Establece la ruta del editor externo"
+#: spyder/app/mainwindow.py:1096 spyder/app/mainwindow.py:1893
+#: spyder/app/mainwindow.py:1894
+msgid "Show toolbars"
+msgstr "Mostrar barras de herramientas"
 
-#: spyderlib/plugins/console.py:162 spyderlib/plugins/editor.py:139
-#: spyderlib/plugins/externalconsole.py:88 spyderlib/plugins/history.py:44
-#: spyderlib/plugins/history.py:172 spyderlib/plugins/inspector.py:180
-#: spyderlib/plugins/inspector.py:391
-msgid "Wrap lines"
-msgstr "Ajuste de línea automático"
+#: spyder/app/mainwindow.py:1111
+msgid "Attached console window (debugging)"
+msgstr "Ventana de terminal anexa (para depuración)"
 
-#: spyderlib/plugins/console.py:165 spyderlib/plugins/editor.py:181
-#: spyderlib/plugins/externalconsole.py:133
-#: spyderlib/plugins/ipythonconsole.py:172
-msgid "Display balloon tips"
-msgstr "Mostrar globos de sugerencias"
+#: spyder/app/mainwindow.py:1294 spyder/plugins/projects.py:238
+#: spyder/widgets/explorer.py:627 spyder/widgets/explorer.py:732
+#: spyder/widgets/externalshell/pythonshell.py:533
+#: spyder/widgets/externalshell/systemshell.py:105
+#: spyder/widgets/variableexplorer/arrayeditor.py:573
+#: spyder/widgets/variableexplorer/collectionseditor.py:419
+#: spyder/widgets/variableexplorer/dataframeeditor.py:593
+msgid "Error"
+msgstr "Error"
 
-#: spyderlib/plugins/console.py:169 spyderlib/plugins/editor.py:175
-#: spyderlib/plugins/externalconsole.py:127
-msgid "Automatic code completion"
-msgstr "Completar código automáticamente"
+#: spyder/app/mainwindow.py:1295
+msgid ""
+"<b>You have missing dependencies!</b><br><br><tt>%s</tt><br><br><b>Please "
+"install them to avoid this message.</b><br><br><i>Note</i>: Spyder could "
+"work without some of these dependencies, however to have a smooth experience "
+"when using Spyder we <i>strongly</i> recommend you to install all the listed "
+"missing dependencies.<br><br>Failing to install these dependencies might "
+"result in bugs. Please be sure that any found bugs are not the direct result "
+"of missing dependencies, prior to reporting a new issue."
+msgstr ""
+"<b>Algunas dependencias no están instaladas!</b><br><br><tt>%s</"
+"tt><br><br><b>Por favor instálelas para evitar este mensaje.</"
+"b><br><br><i>Nota</i>: Spyder puede funcionar sin algunas de estas "
+"dependencias. Sin embargo, para no tener problemas al usar Spyder nosotros "
+"<i>firmemente</i> le recomendamos instalar todas las dependencias faltantes."
+"<br><br>El no instalar estas dependencias puede resultar en errores. Por "
+"favor asegúrese de que cualquier error que encuentre no sea el resultado "
+"directo de las dependencias faltantes, antes de reportar un nuevo problema."
+
+#: spyder/app/mainwindow.py:1740
+msgid "Spyder Default Layout"
+msgstr "Disposición por defecto"
 
-#: spyderlib/plugins/console.py:173 spyderlib/plugins/editor.py:179
-#: spyderlib/plugins/externalconsole.py:131
-msgid "Enter key selects completion"
-msgstr "La tecla Enter selecciona el resultado a completar"
+#: spyder/app/mainwindow.py:1758
+msgid "Save current layout"
+msgstr "Guardar la disposición actual"
 
-#: spyderlib/plugins/console.py:178
-msgid "Internal console settings"
-msgstr "Opciones"
+#: spyder/app/mainwindow.py:1762
+msgid "Layout preferences"
+msgstr "Preferencias de disposición"
 
-#: spyderlib/plugins/console.py:231 spyderlib/plugins/externalconsole.py:1220
-msgid "Run Python script"
-msgstr "Ejecutar archivo de Python"
+#: spyder/app/mainwindow.py:1766
+msgid "Reset to spyder default"
+msgstr "Restaurar a la disposición por defecto"
+
+#: spyder/app/mainwindow.py:1786 spyder/app/mainwindow.py:1808
+#: spyder/app/mainwindow.py:1871 spyder/app/mainwindow.py:2655
+#: spyder/plugins/configdialog.py:1250 spyder/plugins/externalconsole.py:446
+#: spyder/plugins/ipythonconsole.py:119 spyder/plugins/ipythonconsole.py:835
+#: spyder/plugins/maininterpreter.py:167 spyder/utils/environ.py:100
+#: spyder/utils/environ.py:113
+#: spyder/widgets/variableexplorer/arrayeditor.py:496
+#: spyder/widgets/variableexplorer/collectionseditor.py:410
+#: spyder/widgets/variableexplorer/collectionseditor.py:1063
+msgid "Warning"
+msgstr "Advertencia"
 
-#: spyderlib/plugins/console.py:232 spyderlib/plugins/externalconsole.py:226
-#: spyderlib/plugins/externalconsole.py:1221 spyderlib/widgets/explorer.py:675
-msgid "Python scripts"
-msgstr "Archivos de Python"
+#: spyder/app/mainwindow.py:1787
+msgid ""
+"Window layout will be reset to default settings: this affects window "
+"position, size and dockwidgets.\n"
+"Do you want to continue?"
+msgstr ""
+"La disposición de componentes será restablecida a los ajustes por defecto. "
+"Esto afecta a la posición y tamaño de la ventana y los componentes.\n"
+"¿Desea continuar?"
 
-#: spyderlib/plugins/console.py:278 spyderlib/plugins/explorer.py:117
-#: spyderlib/plugins/history.py:285 spyderlib/plugins/inspector.py:665
-#: spyderlib/plugins/projectexplorer.py:126
-msgid "Select a new font"
-msgstr "Seleccionar una nueva fuente"
+#: spyder/app/mainwindow.py:1809
+msgid ""
+"Layout <b>%s</b> will be                                                "
+"overwritten. Do you want to                                                "
+"continue?"
+msgstr "La disposición <b>%s</b> será sobrescrita. Desea continuar?"
 
-#: spyderlib/plugins/console.py:286
-msgid "Buffer"
-msgstr "Mostrar"
+#: spyder/app/mainwindow.py:1872
+msgid "Quick switch layout #%s has not yet been defined."
+msgstr "Aún no se ha definido la disposición de componentes #%d"
 
-#: spyderlib/plugins/console.py:287
-msgid "Maximum line count"
-msgstr "Máximo número de líneas a mostrar"
+#: spyder/app/mainwindow.py:1890 spyder/app/mainwindow.py:1891
+msgid "Hide toolbars"
+msgstr "Ocultar las barras de herramientas"
 
-#: spyderlib/plugins/console.py:297
-msgid "External editor"
-msgstr "Editor externo"
+#: spyder/app/mainwindow.py:2184 spyder/app/mainwindow.py:2185
+msgid "Maximize current pane"
+msgstr "Maximizar el panel actual"
 
-#: spyderlib/plugins/console.py:298
-msgid "External editor executable path:"
-msgstr "Ruta ejecutable del editor externo:"
+#: spyder/app/mainwindow.py:2188
+msgid "Restore current pane"
+msgstr "Restaurar el panel actual"
 
-#: spyderlib/plugins/editor.py:101
-msgid "Edit template for new modules"
-msgstr "Editar la plantilla para nuevos módulos"
+#: spyder/app/mainwindow.py:2189
+msgid "Restore pane to its original size"
+msgstr "Restaurar el panel a su tamaño original"
 
-#: spyderlib/plugins/editor.py:106
-msgid "Text and margin font style"
-msgstr "Tipo de letra para el texto y las márgenes"
+#: spyder/app/mainwindow.py:2273
+msgid "About %s"
+msgstr "Acerca de %s"
 
-#: spyderlib/plugins/editor.py:109
-msgid "Sort files according to full path"
-msgstr "Ordenar archivos según su ruta completa"
+#: spyder/app/mainwindow.py:2400 spyder/plugins/editor.py:158
+#: spyder/plugins/runconfig.py:322 spyder/plugins/runconfig.py:444
+#: spyder/plugins/runconfig.py:449 spyder/utils/programs.py:285
+#: spyder/widgets/explorer.py:269 spyder/widgets/externalshell/baseshell.py:127
+msgid "Run"
+msgstr "Ejecutar"
 
-#: spyderlib/plugins/editor.py:111
-msgid "Show tab bar"
-msgstr "Mostrar barra de pestañas"
+#: spyder/app/mainwindow.py:2401
+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/plugins/editor.py:118 spyderlib/plugins/editor.py:195
-#: spyderlib/plugins/externalconsole.py:83
-#: spyderlib/plugins/externalconsole.py:126 spyderlib/plugins/history.py:43
-#: spyderlib/plugins/inspector.py:179 spyderlib/plugins/ipythonconsole.py:206
-msgid "Source code"
-msgstr "Código fuente"
+#: spyder/app/mainwindow.py:2656
+msgid ""
+"Spyder will restart and reset to default settings: <br><br>Do you want to "
+"continue?"
+msgstr ""
+"Spyder se reiniciará y volverá a su configuración por defecto: "
+"<br><br>¿Desea continuar?"
 
-#: spyderlib/plugins/editor.py:119
-msgid "Show line numbers"
-msgstr "Mostrar números de líneas"
+#: spyder/app/mainwindow.py:2753 spyder/widgets/helperwidgets.py:250
+msgid "Spyder updates"
+msgstr "Actualizaciones de Spyder"
 
-#: spyderlib/plugins/editor.py:120 spyderlib/plugins/editor.py:916
-msgid "Show blank spaces"
-msgstr "Mostrar espacios en blanco"
+#: spyder/app/mainwindow.py:2754 spyder/plugins/configdialog.py:819
+msgid "Check for updates on startup"
+msgstr "Buscar actualizaciones al inicio"
 
-#: spyderlib/plugins/editor.py:121
-msgid "Show vertical line after"
-msgstr "Mostrar una línea vertical después de"
+#: spyder/app/mainwindow.py:2772
+msgid ""
+"<b>Spyder %s is available!</b> <br><br>Please use your package manager to "
+"update Spyder or go to our <a href=\"%s\">Releases</a> page to download this "
+"new version. <br><br>If you are not sure how to proceed to update Spyder "
+"please refer to our  <a href=\"%s\">Installation</a> instructions."
+msgstr ""
+"<b>Spyder %s está disponible!</b> <br><br>Por favor utilice su instalador de "
+"paquetes para actualizar Spyder o vaya a nuestra página de <a href=\"%s"
+"\">Lanzamientos</a> para descargar esta nueva versión. <br><br>Si no está "
+"seguro de cómo proceder para actualizar Spyder, por favor lea nuestra "
+"instrucciones de <a href=\"%s\">Instalación</a> (en inglés)."
 
-#: spyderlib/plugins/editor.py:122
-msgid "characters"
-msgstr "caracteres"
+#: spyder/app/mainwindow.py:2784
+msgid "Spyder is up to date."
+msgstr "Spyder está actualizado."
 
-#: spyderlib/plugins/editor.py:127
-msgid "Highlight current line"
-msgstr "Resaltar la línea actual"
+#: spyder/app/restart.py:133
+msgid ""
+"It was not possible to close the previous Spyder instance.\n"
+"Restart aborted."
+msgstr ""
+"No fue posible cerrar la instancia anterior de Spyder.\n"
+"Reinicialización abortada."
 
-#: spyderlib/plugins/editor.py:129
-msgid "Highlight current cell"
-msgstr "Resaltar la celda actual"
+#: spyder/app/restart.py:135
+msgid ""
+"Spyder could not reset to factory defaults.\n"
+"Restart aborted."
+msgstr ""
+"Spyder no pudo volver a la configuración por defecto.\n"
+"Reinicialización abortada."
 
-#: spyderlib/plugins/editor.py:131
-msgid "Highlight occurrences after"
-msgstr "Resaltar ocurrencias después de"
+#: spyder/app/restart.py:137
+msgid ""
+"It was not possible to restart Spyder.\n"
+"Operation aborted."
+msgstr ""
+"No fue posible reiniciar Spyder.\n"
+"Operación abortada."
 
-#: spyderlib/plugins/editor.py:142 spyderlib/plugins/history.py:52
-#: spyderlib/plugins/inspector.py:183
-msgid "Syntax color scheme: "
-msgstr "Esquema de coloreado:"
+#: spyder/app/restart.py:139
+msgid "Spyder exit error"
+msgstr "Error de salida de de Spyder"
 
-#: spyderlib/plugins/editor.py:164 spyderlib/plugins/runconfig.py:321
-#: spyderlib/plugins/runconfig.py:443 spyderlib/plugins/runconfig.py:448
-#: spyderlib/spyder.py:2501 spyderlib/utils/programs.py:175
-#: spyderlib/widgets/explorer.py:240
-#: spyderlib/widgets/externalshell/baseshell.py:140
-msgid "Run"
-msgstr "Ejecutar"
+#: spyder/app/restart.py:140
+msgid "Spyder reset error"
+msgstr "Error de restauración de Spyder"
 
-#: spyderlib/plugins/editor.py:165
-msgid "Save all files before running script"
-msgstr "Guardar todo antes de ejecutar un archivo"
+#: spyder/app/restart.py:141
+msgid "Spyder restart error"
+msgstr "Error de reinicio de Spyder"
 
-#: spyderlib/plugins/editor.py:168
-msgid "Run selection"
-msgstr "Ejecutar selección"
+#: spyder/app/restart.py:165
+msgid "Closing Spyder"
+msgstr "Cerrando Spyder"
 
-#: spyderlib/plugins/editor.py:169
-msgid "Maintain focus in the Editor after running cells or selections"
-msgstr "Mantener el foco en el Editor después de ejecutar celdas o selecciones"
-
-#: spyderlib/plugins/editor.py:172 spyderlib/plugins/externalconsole.py:334
-msgid "Introspection"
-msgstr "Introspección"
+#: spyder/app/restart.py:239
+msgid "Resetting Spyder to defaults"
+msgstr "Restaurando a los valores por defecto"
 
-#: spyderlib/plugins/editor.py:177 spyderlib/plugins/externalconsole.py:129
-msgid "Case sensitive code completion"
-msgstr "Diferenciar entre mayúsculas y minúsculas al completar código"
+#: spyder/app/restart.py:271
+msgid "Restarting"
+msgstr "Reiniciando"
 
-#: spyderlib/plugins/editor.py:182
-msgid "Link to object definition"
-msgstr "Enlazar a la definición de un objeto"
+#: spyder/app/tour.py:124
+msgid "Welcome to the Introduction tour"
+msgstr "Bienvenido al Tour introductorio!"
 
-#: spyderlib/plugins/editor.py:184
+#: spyder/app/tour.py:125
 msgid ""
-"If this option is enabled, clicking on an object\n"
-"name (left-click + Ctrl key) will go this object\n"
-"definition (if resolved)."
+"<b>Spyder</b> is a powerful Interactive Development Environment (or IDE) for "
+"the Python programming language.<br><br>Here we are going to guide you "
+"through its most important features.<br><br>Please use the arrow keys or "
+"click on the buttons below to move along the tour."
 msgstr ""
-"Si está opción está activada, al hacer click\n"
-"sobre el nombre de un objeto (click-izquierdo +\n"
-"la tecla Ctrl), el Editor se ubicará en la definición\n"
-"del mismo (de poder resolverse el nombre)."
+"<b>Spyder</b> es un potente entorno de desarrollo integrado para el lenguaje "
+"de programación Python.<br><br>A continuación vamos a guiarlo a través de "
+"sus características más importantes.<br><br>Por favor utilice las teclas de "
+"flechas o haga click en los botones que aparecen abajo para moverse a lo "
+"largo del tour."
+
+#: spyder/app/tour.py:134
+msgid "The Editor"
+msgstr "El Editor"
 
-#: spyderlib/plugins/editor.py:188
+#: spyder/app/tour.py:135
 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."
+"This is the pane where you write Python code before evaluating it. You can "
+"get automatic suggestions and completions while writing, by pressing the "
+"<b>Tab</b> key next to a given text.<br><br>The Editor comes with a line "
+"number area (highlighted here in red), where Spyder shows warnings and "
+"syntax errors. They can help you to detect potential problems before running "
+"the code.<br><br>You can also set debug breakpoints in the line number area, "
+"by doing a double click next to a non-empty line."
 msgstr ""
-"<b>Advertencia:</b><br>El módulo de Python<i>rope</i> no está instalado en "
-"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:196
-msgid "Automatic insertion of parentheses, braces and brackets"
-msgstr "Inserción automática de paréntesis, llaves y corchetes"
+"Este es el panel en el que puede escribir su código de Python antes de "
+"evaluarlo. Para obtener sugerencias automáticas de completado mientras "
+"escribe, puede presionar la tecla <b>Tab</b> junto a un texto dado."
+"<br><br>El Editor viene con un área para los números de línea (resaltada "
+"aquí en rojo), donde Spyder también muestra advertencias y mensajes de "
+"error. Estos pueden ayudarle a detectar posibles problemas antes de correr "
+"el código.<br><br>También se pueden establecer puntos de breakpoint en esta "
+"área al hacer doble click junto a una línea que no esté vacía."
 
-#: spyderlib/plugins/editor.py:199
-msgid "Automatic insertion of closing quotes"
-msgstr "Inserción automática de comillas"
-
-#: spyderlib/plugins/editor.py:201
-msgid "Automatic insertion of colons after 'for', 'if', 'def', etc"
-msgstr "Inserción automática de ':' después de 'for', 'if', 'def', etc"
+#: spyder/app/tour.py:150
+msgid "The IPython console"
+msgstr "La Terminal de IPython"
 
-#: spyderlib/plugins/editor.py:204
-msgid "Automatic indentation after 'else', 'elif', etc."
-msgstr "Indentación automática después de 'else', 'elif', etc."
+#: spyder/app/tour.py:151
+msgid ""
+"This is one of panes where you can run or execute the code you wrote on the "
+"Editor. To do it you need to press the <b>F5</b> key.<br><br>This console "
+"comes with several useful features that greatly improve your programming "
+"workflow (like syntax highlighting and inline plots). If you want to know "
+"more about them, please follow this <a href=\"{0}\">link</a>.<br><br>Please "
+"click on the button below to run some simple code in this console. This will "
+"be useful to show you other important features."
+msgstr ""
+"Este es uno de los paneles en los que es posible ejecutar el código escrito "
+"en el Editor. Para hacerlo es necesario presionar la teclar <b>F5</b>."
+"<br><br>Esta terminal viene dotada con varias características que mejoran "
+"significativamente la experiencia de programar en Python (como el resaltado "
+"de sintaxis). Si desea saber más al respecto, por favor siga este <a href="
+"\"{0}\">enlace</a>.<br><br>Por favor oprima el botón que aparece abajo para "
+"ejecutar un código muy sencillo en esta terminal. Esto será útil para "
+"mostrarle otras características más adelante."
+
+#: spyder/app/tour.py:167
+msgid "The Variable Explorer"
+msgstr "El Explorador de variables"
 
-#: spyderlib/plugins/editor.py:206
-msgid "Indentation characters: "
-msgstr "Caracteres de indentación:"
+#: spyder/app/tour.py:168
+msgid ""
+"In this pane you can view and edit the variables generated during the "
+"execution of a program, or those entered directly in one of Spyder consoles."
+"<br><br>As you can see, the Variable Explorer is showing the variables "
+"generated during the last step of this tour. By doing a double-click on any "
+"of them, a new window will be opened, where you can inspect and modify their "
+"contents."
+msgstr ""
+"En este panel se pueden ver y editar las variables generadas durante la "
+"ejecución de un programa, o de los comandos introducidos directamente en "
+"alguna de las terminales de Spyder.<br><br>Como se puede observar, el "
+"Explorador de Variables está mostrando las variables generadas durante el "
+"último paso de este tour. Al hacer doble click en alguna de ellas, se "
+"mostrará una nueva ventana, en la cual se pueden inspeccionar y modificar "
+"sus contenidos."
 
-#: spyderlib/plugins/editor.py:207
-msgid "4 spaces"
-msgstr "4 espacios"
+#: spyder/app/tour.py:180
+msgid "The Python console"
+msgstr "La Terminal de Python"
 
-#: spyderlib/plugins/editor.py:208
-msgid "2 spaces"
-msgstr "2 espacios"
+#: spyder/app/tour.py:181
+msgid ""
+"You can also run your code on a Python console. These consoles are useful "
+"because they let you run a file in a console dedicated only to it.To select "
+"this behavior, please press the <b>F6</b> key.<br><br>By pressing the button "
+"below and then focusing the Variable Explorer, you will notice that Python "
+"consoles are also connected to that pane, and that the Variable Explorer "
+"only shows the variables of the currently focused console."
+msgstr ""
+"También es posible ejecutar su código en una terminal de Python. Estas "
+"terminales son útiles porque le permiten ejecutar un archivo en una terminal "
+"exclusivamente dedicada al mismo. Por favor oprima la tecla <b>Ctrl+F6</b> "
+"para seleccionar este comportamiento.<br><br>Al oprimir el botón que aparece "
+"abajo y luego enfocar el Explorador de Variables, podrá notar que las "
+"terminales de Python están también conectadas a ese panel, y que el "
+"Explorador de Variables sólo muestra las variables de la terminal que "
+"actualmente está enfocada."
+
+#: spyder/app/tour.py:195 spyder/plugins/help.py:485 spyder/plugins/help.py:929
+#: spyder/widgets/internalshell.py:270
+msgid "Help"
+msgstr "Ayuda"
 
-#: spyderlib/plugins/editor.py:209
-msgid "tab"
-msgstr "tabulador"
+#: spyder/app/tour.py:196
+msgid ""
+"This pane displays documentation of the functions, classes, methods or "
+"modules you are currently using in the Editor or the Consoles.<br><br>To use "
+"it, you need to press <b>Ctrl+I</b> in front of an object. If that object "
+"has some documentation associated with it, it will be displayed here."
+msgstr ""
+"Este panel muestra la documentación de las funciones, clases, métodos o "
+"módulos que se estén usando en el Editor o las Terminales.<br><br>Para "
+"usarlo, por favor oprima la tecla <b>Ctrl+I</b> frente a un objeto dado. Si "
+"ese objeto cuenta con documentación asociada, ésta se mostrará aquí."
 
-#: spyderlib/plugins/editor.py:210
-msgid "Tab stop width:"
-msgstr "Ancho de las tabulaciones:"
+#: spyder/app/tour.py:206
+msgid "The File Explorer"
+msgstr "El Explorador de archivos"
 
-#: spyderlib/plugins/editor.py:210
-msgid "pixels"
-msgstr "pixels"
+#: spyder/app/tour.py:207
+msgid ""
+"This pane lets you navigate through the directories and files present in "
+"your computer.<br><br>You can also open any of these files with its "
+"corresponding application, by doing a double click on it.<br><br>There is "
+"one exception to this rule: plain-text files will always be opened in the "
+"Spyder Editor."
+msgstr ""
+"Este panel le permite navegar a través de los directorios y archivos "
+"presentes en su computador.<br><br>También es posible abrir cualquier "
+"archivo desde este panel con su aplicación correspondiente, al hacer doble "
+"click en el mismo.<br><br>Sin embargo, existe una excepción a esta regla: "
+"todos los archivos de texto plano siempre se abrirán en el Editor de Spyder."
 
-#: spyderlib/plugins/editor.py:212
-msgid "Tab always indent"
-msgstr "Siempre indentar con la tecla Tab"
+#: spyder/app/tour.py:217
+msgid "The History Log"
+msgstr "El Historial de comandos"
 
-#: spyderlib/plugins/editor.py:214
+#: spyder/app/tour.py:218
 msgid ""
-"If enabled, pressing Tab will always indent,\n"
-"even when the cursor is not at the beginning\n"
-"of a line (when this option is enabled, code\n"
-"completion may be triggered using the alternate\n"
-"shortcut: Ctrl+Space)"
+"This pane records all commands introduced in the Python and IPython consoles."
 msgstr ""
-"Si esta opción está activada, el oprimir Tab\n"
-"siempre indentará el código, aún cuando el\n"
-"cursor no esté al principio de una línea\n"
-"(de seleccionar esta opción, se puede usar\n"
-"la combinación de teclas Ctrl+Espacio para\n"
-"activar el completado de código)"
+"Este panel guarda un registro de todos los comandos introducidos en las "
+"terminales de IPython y Python."
 
-#: spyderlib/plugins/editor.py:219
-msgid "Intelligent backspace"
-msgstr "Tecla de retroceso (\"backspace\") inteligente"
-
-#: spyderlib/plugins/editor.py:221
-msgid "Automatically remove trailing spaces when saving files"
-msgstr "Eliminar automáticamente espacios en blanco al guardar un archivo"
+#: spyder/app/tour.py:266
+msgid "<b>Spyder</b> is an interactive development environment based on bla"
+msgstr ""
 
-#: spyderlib/plugins/editor.py:225
-msgid "Analysis"
-msgstr "Análisis"
+#: spyder/app/tour.py:270
+msgid "Welcome to Spyder introduction tour"
+msgstr "Bienvenido al Tour Introductorio de Spyder!"
 
-#: spyderlib/plugins/editor.py:227
-msgid "<i>(Refer to the {} page)</i>"
+#: spyder/app/tour.py:271
+msgid "Spyder is an interactive development environment based on bla"
 msgstr ""
 
-#: spyderlib/plugins/editor.py:231
-#, fuzzy
-msgid "Real-time code analysis"
-msgstr "Análisis del código en tiempo real en el Editor"
+#: spyder/app/tour.py:276
+msgid "Introduction tour"
+msgstr "Tour Introductorio"
 
-#: spyderlib/plugins/editor.py:233
-#, fuzzy
-msgid ""
-"<p>If enabled, Python source code will be analyzedusing pyflakes, lines "
-"containing errors or warnings will be highlighted.</p><p><u>Note</u>: add "
-"<b>analysis:ignore</b> in a comment to ignore code analysis warnings.</p>"
+#: spyder/app/tour.py:277
+msgid "New features in version 3.0"
 msgstr ""
-"Si esta opción está activada, los archivos de Python\n"
-"serán analizados automáticamente y las líneas que\n"
-"contengan errores o advertencias serán resaltadas"
 
-#: spyderlib/plugins/editor.py:241
-msgid "Code analysis requires pyflakes %s+"
-msgstr "El análisis del código requiere pyflakes %s+"
+#: spyder/app/tour.py:555 spyder/plugins/ipythonconsole.py:431
+msgid "Run code"
+msgstr "Ejecutar código"
 
-#: spyderlib/plugins/editor.py:243
-#, fuzzy
-msgid "Real-time code style analysis"
-msgstr "Análisis de estilo del código en el Editor"
+#: spyder/app/tour.py:824
+msgid "Go to step: "
+msgstr "Ir al paso:"
 
-#: spyderlib/plugins/editor.py:245
-#, fuzzy
+#: spyder/config/base.py:249
 msgid ""
-"<p>If enabled, Python source code will be analyzedusing pep8, lines that are "
-"not following PEP8 style guide will be highlighted.</p><p><u>Note</u>: add "
-"<b>analysis:ignore</b> in a comment to ignore style analysis warnings.</p>"
+"Update LANGUAGE_CODES (inside config/base.py) if a new translation has been "
+"added to Spyder"
 msgstr ""
-"Si esta opción está activada, los archivos de Python\n"
-"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:252
-#, fuzzy
-msgid "Code annotations (TODO, FIXME, XXX, HINT, TIP, @todo)"
-msgstr "Tareas (TODO, FIXME, XXX, HINT, TIP, @todo)"
+"Actualice LANGUAGE_CODES (en config/base.py) si una nueva traducción se "
+"añadió a Spyder"
 
-#: spyderlib/plugins/editor.py:255
-msgid "Perform analysis when saving file and every"
-msgstr "Realizar los análisis al guardar el archivo y cada"
+#: spyder/config/ipython.py:23
+msgid "Integrate the IPython console"
+msgstr "Integración con la Terminal de IPython"
 
-#: spyderlib/plugins/editor.py:259
-msgid "Perform analysis only when saving file"
-msgstr "Realizar análisis sólo cuando se guarde el archivo"
+#: spyder/config/ipython.py:25
+msgid "Manipulate Jupyter notebooks on the Editor"
+msgstr "Manipular notebooks de Jupyter en el Editor"
 
-#: spyderlib/plugins/editor.py:318
-msgid "End-of-line characters"
-msgstr "Caracteres de fin de línea"
+#: spyder/config/utils.py:24
+msgid "Python files"
+msgstr "Archivos Python"
 
-#: spyderlib/plugins/editor.py:319
-msgid ""
-"When opening a text file containing mixed end-of-line characters (this may "
-"raise syntax errors in the consoles on Windows platforms), Spyder may fix "
-"the file automatically."
-msgstr ""
-"Cuando se abra un archivo de texto que contenga varios tipos de caracteres "
-"de fin de línea (lo cual puede dar lugar a errores en Windows), Spyder puede "
-"arreglar el archivo automáticamente."
+#: spyder/config/utils.py:25
+msgid "Cython/Pyrex files"
+msgstr "Archivos Cython/Pyrex"
 
-#: spyderlib/plugins/editor.py:325
-msgid "Fix automatically and show warning message box"
-msgstr "Arreglar automáticamente y mostrar un mensaje de advertencia"
+#: spyder/config/utils.py:26
+msgid "C files"
+msgstr "Archivos C"
 
-#: spyderlib/plugins/editor.py:336 spyderlib/plugins/externalconsole.py:332
-#: spyderlib/plugins/ipythonconsole.py:463
-#: spyderlib/plugins/variableexplorer.py:41
-msgid "Display"
-msgstr "Visualización"
+#: spyder/config/utils.py:27
+msgid "C++ files"
+msgstr "Archivos C++"
 
-#: spyderlib/plugins/editor.py:338
-msgid "Code Introspection/Analysis"
-msgstr "Análisis e introspección de código"
+#: spyder/config/utils.py:28
+msgid "OpenCL files"
+msgstr "Archivos OpenCL"
 
-#: spyderlib/plugins/editor.py:341 spyderlib/plugins/externalconsole.py:336
-msgid "Advanced settings"
-msgstr "Opciones avanzadas"
+#: spyder/config/utils.py:29
+msgid "Fortran files"
+msgstr "Archivos Fortran"
 
-#: spyderlib/plugins/editor.py:607 spyderlib/widgets/editortools.py:510
-msgid "Show/hide outline explorer"
-msgstr ""
-"Mostrar u ocultar el\n"
-"explorador de código"
+#: spyder/config/utils.py:30
+msgid "IDL files"
+msgstr "Archivos IDL"
 
-#: spyderlib/plugins/editor.py:613
-msgid "Show/hide project explorer"
-msgstr "Mostrar/cerrar el explorador de proyectos"
+#: spyder/config/utils.py:31
+msgid "MATLAB files"
+msgstr "Archivos MATLAB"
 
-#: spyderlib/plugins/editor.py:621
-msgid "&New file..."
-msgstr "&Nuevo"
+#: spyder/config/utils.py:32
+msgid "Julia files"
+msgstr "Archivos Julia"
 
-#: spyderlib/plugins/editor.py:622 spyderlib/plugins/workingdirectory.py:82
-#: spyderlib/widgets/explorer.py:652 spyderlib/widgets/explorer.py:659
-msgid "New file"
-msgstr "Nuevo archivo"
+#: spyder/config/utils.py:33
+msgid "Yaml files"
+msgstr "Archivos Yaml"
 
-#: spyderlib/plugins/editor.py:629
-msgid "&Open..."
-msgstr "&Abrir"
+#: spyder/config/utils.py:34
+msgid "Patch and diff files"
+msgstr "Archivos Patch y diff"
 
-#: spyderlib/plugins/editor.py:630 spyderlib/plugins/editor.py:1643
-#: spyderlib/plugins/workingdirectory.py:69
-msgid "Open file"
-msgstr "Abrir archivo"
+#: spyder/config/utils.py:35
+msgid "Batch files"
+msgstr "Archivos Batch"
 
-#: spyderlib/plugins/editor.py:637
-msgid "&Revert"
-msgstr "&Restaurar"
+#: spyder/config/utils.py:36 spyder/utils/iofuncs.py:426
+msgid "Text files"
+msgstr "Archivos de Texto"
 
-#: spyderlib/plugins/editor.py:638
-msgid "Revert file from disk"
-msgstr "Restaurar archivo desde el disco"
+#: spyder/config/utils.py:37
+msgid "reStructuredText files"
+msgstr "Archivos de Texto reStructurado"
 
-#: spyderlib/plugins/editor.py:641
-msgid "&Save"
-msgstr "&Guardar"
+#: spyder/config/utils.py:38
+msgid "gettext files"
+msgstr "Archivos gettext"
 
-#: spyderlib/plugins/editor.py:642
-msgid "Save file"
-msgstr "Guardar archivo"
+#: spyder/config/utils.py:39
+msgid "NSIS files"
+msgstr "Archivos NSIS"
 
-#: spyderlib/plugins/editor.py:649
-msgid "Sav&e all"
-msgstr "Guardar t&odo"
+#: spyder/config/utils.py:40
+msgid "Web page files"
+msgstr "Archivos de Páginas web"
 
-#: spyderlib/plugins/editor.py:650
-msgid "Save all files"
-msgstr "Guardar todos los archivos"
+#: spyder/config/utils.py:41
+msgid "XML files"
+msgstr "Archivos XML"
 
-#: spyderlib/plugins/editor.py:658
-msgid "Save &as..."
-msgstr "Gu&ardar como..."
+#: spyder/config/utils.py:42
+msgid "Javascript files"
+msgstr "Archivos Javascript"
 
-#: spyderlib/plugins/editor.py:659
-msgid "Save current file as..."
-msgstr "Guardar el archivo actual como..."
+#: spyder/config/utils.py:43
+msgid "Json files"
+msgstr "Archivos Json"
 
-#: spyderlib/plugins/editor.py:663 spyderlib/plugins/editor.py:664
-msgid "Print preview..."
-msgstr "Presentación preliminar..."
+#: spyder/config/utils.py:44
+msgid "IPython notebooks"
+msgstr "Notebooks de IPython"
 
-#: spyderlib/plugins/editor.py:665
-msgid "&Print..."
-msgstr "Im&primir"
+#: spyder/config/utils.py:45
+msgid "Enaml files"
+msgstr "Archivos Enaml"
 
-#: spyderlib/plugins/editor.py:666
-msgid "Print current file..."
-msgstr "Imprimir el archivo actual..."
+#: spyder/config/utils.py:46
+msgid "Configuration files"
+msgstr "Archivos de Configuración"
 
-#: spyderlib/plugins/editor.py:669
-msgid "&Close"
-msgstr "&Cerrar"
+#: spyder/config/utils.py:51 spyder/widgets/explorer.py:700
+msgid "All files"
+msgstr "Todos los archivos"
 
-#: spyderlib/plugins/editor.py:670
-msgid "Close current file"
-msgstr "Cerrar el archivo actual"
+#: spyder/config/utils.py:121
+msgid "Supported text files"
+msgstr "Archivos de texto soportados"
 
-#: spyderlib/plugins/editor.py:673
-msgid "C&lose all"
-msgstr "C&errar todo"
+#: spyder/plugins/__init__.py:508 spyder/plugins/editor.py:98
+#: spyder/plugins/editor.py:545 spyder/plugins/editor.py:1718
+#: spyder/plugins/help.py:118 spyder/plugins/help.py:385
+#: spyder/widgets/editor.py:369 spyder/widgets/sourcecode/codeeditor.py:97
+#: spyder/widgets/sourcecode/codeeditor.py:2960
+msgid "Editor"
+msgstr "Editor"
 
-#: spyderlib/plugins/editor.py:674
-msgid "Close all opened files"
-msgstr "Cerrar todos los archivos abiertos"
+#: spyder/plugins/configdialog.py:139
+msgid "Reset to defaults"
+msgstr "Restaurar los valores por defecto"
 
-#: spyderlib/plugins/editor.py:681
-msgid "Set/Clear breakpoint"
-msgstr "Añadir o eliminar un punto de interrupción"
+#: spyder/plugins/configdialog.py:151
+msgid "Preferences"
+msgstr "Preferencias"
 
-#: spyderlib/plugins/editor.py:688
-msgid "Set/Edit conditional breakpoint"
-msgstr "Añadir o editar un punto de interrupción condicional"
+#: spyder/plugins/configdialog.py:491
+msgid "Invalid directory path"
+msgstr "Ruta de directorio inválida"
 
-#: spyderlib/plugins/editor.py:695
-msgid "Clear breakpoints in all files"
-msgstr "Eliminar los puntos de interrupción de todos los archivos"
+#: spyder/plugins/configdialog.py:494 spyder/plugins/configdialog.py:509
+#: spyder/plugins/runconfig.py:177 spyder/plugins/runconfig.py:241
+#: spyder/plugins/workingdirectory.py:291 spyder/widgets/explorer.py:614
+#: spyder/widgets/externalshell/pythonshell.py:616
+#: spyder/widgets/findinfiles.py:504 spyder/widgets/pathmanager.py:224
+#: spyder/widgets/projects/projectdialog.py:155
+msgid "Select directory"
+msgstr "Seleccionar directorio"
 
-#: spyderlib/plugins/editor.py:697
-msgid "Breakpoints"
-msgstr "Puntos de interrupción (Breakpoints)"
+#: spyder/plugins/configdialog.py:521
+msgid "Invalid file path"
+msgstr "Ruta de archivo inválida"
 
-#: spyderlib/plugins/editor.py:701
-msgid "Debug with winpdb"
-msgstr "Depurar con winpdb"
+#: spyder/plugins/configdialog.py:524 spyder/plugins/configdialog.py:541
+msgid "Select file"
+msgstr "Seleccionar archivo"
 
-#: spyderlib/plugins/editor.py:708 spyderlib/spyder.py:659
-msgid "&Debug"
-msgstr "&Depurar"
+#: spyder/plugins/configdialog.py:540
+msgid "All files (*)"
+msgstr "Todos los archivos (*)"
 
-#: spyderlib/plugins/editor.py:709
-msgid "Debug file"
-msgstr "Depurar archivo"
+#: spyder/plugins/configdialog.py:613 spyder/widgets/formlayout.py:215
+msgid "Bold"
+msgstr "Negrita"
 
-#: spyderlib/plugins/editor.py:713
-msgid "Step"
-msgstr "Ejecutar línea"
+#: spyder/plugins/configdialog.py:616 spyder/widgets/formlayout.py:210
+msgid "Italic"
+msgstr "Cursiva"
 
-#: spyderlib/plugins/editor.py:714
-msgid "Run current line"
-msgstr "Ejecutar la línea seleccionada"
+#: spyder/plugins/configdialog.py:670
+msgid "Font: "
+msgstr "Tipo de letra"
 
-#: spyderlib/plugins/editor.py:720
-msgid "Continue"
-msgstr "Continuar"
+#: spyder/plugins/configdialog.py:676
+msgid "Size: "
+msgstr "Tamaño:"
 
-#: spyderlib/plugins/editor.py:721
-msgid "Continue execution until next breakpoint"
-msgstr "Continuar con la ejecución hasta el siguiente punto de interrupción"
+#: spyder/plugins/configdialog.py:695
+msgid "Font style"
+msgstr "Fuente"
 
-#: spyderlib/plugins/editor.py:728
-msgid "Step Into"
-msgstr "Ingresar en la función/método"
+#: spyder/plugins/configdialog.py:772
+msgid "Spyder needs to restart to change the following setting:"
+msgstr "Spyder necesita reiniciar para cambiar la siguiente configuración:"
 
-#: spyderlib/plugins/editor.py:729
-msgid "Step into function or method of current line"
-msgstr "Ingresar en la función o método de la línea actual"
+#: spyder/plugins/configdialog.py:775
+msgid "Spyder needs to restart to change the following settings:"
+msgstr "Spyder necesita reiniciar para cambiar las siguientes configuraciones:"
 
-#: spyderlib/plugins/editor.py:736
-msgid "Step Return"
-msgstr "Salir de la función/método"
+#: spyder/plugins/configdialog.py:777
+msgid "Do you wish to restart now?"
+msgstr "¿Desea reiniciar ahora?"
 
-#: spyderlib/plugins/editor.py:737
-msgid "Run until current function or method returns"
-msgstr "Ejecutar hasta que la función o método actual termine"
+#: spyder/plugins/configdialog.py:783
+msgid "Information"
+msgstr "Información"
 
-#: spyderlib/plugins/editor.py:744
-msgid "Exit"
-msgstr "Terminar"
+#: spyder/plugins/configdialog.py:797 spyder/plugins/configdialog.py:804
+#: spyder/widgets/projects/configdialog.py:74
+msgid "General"
+msgstr "General"
 
-#: spyderlib/plugins/editor.py:745
-msgid "Exit Debug"
-msgstr "Terminar depuración"
+#: spyder/plugins/configdialog.py:807
+msgid "Language"
+msgstr "Lenguaje"
 
-#: spyderlib/plugins/editor.py:756
-msgid "Debugging control"
-msgstr "Control de depuración"
+#: spyder/plugins/configdialog.py:810
+msgid "Use a single instance"
+msgstr "Utilizar una única instancia"
 
-#: spyderlib/plugins/editor.py:760 spyderlib/plugins/editor.py:1236
-#: spyderlib/spyder.py:654
-msgid "&Run"
-msgstr "E&jecutar"
+#: spyder/plugins/configdialog.py:812
+msgid ""
+"Set this to open external<br> Python files in an already running instance "
+"(Requires a restart)"
+msgstr ""
+"Seleccione esta opción<br> para abrir archivos externos de Python en la "
+"ventana actual (Requiere reiniciar)"
 
-#: spyderlib/plugins/editor.py:761
-msgid "Run file"
-msgstr "Ejecutar archivo"
+#: spyder/plugins/configdialog.py:815
+msgid "Prompt when exiting"
+msgstr "Preguntar antes de salir"
 
-#: spyderlib/plugins/editor.py:766
-msgid "&Configure..."
-msgstr "&Configurar..."
+#: spyder/plugins/configdialog.py:816
+msgid "Pop up internal console when internal errors appear"
+msgstr "Mostrar la terminal interna cuando se produzcan errores"
 
-#: spyderlib/plugins/editor.py:768
-#: spyderlib/widgets/externalshell/pythonshell.py:311
-msgid "Run settings"
-msgstr "Ajustes de ejecución"
+#: spyder/plugins/configdialog.py:836 spyder/plugins/editor.py:107
+#: spyder/plugins/externalconsole.py:57 spyder/plugins/ipythonconsole.py:273
+#: spyder/widgets/projects/configdialog.py:81
+msgid "Interface"
+msgstr "Interfaz"
 
-#: spyderlib/plugins/editor.py:776
-msgid "Re-run &last script"
-msgstr "Ejecutar de &nuevo el último archivo"
+#: spyder/plugins/configdialog.py:844
+msgid "Qt windows style"
+msgstr "Estilo de Qt"
 
-#: spyderlib/plugins/editor.py:778
-msgid "Run again last file"
-msgstr "Ejecutar de nuevo el mismo archivo"
+#: spyder/plugins/configdialog.py:850
+msgid "Icon theme"
+msgstr "Tema de iconos"
 
-#: spyderlib/plugins/editor.py:785
-#: spyderlib/widgets/sourcecode/codeeditor.py:2462
-msgid "Run &selection or current line"
-msgstr "Ejecutar la &selección o la línea actual"
+#: spyder/plugins/configdialog.py:854
+msgid "Vertical title bars in panes"
+msgstr "Barras de título verticales para los paneles"
 
-#: spyderlib/plugins/editor.py:788
-msgid "Run selection or current line"
-msgstr "Ejecutar la &selección o línea actual"
+#: spyder/plugins/configdialog.py:856
+msgid "Vertical tabs in panes"
+msgstr "Pestañas verticales en los paneles"
 
-#: spyderlib/plugins/editor.py:801
-msgid "Run cell"
-msgstr "Ejecutar la celda"
+#: spyder/plugins/configdialog.py:858
+msgid "Animated toolbars and panes"
+msgstr "Barras de herramientas y paneles animados"
 
-#: spyderlib/plugins/editor.py:804
-msgid ""
-"Run current cell (Ctrl+Enter)\n"
-"[Use #%% to create cells]"
+#: spyder/plugins/configdialog.py:860
+msgid "Tear off menus"
+msgstr "Separar los menús"
+
+#: spyder/plugins/configdialog.py:861
+msgid "Set this to detach any<br> menu from the main window"
 msgstr ""
-"Ejecutar la celda actual (Ctrl+Enter)\n"
-"[Usar #%% para crear celdas]"
+"Establezca esta opción<br> si desea separar los menús de la ventana principal"
 
-#: spyderlib/plugins/editor.py:809
-msgid "Run cell and advance"
-msgstr "Ejecutar la celda y avanzar"
+#: spyder/plugins/configdialog.py:863
+msgid "Custom margin for panes:"
+msgstr "Márgenes personalizadas para los paneles:"
 
-#: spyderlib/plugins/editor.py:812
-msgid "Run current cell and go to the next one (Shift+Enter)"
-msgstr "Ejecutar la celda actual y avanzar a la siguiente (Shift+Enter)"
+#: spyder/plugins/configdialog.py:865 spyder/plugins/editor.py:209
+msgid "pixels"
+msgstr "pixels"
 
-#: spyderlib/plugins/editor.py:818
-msgid "Show todo list"
-msgstr "Mostrar lista de TODO's"
+#: spyder/plugins/configdialog.py:893
+msgid "Status bar"
+msgstr "Barra de estado"
 
-#: spyderlib/plugins/editor.py:819
-msgid "Show TODO/FIXME/XXX/HINT/TIP/@todo comments list"
-msgstr ""
-"Mostrar la lista de comentarios de\n"
-"los TODO/FIXME/XXX/HINT/TIP/@todo"
+#: spyder/plugins/configdialog.py:894
+msgid "Show status bar"
+msgstr "Mostrar la barra de estatus"
 
-#: spyderlib/plugins/editor.py:826
-msgid "Show warning/error list"
-msgstr ""
-"Mostrar la lista de errores\n"
-"y advertencias"
+#: spyder/plugins/configdialog.py:896
+msgid "Show memory usage every"
+msgstr "Mostrar la memoria usada cada"
 
-#: spyderlib/plugins/editor.py:827
-msgid "Show code analysis warnings/errors"
-msgstr ""
-"Mostrar errores o advertencias\n"
-"del análisis del código"
+#: spyder/plugins/configdialog.py:898 spyder/plugins/configdialog.py:907
+#: spyder/plugins/editor.py:133 spyder/plugins/editor.py:261
+#: spyder/plugins/variableexplorer.py:30
+msgid " ms"
+msgstr "ms"
 
-#: spyderlib/plugins/editor.py:833
-msgid "Previous warning/error"
-msgstr "Anterior advertencia o error"
+#: spyder/plugins/configdialog.py:905
+msgid "Show CPU usage every"
+msgstr "Mostrar el uso de CPU cada"
 
-#: spyderlib/plugins/editor.py:834
-msgid "Go to previous code analysis warning/error"
-msgstr ""
-"Ir a la línea anterior de\n"
-"advertencia o error"
+#: spyder/plugins/configdialog.py:940
+msgid "Plain text font"
+msgstr "Texto plano"
 
-#: spyderlib/plugins/editor.py:837
-msgid "Next warning/error"
-msgstr "Siguiente advertencia o error"
+#: spyder/plugins/configdialog.py:946
+msgid "Rich text font"
+msgstr "Texto enriquecido"
 
-#: spyderlib/plugins/editor.py:838
-msgid "Go to next code analysis warning/error"
-msgstr ""
-"Ir a la próxima línea de\n"
-"advertencia o error"
+#: spyder/plugins/configdialog.py:949
+msgid "Fonts"
+msgstr "Tipo de letra"
 
-#: spyderlib/plugins/editor.py:842
-msgid "Last edit location"
-msgstr "Última posición de edición"
+#: spyder/plugins/configdialog.py:963
+msgid "Appearance"
+msgstr "Apariencia"
 
-#: spyderlib/plugins/editor.py:843
-msgid "Go to last edit location"
-msgstr ""
-"Ir a la anterior posición\n"
-"de edición"
+#: spyder/plugins/configdialog.py:965 spyder/plugins/ipythonconsole.py:564
+msgid "Advanced Settings"
+msgstr "Opciones avanzadas"
 
-#: spyderlib/plugins/editor.py:849
-msgid "Previous cursor position"
-msgstr "Anterior posición del cursor"
+#: spyder/plugins/configdialog.py:1001
+msgid "Syntax coloring"
+msgstr "Coloreado de sintaxis"
 
-#: spyderlib/plugins/editor.py:850
-msgid "Go to previous cursor position"
-msgstr "Ir a la anterior posición del cursor"
+#: spyder/plugins/configdialog.py:1014
+msgid ""
+"Here you can select the color scheme used in the Editor and all other Spyder "
+"plugins.<br><br>You can also edit the color schemes provided by Spyder or "
+"create your own ones by using the options provided below.<br>"
+msgstr ""
+"Aquí puede seleccionar el esquema de colores usado en el Editor y todos los "
+"demás paneles de Spyder.<br><br>También puede editar los esquemas de colores "
+"que vienen con Spyder o crear los suyos al usar las opciones que aparecen a "
+"continuación.<br>"
 
-#: spyderlib/plugins/editor.py:856
-msgid "Next cursor position"
-msgstr "Siguiente posición del cursor"
+#: spyder/plugins/configdialog.py:1019
+msgid "Edit selected"
+msgstr "Editar esquema"
 
-#: spyderlib/plugins/editor.py:857
-msgid "Go to next cursor position"
-msgstr "Ir a la siguiente posición del cursor"
+#: spyder/plugins/configdialog.py:1020
+msgid "Create new scheme"
+msgstr "Crear nuevo esquema"
 
-#: spyderlib/plugins/editor.py:864
-#: spyderlib/widgets/sourcecode/codeeditor.py:2449
-msgid "Comment"
-msgstr "Comentar"
+#: spyder/plugins/configdialog.py:1021 spyder/widgets/explorer.py:510
+#: spyder/widgets/shell.py:134
+msgid "Delete"
+msgstr "Eliminar"
 
-#: spyderlib/plugins/editor.py:864
-#: spyderlib/widgets/sourcecode/codeeditor.py:2449
-msgid "Uncomment"
-msgstr "Descomentar"
+#: spyder/plugins/configdialog.py:1024
+msgid "Reset"
+msgstr "Restaurar"
 
-#: spyderlib/plugins/editor.py:865
-msgid "Comment current line or selection"
-msgstr "Comentar la línea o selección actual"
+#: spyder/plugins/configdialog.py:1031
+msgid "Scheme:"
+msgstr "Esquema:"
 
-#: spyderlib/plugins/editor.py:869
-msgid "Add &block comment"
-msgstr "Añadir comentario de &bloque"
+#: spyder/plugins/configdialog.py:1062
+msgid "Manage color schemes"
+msgstr "Manejar esquemas de coloreado"
 
-#: spyderlib/plugins/editor.py:870
-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"
+#: spyder/plugins/configdialog.py:1251
+msgid "Are you sure you want to delete this scheme?"
+msgstr "¿Está seguro de que borrar este esquema?"
 
-#: spyderlib/plugins/editor.py:876
-msgid "R&emove block comment"
-msgstr "&Eliminar comentario de bloque"
+#: spyder/plugins/configdialog.py:1368
+msgid "Text"
+msgstr "Texto"
 
-#: spyderlib/plugins/editor.py:877
-msgid "Remove comment block around current line or selection"
-msgstr "Eliminar comentario de bloque alrededor de la línea o selección actual"
+#: spyder/plugins/configdialog.py:1370
+msgid "Highlight"
+msgstr "Resaltar"
 
-#: spyderlib/plugins/editor.py:888
-msgid "Indent"
-msgstr "Indentar"
+#: spyder/plugins/configdialog.py:1372
+msgid "Background"
+msgstr "Fondo"
 
-#: spyderlib/plugins/editor.py:889
-msgid "Indent current line or selection"
-msgstr "Indentar la línea o selección actual"
+#: spyder/plugins/configdialog.py:1376
+msgid "Scheme name:"
+msgstr "Nombre del esquema:"
 
-#: spyderlib/plugins/editor.py:892
-msgid "Unindent"
-msgstr "Quitar indentación"
+#: spyder/plugins/configdialog.py:1383
+msgid "Color scheme editor"
+msgstr "Editor de esquemas"
 
-#: spyderlib/plugins/editor.py:893
-msgid "Unindent current line or selection"
-msgstr "Quitar indentación de la línea o selección actual"
+#: spyder/plugins/console.py:109
+msgid "Internal console"
+msgstr "Terminal interna"
 
-#: spyderlib/plugins/editor.py:898
-msgid "Carriage return and line feed (Windows)"
-msgstr "Retorno de carro y salto de línea (Windows)"
+#: spyder/plugins/console.py:139 spyder/plugins/externalconsole.py:743
+msgid "&Run..."
+msgstr "E&jecutar..."
 
-#: spyderlib/plugins/editor.py:901
-msgid "Line feed (UNIX)"
-msgstr "Salto de línea (UNIX)"
+#: spyder/plugins/console.py:141 spyder/plugins/externalconsole.py:744
+msgid "Run a Python script"
+msgstr "Ejecutar un archivo de Python"
 
-#: spyderlib/plugins/editor.py:904
-msgid "Carriage return (Mac)"
-msgstr "Retorno de carro (Mac)"
+#: spyder/plugins/console.py:144
+msgid "Environment variables..."
+msgstr "Variables de entorno..."
 
-#: spyderlib/plugins/editor.py:910
-msgid "Convert end-of-line characters"
-msgstr "Convertir caracteres de fin de línea"
+#: spyder/plugins/console.py:146
+msgid "Show and edit environment variables (for current session)"
+msgstr "Muestra y edita las variables de entorno (para la sesión actual)"
 
-#: spyderlib/plugins/editor.py:914
-msgid "Remove trailing spaces"
-msgstr "Eliminar espacios en blanco"
+#: spyder/plugins/console.py:150
+msgid "Show sys.path contents..."
+msgstr "Contenidos del sys.path"
 
-#: spyderlib/plugins/editor.py:918
-msgid "Fix indentation"
-msgstr "Corregir la indentación"
+#: spyder/plugins/console.py:152
+msgid "Show (read-only) sys.path"
+msgstr "Muestra los contenidos del sys.path en modo lectura"
 
-#: spyderlib/plugins/editor.py:919
-msgid "Replace tab characters by space characters"
-msgstr "Reemplazar caracteres de tabulación por espacios"
+#: spyder/plugins/console.py:155
+msgid "Buffer..."
+msgstr "Mostrar líneas..."
 
-#: spyderlib/plugins/editor.py:922
-msgid "Go to line..."
-msgstr "Ir a la línea..."
+#: spyder/plugins/console.py:156 spyder/plugins/externalconsole.py:75
+#: spyder/plugins/history.py:43
+msgid "Set maximum line count"
+msgstr "Establece el máximo número de líneas a mostrar en la terminal"
 
-#: spyderlib/plugins/editor.py:930
-msgid "Set console working directory"
-msgstr "Establecer directorio de trabajo"
+#: spyder/plugins/console.py:159
+msgid "External editor path..."
+msgstr "Ruta del editor externo..."
 
-#: spyderlib/plugins/editor.py:932
-msgid ""
-"Set current console (and file explorer) working directory to current script "
-"directory"
-msgstr ""
-"Fija el directorio de trabajo para la terminal actual como el directorio del "
-"archivo actual"
+#: spyder/plugins/console.py:160
+msgid "Set external editor executable path"
+msgstr "Establece la ruta del editor externo"
 
-#: spyderlib/plugins/editor.py:937
-msgid "Maximum number of recent files..."
-msgstr "Máximo número de archivos recientes..."
+#: spyder/plugins/console.py:163 spyder/plugins/editor.py:139
+#: spyder/plugins/externalconsole.py:76 spyder/plugins/help.py:157
+#: spyder/plugins/help.py:360 spyder/plugins/history.py:46
+#: spyder/plugins/history.py:157
+msgid "Wrap lines"
+msgstr "Ajuste de línea automático"
 
-#: spyderlib/plugins/editor.py:940
-msgid "Clear recent files list"
-msgstr "Limpiar la lista de archivos recientes"
-
-#: spyderlib/plugins/editor.py:940
-msgid "Clear this list"
-msgstr "Limpiar esta lista"
-
-#: spyderlib/plugins/editor.py:942
-msgid "Open &recent"
-msgstr "Abrir &reciente"
-
-#: spyderlib/plugins/editor.py:1224 spyderlib/spyder.py:635
-msgid "File toolbar"
-msgstr "Barra de archivo"
+#: spyder/plugins/console.py:166 spyder/plugins/editor.py:175
+#: spyder/plugins/externalconsole.py:121 spyder/plugins/ipythonconsole.py:283
+msgid "Display balloon tips"
+msgstr "Mostrar globos de sugerencias"
 
-#: spyderlib/plugins/editor.py:1225 spyderlib/spyder.py:645
-msgid "Search toolbar"
-msgstr "Barra de búsqueda"
+#: spyder/plugins/console.py:170 spyder/plugins/editor.py:169
+#: spyder/plugins/externalconsole.py:115
+msgid "Automatic code completion"
+msgstr "Completar código automáticamente"
 
-#: spyderlib/plugins/editor.py:1226 spyderlib/spyder.py:650
-msgid "Source toolbar"
-msgstr "Barra de código fuente"
+#: spyder/plugins/console.py:174 spyder/plugins/editor.py:173
+#: spyder/plugins/externalconsole.py:119
+msgid "Enter key selects completion"
+msgstr "La tecla Enter selecciona el resultado a completar"
 
-#: spyderlib/plugins/editor.py:1227 spyderlib/spyder.py:655
-msgid "Run toolbar"
-msgstr "Barra de ejecución"
+#: spyder/plugins/console.py:179
+msgid "Internal console settings"
+msgstr "Opciones"
 
-#: spyderlib/plugins/editor.py:1228 spyderlib/spyder.py:660
-msgid "Debug toolbar"
-msgstr "Barra de depuración"
+#: spyder/plugins/console.py:232 spyder/plugins/externalconsole.py:918
+msgid "Run Python script"
+msgstr "Ejecutar archivo de Python"
 
-#: spyderlib/plugins/editor.py:1229 spyderlib/spyder.py:640
-msgid "Edit toolbar"
-msgstr "Barra de edición"
+#: spyder/plugins/console.py:233 spyder/plugins/externalconsole.py:146
+#: spyder/plugins/externalconsole.py:919 spyder/widgets/explorer.py:715
+msgid "Python scripts"
+msgstr "Archivos de Python"
 
-#: spyderlib/plugins/editor.py:1232 spyderlib/spyder.py:633
-msgid "&File"
-msgstr "&Archivo"
+#: spyder/plugins/console.py:278
+msgid "Buffer"
+msgstr "Mostrar"
 
-#: spyderlib/plugins/editor.py:1233 spyderlib/spyder.py:639
-msgid "&Edit"
-msgstr "&Editar"
+#: spyder/plugins/console.py:279
+msgid "Maximum line count"
+msgstr "Máximo número de líneas a mostrar"
 
-#: spyderlib/plugins/editor.py:1234 spyderlib/spyder.py:644
-msgid "&Search"
-msgstr "&Buscar"
+#: spyder/plugins/console.py:289
+msgid "External editor"
+msgstr "Editor externo"
 
-#: spyderlib/plugins/editor.py:1235 spyderlib/spyder.py:649
-msgid "Sour&ce"
-msgstr "&Código fuente"
+#: spyder/plugins/console.py:290
+msgid "External editor executable path:"
+msgstr "Ruta ejecutable del editor externo:"
 
-#: spyderlib/plugins/editor.py:1237 spyderlib/spyder.py:667
-msgid "&Tools"
-msgstr "&Herramientas"
+#: spyder/plugins/editor.py:104
+msgid "Edit template for new modules"
+msgstr "Editar la plantilla para nuevos módulos"
 
-#: spyderlib/plugins/editor.py:1238
-msgid "?"
-msgstr "?"
+#: spyder/plugins/editor.py:109
+msgid "Sort files according to full path"
+msgstr "Ordenar archivos según su ruta completa"
 
-#: spyderlib/plugins/editor.py:1458
-msgid "Spyder Editor"
-msgstr "Editor de Spyder"
+#: spyder/plugins/editor.py:111
+msgid "Show tab bar"
+msgstr "Mostrar barra de pestañas"
 
-#: spyderlib/plugins/editor.py:1459
-msgid "This is a temporary script file."
-msgstr "Este es un archivo temporal"
+#: spyder/plugins/editor.py:118 spyder/plugins/editor.py:189
+#: spyder/plugins/externalconsole.py:71 spyder/plugins/externalconsole.py:114
+#: spyder/plugins/help.py:156 spyder/plugins/history.py:45
+#: spyder/plugins/ipythonconsole.py:317
+msgid "Source code"
+msgstr "Código fuente"
 
-#: spyderlib/plugins/editor.py:1527
-msgid "untitled"
-msgstr "Sin título "
+#: spyder/plugins/editor.py:119
+msgid "Show line numbers"
+msgstr "Mostrar números de líneas"
 
-#: spyderlib/plugins/editor.py:1601
-msgid "Maximum number of recent files"
-msgstr "Máximo número de archivos recientes"
+#: spyder/plugins/editor.py:120 spyder/plugins/editor.py:937
+msgid "Show blank spaces"
+msgstr "Mostrar espacios en blanco"
 
-#: spyderlib/plugins/editor.py:1726
-msgid "Printing..."
-msgstr "Imprimir..."
+#: spyder/plugins/editor.py:121
+msgid "Show vertical line after"
+msgstr "Mostrar una línea vertical después de"
 
-#: spyderlib/plugins/explorer.py:55
-msgid "File explorer"
-msgstr "Explorador de archivos"
+#: spyder/plugins/editor.py:122
+msgid "characters"
+msgstr "caracteres"
 
-#: spyderlib/plugins/explorer.py:68 spyderlib/plugins/inspector.py:389
-#: spyderlib/plugins/projectexplorer.py:69
-msgid "Set font style"
-msgstr "Establece el tipo de fuente"
+#: spyder/plugins/editor.py:127
+msgid "Highlight current line"
+msgstr "Resaltar la línea actual"
 
-#: spyderlib/plugins/externalconsole.py:49
-msgid "Interactive data plotting in the consoles"
-msgstr "Graficar datos interactivamente en la terminal"
+#: spyder/plugins/editor.py:129
+msgid "Highlight current cell"
+msgstr "Resaltar la celda actual"
 
-#: spyderlib/plugins/externalconsole.py:57
-#: spyderlib/plugins/externalconsole.py:1005
-#: spyderlib/plugins/inspector.py:419 spyderlib/plugins/runconfig.py:185
-#: spyderlib/plugins/runconfig.py:455
-#: spyderlib/widgets/externalshell/baseshell.py:107
-#: spyderlib/widgets/ipython.py:521
-msgid "Console"
-msgstr "Terminal"
+#: spyder/plugins/editor.py:131
+msgid "Highlight occurrences after"
+msgstr "Resaltar ocurrencias después de"
 
-#: spyderlib/plugins/externalconsole.py:71
-msgid "One tab per script"
-msgstr "Una pestaña por archivo"
+#: spyder/plugins/editor.py:159
+msgid "Save all files before running script"
+msgstr "Guardar todo antes de ejecutar un archivo"
 
-#: spyderlib/plugins/externalconsole.py:72
-#: spyderlib/widgets/externalshell/baseshell.py:173
-msgid "Show elapsed time"
-msgstr "Mostrar el tiempo transcurrido"
+#: spyder/plugins/editor.py:162
+msgid "Run selection"
+msgstr "Ejecutar selección"
 
-#: spyderlib/plugins/externalconsole.py:73 spyderlib/widgets/explorer.py:1016
-msgid "Show icons and text"
-msgstr "Mostrar iconos y texto "
+#: spyder/plugins/editor.py:163
+msgid "Maintain focus in the Editor after running cells or selections"
+msgstr "Mantener el foco en el Editor después de ejecutar celdas o selecciones"
 
-#: spyderlib/plugins/externalconsole.py:85
-msgid "Buffer: "
-msgstr "Mostrar:"
+#: spyder/plugins/editor.py:166 spyder/plugins/externalconsole.py:252
+msgid "Introspection"
+msgstr "Introspección"
 
-#: spyderlib/plugins/externalconsole.py:85
-#: spyderlib/plugins/ipythonconsole.py:208
-msgid " lines"
-msgstr "líneas"
+#: spyder/plugins/editor.py:171 spyder/plugins/externalconsole.py:117
+msgid "Case sensitive code completion"
+msgstr "Diferenciar entre mayúsculas y minúsculas al completar código"
 
-#: spyderlib/plugins/externalconsole.py:90
-msgid "Merge process standard output/error channels"
-msgstr "Combinar los canales de salida y error estándar del proceso"
+#: spyder/plugins/editor.py:176
+msgid "Link to object definition"
+msgstr "Enlazar a la definición de un objeto"
 
-#: spyderlib/plugins/externalconsole.py:92
+#: spyder/plugins/editor.py:178
 msgid ""
-"Merging the output channels of the process means that\n"
-"the standard error won't be written in red anymore,\n"
-"but this has the effect of speeding up display."
+"If this option is enabled, clicking on an object\n"
+"name (left-click + Ctrl key) will go this object\n"
+"definition (if resolved)."
 msgstr ""
-"Combinar los canales de salida del proceso quiere decir que\n"
-"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:96
-msgid "Colorize standard error channel using ANSI escape codes"
-msgstr "Colorear el canal de error estándar usando códigos de escape ANSI "
+"Si está opción está activada, al hacer click\n"
+"sobre el nombre de un objeto (click-izquierdo +\n"
+"la tecla Ctrl), el Editor se ubicará en la definición\n"
+"del mismo (de poder resolverse el nombre)."
 
-#: spyderlib/plugins/externalconsole.py:98
+#: spyder/plugins/editor.py:182
 msgid ""
-"This method is the only way to have colorized standard\n"
-"error channel when the output channels have been merged."
+"<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 ""
-"É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:114
-#: spyderlib/plugins/ipythonconsole.py:195
-#: spyderlib/widgets/arrayeditor.py:461
-#: spyderlib/widgets/dataframeeditor.py:516
-msgid "Background color"
-msgstr "Color de fondo"
+"<b>Advertencia:</b><br>El módulo de Python<i>rope</i> no está instalado en "
+"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/externalconsole.py:115
-msgid ""
-"This option will be applied the next time a Python console or a terminal is "
-"opened."
-msgstr ""
-"Esta opción será aplicada la próxima vez que una terminal de Python o una "
-"consola sea abierta."
+#: spyder/plugins/editor.py:190
+msgid "Automatic insertion of parentheses, braces and brackets"
+msgstr "Inserción automática de paréntesis, llaves y corchetes"
 
-#: spyderlib/plugins/externalconsole.py:118
-msgid "Light background (white color)"
-msgstr "Fondo claro (color blanco)"
+#: spyder/plugins/editor.py:193
+msgid "Automatic insertion of closing quotes"
+msgstr "Inserción automática de comillas"
 
-#: spyderlib/plugins/externalconsole.py:143
-msgid "User Module Reloader (UMR)"
-msgstr "Recargador de Módulos del Usuario (RMU)"
+#: spyder/plugins/editor.py:195
+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/externalconsole.py:144
-msgid ""
-"UMR forces Python to reload modules which were imported when executing a \n"
-"script in the external console with the 'runfile' function."
-msgstr ""
-"El RMU 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'."
+#: spyder/plugins/editor.py:198
+msgid "Automatic indentation after 'else', 'elif', etc."
+msgstr "Indentación automática después de 'else', 'elif', etc."
 
-#: spyderlib/plugins/externalconsole.py:147
-msgid "Enable UMR"
-msgstr "Activar el RMU"
+#: spyder/plugins/editor.py:200
+msgid "Indentation characters: "
+msgstr "Caracteres de indentación:"
 
-#: spyderlib/plugins/externalconsole.py:148
-msgid ""
-"This option will enable the User Module Reloader (UMR) in Python/IPython "
-"consoles. UMR forces Python to reload deeply modules during import when "
-"running a Python script using the Spyder's builtin function <b>runfile</b>."
-"<br><br><b>1.</b> UMR may require to restart the console in which it will be "
-"called (otherwise only newly imported modules will be reloaded when "
-"executing scripts).<br><br><b>2.</b> If errors occur when re-running a PyQt-"
-"based program, please check that the Qt objects are properly destroyed (e.g. "
-"you may have to use the attribute <b>Qt.WA_DeleteOnClose</b> on your main "
-"window, using the <b>setAttribute</b> method)"
-msgstr ""
-"Esta opción activará el Recargador de Módulos del Usuario (RMU) en las "
-"terminales de Python y IPython. El RMU obliga a Python a recargar "
-"profundamente los módulos que fueron importados al ejecutar un archivo de "
-"Python, usando la función incorporada de Spyder llamada <b>runfile</b>."
-"<br><br><b>1.</b> El RMU puede requerir que se reinicie la terminal en la "
-"cual será utilizado (de otra forma, sólo los módulos que fueron importados "
-"en último lugar serán recargados al ejecutar un archivo).<br><br><b>2.</b> "
-"Si ocurre algún error al re-ejecutar programas basados en PyQt o PySide, por "
-"favor verifique que los objetos de Qt sean destruidos apropiadamente (por "
-"ejemplo, puede tener que usar el atributo <b>Qt.WA_DeleteOnClose</b> en su "
-"ventana principal, utilizando para ello el método <b>setAttribute</b>)."
+#: spyder/plugins/editor.py:201
+msgid "2 spaces"
+msgstr "2 espacios"
 
-#: spyderlib/plugins/externalconsole.py:164
-msgid "Show reloaded modules list"
-msgstr "Mostrar la lista de módulos que fueron recargados"
+#: spyder/plugins/editor.py:202
+msgid "3 spaces"
+msgstr "3 espacios"
 
-#: spyderlib/plugins/externalconsole.py:165
-msgid "Please note that these changes will be applied only to new consoles"
-msgstr ""
-"Por favor tenga en cuenta que estos cambios sólo se aplicarán a nuevas "
-"terminales"
+#: spyder/plugins/editor.py:203
+msgid "4 spaces"
+msgstr "4 espacios"
 
-#: spyderlib/plugins/externalconsole.py:169
-msgid "Set UMR excluded (not reloaded) modules"
-msgstr "Establecer la lista de módulos excluidos por el RMU"
+#: spyder/plugins/editor.py:204
+msgid "5 spaces"
+msgstr "5 espacios"
 
-#: spyderlib/plugins/externalconsole.py:180
-msgid "Python executable"
-msgstr "Archivo ejecutable de Python"
+#: spyder/plugins/editor.py:205
+msgid "6 spaces"
+msgstr "6 espacios"
 
-#: spyderlib/plugins/externalconsole.py:182
-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:"
+#: spyder/plugins/editor.py:206
+msgid "7 spaces"
+msgstr "7 espacios"
 
-#: spyderlib/plugins/externalconsole.py:185
-msgid "Default (i.e. the same as Spyder's)"
-msgstr "Por defecto (es decir, el mismo de Spyder)"
+#: spyder/plugins/editor.py:207
+msgid "8 spaces"
+msgstr "8 espacios"
 
-#: spyderlib/plugins/externalconsole.py:189
-msgid "Use the following Python interpreter:"
-msgstr "Usar el siguiente intérprete:"
+#: spyder/plugins/editor.py:208
+msgid "Tabulations"
+msgstr "Tabulaciones"
 
-#: spyderlib/plugins/externalconsole.py:193
-msgid "Executables"
-msgstr "Ejecutables"
+#: spyder/plugins/editor.py:209
+msgid "Tab stop width:"
+msgstr "Ancho de las tabulaciones:"
 
-#: spyderlib/plugins/externalconsole.py:211
-msgid "PYTHONSTARTUP replacement"
-msgstr "Reemplazo de PYTHONSTARTUP"
+#: spyder/plugins/editor.py:211
+msgid "Tab always indent"
+msgstr "Siempre indentar con la tecla Tab"
 
-#: spyderlib/plugins/externalconsole.py:213
+#: spyder/plugins/editor.py:213
 msgid ""
-"This option will override the PYTHONSTARTUP environment variable which\n"
-"defines the script to be executed during the Python console startup."
+"If enabled, pressing Tab will always indent,\n"
+"even when the cursor is not at the beginning\n"
+"of a line (when this option is enabled, code\n"
+"completion may be triggered using the alternate\n"
+"shortcut: Ctrl+Space)"
 msgstr ""
-"Esta opción modificará la variable de entorno PYTHONSTARTUP, la cual\n"
-"define el archivo que es ejecutado durante el arranque de la terminal de\n"
-"Python."
+"Si esta opción está activada, el oprimir Tab\n"
+"siempre indentará el código, aún cuando el\n"
+"cursor no esté al principio de una línea\n"
+"(de seleccionar esta opción, se puede usar\n"
+"la combinación de teclas Ctrl+Espacio para\n"
+"activar el completado de código)"
 
-#: spyderlib/plugins/externalconsole.py:218
-msgid "Default PYTHONSTARTUP script"
-msgstr "Utilizar el archivo por defecto de PYTHONSTARTUP"
+#: spyder/plugins/editor.py:218
+msgid "Intelligent backspace"
+msgstr "Tecla de retroceso (\"backspace\") inteligente"
 
-#: spyderlib/plugins/externalconsole.py:222
-msgid "Use the following startup script:"
-msgstr "Utilizar el siguiente archivo de arranque:"
+#: spyder/plugins/editor.py:220
+msgid "Automatically remove trailing spaces when saving files"
+msgstr "Eliminar automáticamente espacios en blanco al guardar un archivo"
 
-#: spyderlib/plugins/externalconsole.py:239
-msgid "Monitor"
-msgstr "Monitor"
+#: spyder/plugins/editor.py:224
+msgid "Analysis"
+msgstr "Análisis"
+
+#: spyder/plugins/editor.py:226
+msgid "<i>(Refer to the {} page)</i>"
+msgstr "<i>(Mirar la página {})</i>"
+
+#: spyder/plugins/editor.py:230
+msgid "Real-time code analysis"
+msgstr "Análisis del código en tiempo real en el Editor"
 
-#: spyderlib/plugins/externalconsole.py:240
+#: spyder/plugins/editor.py:232
 msgid ""
-"The monitor provides introspection features to console: code completion, "
-"calltips and variable explorer. Because it relies on several modules, "
-"disabling the monitor may be useful to accelerate console startup."
+"<p>If enabled, Python source code will be analyzed using pyflakes, lines "
+"containing errors or warnings will be highlighted.</p><p><u>Note</u>: add "
+"<b>analysis:ignore</b> in a comment to ignore code analysis warnings.</p>"
 msgstr ""
-"El monitor es el que brinda características de introspección a la terminal: "
-"completado del código, globos de sugerencias y el explorador de variables. "
-"Dado que depende de varios módulos adicionales, desactivar el monitor puede "
-"acelerar el arranque de la terminal."
+"<p>Si esta opción está activada, los archivos de Python serán analizados "
+"automáticamente y y las líneas que contengan errores o advertencias serán "
+"resaltadas.</p><p><u>Nota</u>: Puede añadir <b>analysis:ignore</b> en un "
+"comentario para ignorar estas advertencias.</p>"
 
-#: spyderlib/plugins/externalconsole.py:247
-msgid "Enable monitor"
-msgstr "Activar el monitor"
+#: spyder/plugins/editor.py:240
+msgid "Code analysis requires pyflakes %s+"
+msgstr "El análisis del código requiere pyflakes %s+"
 
-#: spyderlib/plugins/externalconsole.py:260
-msgid "Default library"
-msgstr "Librería por defecto"
-
-#: spyderlib/plugins/externalconsole.py:265
-#, fuzzy
-msgid "Qt-Python Bindings"
-msgstr "Selección de la librería de enlace entre Qt y Python:"
-
-#: spyderlib/plugins/externalconsole.py:267
-msgid "Library:"
-msgstr ""
+#: spyder/plugins/editor.py:242
+msgid "Real-time code style analysis"
+msgstr "Análisis de estilo del código en el Editor"
 
-#: spyderlib/plugins/externalconsole.py:269
+#: spyder/plugins/editor.py:244
 msgid ""
-"This option will act on<br> libraries such as Matplotlib, guidata or ETS"
+"<p>If enabled, Python source code will be analyzedusing pep8, lines that are "
+"not following PEP8 style guide will be highlighted.</p><p><u>Note</u>: add "
+"<b>analysis:ignore</b> in a comment to ignore style analysis warnings.</p>"
 msgstr ""
-"Esta opción tendrá efecto<br> en librerías como Matplotlib, guidata o ETS"
-
-#: spyderlib/plugins/externalconsole.py:278
-#: spyderlib/plugins/ipythonconsole.py:465
-msgid "Graphics"
-msgstr "Gráficas"
+"<p>Si esta opción está activada,  los archivos de Python serán analizados "
+"con PEP8 y las líneas que no sigan esta guía de estilo serán resaltadas.</"
+"p><p><u>Nota</u>: Añada <b>analysis:ignore</b> en un comentario para ignorar "
+"estas advertencias.</p>"
 
-#: spyderlib/plugins/externalconsole.py:279
-msgid ""
-"Decide which backend to use to display graphics. If unsure, please select "
-"the <b>Automatic</b> backend.<br><br><b>Note:</b> We support a very limited "
-"number of backends in our Python consoles. If you prefer to work with a "
-"different one, please use an IPython console."
-msgstr ""
+#: spyder/plugins/editor.py:251
+msgid "Code annotations (TODO, FIXME, XXX, HINT, TIP, @todo)"
+msgstr "Anotaciones (TODO, FIXME, XXX, HINT, TIP, @todo)"
 
-#: spyderlib/plugins/externalconsole.py:295
-#: spyderlib/plugins/ipythonconsole.py:270
-msgid "Backend:"
-msgstr "Salida:"
+#: spyder/plugins/editor.py:254
+msgid "Perform analysis when saving file and every"
+msgstr "Realizar los análisis al guardar el archivo y cada"
 
-#: spyderlib/plugins/externalconsole.py:297
-#: spyderlib/plugins/ipythonconsole.py:272
-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."
+#: spyder/plugins/editor.py:258
+msgid "Perform analysis only when saving file"
+msgstr "Realizar análisis sólo cuando se guarde el archivo"
 
-#: spyderlib/plugins/externalconsole.py:308
-msgid "Enthought Tool Suite"
-msgstr "Enthought Tool Suite"
+#: spyder/plugins/editor.py:317
+msgid "End-of-line characters"
+msgstr "Caracteres de fin de línea"
 
-#: spyderlib/plugins/externalconsole.py:309
+#: spyder/plugins/editor.py:318
 msgid ""
-"Enthought Tool Suite (ETS) supports PyQt4 (qt4) and wxPython (wx) graphical "
-"user interfaces."
+"When opening a text file containing mixed end-of-line characters (this may "
+"raise syntax errors in the consoles on Windows platforms), Spyder may fix "
+"the file automatically."
 msgstr ""
-"Enthought Tool Suite (ETS) funciona con las librerías gráficas PyQt4 (qt4) "
-"y \n"
-"wxPython (wx). Esta opción establece cual desea utilizar el usuario."
-
-#: spyderlib/plugins/externalconsole.py:313
-msgid "ETS_TOOLKIT:"
-msgstr "ETS_TOOLKIT:"
+"Cuando se abra un archivo de texto que contenga varios tipos de caracteres "
+"de fin de línea (lo cual puede dar lugar a errores en Windows), Spyder puede "
+"arreglar el archivo automáticamente."
 
-#: spyderlib/plugins/externalconsole.py:338
-msgid "External modules"
-msgstr "Módulos externos"
+#: spyder/plugins/editor.py:324
+msgid "Fix automatically and show warning message box"
+msgstr "Arreglar automáticamente y mostrar un mensaje de advertencia"
 
-#: spyderlib/plugins/externalconsole.py:374
-#: spyderlib/plugins/externalconsole.py:617
-#: spyderlib/plugins/ipythonconsole.py:114
-#: spyderlib/plugins/ipythonconsole.py:832 spyderlib/spyder.py:1803
-#: spyderlib/spyder.py:1825 spyderlib/spyder.py:1888 spyderlib/spyder.py:2774
-#: spyderlib/utils/environ.py:95 spyderlib/utils/environ.py:108
-#: spyderlib/widgets/dicteditor.py:452
-msgid "Warning"
-msgstr "Advertencia"
+#: spyder/plugins/editor.py:335 spyder/plugins/externalconsole.py:250
+#: spyder/plugins/ipythonconsole.py:558 spyder/plugins/variableexplorer.py:43
+msgid "Display"
+msgstr "Visualización"
 
-#: spyderlib/plugins/externalconsole.py:375
-msgid ""
-"You selected a <b>Python %d</b> interpreter for the console but Spyder is "
-"running on <b>Python %d</b>!.<br><br>Although this is possible, we recommend "
-"you to install and run Spyder directly with your selected interpreter, to "
-"avoid seeing false warnings and errors due to the incompatible syntax "
-"between these two Python versions."
-msgstr ""
-"Usted seleccionó un intérprete de <b>Python %d</b> para la terminal, pero "
-"Spyder está corriendo bajo <b>Python %d</b>!.<br><br>Aunque esto es posible, "
-"le recomendamos instalar y correr Spyder directamente con el intérprete "
-"seleccionado, para evitar ver falsos errores y alarmas en el Editor debido a "
-"la sintaxis incompatible entre estas dos versiones de Python."
+#: spyder/plugins/editor.py:337
+msgid "Code Introspection/Analysis"
+msgstr "Análisis e introspección de código"
 
-#: spyderlib/plugins/externalconsole.py:538
-msgid "Trying to kill a kernel?"
-msgstr "Desea cerrar un núcleo?"
+#: spyder/plugins/editor.py:340 spyder/plugins/externalconsole.py:253
+msgid "Advanced settings"
+msgstr "Opciones avanzadas"
 
-#: spyderlib/plugins/externalconsole.py:539
-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 "
-"the second button from right to left."
+#: spyder/plugins/editor.py:613 spyder/widgets/editortools.py:510
+msgid "Show/hide outline explorer"
 msgstr ""
-"No puede cerrar este núcleo porque tiene una o más terminales conectadas a "
-"él.<br><br>Debe cerrarlas previamente o puede terminar el proceso usando el "
-"segundo botón ubicado de derecha a izquierda."
+"Mostrar u ocultar el\n"
+"explorador de código"
 
-#: spyderlib/plugins/externalconsole.py:618
-msgid ""
-"No Python console is currently selected to run <b>%s</b>.<br><br>Please "
-"select or open a new Python console and try again."
-msgstr ""
-"No existe una terminal de Python para ejecutar <b>%s</b>.<br><br>Por favor "
-"abra una nueva y pruebe otra vez."
+#: spyder/plugins/editor.py:619
+msgid "Show/hide project explorer"
+msgstr "Mostrar/cerrar el explorador de proyectos"
 
-#: spyderlib/plugins/externalconsole.py:698
-msgid ""
-"%s is already running in a separate process.\n"
-"Do you want to kill the process before starting a new one?"
-msgstr ""
-"%s ya se está ejecutando en proceso aparte.\n"
-"¿Desea terminar este proceso antes de empezar uno nuevo?"
+#: spyder/plugins/editor.py:627
+msgid "&New file..."
+msgstr "&Nuevo"
 
-#: spyderlib/plugins/externalconsole.py:858
-msgid "Kernel"
-msgstr "Núcleo"
+#: spyder/plugins/editor.py:628 spyder/plugins/workingdirectory.py:83
+#: spyder/widgets/explorer.py:692 spyder/widgets/explorer.py:699
+msgid "New file"
+msgstr "Nuevo archivo"
 
-#: spyderlib/plugins/externalconsole.py:868
-msgid ""
-"Either:<ol><li>Your IPython frontend and kernel versions are "
-"<b>incompatible</b> or</li><li>You <b>don't have</b> IPython installed in "
-"your external interpreter.</li></ol>In any case, we're sorry but we can't "
-"create a console for you."
-msgstr ""
-"O bien:<ol><li>Sus versiones del núcleo y la interfaz gráfica de IPython son "
-"<b>incompatibles</b> o</li><li>Usted <b>no tiene</b> IPython instalado en su "
-"intérprete externo.</li></ol>Lo lamentamos, pero en cualquier caso no "
-"podemos crear una terminal de IPython para usted."
+#: spyder/plugins/editor.py:634
+msgid "&Open..."
+msgstr "&Abrir"
 
-#: spyderlib/plugins/externalconsole.py:892
-msgid "Command Window"
-msgstr "Símbolo"
+#: spyder/plugins/editor.py:635 spyder/plugins/editor.py:1767
+#: spyder/plugins/workingdirectory.py:70
+msgid "Open file"
+msgstr "Abrir archivo"
 
-#: spyderlib/plugins/externalconsole.py:894
-msgid "Terminal"
-msgstr "Terminal"
+#: spyder/plugins/editor.py:641 spyder/widgets/editor.py:345
+msgid "File switcher..."
+msgstr "Cambiador de archivos..."
 
-#: spyderlib/plugins/externalconsole.py:947
-msgid "Kernel %s"
-msgstr "Núcleo %s"
+#: spyder/plugins/editor.py:643
+msgid "Fast switch between files"
+msgstr "Cambiar rápidamente entre archivos"
 
-#: spyderlib/plugins/externalconsole.py:1027
-msgid "Open a &Python console"
-msgstr "Abrir una terminal de Python"
+#: spyder/plugins/editor.py:649
+msgid "&Revert"
+msgstr "&Restaurar"
 
-#: spyderlib/plugins/externalconsole.py:1031
-msgid "Open &command prompt"
-msgstr "Abrir &símbolo del sistema"
+#: spyder/plugins/editor.py:650
+msgid "Revert file from disk"
+msgstr "Restaurar archivo desde el disco"
 
-#: spyderlib/plugins/externalconsole.py:1032
-msgid "Open a Windows command prompt"
-msgstr "Abre el símbolo del sistema de Windows"
+#: spyder/plugins/editor.py:653
+msgid "&Save"
+msgstr "&Guardar"
 
-#: spyderlib/plugins/externalconsole.py:1034
-msgid "Open a &terminal"
-msgstr "Abrir &terminal de comandos"
+#: spyder/plugins/editor.py:654 spyder/widgets/editor.py:1304
+msgid "Save file"
+msgstr "Guardar archivo"
 
-#: spyderlib/plugins/externalconsole.py:1035
-msgid "Open a terminal window"
-msgstr "Abre una terminal del sistema"
+#: spyder/plugins/editor.py:660
+msgid "Sav&e all"
+msgstr "Guardar t&odo"
 
-#: spyderlib/plugins/externalconsole.py:1196
-msgid "Open an IPython console"
-msgstr "Abrir una terminal de IPython"
+#: spyder/plugins/editor.py:661
+msgid "Save all files"
+msgstr "Guardar todos los archivos"
 
-#: spyderlib/plugins/externalconsole.py:1197
-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 ""
-"El monitor está desactivado, por tanto se creará un kernel de IPython pero "
-"usted deberá conectar manualmente un intérprete al mismo."
+#: spyder/plugins/editor.py:667
+msgid "Save &as..."
+msgstr "Gu&ardar como..."
 
-#: spyderlib/plugins/externalconsole.py:1229
-#: spyderlib/plugins/externalconsole.py:1242
-#: spyderlib/plugins/externalconsole.py:1246
-msgid "UMR"
-msgstr "RMU"
+#: spyder/plugins/editor.py:668
+msgid "Save current file as..."
+msgstr "Guardar el archivo actual como..."
 
-#: spyderlib/plugins/externalconsole.py:1230
-msgid ""
-"UMR excluded modules:\n"
-"(example: guidata, guiqwt)"
-msgstr ""
-"Módulos excluidos del RMU:\n"
-"(por ejemplo: guidata, guiqwt)"
+#: spyder/plugins/editor.py:673 spyder/plugins/editor.py:674
+msgid "Print preview..."
+msgstr "Presentación preliminar..."
 
-#: spyderlib/plugins/externalconsole.py:1243
-msgid ""
-"The following modules are not installed on your machine:\n"
-"%s"
-msgstr ""
-"Los siguientes módulos no están instalados en su computador:\n"
-"%s"
+#: spyder/plugins/editor.py:675
+msgid "&Print..."
+msgstr "Im&primir"
 
-#: spyderlib/plugins/externalconsole.py:1247
-msgid ""
-"Please note that these changes will be applied only to new Python/IPython "
-"consoles"
-msgstr ""
-"Por favor tenga en cuenta que estos cambios sólo se aplicarán a nuevas "
-"terminales de IPython y Python"
+#: spyder/plugins/editor.py:676
+msgid "Print current file..."
+msgstr "Imprimir el archivo actual..."
 
-#: spyderlib/plugins/findinfiles.py:96 spyderlib/widgets/findinfiles.py:690
-msgid "Find in files"
-msgstr "Buscar en archivos"
+#: spyder/plugins/editor.py:679
+msgid "&Close"
+msgstr "&Cerrar"
 
-#: spyderlib/plugins/findinfiles.py:117
-msgid "&Find in files"
-msgstr "Bus&car en archivos"
+#: spyder/plugins/editor.py:680
+msgid "Close current file"
+msgstr "Cerrar el archivo actual"
 
-#: spyderlib/plugins/findinfiles.py:120
-msgid "Search text in multiple files"
-msgstr "Buscar en varios archivos a la vez"
+#: spyder/plugins/editor.py:683
+msgid "C&lose all"
+msgstr "C&errar todo"
 
-#: spyderlib/plugins/history.py:37
-msgid "Settings"
-msgstr "Ajustes"
+#: spyder/plugins/editor.py:684
+msgid "Close all opened files"
+msgstr "Cerrar todos los archivos abiertos"
 
-#: spyderlib/plugins/history.py:39
-msgid " entries"
-msgstr "entradas"
+#: spyder/plugins/editor.py:691
+msgid "&Find text"
+msgstr "&Buscar texto"
 
-#: spyderlib/plugins/history.py:39
-msgid "History depth: "
-msgstr "Longitud del historial"
+#: spyder/plugins/editor.py:697
+msgid "Find &next"
+msgstr "Buscar &siguiente"
 
-#: spyderlib/plugins/history.py:46
-msgid "Scroll automatically to last entry"
-msgstr "Desplazarse automáticamente a la última entrada"
+#: spyder/plugins/editor.py:703
+msgid "Find &previous"
+msgstr "Buscar &anterior"
 
-#: spyderlib/plugins/history.py:118 spyderlib/plugins/inspector.py:472
-#: spyderlib/widgets/editor.py:459 spyderlib/widgets/explorer.py:1027
-#: spyderlib/widgets/externalshell/baseshell.py:153
-#: spyderlib/widgets/externalshell/namespacebrowser.py:139
-#: spyderlib/widgets/ipython.py:568
-msgid "Options"
-msgstr "Opciones"
+#: spyder/plugins/editor.py:709
+msgid "&Replace text"
+msgstr "&Reemplazar texto"
 
-#: spyderlib/plugins/history.py:138
-msgid "History log"
-msgstr "Historial de comandos"
+#: spyder/plugins/editor.py:718
+msgid "Set/Clear breakpoint"
+msgstr "Añadir o eliminar un punto de interrupción"
 
-#: spyderlib/plugins/history.py:165
-msgid "History..."
-msgstr "Historial..."
+#: spyder/plugins/editor.py:725
+msgid "Set/Edit conditional breakpoint"
+msgstr "Añadir o editar un punto de interrupción condicional"
 
-#: spyderlib/plugins/history.py:167
-msgid "Set history maximum entries"
-msgstr "Establece el máximo número de entradas a almacenar"
+#: spyder/plugins/editor.py:732
+msgid "Clear breakpoints in all files"
+msgstr "Eliminar los puntos de interrupción de todos los archivos"
 
-#: spyderlib/plugins/history.py:274
-msgid "History"
-msgstr "Historial"
+#: spyder/plugins/editor.py:734
+msgid "Debug with winpdb"
+msgstr "Depurar con winpdb"
 
-#: spyderlib/plugins/history.py:275
-msgid "Maximum entries"
-msgstr "Máximo número de entradas"
+#: spyder/plugins/editor.py:741
+msgid "Debug file"
+msgstr "Depurar archivo"
 
-#: spyderlib/plugins/inspector.py:58
-msgid "Rich text help on the Object Inspector"
-msgstr "Ayuda en texto enriquecido en el Inspector de Objetos"
+#: spyder/plugins/editor.py:746
+msgid "Step"
+msgstr "Ejecutar línea"
 
-#: spyderlib/plugins/inspector.py:125
-msgid "Plain text font style"
-msgstr "Fuente para el texto plano"
+#: spyder/plugins/editor.py:747
+msgid "Run current line"
+msgstr "Ejecutar la línea seleccionada"
 
-#: spyderlib/plugins/inspector.py:128
-msgid "Rich text font style"
-msgstr "Fuente para el texto enriquecido"
+#: spyder/plugins/editor.py:752
+msgid "Continue"
+msgstr "Continuar"
 
-#: spyderlib/plugins/inspector.py:131
-msgid "Automatic connections"
-msgstr "Conexiones automáticas"
+#: spyder/plugins/editor.py:754
+msgid "Continue execution until next breakpoint"
+msgstr "Continuar con la ejecución hasta el siguiente punto de interrupción"
 
-#: spyderlib/plugins/inspector.py:132
-msgid ""
-"The Object Inspector can automatically show an object's help information "
-"after a left parenthesis is written next to it. Below you can decide to "
-"which plugin you want to connect it to turn on this feature."
-msgstr ""
-"El Inspector de Objetos puede mostrar automáticamente la ayuda de un objeto "
-"después de escribir un paréntesis junto al mismo. A continuación puede "
-"decidir a que panel desea conectarlo para activar esta característica."
+#: spyder/plugins/editor.py:759
+msgid "Step Into"
+msgstr "Ingresar en la función/método"
 
-#: spyderlib/plugins/inspector.py:144
-msgid ""
-"This feature requires the Rope or Jedi libraries.\n"
-"It seems you don't have either installed."
-msgstr ""
-"Esta característica requiere las librerías Rope o Jedi.\n"
-"Al parecer no tiene ninguna instalada."
+#: spyder/plugins/editor.py:761
+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/inspector.py:147
-msgid "Python Console"
-msgstr "Terminal de IPython"
+#: spyder/plugins/editor.py:766
+msgid "Step Return"
+msgstr "Salir de la función/método"
 
-#: spyderlib/plugins/inspector.py:149
-msgid "IPython Console"
-msgstr "Terminal de IPython"
+#: spyder/plugins/editor.py:768
+msgid "Run until current function or method returns"
+msgstr "Ejecutar hasta que la función o método actual termine"
 
-#: spyderlib/plugins/inspector.py:161
-msgid "Additional features"
-msgstr "Características adicionales"
+#: spyder/plugins/editor.py:773 spyder/widgets/findinfiles.py:333
+#: spyder/widgets/ipythonconsole/client.py:236
+msgid "Stop"
+msgstr "Detener"
 
-#: spyderlib/plugins/inspector.py:162
-msgid "Render mathematical equations"
-msgstr "Renderizar ecuaciones matemáticas"
+#: spyder/plugins/editor.py:774
+msgid "Stop debugging"
+msgstr "Detener la depuración"
 
-#: spyderlib/plugins/inspector.py:168
-msgid "This feature requires Sphinx 1.1 or superior."
-msgstr "Esta característica requiere Sphinx 1.1 o superior."
+#: spyder/plugins/editor.py:781
+msgid "Run file"
+msgstr "Ejecutar archivo"
 
-#: spyderlib/plugins/inspector.py:170
-msgid "Sphinx %s is currently installed."
-msgstr "Sphinx %s está instalado actualmente."
+#: spyder/plugins/editor.py:786
+msgid "&Configure..."
+msgstr "&Configurar..."
 
-#: spyderlib/plugins/inspector.py:373
-msgid "No further documentation available"
-msgstr "No existe más documentación disponible"
-
-#: spyderlib/plugins/inspector.py:412
-msgid "Source"
-msgstr "Origen"
-
-#: spyderlib/plugins/inspector.py:427 spyderlib/widgets/dicteditor.py:173
-msgid "Object"
-msgstr "Objeto"
+#: spyder/plugins/editor.py:788 spyder/widgets/externalshell/pythonshell.py:304
+msgid "Run settings"
+msgstr "Ajustes de ejecución"
 
-#: spyderlib/plugins/inspector.py:442
-msgid "Plain Text"
-msgstr "Texto plano"
+#: spyder/plugins/editor.py:794
+msgid "Re-run &last script"
+msgstr "Ejecutar de &nuevo el último archivo"
 
-#: spyderlib/plugins/inspector.py:446
-msgid "Show Source"
-msgstr "Mostrar código fuente"
+#: spyder/plugins/editor.py:796
+msgid "Run again last file"
+msgstr "Ejecutar de nuevo el mismo archivo"
 
-#: spyderlib/plugins/inspector.py:450
-msgid "Rich Text"
-msgstr "Texto enriquecido"
+#: spyder/plugins/editor.py:802 spyder/widgets/sourcecode/codeeditor.py:2507
+msgid "Run &selection or current line"
+msgstr "Ejecutar la &selección o la línea actual"
 
-#: spyderlib/plugins/inspector.py:460
-msgid "Automatic import"
-msgstr "Importar automáticamente"
+#: spyder/plugins/editor.py:805
+msgid "Run selection or current line"
+msgstr "Ejecutar la &selección o línea actual"
 
-#: spyderlib/plugins/inspector.py:520 spyderlib/plugins/inspector.py:983
-msgid "Object inspector"
-msgstr "Inspector de objetos"
+#: spyder/plugins/editor.py:813 spyder/widgets/sourcecode/codeeditor.py:2499
+msgid "Run cell"
+msgstr "Ejecutar la celda"
 
-#: spyderlib/plugins/inspector.py:740
+#: spyder/plugins/editor.py:816
 msgid ""
-"Here you can get help of any object by pressing %s in front of it, either on "
-"the Editor or the Console.%sHelp can also be shown automatically after "
-"writing a left parenthesis next to an object. You can activate this behavior "
-"in %s."
+"Run current cell (Ctrl+Enter)\n"
+"[Use #%% to create cells]"
 msgstr ""
-"En este panel es posible obtener la ayuda de cualquier objeto al oprimir %s "
-"estando al frente del mismo, bien sea en el Editor o en la Terminal.%sEsta "
-"ayuda también se puede mostrar automáticamente después de escribir un "
-"paréntesis junto a un objeto. Este comportamiento puede activarse en %s."
+"Ejecutar la celda actual (Ctrl+Enter)\n"
+"[Usar #%% para crear celdas]"
 
-#: spyderlib/plugins/inspector.py:746
-msgid "Preferences > Object Inspector"
-msgstr "Preferencias > Inspector de objetos"
+#: spyder/plugins/editor.py:822 spyder/widgets/sourcecode/codeeditor.py:2503
+msgid "Run cell and advance"
+msgstr "Ejecutar la celda y avanzar"
 
-#: spyderlib/plugins/inspector.py:753
-msgid "Usage"
-msgstr "Uso"
+#: spyder/plugins/editor.py:825
+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/inspector.py:754
-msgid "New to Spyder? Read our"
-msgstr "Nuevo en Spyder? Lee nuestro"
+#: spyder/plugins/editor.py:832
+msgid "Show todo list"
+msgstr "Mostrar lista de TODO's"
 
-#: spyderlib/plugins/inspector.py:755
-msgid "tutorial"
-msgstr "tutorial"
+#: spyder/plugins/editor.py:833
+msgid "Show TODO/FIXME/XXX/HINT/TIP/@todo comments list"
+msgstr ""
+"Mostrar la lista de comentarios de\n"
+"los TODO/FIXME/XXX/HINT/TIP/@todo"
 
-#: spyderlib/plugins/inspector.py:762
-msgid ""
-"Please consider installing Sphinx to get documentation rendered in rich text."
+#: spyder/plugins/editor.py:840
+msgid "Show warning/error list"
 msgstr ""
-"Por favor considere instalar Sphinx para obtener la documentación en texto "
-"enriquecido "
+"Mostrar la lista de errores\n"
+"y advertencias"
 
-#: spyderlib/plugins/inspector.py:939
-msgid "Lock"
-msgstr "Bloquear"
+#: spyder/plugins/editor.py:841
+msgid "Show code analysis warnings/errors"
+msgstr ""
+"Mostrar errores o advertencias\n"
+"del análisis del código"
 
-#: spyderlib/plugins/inspector.py:939
-msgid "Unlock"
-msgstr "Desbloquear"
+#: spyder/plugins/editor.py:847
+msgid "Previous warning/error"
+msgstr "Anterior advertencia o error"
 
-#: spyderlib/plugins/inspector.py:984
-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"
+#: spyder/plugins/editor.py:848
+msgid "Go to previous code analysis warning/error"
 msgstr ""
-"Ocurrió el siguiente error cuando se trató de utilizar <b>Sphinx %s</b>."
-"<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:1028
-msgid "No source code available."
-msgstr "No está disponible el código fuente"
+"Ir a la línea anterior de\n"
+"advertencia o error"
 
-#: spyderlib/plugins/ipythonconsole.py:62
-msgid "Symbolic mathematics in the IPython Console"
-msgstr "Matemática simbólica en la terminal de IPython"
+#: spyder/plugins/editor.py:851
+msgid "Next warning/error"
+msgstr "Siguiente advertencia o error"
 
-#: spyderlib/plugins/ipythonconsole.py:111
-msgid ""
-"The authenticity of host <b>%s</b> can't be established. Are you sure you "
-"want to continue connecting?"
+#: spyder/plugins/editor.py:852
+msgid "Go to next code analysis warning/error"
 msgstr ""
-"La autenticidad del servidor <b>%s</b> no puede ser establecida. ¿Está "
-"seguro de que desea continuar conectándose?"
+"Ir a la próxima línea de\n"
+"advertencia o error"
 
-#: spyderlib/plugins/ipythonconsole.py:123
-msgid "The authenticity of the host can't be established"
-msgstr "La autenticidad del servidor no puede ser establecida"
+#: spyder/plugins/editor.py:856
+msgid "Last edit location"
+msgstr "Última posición de edición"
 
-#: spyderlib/plugins/ipythonconsole.py:130
-msgid "Tunnel '%s' failed to start"
-msgstr "El túnel '%s' falló en ser iniciado"
+#: spyder/plugins/editor.py:857
+msgid "Go to last edit location"
+msgstr ""
+"Ir a la anterior posición\n"
+"de edición"
 
-#: spyderlib/plugins/ipythonconsole.py:135
-msgid "Could not connect to remote host"
-msgstr "No fue posible conectarse al servidor remoto"
+#: spyder/plugins/editor.py:865
+msgid "Previous cursor position"
+msgstr "Anterior posición del cursor"
 
-#: spyderlib/plugins/ipythonconsole.py:151
-#: spyderlib/plugins/ipythonconsole.py:689
-msgid "IPython console"
-msgstr "Terminal de IPython"
+#: spyder/plugins/editor.py:866
+msgid "Go to previous cursor position"
+msgstr "Ir a la anterior posición del cursor"
 
-#: spyderlib/plugins/ipythonconsole.py:163
-msgid "Display initial banner"
-msgstr "Mostrar el banner inicial"
+#: spyder/plugins/editor.py:874
+msgid "Next cursor position"
+msgstr "Siguiente posición del cursor"
 
-#: spyderlib/plugins/ipythonconsole.py:164
-msgid ""
-"This option lets you hide the message shown at\n"
-"the top of the console when it's opened."
-msgstr ""
-"Esta opción le permite ocultar el mensaje que \n"
-"aparece al principio de la terminal cuando se abre\n"
-"por primera vez."
+#: spyder/plugins/editor.py:875
+msgid "Go to next cursor position"
+msgstr "Ir a la siguiente posición del cursor"
 
-#: spyderlib/plugins/ipythonconsole.py:166
-msgid "Use a pager to display additional text inside the console"
-msgstr "Usar un paginador para mostrar textos dentro de la terminal"
+#: spyder/plugins/editor.py:885 spyder/widgets/sourcecode/codeeditor.py:2483
+msgid "Comment"
+msgstr "Comentar"
 
-#: spyderlib/plugins/ipythonconsole.py:168
-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 ""
-"Es útil si no desea llenar la terminal con largos textos de ayuda.\n"
-"Nota: Debe usar la tecla Q para salir del paginador"
+#: spyder/plugins/editor.py:885 spyder/widgets/sourcecode/codeeditor.py:2483
+msgid "Uncomment"
+msgstr "Descomentar"
 
-#: spyderlib/plugins/ipythonconsole.py:173
-msgid "Ask for confirmation before closing"
-msgstr "Mostrar un diálogo de confirmación antes de cerrar una terminal"
+#: spyder/plugins/editor.py:886
+msgid "Comment current line or selection"
+msgstr "Comentar la línea o selección actual"
 
-#: spyderlib/plugins/ipythonconsole.py:183
-msgid "Completion Type"
-msgstr ""
+#: spyder/plugins/editor.py:890
+msgid "Add &block comment"
+msgstr "Añadir comentario de &bloque"
 
-#: spyderlib/plugins/ipythonconsole.py:184
-msgid "Decide what type of completion to use"
+#: spyder/plugins/editor.py:891
+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/ipythonconsole.py:187
-#, fuzzy
-msgid "Completion:"
-msgstr "Condición:"
+#: spyder/plugins/editor.py:897
+msgid "R&emove block comment"
+msgstr "&Eliminar comentario de bloque"
 
-#: spyderlib/plugins/ipythonconsole.py:196
-msgid "Light background"
-msgstr "Fondo claro"
+#: spyder/plugins/editor.py:898
+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/ipythonconsole.py:198
-msgid "Dark background"
-msgstr "Fondo oscuro"
+#: spyder/plugins/editor.py:909
+msgid "Indent"
+msgstr "Indentar"
 
-#: spyderlib/plugins/ipythonconsole.py:208
-msgid "Buffer:  "
-msgstr "Mostrar"
+#: spyder/plugins/editor.py:910
+msgid "Indent current line or selection"
+msgstr "Indentar la línea o selección actual"
 
-#: spyderlib/plugins/ipythonconsole.py:210
-msgid ""
-"Set the maximum number of lines of text shown in the\n"
-"console before truncation. Specifying -1 disables it\n"
-"(not recommended!)"
-msgstr ""
-"Establece el máximo número de líneas que se mostrarán\n"
-"en la terminal en cualquier momento. Si se introduce -1 se\n"
-"mostrarán todas las líneas (no se recomienda!)"
+#: spyder/plugins/editor.py:913
+msgid "Unindent"
+msgstr "Quitar indentación"
 
-#: spyderlib/plugins/ipythonconsole.py:219
-msgid "Support for graphics (Matplotlib)"
-msgstr "Soporte para crear gráficas (Matplotlib)"
+#: spyder/plugins/editor.py:914
+msgid "Unindent current line or selection"
+msgstr "Quitar indentación de la línea o selección actual"
 
-#: spyderlib/plugins/ipythonconsole.py:220
-msgid "Activate support"
-msgstr "Activar el soporte"
+#: spyder/plugins/editor.py:919
+msgid "Carriage return and line feed (Windows)"
+msgstr "Retorno de carro y salto de línea (Windows)"
 
-#: spyderlib/plugins/ipythonconsole.py:221
-msgid "Automatically load Pylab and NumPy modules"
-msgstr "Cargar automáticamente los módulos de Pylab y NumPy"
+#: spyder/plugins/editor.py:922
+msgid "Line feed (UNIX)"
+msgstr "Salto de línea (UNIX)"
 
-#: spyderlib/plugins/ipythonconsole.py:224
-msgid ""
-"This lets you load graphics support without importing \n"
-"the commands to do plots. Useful to work with other\n"
-"plotting libraries different to Matplotlib or to develop \n"
-"GUIs with Spyder."
-msgstr ""
-"Esto le permite cargar el soporte gráfico sin importar\n"
-"los comandos para crear figuras. Es útil para trabajar con\n"
-"otras librerías gráficas diferentes a Matplotlib o para\n"
-"desarrollar interfaces gráficas con Spyder."
+#: spyder/plugins/editor.py:925
+msgid "Carriage return (Mac)"
+msgstr "Retorno de carro (Mac)"
 
-#: spyderlib/plugins/ipythonconsole.py:242
-msgid ""
-"This feature requires the Matplotlib library.\n"
-"It seems you don't have it installed."
-msgstr ""
-"Esta característica requiere la librería Matplotlib.\n"
-"Al parecer no la tiene instalada."
+#: spyder/plugins/editor.py:931
+msgid "Convert end-of-line characters"
+msgstr "Convertir caracteres de fin de línea"
 
-#: spyderlib/plugins/ipythonconsole.py:247
-msgid "Inline"
-msgstr "En línea"
+#: spyder/plugins/editor.py:935
+msgid "Remove trailing spaces"
+msgstr "Eliminar espacios en blanco"
 
-#: spyderlib/plugins/ipythonconsole.py:248
-msgid "Automatic"
-msgstr "Automático"
+#: spyder/plugins/editor.py:939
+msgid "Fix indentation"
+msgstr "Corregir la indentación"
 
-#: spyderlib/plugins/ipythonconsole.py:249
-msgid "Graphics backend"
-msgstr "Salida gráfica:"
+#: spyder/plugins/editor.py:940
+msgid "Replace tab characters by space characters"
+msgstr "Reemplazar caracteres de tabulación por espacios"
 
-#: spyderlib/plugins/ipythonconsole.py:250
-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 ""
-"Decidir como se mostrarán las gráficas en la terminal. Si no está seguro, "
-"por favor seleccione <b>%s</b> para colocar las gráficas en la consola o <b>"
-"%s</b> para interactuar con ellas (a través de acercamientos y paneos) en "
-"una ventana aparte."
+#: spyder/plugins/editor.py:943
+msgid "Go to line..."
+msgstr "Ir a la línea..."
 
-#: spyderlib/plugins/ipythonconsole.py:283
-msgid "Inline backend"
-msgstr "Salida en línea:"
+#: spyder/plugins/editor.py:951
+msgid "Set console working directory"
+msgstr "Establecer directorio de trabajo"
 
-#: spyderlib/plugins/ipythonconsole.py:284
-msgid "Decide how to render the figures created by this backend"
+#: spyder/plugins/editor.py:953
+msgid ""
+"Set current console (and file explorer) working directory to current script "
+"directory"
 msgstr ""
-"Decida como renderizar las figuras creadas por este tipo de salida gráfica"
+"Fija el directorio de trabajo para la terminal actual como el directorio del "
+"archivo actual"
 
-#: spyderlib/plugins/ipythonconsole.py:288
-msgid "Format:"
-msgstr "Formato:"
+#: spyder/plugins/editor.py:958
+msgid "Maximum number of recent files..."
+msgstr "Máximo número de archivos recientes..."
 
-#: spyderlib/plugins/ipythonconsole.py:291
-msgid "Resolution:"
-msgstr "Resolución:"
+#: spyder/plugins/editor.py:961
+msgid "Clear recent files list"
+msgstr "Limpiar la lista de archivos recientes"
 
-#: spyderlib/plugins/ipythonconsole.py:291
-msgid "dpi"
-msgstr "dpi"
+#: spyder/plugins/editor.py:961 spyder/plugins/projects.py:97
+msgid "Clear this list"
+msgstr "Limpiar esta lista"
 
-#: spyderlib/plugins/ipythonconsole.py:293
-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."
+#: spyder/plugins/editor.py:965
+msgid "Open &recent"
+msgstr "Abrir &reciente"
 
-#: spyderlib/plugins/ipythonconsole.py:296
-msgid "Width:"
-msgstr "Ancho:"
+#: spyder/plugins/editor.py:1348
+msgid "?"
+msgstr "?"
 
-#: spyderlib/plugins/ipythonconsole.py:296
-#: spyderlib/plugins/ipythonconsole.py:300
-msgid "inches"
-msgstr "pulgadas"
+#: spyder/plugins/editor.py:1575
+msgid "Spyder Editor"
+msgstr "Editor de Spyder"
 
-#: spyderlib/plugins/ipythonconsole.py:298
-msgid "Default is 6"
-msgstr "Por defecto es 6"
+#: spyder/plugins/editor.py:1576
+msgid "This is a temporary script file."
+msgstr "Este es un archivo temporal"
 
-#: spyderlib/plugins/ipythonconsole.py:300
-msgid "Height:"
-msgstr "Alto:"
+#: spyder/plugins/editor.py:1645
+msgid "untitled"
+msgstr "Sin título "
 
-#: spyderlib/plugins/ipythonconsole.py:302
-msgid "Default is 4"
-msgstr "Por defecto es 4"
+#: spyder/plugins/editor.py:1719
+msgid "Maximum number of recent files"
+msgstr "Máximo número de archivos recientes"
 
-#: spyderlib/plugins/ipythonconsole.py:328 spyderlib/tour.py:552
-msgid "Run code"
-msgstr "Ejecutar código"
+#: spyder/plugins/editor.py:1852
+msgid "Printing..."
+msgstr "Imprimir..."
 
-#: spyderlib/plugins/ipythonconsole.py:329
-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 ""
-"Se pueden ejecutar varias líneas de código al abrir una terminal. Por favor "
-"introduzca cada una separada por comas, por ejemplo:<br><i>import os, import "
-"sys</i>"
+#: spyder/plugins/explorer.py:53
+msgid "File explorer"
+msgstr "Explorador de archivos"
 
-#: spyderlib/plugins/ipythonconsole.py:335
-msgid "Lines:"
-msgstr "Líneas:"
+#: spyder/plugins/externalconsole.py:46
+msgid "Interactive data plotting in the consoles"
+msgstr "Graficar datos interactivamente en la terminal"
 
-#: spyderlib/plugins/ipythonconsole.py:344
-msgid "Run a file"
-msgstr "Ejecutar un archivo"
+#: spyder/plugins/externalconsole.py:54 spyder/plugins/externalconsole.py:709
+msgid "Python console"
+msgstr "Terminal de Python"
 
-#: spyderlib/plugins/ipythonconsole.py:345
-msgid ""
-"You can also run a whole file at startup instead of just some lines (This is "
-"similar to have a PYTHONSTARTUP file)."
-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)."
+#: spyder/plugins/externalconsole.py:59
+msgid "One tab per script"
+msgstr "Una pestaña por archivo"
 
-#: spyderlib/plugins/ipythonconsole.py:349
-msgid "Use the following file:"
-msgstr "Usar el siguiente archivo:"
+#: spyder/plugins/externalconsole.py:60
+#: spyder/widgets/externalshell/baseshell.py:160
+msgid "Show elapsed time"
+msgstr "Mostrar el tiempo transcurrido"
 
-#: spyderlib/plugins/ipythonconsole.py:363
-msgid "Greedy completion"
-msgstr "Completado ambicioso"
+#: spyder/plugins/externalconsole.py:61 spyder/widgets/explorer.py:1074
+msgid "Show icons and text"
+msgstr "Mostrar iconos y texto "
 
-#: spyderlib/plugins/ipythonconsole.py:364
-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 ""
-"Habilita el completado usando la tecla <tt>Tab</tt> en elementos de listas, "
-"resultados de llamadas de funciones, etc, <i>sin</i> asignarlos a una "
-"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>"
+#: spyder/plugins/externalconsole.py:73
+msgid "Buffer: "
+msgstr "Mostrar:"
 
-#: spyderlib/plugins/ipythonconsole.py:372
-msgid "Use the greedy completer"
-msgstr "Usar el completado ambicioso"
+#: spyder/plugins/externalconsole.py:73 spyder/plugins/ipythonconsole.py:319
+msgid " lines"
+msgstr "líneas"
 
-#: spyderlib/plugins/ipythonconsole.py:383
-msgid "Autocall"
-msgstr "Autollamar"
+#: spyder/plugins/externalconsole.py:78
+msgid "Merge process standard output/error channels"
+msgstr "Combinar los canales de salida y error estándar del proceso"
 
-#: spyderlib/plugins/ipythonconsole.py:384
+#: spyder/plugins/externalconsole.py:80
 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."
+"Merging the output channels of the process means that\n"
+"the standard error won't be written in red anymore,\n"
+"but this has the effect of speeding up display."
 msgstr ""
-"Esta opción hace que IPython llame automáticamente cualquier objeto "
-"\"llamable\" (callable) aún si no se escriben paréntesis a su alrededor."
-"<br>Por ejemplo, al escribir <i>str 43</i>, se convertirá automáticamente en "
-"<i>str(43)</i>."
-
-#: spyderlib/plugins/ipythonconsole.py:391
-msgid "Smart"
-msgstr "Inteligente"
-
-#: spyderlib/plugins/ipythonconsole.py:392
-msgid "Full"
-msgstr "Total"
-
-#: spyderlib/plugins/ipythonconsole.py:393
-msgid "Off"
-msgstr "Desactivado"
+"Combinar los canales de salida del proceso quiere decir que\n"
+"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/ipythonconsole.py:395
-msgid "Autocall:  "
-msgstr "Autollamar:"
+#: spyder/plugins/externalconsole.py:84
+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/ipythonconsole.py:396
+#: spyder/plugins/externalconsole.py:86
 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)."
+"This method is the only way to have colorized standard\n"
+"error channel when the output channels have been merged."
 msgstr ""
-"En modo <b>%s</b>, Autollamar no se usa si no hay argumentos después del "
-"objeto llamable. En modo <b>%s</b>, todos los objetos llamables son llamados "
-"automáticamente (aún si no hay argumentos presentes)."
+"É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/ipythonconsole.py:408
-msgid "Symbolic Mathematics"
-msgstr "Matemática simbólica"
+#: spyder/plugins/externalconsole.py:102 spyder/plugins/ipythonconsole.py:306
+#: spyder/widgets/variableexplorer/arrayeditor.py:540
+#: spyder/widgets/variableexplorer/dataframeeditor.py:552
+msgid "Background color"
+msgstr "Color de fondo"
 
-#: spyderlib/plugins/ipythonconsole.py:409
+#: spyder/plugins/externalconsole.py:103
 msgid ""
-"Perfom symbolic operations in the console (e.g. integrals, derivatives, "
-"vector calculus, etc) and get the outputs in a beautifully printed style."
+"This option will be applied the next time a Python console or a terminal is "
+"opened."
 msgstr ""
-"Realice operaciones simbólicas en la terminal (integrales, derivadas o "
-"cálculo vectorial) y obtenga los resultados en un bello estilo impreso."
+"Esta opción será aplicada la próxima vez que una terminal de Python o una "
+"consola sea abierta."
 
-#: spyderlib/plugins/ipythonconsole.py:414
-msgid "Use symbolic math"
-msgstr "Usar matemática simbólica"
+#: spyder/plugins/externalconsole.py:106
+msgid "Light background (white color)"
+msgstr "Fondo claro (color blanco)"
+
+#: spyder/plugins/externalconsole.py:131
+msgid "PYTHONSTARTUP replacement"
+msgstr "Reemplazo de PYTHONSTARTUP"
 
-#: spyderlib/plugins/ipythonconsole.py:415
+#: spyder/plugins/externalconsole.py:133
 msgid ""
-"This option loads the Sympy library to work with.<br>Please refer to its "
-"documentation to learn how to use it."
+"This option will override the PYTHONSTARTUP environment variable which\n"
+"defines the script to be executed during the Python console startup."
 msgstr ""
-"Esta opción carga la librería Sympy para trabajar<br>con ella. Por favor lea "
-"su documentación para aprender como usarla."
+"Esta opción modificará la variable de entorno PYTHONSTARTUP, la cual\n"
+"define el archivo que es ejecutado durante el arranque de la terminal de\n"
+"Python."
+
+#: spyder/plugins/externalconsole.py:138
+msgid "Default PYTHONSTARTUP script"
+msgstr "Utilizar el archivo por defecto de PYTHONSTARTUP"
+
+#: spyder/plugins/externalconsole.py:142
+msgid "Use the following startup script:"
+msgstr "Utilizar el siguiente archivo de arranque:"
+
+#: spyder/plugins/externalconsole.py:159
+msgid "Monitor"
+msgstr "Monitor"
 
-#: spyderlib/plugins/ipythonconsole.py:428
+#: spyder/plugins/externalconsole.py:160
 msgid ""
-"This feature requires the Sympy library.\n"
-"It seems you don't have it installed."
+"The monitor provides introspection features to console: code completion, "
+"calltips and variable explorer. Because it relies on several modules, "
+"disabling the monitor may be useful to accelerate console startup."
 msgstr ""
-"Esta característica requiere la librería Sympy.\n"
-"Al parecer no la tiene instalada."
+"El monitor es el que brinda características de introspección a la terminal: "
+"completado del código, globos de sugerencias y el explorador de variables. "
+"Dado que depende de varios módulos adicionales, desactivar el monitor puede "
+"acelerar el arranque de la terminal."
 
-#: spyderlib/plugins/ipythonconsole.py:433
-msgid "Prompts"
-msgstr "Prompts"
+#: spyder/plugins/externalconsole.py:167
+msgid "Enable monitor"
+msgstr "Activar el monitor"
 
-#: spyderlib/plugins/ipythonconsole.py:434
-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."
+#: spyder/plugins/externalconsole.py:180
+msgid "Default library"
+msgstr "Librería por defecto"
 
-#: spyderlib/plugins/ipythonconsole.py:437
-msgid "Input prompt:"
-msgstr "Prompt de entrada:"
+#: spyder/plugins/externalconsole.py:185
+msgid "Qt-Python Bindings"
+msgstr "Librerías de enlace entre Qt y Python"
+
+#: spyder/plugins/externalconsole.py:187
+msgid "Library:"
+msgstr "Librería"
 
-#: spyderlib/plugins/ipythonconsole.py:439
+#: spyder/plugins/externalconsole.py:189
 msgid ""
-"Default is<br>In [<span class=\"in-prompt-number\">%i</span>]:"
+"This option will act on<br> libraries such as Matplotlib, guidata or ETS"
 msgstr ""
-"Por defecto es<br>In [<span class=\"in-prompt-number\">%i</"
-"span>]:"
+"Esta opción tendrá efecto<br> en librerías como Matplotlib, guidata o ETS"
 
-#: spyderlib/plugins/ipythonconsole.py:443
-msgid "Output prompt:"
-msgstr "Prompt de salida:"
+#: spyder/plugins/externalconsole.py:198 spyder/plugins/ipythonconsole.py:560
+msgid "Graphics"
+msgstr "Gráficas"
 
-#: spyderlib/plugins/ipythonconsole.py:445
+#: spyder/plugins/externalconsole.py:199
 msgid ""
-"Default is<br>Out[<span class=\"out-prompt-number\">%i</span>]:"
+"Decide which backend to use to display graphics. If unsure, please select "
+"the <b>Automatic</b> backend.<br><br><b>Note:</b> We support a very limited "
+"number of backends in our Python consoles. If you prefer to work with a "
+"different one, please use an IPython console."
 msgstr ""
-"Por defecto es<br>Out[<span class=\"out-prompt-number\">%i</"
-"span>]:"
+"Decidir que salida gráfica utilizar para mostrar gráficas. Si no está "
+"seguro, por favor seleccione la salida <b>Automática</b>.<br><br><b>Nota:</"
+"b> La terminal de Python soporta un número muy limitado de salidas gráficas. "
+"Si prefiere trabajar con alguna salida diferente, por favor utilice una "
+"terminal de IPython."
 
-#: spyderlib/plugins/ipythonconsole.py:467
-#: spyderlib/plugins/workingdirectory.py:44
-msgid "Startup"
-msgstr "Inicialización"
+#: spyder/plugins/externalconsole.py:208
+msgid "None"
+msgstr "Ninguno"
 
-#: spyderlib/plugins/ipythonconsole.py:469
-msgid "Advanced Settings"
-msgstr "Opciones avanzadas"
+#: spyder/plugins/externalconsole.py:208 spyder/plugins/ipythonconsole.py:351
+msgid "Automatic"
+msgstr "Automático"
 
-#: spyderlib/plugins/ipythonconsole.py:481
-#: spyderlib/plugins/ipythonconsole.py:749
-msgid "Connect to an existing kernel"
-msgstr "Conectarse a un núcleo existente"
+#: spyder/plugins/externalconsole.py:213 spyder/plugins/ipythonconsole.py:373
+msgid "Backend:"
+msgstr "Salida:"
+
+#: spyder/plugins/externalconsole.py:215 spyder/plugins/ipythonconsole.py:375
+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:483
+#: spyder/plugins/externalconsole.py:226
+msgid "Enthought Tool Suite"
+msgstr "Enthought Tool Suite"
+
+#: spyder/plugins/externalconsole.py:227
 msgid ""
-"Please enter the connection info of the kernel you want to connect to. For "
-"that you can either select its JSON connection file using the <tt>Browse</"
-"tt> button, or write directly its id, in case it's a local kernel (for "
-"example <tt>kernel-3764.json</tt> or just <tt>3764</tt>)."
+"Enthought Tool Suite (ETS) supports PyQt4 (qt4) and wxPython (wx) graphical "
+"user interfaces."
 msgstr ""
-"Por favor introduzca la información de conexión del núcleo al cual desea "
-"conectarse. Para ello puede seleccionar su archivo de conexión JSON, usando "
-"el botón <tt>Seleccionar</tt>, o escribir directamente su id, en caso de que "
-"sea un núcleo local (por ejemplo, <tt>kernel-3764.json</tt> o sólo <tt>3764</"
-"tt>)"
-
-#: spyderlib/plugins/ipythonconsole.py:494
-msgid "Connection info:"
-msgstr "Información de conexión:"
+"Enthought Tool Suite (ETS) funciona con las librerías gráficas PyQt4 (qt4) "
+"y \n"
+"wxPython (wx). Esta opción establece cual desea utilizar el usuario."
 
-#: spyderlib/plugins/ipythonconsole.py:496
-msgid "Path to connection file or kernel id"
-msgstr "Ruta al archivo de conexión o id del núcleo"
+#: spyder/plugins/externalconsole.py:231
+msgid "ETS_TOOLKIT:"
+msgstr "ETS_TOOLKIT:"
 
-#: spyderlib/plugins/ipythonconsole.py:498
-#: spyderlib/plugins/ipythonconsole.py:515
-msgid "Browse"
-msgstr "Seleccionar"
+#: spyder/plugins/externalconsole.py:255
+msgid "External modules"
+msgstr "Módulos externos"
 
-#: spyderlib/plugins/ipythonconsole.py:507
-msgid "This is a remote kernel"
-msgstr "Este es un núcleo remoto"
+#: spyder/plugins/externalconsole.py:447
+msgid ""
+"No Python console is currently selected to run <b>%s</b>.<br><br>Please "
+"select or open a new Python console and try again."
+msgstr ""
+"No existe una terminal de Python para ejecutar <b>%s</b>.<br><br>Por favor "
+"abra una nueva y pruebe otra vez."
 
-#: spyderlib/plugins/ipythonconsole.py:511
-msgid "username at hostname:port"
-msgstr "usuario at servidor:puerto"
+#: spyder/plugins/externalconsole.py:518
+msgid ""
+"%s is already running in a separate process.\n"
+"Do you want to kill the process before starting a new one?"
+msgstr ""
+"%s ya se está ejecutando en proceso aparte.\n"
+"¿Desea terminar este proceso antes de empezar uno nuevo?"
 
-#: spyderlib/plugins/ipythonconsole.py:514
-msgid "Path to ssh key file"
-msgstr "Ruta al archivo de clave ssh"
+#: spyder/plugins/externalconsole.py:647
+msgid "Command Window"
+msgstr "Símbolo"
 
-#: spyderlib/plugins/ipythonconsole.py:523
-msgid "Password or ssh key passphrase"
-msgstr "Contraseña o frase de contraseña de la clave ssh"
+#: spyder/plugins/externalconsole.py:649 spyder/plugins/ipythonconsole.py:297
+msgid "Terminal"
+msgstr "Terminal"
 
-#: spyderlib/plugins/ipythonconsole.py:527
-msgid "Host name"
-msgstr "Servidor"
+#: spyder/plugins/externalconsole.py:731
+msgid "Open a &Python console"
+msgstr "Abrir una terminal de Python"
 
-#: spyderlib/plugins/ipythonconsole.py:528
-msgid "Ssh key"
-msgstr "Clave ssh"
+#: spyder/plugins/externalconsole.py:735
+msgid "Open &command prompt"
+msgstr "Abrir &símbolo del sistema"
 
-#: spyderlib/plugins/ipythonconsole.py:529
-msgid "Password"
-msgstr "Contraseña"
+#: spyder/plugins/externalconsole.py:736
+msgid "Open a Windows command prompt"
+msgstr "Abre el símbolo del sistema de Windows"
 
-#: spyderlib/plugins/ipythonconsole.py:558
-msgid "Open IPython connection file"
-msgstr "Abrir un archivo de conexión de IPython"
+#: spyder/plugins/externalconsole.py:738
+msgid "Open a &terminal"
+msgstr "Abrir &terminal de comandos"
 
-#: spyderlib/plugins/ipythonconsole.py:564
-msgid "Select ssh key"
-msgstr "Seleccionar clave ssh"
+#: spyder/plugins/externalconsole.py:739
+msgid "Open a terminal window"
+msgstr "Abre una terminal del sistema"
 
-#: spyderlib/plugins/ipythonconsole.py:737
-msgid "Open an &IPython console"
-msgstr "Abrir una terminal de IPython"
+#: spyder/plugins/findinfiles.py:127 spyder/widgets/findinfiles.py:689
+msgid "Find in files"
+msgstr "Buscar en archivos"
 
-#: spyderlib/plugins/ipythonconsole.py:740
-msgid "Use %s+T when the console is selected to open a new one"
-msgstr "Usar %s+T para abrir una nueva terminal"
+#: spyder/plugins/findinfiles.py:148
+msgid "&Find in files"
+msgstr "Bus&car en archivos"
 
-#: spyderlib/plugins/ipythonconsole.py:743
-msgid "Open a new console"
-msgstr "Abrir una nueva terminal"
+#: spyder/plugins/findinfiles.py:151
+msgid "Search text in multiple files"
+msgstr "Buscar en varios archivos a la vez"
 
-#: spyderlib/plugins/ipythonconsole.py:750
-msgid "Open a new IPython console connected to an existing kernel"
-msgstr "Abrir una nueva terminal de IPython conectada a un núcleo existente"
+#: spyder/plugins/help.py:44
+msgid "Show help for objects in the Editor and Consoles in a dedicated pane"
+msgstr "Mostrar ayuda para los objetos del Editor y las terminales"
 
-#: spyderlib/plugins/ipythonconsole.py:833
-msgid ""
-"No IPython console is currently available to run <b>%s</b>.<br><br>Please "
-"open a new one and try again."
-msgstr ""
-"No existe un intérprete de IPython para ejecutar <b>%s</b>.<br><br>Por favor "
-"abra uno nuevo e intente otra vez."
+#: spyder/plugins/help.py:110
+msgid "Automatic connections"
+msgstr "Conexiones automáticas"
 
-#: spyderlib/plugins/ipythonconsole.py:968
+#: spyder/plugins/help.py:111
 msgid ""
-"Do you want to close all other consoles connected to the same kernel as this "
-"one?"
+"This pane can automatically show an object's help information after a left "
+"parenthesis is written next to it. Below you can decide to which plugin you "
+"want to connect it to turn on this feature."
 msgstr ""
-"¿Desea cerrar todas las otras terminales conectadas al mismo núcleo que ésta?"
-
-#: spyderlib/plugins/ipythonconsole.py:1050
-msgid "Connection error"
-msgstr "Error de conexión"
+"Este panel puede mostrar automáticamente la ayuda de un objeto después de "
+"escribir un paréntesis junto al mismo. A continuación puede decidir a que "
+"panel desea conectarlo para activar esta característica."
 
-#: spyderlib/plugins/ipythonconsole.py:1051
+#: spyder/plugins/help.py:123
 msgid ""
-"Could not open ssh tunnel. The error was:\n"
-"\n"
+"This feature requires the Rope or Jedi libraries.\n"
+"It seems you don't have either installed."
 msgstr ""
-"No fue posible crear un túnel ssh. El error fue:\n"
-"\n"
-
-#: spyderlib/plugins/ipythonconsole.py:1088
-msgid "IPython"
-msgstr "IPython"
-
-#: spyderlib/plugins/ipythonconsole.py:1089
-msgid "Unable to connect to IPython <b>%s"
-msgstr "No se pudo establecer conexión con el núcleo <b>`%s`"
-
-#: spyderlib/plugins/ipythonconsole.py:1140
-msgid "Are you sure you want to restart the kernel?"
-msgstr "Está seguro de que desea reiniciar el núcleo?"
+"Esta característica requiere las librerías Rope o Jedi.\n"
+"Al parecer no tiene ninguna instalada."
 
-#: spyderlib/plugins/ipythonconsole.py:1142
-msgid "Restart kernel?"
-msgstr "Reiniciar el núcleo?"
+#: spyder/plugins/help.py:126
+msgid "Python Console"
+msgstr "Terminal de IPython"
 
-#: spyderlib/plugins/layoutdialog.py:174
-#, fuzzy
-msgid "Move Up"
-msgstr "Mover arriba"
+#: spyder/plugins/help.py:128
+msgid "IPython Console"
+msgstr "Terminal de IPython"
 
-#: spyderlib/plugins/layoutdialog.py:175
-#, fuzzy
-msgid "Move Down"
-msgstr "Mover abajo"
+#: spyder/plugins/help.py:140
+msgid "Additional features"
+msgstr "Características adicionales"
 
-#: spyderlib/plugins/layoutdialog.py:176
-#, fuzzy
-msgid "Delete Layout"
-msgstr "Eliminar"
+#: spyder/plugins/help.py:141
+msgid "Render mathematical equations"
+msgstr "Renderizar ecuaciones matemáticas"
 
-#: spyderlib/plugins/layoutdialog.py:180
-msgid "Layout Dispay and Order"
-msgstr ""
+#: spyder/plugins/help.py:147
+msgid "This feature requires Sphinx 1.1 or superior."
+msgstr "Esta característica requiere Sphinx 1.1 o superior."
 
-#: spyderlib/plugins/onlinehelp.py:68
-msgid "Online help"
-msgstr "Ayuda en línea"
+#: spyder/plugins/help.py:148
+msgid "Sphinx %s is currently installed."
+msgstr "Sphinx %s está instalado actualmente."
 
-#: spyderlib/plugins/outlineexplorer.py:48
-#: spyderlib/widgets/editortools.py:195
-msgid "Outline"
-msgstr "Explorador de código"
+#: spyder/plugins/help.py:309
+msgid "No further documentation available"
+msgstr "No existe más documentación disponible"
 
-#: spyderlib/plugins/projectexplorer.py:53
-#: spyderlib/widgets/projectexplorer.py:1150
-#: spyderlib/widgets/projectexplorer.py:1164
-msgid "Project explorer"
-msgstr "Explorador de proyectos"
+#: spyder/plugins/help.py:347
+msgid "No documentation available"
+msgstr "No existe documentación disponible"
 
-#: spyderlib/plugins/projectexplorer.py:64
-#: spyderlib/widgets/projectexplorer.py:549
-msgid "New project..."
-msgstr "Nuevo proyecto..."
+#: spyder/plugins/help.py:378
+msgid "Source"
+msgstr "Origen"
 
-#: spyderlib/plugins/runconfig.py:28
-msgid "Execute in current Python or IPython console"
-msgstr "Ejecutar en la terminal actual de Python o IPython"
+#: spyder/plugins/help.py:385 spyder/plugins/runconfig.py:186
+#: spyder/plugins/runconfig.py:456 spyder/widgets/externalshell/baseshell.py:94
+#: spyder/widgets/ipythonconsole/client.py:200
+msgid "Console"
+msgstr "Terminal"
 
-#: spyderlib/plugins/runconfig.py:29
-msgid "Execute in a new dedicated Python console"
-msgstr "Ejecutar en una terminal de Python dedicada"
+#: spyder/plugins/help.py:393
+#: spyder/widgets/variableexplorer/collectionseditor.py:133
+msgid "Object"
+msgstr "Objeto"
 
-#: spyderlib/plugins/runconfig.py:30
-msgid "Execute in an external System terminal"
-msgstr "Ejecutar en una terminal de comandos del sistema"
+#: spyder/plugins/help.py:407
+msgid "Plain Text"
+msgstr "Texto plano"
 
-#: spyderlib/plugins/runconfig.py:40
-msgid "Always show %s on a first file run"
-msgstr "Siempre muestre %s en una primera ejecución"
+#: spyder/plugins/help.py:411
+msgid "Show Source"
+msgstr "Mostrar código fuente"
 
-#: spyderlib/plugins/runconfig.py:159
-msgid "General settings"
-msgstr "Ajustes generales"
+#: spyder/plugins/help.py:415
+msgid "Rich Text"
+msgstr "Texto enriquecido"
 
-#: spyderlib/plugins/runconfig.py:162 spyderlib/plugins/runconfig.py:208
-msgid "Command line options:"
-msgstr "Opciones de línea de comandos:"
+#: spyder/plugins/help.py:425
+msgid "Automatic import"
+msgstr "Importar automáticamente"
 
-#: spyderlib/plugins/runconfig.py:168
-msgid "Working directory:"
-msgstr "Directorio de trabajo:"
+#: spyder/plugins/help.py:437 spyder/plugins/history.py:106
+#: spyder/widgets/editor.py:502 spyder/widgets/explorer.py:1085
+#: spyder/widgets/externalshell/baseshell.py:140
+#: spyder/widgets/ipythonconsole/client.py:249
+#: spyder/widgets/variableexplorer/namespacebrowser.py:162
+msgid "Options"
+msgstr "Opciones"
 
-#: spyderlib/plugins/runconfig.py:180 spyderlib/plugins/runconfig.py:491
-msgid "Enter debugging mode when errors appear during execution"
+#: spyder/plugins/help.py:695
+msgid ""
+"Here you can get help of any object by pressing %s in front of it, either on "
+"the Editor or the Console.%sHelp can also be shown automatically after "
+"writing a left parenthesis next to an object. You can activate this behavior "
+"in %s."
 msgstr ""
+"En este panel es posible obtener la ayuda de cualquier objeto al oprimir %s "
+"estando al frente del mismo, bien sea en el Editor o en la Terminal.%sEsta "
+"ayuda también se puede mostrar automáticamente después de escribir un "
+"paréntesis junto a un objeto. Este comportamiento puede activarse en %s."
 
-#: spyderlib/plugins/runconfig.py:196 spyderlib/plugins/runconfig.py:501
-msgid "Dedicated Python console"
-msgstr "Terminal de Python dedicada"
-
-#: spyderlib/plugins/runconfig.py:200 spyderlib/plugins/runconfig.py:503
-msgid "Interact with the Python console after execution"
-msgstr "Interactuar con la terminal después de la ejecución"
-
-#: spyderlib/plugins/runconfig.py:204
-msgid "Show warning when killing running process"
-msgstr "Mostrar una advertencia cuando se termine el proceso"
-
-#: spyderlib/plugins/runconfig.py:213
-msgid "<b>-u</b> is added to the other options you set here"
-msgstr "La opción <b>-u</b> se añade a estas opciones"
+#: spyder/plugins/help.py:701
+msgid "Preferences > Help"
+msgstr "Preferencias > Ayuda"
 
-#: spyderlib/plugins/runconfig.py:223
-msgid "this dialog"
-msgstr "este diálogo"
+#: spyder/plugins/help.py:708
+msgid "Usage"
+msgstr "Uso"
 
-#: spyderlib/plugins/runconfig.py:282
-msgid "Run configuration"
-msgstr "Opciones de ejecución"
+#: spyder/plugins/help.py:709
+msgid "New to Spyder? Read our"
+msgstr "Nuevo en Spyder? Lee nuestro"
 
-#: spyderlib/plugins/runconfig.py:283
-msgid "The following working directory is not valid:<br><b>%s</b>"
-msgstr "El siguiente directorio de trabajo no es válido:<br><b>%s</b>"
+#: spyder/plugins/help.py:710
+msgid "tutorial"
+msgstr "tutorial"
 
-#: spyderlib/plugins/runconfig.py:361
-msgid "Run settings for %s"
-msgstr "Ajustes de ejecución para %s"
+#: spyder/plugins/help.py:717
+msgid ""
+"Please consider installing Sphinx to get documentation rendered in rich text."
+msgstr ""
+"Por favor considere instalar Sphinx para obtener la documentación en texto "
+"enriquecido "
 
-#: spyderlib/plugins/runconfig.py:393
-msgid "Select a run configuration:"
-msgstr "Seleccionar una configuración de ejecución:"
+#: spyder/plugins/help.py:886
+msgid "Lock"
+msgstr "Bloquear"
 
-#: spyderlib/plugins/runconfig.py:422 spyderlib/plugins/runconfig.py:447
-msgid "Run Settings"
-msgstr "Ajustes de ejecución"
+#: spyder/plugins/help.py:886
+msgid "Unlock"
+msgstr "Desbloquear"
 
-#: spyderlib/plugins/runconfig.py:449
+#: spyder/plugins/help.py:930
 msgid ""
-"The following are the default <i>%s</i>. These options may be overriden "
-"using the <b>%s</b> dialog box (see the <b>%s</b> menu)"
+"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 ""
-"Las siguientes son los <i>%s</i> por defecto. Estos ajustes pueden "
-"modificarse usando el diálogo <b>%s</b> (ver el menú <b>%s</b>)"
+"Ocurrió el siguiente error cuando se trató de utilizar <b>Sphinx %s</b>."
+"<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/runconfig.py:475
-msgid "Default working directory is:"
-msgstr "Directorio de trabajo:"
+#: spyder/plugins/help.py:974
+msgid "No source code available."
+msgstr "No está disponible el código fuente"
 
-#: spyderlib/plugins/runconfig.py:477
-msgid "the script directory"
-msgstr "El directorio en  el que se encuentra el archivo actual"
+#: spyder/plugins/history.py:39
+msgid "Settings"
+msgstr "Ajustes"
 
-#: spyderlib/plugins/runconfig.py:480 spyderlib/plugins/workingdirectory.py:56
-msgid "the following directory:"
-msgstr "el siguiente directorio:"
+#: spyder/plugins/history.py:41
+msgid " entries"
+msgstr "entradas"
 
-#: spyderlib/plugins/runconfig.py:506
-#, fuzzy
-msgid "Show warning when killing running processes"
-msgstr "Mostrar una advertencia cuando se termine el proceso"
+#: spyder/plugins/history.py:41
+msgid "History depth: "
+msgstr "Longitud del historial"
 
-#: spyderlib/plugins/runconfig.py:515
-msgid "Run Settings dialog"
-msgstr "Ajustes de ejecución"
+#: spyder/plugins/history.py:48
+msgid "Scroll automatically to last entry"
+msgstr "Desplazarse automáticamente a la última entrada"
 
-#: spyderlib/plugins/shortcuts.py:134
-msgid ""
-"Press the new shortcut and select 'Ok': \n"
-"(Press 'Tab' once to switch focus between the shortcut entry \n"
-"and the buttons below it)"
-msgstr ""
+#: spyder/plugins/history.py:126
+msgid "History log"
+msgstr "Historial de comandos"
 
-#: spyderlib/plugins/shortcuts.py:137
-#, fuzzy
-msgid "Current shortcut:"
-msgstr "Celda seleccionada:"
+#: spyder/plugins/history.py:153
+msgid "History..."
+msgstr "Historial..."
 
-#: spyderlib/plugins/shortcuts.py:139
-#, fuzzy
-msgid "New shortcut:"
-msgstr "Atajos de teclado"
+#: spyder/plugins/history.py:155
+msgid "Set history maximum entries"
+msgstr "Establece el máximo número de entradas a almacenar"
 
-#: spyderlib/plugins/shortcuts.py:152
-msgid "Shortcut: {0}"
-msgstr ""
+#: spyder/plugins/history.py:260
+msgid "History"
+msgstr "Historial"
 
-#: spyderlib/plugins/shortcuts.py:273
-msgid "Please introduce a different shortcut"
-msgstr ""
+#: spyder/plugins/history.py:261
+msgid "Maximum entries"
+msgstr "Máximo número de entradas"
 
-#: spyderlib/plugins/shortcuts.py:310
-msgid "The new shorcut conflicts with:"
-msgstr ""
+#: spyder/plugins/ipythonconsole.py:64
+msgid "Symbolic mathematics in the IPython Console"
+msgstr "Matemática simbólica en la terminal de IPython"
 
-#: spyderlib/plugins/shortcuts.py:321
+#: spyder/plugins/ipythonconsole.py:116
 msgid ""
-"A compound sequence can have {break} a maximum of 4 subsequences.{break}"
+"The authenticity of host <b>%s</b> can't be established. Are you sure you "
+"want to continue connecting?"
 msgstr ""
+"La autenticidad del servidor <b>%s</b> no puede ser establecida. ¿Está "
+"seguro de que desea continuar conectándose?"
 
-#: spyderlib/plugins/shortcuts.py:326
-#, fuzzy
-msgid "Invalid key entered"
-msgstr "Ruta de archivo inválida"
+#: spyder/plugins/ipythonconsole.py:128
+msgid "The authenticity of the host can't be established"
+msgstr "La autenticidad del servidor no puede ser establecida"
 
-#: spyderlib/plugins/shortcuts.py:515
-msgid "Context"
-msgstr "Contexto"
+#: spyder/plugins/ipythonconsole.py:135
+msgid "Tunnel '%s' failed to start"
+msgstr "El túnel '%s' falló en ser iniciado"
 
-#: spyderlib/plugins/shortcuts.py:517 spyderlib/widgets/dicteditor.py:158
-msgid "Name"
-msgstr "Nombre"
+#: spyder/plugins/ipythonconsole.py:140
+msgid "Could not connect to remote host"
+msgstr "No fue posible conectarse al servidor remoto"
 
-#: spyderlib/plugins/shortcuts.py:519
-msgid "Shortcut"
-msgstr ""
+#: spyder/plugins/ipythonconsole.py:157 spyder/plugins/ipythonconsole.py:747
+msgid "Connect to an existing kernel"
+msgstr "Conectarse a un núcleo existente"
 
-#: spyderlib/plugins/shortcuts.py:521
-msgid "Score"
+#: spyder/plugins/ipythonconsole.py:159
+msgid ""
+"Please enter the connection info of the kernel you want to connect to. For "
+"that you can either select its JSON connection file using the <tt>Browse</"
+"tt> button, or write directly its id, in case it's a local kernel (for "
+"example <tt>kernel-3764.json</tt> or just <tt>3764</tt>)."
 msgstr ""
+"Por favor introduzca la información de conexión del núcleo al cual desea "
+"conectarse. Para ello puede seleccionar su archivo de conexión JSON, usando "
+"el botón <tt>Seleccionar</tt>, o escribir directamente su id, en caso de que "
+"sea un núcleo local (por ejemplo, <tt>kernel-3764.json</tt> o sólo <tt>3764</"
+"tt>)"
 
-#: spyderlib/plugins/shortcuts.py:681
-msgid "Conflicts"
-msgstr "Conflicto con"
-
-#: spyderlib/plugins/shortcuts.py:682
-msgid "The following conflicts have been detected:"
-msgstr "Los siguientes conflictos han sido detectados:"
-
-#: spyderlib/plugins/shortcuts.py:767
-msgid "Keyboard shortcuts"
-msgstr "Atajos de teclado"
+#: spyder/plugins/ipythonconsole.py:170
+msgid "Connection info:"
+msgstr "Información de conexión:"
 
-#: spyderlib/plugins/shortcuts.py:775
-#, fuzzy
-msgid "Search: "
-msgstr "Buscar"
+#: spyder/plugins/ipythonconsole.py:172
+msgid "Path to connection file or kernel id"
+msgstr "Ruta al archivo de conexión o id del núcleo"
 
-#: spyderlib/plugins/variableexplorer.py:24
-msgid "Autorefresh"
-msgstr "Actualizar automáticamente"
+#: spyder/plugins/ipythonconsole.py:174 spyder/plugins/ipythonconsole.py:191
+msgid "Browse"
+msgstr "Seleccionar"
 
-#: spyderlib/plugins/variableexplorer.py:25
-msgid "Enable autorefresh"
-msgstr "Activar las actualizaciones automáticas"
+#: spyder/plugins/ipythonconsole.py:183
+msgid "This is a remote kernel"
+msgstr "Este es un núcleo remoto"
 
-#: spyderlib/plugins/variableexplorer.py:27
-msgid "Refresh interval: "
-msgstr "Intervalo de actualización"
+#: spyder/plugins/ipythonconsole.py:187
+msgid "username at hostname:port"
+msgstr "usuario at servidor:puerto"
 
-#: spyderlib/plugins/variableexplorer.py:28
-msgid " ms"
-msgstr "ms"
+#: spyder/plugins/ipythonconsole.py:190
+msgid "Path to ssh key file"
+msgstr "Ruta al archivo de clave ssh"
 
-#: spyderlib/plugins/variableexplorer.py:31
-msgid "Filter"
-msgstr "Filtrar"
+#: spyder/plugins/ipythonconsole.py:199
+msgid "Password or ssh key passphrase"
+msgstr "Contraseña o frase de contraseña de la clave ssh"
 
-#: spyderlib/plugins/variableexplorer.py:33
-#: spyderlib/widgets/externalshell/namespacebrowser.py:214
-msgid "Exclude private references"
-msgstr "Excluir variables privadas"
+#: spyder/plugins/ipythonconsole.py:203
+msgid "Host name"
+msgstr "Servidor"
 
-#: spyderlib/plugins/variableexplorer.py:34
-#: spyderlib/widgets/externalshell/namespacebrowser.py:229
-msgid "Exclude capitalized references"
-msgstr "Excluir variables que comienzan en mayúsculas"
+#: spyder/plugins/ipythonconsole.py:204
+msgid "Ssh key"
+msgstr "Clave ssh"
 
-#: spyderlib/plugins/variableexplorer.py:35
-#: spyderlib/widgets/externalshell/namespacebrowser.py:222
-msgid "Exclude all-uppercase references"
-msgstr "Excluir variables en mayúsculas"
+#: spyder/plugins/ipythonconsole.py:205
+msgid "Password"
+msgstr "Contraseña"
 
-#: spyderlib/plugins/variableexplorer.py:36
-#: spyderlib/widgets/externalshell/namespacebrowser.py:237
-msgid "Exclude unsupported data types"
-msgstr "Excluir tipos de datos no soportados"
+#: spyder/plugins/ipythonconsole.py:234
+msgid "Open connection file"
+msgstr "Abrir un archivo de conexión"
 
-#: spyderlib/plugins/variableexplorer.py:42
-#: spyderlib/widgets/dicteditor.py:708
-msgid "Truncate values"
-msgstr "Abreviar valores"
+#: spyder/plugins/ipythonconsole.py:239
+msgid "Select ssh key"
+msgstr "Seleccionar clave ssh"
 
-#: spyderlib/plugins/variableexplorer.py:44
-#: spyderlib/widgets/dicteditor.py:712
-msgid "Show arrays min/max"
-msgstr "Mostrar el máximo y mínimo de arreglos"
+#: spyder/plugins/ipythonconsole.py:267 spyder/plugins/ipythonconsole.py:686
+msgid "IPython console"
+msgstr "Terminal de IPython"
 
-#: spyderlib/plugins/variableexplorer.py:46
-msgid "Edit data in the remote process"
-msgstr "Editar los datos en un proceso remoto"
+#: spyder/plugins/ipythonconsole.py:274
+msgid "Display initial banner"
+msgstr "Mostrar el banner inicial"
 
-#: spyderlib/plugins/variableexplorer.py:47
+#: spyder/plugins/ipythonconsole.py:275
 msgid ""
-"Editors are opened in the remote process for NumPy arrays, PIL images, "
-"lists, tuples and dictionaries.\n"
-"This avoids transfering large amount of data between the remote process and "
-"Spyder (through the socket)."
+"This option lets you hide the message shown at\n"
+"the top of the console when it's opened."
 msgstr ""
-"Esta opción permite modificar arreglos de NumPy, imágenes de\n"
-"de PIL/Pillow, Dataframes, y listas, tuplas y diccionarios en el\n"
-"proceso remoto. Esto impide transferir grandes cantidades de\n"
-"datos entre el proceso remoto y Spyder."
+"Esta opción le permite ocultar el mensaje que \n"
+"aparece al principio de la terminal cuando se abre\n"
+"por primera vez."
 
-#: spyderlib/plugins/variableexplorer.py:183
-msgid "Variable explorer"
-msgstr "Explorador de variables"
+#: spyder/plugins/ipythonconsole.py:277
+msgid "Use a pager to display additional text inside the console"
+msgstr "Usar un paginador para mostrar textos dentro de la terminal"
 
-#: spyderlib/plugins/workingdirectory.py:37
+#: spyder/plugins/ipythonconsole.py:279
 msgid ""
-"The <b>global working directory</b> is the working directory for newly "
-"opened <i>consoles</i> (Python/IPython consoles and terminals), for the "
-"<i>file explorer</i>, for the <i>find in files</i> plugin and for new files "
-"created in the <i>editor</i>."
+"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 ""
-"El <b>directorio de trabajo global</b> es el directorio de trabajo para las "
-"<i>terminales</i> que se abran de aquí en adelante (de IPython y Python, y "
-"terminales de comandos), para el <i>Explorador de archivos</i> y <i>Buscar "
-"en archivos</i> y para los nuevos archivos creados en el <i>Editor</i>."
+"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/workingdirectory.py:46
-msgid "At startup, the global working directory is:"
-msgstr "Al inicio, el directorio de trabajo global es:"
+#: spyder/plugins/ipythonconsole.py:284
+msgid "Ask for confirmation before closing"
+msgstr "Mostrar un diálogo de confirmación antes de cerrar una terminal"
 
-#: spyderlib/plugins/workingdirectory.py:50
-msgid "the same as in last session"
-msgstr "El mismo de la última sesión"
+#: spyder/plugins/ipythonconsole.py:294
+msgid "Completion Type"
+msgstr "Tipo de completado"
 
-#: spyderlib/plugins/workingdirectory.py:52
-msgid "At startup, Spyder will restore the global directory from last session"
-msgstr "Al inicio Spyder restaurará el directorio global de la última sesión"
+#: spyder/plugins/ipythonconsole.py:295
+msgid "Decide what type of completion to use"
+msgstr "Decidir que tipo de completado utilizar"
 
-#: spyderlib/plugins/workingdirectory.py:58
-msgid "At startup, the global working directory will be the specified path"
-msgstr "Al inicio el directorio de trabajo global será el siguiente"
+#: spyder/plugins/ipythonconsole.py:297
+msgid "Graphical"
+msgstr "Gráfico"
 
-#: spyderlib/plugins/workingdirectory.py:70
-msgid "Files are opened from:"
-msgstr "Los archivos deben abrirse desde:"
+#: spyder/plugins/ipythonconsole.py:297
+msgid "Plain"
+msgstr "Plano"
 
-#: spyderlib/plugins/workingdirectory.py:74
-#: spyderlib/plugins/workingdirectory.py:87
-msgid "the current file directory"
-msgstr "El directorio en  el que se encuentra el archivo actual"
+#: spyder/plugins/ipythonconsole.py:298
+msgid "Completion:"
+msgstr "Completado:"
 
-#: spyderlib/plugins/workingdirectory.py:78
-#: spyderlib/plugins/workingdirectory.py:91
-msgid "the global working directory"
-msgstr "El directorio de trabajo global"
+#: spyder/plugins/ipythonconsole.py:307
+msgid "Light background"
+msgstr "Fondo claro"
 
-#: spyderlib/plugins/workingdirectory.py:83
-msgid "Files are created in:"
-msgstr "Los archivos son creados en:"
+#: spyder/plugins/ipythonconsole.py:309
+msgid "Dark background"
+msgstr "Fondo oscuro"
 
-#: spyderlib/plugins/workingdirectory.py:97
-msgid "Change to file base directory"
-msgstr "Cambiarse al directorio base de un archivo"
+#: spyder/plugins/ipythonconsole.py:319
+msgid "Buffer:  "
+msgstr "Mostrar"
 
-#: spyderlib/plugins/workingdirectory.py:99
-msgid "When opening a file"
-msgstr "Cuando se abra un archivo"
+#: spyder/plugins/ipythonconsole.py:321
+msgid ""
+"Set the maximum number of lines of text shown in the\n"
+"console before truncation. Specifying -1 disables it\n"
+"(not recommended!)"
+msgstr ""
+"Establece el máximo número de líneas que se mostrarán\n"
+"en la terminal en cualquier momento. Si se introduce -1 se\n"
+"mostrarán todas las líneas (no se recomienda!)"
 
-#: spyderlib/plugins/workingdirectory.py:101
-msgid "When saving a file"
-msgstr "Cuando se guarde un archivo"
+#: spyder/plugins/ipythonconsole.py:330
+msgid "Support for graphics (Matplotlib)"
+msgstr "Soporte para crear gráficas (Matplotlib)"
 
-#: spyderlib/plugins/workingdirectory.py:171
-msgid "Back"
-msgstr "Anterior"
+#: spyder/plugins/ipythonconsole.py:331
+msgid "Activate support"
+msgstr "Activar el soporte"
 
-#: spyderlib/plugins/workingdirectory.py:179
-#: spyderlib/widgets/explorer.py:1021 spyderlib/widgets/importwizard.py:529
-msgid "Next"
-msgstr "Siguiente"
+#: spyder/plugins/ipythonconsole.py:332
+msgid "Automatically load Pylab and NumPy modules"
+msgstr "Cargar automáticamente los módulos de Pylab y NumPy"
 
-#: spyderlib/plugins/workingdirectory.py:190
+#: spyder/plugins/ipythonconsole.py:335
 msgid ""
-"This is the working directory for newly\n"
-"opened consoles (Python/IPython consoles and\n"
-"terminals), for the file explorer, for the\n"
-"find in files plugin and for new files\n"
-"created in the editor"
+"This lets you load graphics support without importing \n"
+"the commands to do plots. Useful to work with other\n"
+"plotting libraries different to Matplotlib or to develop \n"
+"GUIs with Spyder."
 msgstr ""
-"Este es el directorio de trabajo para las\n"
-"terminales que se abran de aquí en\n"
-"adelante (de IPython y Python y terminales de\n"
-"comandos), para el Explorador de archivos,\n"
-"y Buscar en archivos y para los nuevos\n"
-"archivos creados en el Editor"
-
-#: spyderlib/plugins/workingdirectory.py:216
-msgid "Browse a working directory"
-msgstr "Seleccionar un directorio de trabajo"
-
-#: spyderlib/plugins/workingdirectory.py:222
-msgid "Set as current console's working directory"
-msgstr "Establece el directorio de trabajo para la terminal actual"
-
-#: spyderlib/plugins/workingdirectory.py:230
-msgid "Change to parent directory"
-msgstr "Moverse al directorio superior"
+"Esto le permite cargar el soporte gráfico sin importar\n"
+"los comandos para crear figuras. Es útil para trabajar con\n"
+"otras librerías gráficas diferentes a Matplotlib o para\n"
+"desarrollar interfaces gráficas con Spyder."
 
-#: spyderlib/plugins/workingdirectory.py:237
-msgid "Global working directory"
-msgstr "Directorio de trabajo global"
+#: spyder/plugins/ipythonconsole.py:350
+msgid "Inline"
+msgstr "En línea"
 
-#: spyderlib/restart_app.py:129
-#, fuzzy
-msgid ""
-"It was not possible to close the previous Spyder instance.\n"
-"Restart aborted."
-msgstr "No fue posible ejecutar este archivo en una terminal del sistema"
+#: spyder/plugins/ipythonconsole.py:352
+msgid "Graphics backend"
+msgstr "Salida gráfica:"
 
-#: spyderlib/restart_app.py:131
+#: spyder/plugins/ipythonconsole.py:353
 msgid ""
-"Spyder could not reset to factory defaults.\n"
-"Restart aborted."
+"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 ""
+"Decidir como se mostrarán las gráficas en la terminal. Si no está seguro, "
+"por favor seleccione <b>%s</b> para colocar las gráficas en la consola o <b>"
+"%s</b> para interactuar con ellas (a través de acercamientos y paneos) en "
+"una ventana aparte."
 
-#: spyderlib/restart_app.py:133
-msgid ""
-"It was not possible to restart Spyder.\n"
-"Operation aborted."
+#: spyder/plugins/ipythonconsole.py:386
+msgid "Inline backend"
+msgstr "Salida en línea:"
+
+#: spyder/plugins/ipythonconsole.py:387
+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/restart_app.py:135
-#, fuzzy
-msgid "Spyder exit error"
-msgstr "Editor de Spyder"
+#: spyder/plugins/ipythonconsole.py:391
+msgid "Format:"
+msgstr "Formato:"
 
-#: spyderlib/restart_app.py:136
-#, fuzzy
-msgid "Spyder reset error"
-msgstr "Editor de Spyder"
+#: spyder/plugins/ipythonconsole.py:394
+msgid "Resolution:"
+msgstr "Resolución:"
 
-#: spyderlib/restart_app.py:137
-#, fuzzy
-msgid "Spyder restart error"
-msgstr "Tutorial de Spyder"
+#: spyder/plugins/ipythonconsole.py:394
+msgid "dpi"
+msgstr "dpi"
 
-#: spyderlib/restart_app.py:161
-msgid "Closing Spyder"
-msgstr ""
+#: spyder/plugins/ipythonconsole.py:396
+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/restart_app.py:234
-#, fuzzy
-msgid "Resetting Spyder to defaults"
-msgstr "Restaurar los valores por defecto"
+#: spyder/plugins/ipythonconsole.py:399
+msgid "Width:"
+msgstr "Ancho:"
 
-#: spyderlib/restart_app.py:266
-#, fuzzy
-msgid "Restarting"
-msgstr "Restaurar"
+#: spyder/plugins/ipythonconsole.py:399 spyder/plugins/ipythonconsole.py:403
+msgid "inches"
+msgstr "pulgadas"
 
-#: spyderlib/spyder.py:124
-msgid "Initializing..."
-msgstr "Inicializando..."
+#: spyder/plugins/ipythonconsole.py:401
+msgid "Default is 6"
+msgstr "Por defecto es 6"
 
-#: spyderlib/spyder.py:247
-msgid "Numpy and Scipy documentation"
-msgstr "Documentación de Numpy y Scipy"
+#: spyder/plugins/ipythonconsole.py:403
+msgid "Height:"
+msgstr "Alto:"
 
-#: spyderlib/spyder.py:249 spyderlib/spyder.py:1084
-msgid "Matplotlib documentation"
-msgstr "Documentación de Matplotlib"
+#: spyder/plugins/ipythonconsole.py:405
+msgid "Default is 4"
+msgstr "Por defecto es 4"
 
-#: spyderlib/spyder.py:252
-msgid "PyQt4 Reference Guide"
-msgstr "Manual de referencia de PyQt4"
+#: spyder/plugins/ipythonconsole.py:432
+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 ""
+"Se pueden ejecutar varias líneas de código al abrir una terminal. Por favor "
+"introduzca cada una separada por comas, por ejemplo:<br><i>import os, import "
+"sys</i>"
 
-#: spyderlib/spyder.py:255
-msgid "PyQt4 API Reference"
-msgstr "Referencia del API de PyQt4"
+#: spyder/plugins/ipythonconsole.py:438
+msgid "Lines:"
+msgstr "Líneas:"
 
-#: spyderlib/spyder.py:257
-msgid "Python(x,y)"
-msgstr "Python(x,y)"
+#: spyder/plugins/ipythonconsole.py:447
+msgid "Run a file"
+msgstr "Ejecutar un archivo"
 
-#: spyderlib/spyder.py:259
-msgid "WinPython"
-msgstr "WinPython"
-
-#: spyderlib/spyder.py:305
-msgid "Reload last session"
-msgstr "Recargar la última sesión"
+#: spyder/plugins/ipythonconsole.py:448
+msgid ""
+"You can also run a whole file at startup instead of just some lines (This is "
+"similar to have a PYTHONSTARTUP file)."
+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/spyder.py:309
-msgid "Load session..."
-msgstr "Cargar sesión..."
+#: spyder/plugins/ipythonconsole.py:452
+msgid "Use the following file:"
+msgstr "Usar el siguiente archivo:"
 
-#: spyderlib/spyder.py:312
-msgid "Load Spyder session"
-msgstr "Cargar sesión de Spyder"
+#: spyder/plugins/ipythonconsole.py:466
+msgid "Greedy completion"
+msgstr "Completado ambicioso"
 
-#: spyderlib/spyder.py:314
-msgid "Save session and quit..."
-msgstr "Guardar sesión y salir..."
+#: spyder/plugins/ipythonconsole.py:467
+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 ""
+"Habilita el completado usando la tecla <tt>Tab</tt> en elementos de listas, "
+"resultados de llamadas de funciones, etc, <i>sin</i> asignarlos a una "
+"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/spyder.py:317
-msgid "Save current session and quit application"
-msgstr "Guardar sesión actual y salir de la aplicación"
+#: spyder/plugins/ipythonconsole.py:475
+msgid "Use the greedy completer"
+msgstr "Usar el completado ambicioso"
 
-#: spyderlib/spyder.py:530
-msgid "Close current pane"
-msgstr "Cerrar panel actual"
+#: spyder/plugins/ipythonconsole.py:486
+msgid "Autocall"
+msgstr "Autollamar"
 
-#: spyderlib/spyder.py:535
-msgid "Lock panes"
+#: spyder/plugins/ipythonconsole.py:487
+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 ""
+"Esta opción hace que IPython llame automáticamente cualquier objeto "
+"\"llamable\" (callable) aún si no se escriben paréntesis a su alrededor."
+"<br>Por ejemplo, al escribir <i>str 43</i>, se convertirá automáticamente en "
+"<i>str(43)</i>."
 
-#: spyderlib/spyder.py:542
-#, fuzzy
-msgid "Use next layout"
-msgstr "Restablecer la disposición de componentes"
-
-#: spyderlib/spyder.py:546
-#, fuzzy
-msgid "Use previous layout"
-msgstr "Restablecer la disposición de componentes"
+#: spyder/plugins/ipythonconsole.py:494
+msgid "Smart"
+msgstr "Inteligente"
 
-#: spyderlib/spyder.py:555
-msgid "&Find text"
-msgstr "&Buscar texto"
+#: spyder/plugins/ipythonconsole.py:495
+msgid "Full"
+msgstr "Total"
 
-#: spyderlib/spyder.py:560
-msgid "Find &next"
-msgstr "Buscar &siguiente"
+#: spyder/plugins/ipythonconsole.py:496
+msgid "Off"
+msgstr "Desactivado"
 
-#: spyderlib/spyder.py:567
-msgid "Find &previous"
-msgstr "Buscar &anterior"
+#: spyder/plugins/ipythonconsole.py:498
+msgid "Autocall:  "
+msgstr "Autollamar:"
 
-#: spyderlib/spyder.py:573
-msgid "&Replace text"
-msgstr "&Reemplazar texto"
+#: spyder/plugins/ipythonconsole.py:499
+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 ""
+"En modo <b>%s</b>, Autollamar no se usa si no hay argumentos después del "
+"objeto llamable. En modo <b>%s</b>, todos los objetos llamables son llamados "
+"automáticamente (aún si no hay argumentos presentes)."
 
-#: spyderlib/spyder.py:580 spyderlib/widgets/editor.py:339
-#, fuzzy
-msgid "File switcher..."
-msgstr "Archivo..."
+#: spyder/plugins/ipythonconsole.py:511
+msgid "Symbolic Mathematics"
+msgstr "Matemática simbólica"
 
-#: spyderlib/spyder.py:582
-msgid "Fast switch between files"
+#: spyder/plugins/ipythonconsole.py:512
+msgid ""
+"Perfom symbolic operations in the console (e.g. integrals, derivatives, "
+"vector calculus, etc) and get the outputs in a beautifully printed style (it "
+"requires the Sympy module)."
 msgstr ""
+"Realice operaciones simbólicas en la terminal (integrales, derivadas o "
+"cálculo vectorial) y obtenga los resultados en un bello estilo impreso "
+"(requiere el módulo Sympy)."
 
-#: spyderlib/spyder.py:600 spyderlib/widgets/sourcecode/codeeditor.py:2425
-msgid "Undo"
-msgstr "Deshacer"
-
-#: spyderlib/spyder.py:602 spyderlib/widgets/sourcecode/codeeditor.py:2428
-msgid "Redo"
-msgstr "Rehacer"
+#: spyder/plugins/ipythonconsole.py:517
+msgid "Use symbolic math"
+msgstr "Usar matemática simbólica"
 
-#: spyderlib/spyder.py:604 spyderlib/widgets/arrayeditor.py:392
-#: spyderlib/widgets/dataframeeditor.py:418
-#: spyderlib/widgets/dicteditor.py:680 spyderlib/widgets/shell.py:126
-#: spyderlib/widgets/sourcecode/codeeditor.py:2434
-msgid "Copy"
-msgstr "Copiar"
+#: spyder/plugins/ipythonconsole.py:518
+msgid ""
+"This option loads the Sympy library to work with.<br>Please refer to its "
+"documentation to learn how to use it."
+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/spyder.py:606 spyderlib/widgets/shell.py:122
-#: spyderlib/widgets/sourcecode/codeeditor.py:2431
-msgid "Cut"
-msgstr "Cortar"
+#: spyder/plugins/ipythonconsole.py:528
+msgid "Prompts"
+msgstr "Prompts"
 
-#: spyderlib/spyder.py:608 spyderlib/widgets/dicteditor.py:677
-#: spyderlib/widgets/shell.py:130
-#: spyderlib/widgets/sourcecode/codeeditor.py:2437
-msgid "Paste"
-msgstr "Pegar"
+#: spyder/plugins/ipythonconsole.py:529
+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/spyder.py:610 spyderlib/widgets/explorer.py:470
-#: spyderlib/widgets/projectexplorer.py:1015 spyderlib/widgets/shell.py:139
-#: spyderlib/widgets/sourcecode/codeeditor.py:2440
-msgid "Delete"
-msgstr "Eliminar"
+#: spyder/plugins/ipythonconsole.py:532
+msgid "Input prompt:"
+msgstr "Prompt de entrada:"
 
-#: spyderlib/spyder.py:614 spyderlib/widgets/shell.py:143
-#: spyderlib/widgets/sourcecode/codeeditor.py:2444
-msgid "Select All"
-msgstr "Seleccionar todo"
+#: spyder/plugins/ipythonconsole.py:534
+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/spyder.py:664
-msgid "C&onsoles"
-msgstr "&Terminales"
+#: spyder/plugins/ipythonconsole.py:538
+msgid "Output prompt:"
+msgstr "Prompt de salida:"
 
-#: spyderlib/spyder.py:670
-msgid "&View"
-msgstr "&Ver"
+#: spyder/plugins/ipythonconsole.py:540
+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/spyder.py:673
-msgid "&Help"
-msgstr "A&yuda"
+#: spyder/plugins/ipythonconsole.py:562 spyder/plugins/workingdirectory.py:45
+msgid "Startup"
+msgstr "Inicialización"
 
-#: spyderlib/spyder.py:678
-msgid "Welcome to Spyder!"
-msgstr "Bienvenido a Spyder!"
+#: spyder/plugins/ipythonconsole.py:734
+msgid "Open an &IPython console"
+msgstr "Abrir una terminal de IPython"
 
-#: spyderlib/spyder.py:683
-msgid "Pre&ferences"
-msgstr "Pre&ferencias"
+#: spyder/plugins/ipythonconsole.py:737
+msgid "Use %s+T when the console is selected to open a new one"
+msgstr "Usar %s+T para abrir una nueva terminal"
 
-#: spyderlib/spyder.py:690 spyderlib/widgets/pathmanager.py:48
-#: spyderlib/widgets/projectexplorer.py:598
-msgid "PYTHONPATH manager"
-msgstr "Administrador del PYTHONPATH"
+#: spyder/plugins/ipythonconsole.py:740
+msgid "Open a new console"
+msgstr "Abrir una nueva terminal"
 
-#: spyderlib/spyder.py:693
-msgid "Python Path Manager"
-msgstr "Manejador de rutas de Python"
+#: spyder/plugins/ipythonconsole.py:748
+msgid "Open a new IPython console connected to an existing kernel"
+msgstr "Abrir una nueva terminal de IPython conectada a un núcleo existente"
 
-#: spyderlib/spyder.py:696
-msgid "Update module names list"
-msgstr "Actualizar la lista de nombres de módulos"
+#: spyder/plugins/ipythonconsole.py:836
+msgid ""
+"No IPython console is currently available to run <b>%s</b>.<br><br>Please "
+"open a new one and try again."
+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/spyder.py:699
-msgid "Refresh list of module names available in PYTHONPATH"
+#: spyder/plugins/ipythonconsole.py:873
+msgid ""
+"Your Python environment or installation doesn't have the <tt>ipykernel</tt> "
+"module installed on it. Without this module is not possible for Spyder to "
+"create a console for you.<br><br>You can install <tt>ipykernel</tt> by "
+"running in a terminal:<br><br><tt>pip install ipykernel</"
+"tt><br><br>or<br><br><tt>conda install ipykernel</tt>"
+msgstr ""
+"Su entorno o instalación de Python no cuenta con el módulo <tt>ipykernel</"
+"tt>. Sin este módulo no es posible para Spyder el crear una terminal."
+"<br><br>Puede instalar <tt>ipykernel</tt> al ejecutar en una consola de "
+"comandos:<br><br><tt>pip install ipykernel</tt><br><br>o<br><br><tt>conda "
+"install ipykernel</tt>"
+
+#: spyder/plugins/ipythonconsole.py:1098
+msgid "Do you want to close this console?"
+msgstr "¿Desea cerrar esta terminal?"
+
+#: spyder/plugins/ipythonconsole.py:1104
+msgid ""
+"Do you want to close all other consoles connected to the same kernel as this "
+"one?"
 msgstr ""
-"Actualiza la lista de nombres de los módulos disponibles en su PYTHONPATH"
+"¿Desea cerrar todas las otras terminales conectadas al mismo núcleo que ésta?"
 
-#: spyderlib/spyder.py:702
-#, fuzzy
-msgid "Reset Spyder to factory defaults"
-msgstr "Restaurar los valores por defecto"
+#: spyder/plugins/ipythonconsole.py:1364
+msgid "IPython"
+msgstr "IPython"
 
-#: spyderlib/spyder.py:707
-msgid "Current user environment variables..."
-msgstr "Variables de entorno del usuario actual..."
+#: spyder/plugins/ipythonconsole.py:1365
+msgid "Unable to connect to <b>%s</b>"
+msgstr "No se pudo establecer conexión con <b>`%s`"
+
+#: spyder/plugins/ipythonconsole.py:1422
+msgid "Connection error"
+msgstr "Error de conexión"
 
-#: spyderlib/spyder.py:709
+#: spyder/plugins/ipythonconsole.py:1423
 msgid ""
-"Show and edit current user environment variables in Windows registry (i.e. "
-"for all sessions)"
+"Could not open ssh tunnel. The error was:\n"
+"\n"
 msgstr ""
-"Mostrar y editar las variables de\n"
-"entorno del usuario actual en el\n"
-"registro de Windows (es decir,\n"
-"para todas las sesiones)"
+"No fue posible crear un túnel ssh. El error fue:\n"
+"\n"
 
-#: spyderlib/spyder.py:718 spyderlib/spyder.py:1178
-msgid "External Tools"
-msgstr "Herramientas externas"
+#: spyder/plugins/layoutdialog.py:177
+msgid "Move Up"
+msgstr "Mover arriba"
 
-#: spyderlib/spyder.py:722
-msgid "Python(x,y) launcher"
-msgstr "Lanzador de Python(x,y)"
+#: spyder/plugins/layoutdialog.py:178
+msgid "Move Down"
+msgstr "Mover abajo"
 
-#: spyderlib/spyder.py:729
-msgid "WinPython control panel"
-msgstr "Panel de control de WinPython"
+#: spyder/plugins/layoutdialog.py:179
+msgid "Delete Layout"
+msgstr "Eliminar disposición"
 
-#: spyderlib/spyder.py:738
-msgid "Qt Designer"
-msgstr "Diseñador de interfaces de Qt"
+#: spyder/plugins/layoutdialog.py:183
+msgid "Layout Display and Order"
+msgstr "Orden y visualización de las disposiciones"
 
-#: spyderlib/spyder.py:743
-msgid "Qt Linguist"
-msgstr "Traductor de aplicaciones de Qt"
+#: spyder/plugins/maininterpreter.py:31 spyder/plugins/maininterpreter.py:66
+msgid "Python interpreter"
+msgstr "Intérprete de Python"
 
-#: spyderlib/spyder.py:749
-msgid "Qt examples"
-msgstr "Ejemplos de Qt"
+#: spyder/plugins/maininterpreter.py:68
+msgid "Select the Python interpreter for all Spyder consoles"
+msgstr ""
+"Seleccionar el intérprete de Python para todas las terminales de Spyder"
 
-#: spyderlib/spyder.py:770
-msgid "guidata examples"
-msgstr "Ejemplos de guidata"
+#: spyder/plugins/maininterpreter.py:71
+msgid "Default (i.e. the same as Spyder's)"
+msgstr "Por defecto (es decir, el mismo de Spyder)"
 
-#: spyderlib/spyder.py:781
-msgid "guiqwt examples"
-msgstr "Ejemplos de guiqwt"
+#: spyder/plugins/maininterpreter.py:74
+msgid "Use the following Python interpreter:"
+msgstr "Usar el siguiente intérprete:"
 
-#: spyderlib/spyder.py:786
-msgid "Sift"
-msgstr "Sift"
+#: spyder/plugins/maininterpreter.py:77
+msgid "Executables"
+msgstr "Ejecutables"
 
-#: spyderlib/spyder.py:796
-msgid "ViTables"
-msgstr "ViTables"
+#: spyder/plugins/maininterpreter.py:94
+msgid "User Module Reloader (UMR)"
+msgstr "Recargador de Módulos del Usuario (RMU)"
 
-#: spyderlib/spyder.py:810
-msgid "Fullscreen mode"
-msgstr "Modo a pantalla completa"
+#: spyder/plugins/maininterpreter.py:95
+msgid ""
+"UMR forces Python to reload modules which were imported when executing a "
+"file in a Python or IPython console with the <i>runfile</i> function."
+msgstr ""
+"El RMU obliga a Python a recargar los módulos que fueron importados durante "
+"la ejecución de un archivo en la terminal con la función 'runfile'."
 
-#: spyderlib/spyder.py:822
-msgid "Main toolbar"
-msgstr "Barra principal"
+#: spyder/plugins/maininterpreter.py:100
+msgid "Enable UMR"
+msgstr "Activar el RMU"
 
-#: spyderlib/spyder.py:831
+#: spyder/plugins/maininterpreter.py:101
 msgid ""
-"Spyder Internal Console\n"
-"\n"
-"This console is used to report application\n"
-"internal errors and to inspect Spyder\n"
-"internals with the following commands:\n"
-"  spy.app, spy.window, dir(spy)\n"
-"\n"
-"Please don't use it to run your code\n"
-"\n"
+"This option will enable the User Module Reloader (UMR) in Python/IPython "
+"consoles. UMR forces Python to reload deeply modules during import when "
+"running a Python script using the Spyder's builtin function <b>runfile</b>."
+"<br><br><b>1.</b> UMR may require to restart the console in which it will be "
+"called (otherwise only newly imported modules will be reloaded when "
+"executing files).<br><br><b>2.</b> If errors occur when re-running a PyQt-"
+"based program, please check that the Qt objects are properly destroyed (e.g. "
+"you may have to use the attribute <b>Qt.WA_DeleteOnClose</b> on your main "
+"window, using the <b>setAttribute</b> method)"
 msgstr ""
-"Terminal interna de Spyder!\n"
-"\n"
-"Esta terminal se utiliza para reportar errores de la\n"
-"aplicación y para inspeccionar las características\n"
-"internas de Spyder con los siguientes comandos:\n"
-"  spy.app, spy.window, dir(spy)\n"
-"\n"
-"Por favor no ejecuta su código en esta terminal\n"
-
-#: spyderlib/spyder.py:848
-msgid "Loading object inspector..."
-msgstr "Cargando el inspector de objetos..."
+"Esta opción activará el Recargador de Módulos del Usuario (RMU) en las "
+"terminales de Python y IPython. El RMU obliga a Python a recargar "
+"profundamente los módulos que fueron importados al ejecutar un archivo de "
+"Python, usando la función incorporada de Spyder llamada <b>runfile</b>."
+"<br><br><b>1.</b> El RMU puede requerir que se reinicie la terminal en la "
+"cual será utilizado (de otra forma, sólo los módulos que fueron importados "
+"en último lugar serán recargados al ejecutar un archivo).<br><br><b>2.</b> "
+"Si ocurre algún error al re-ejecutar programas basados en PyQt, por favor "
+"verifique que los objetos de Qt sean destruidos apropiadamente (por ejemplo, "
+"puede tener que usar el atributo <b>Qt.WA_DeleteOnClose</b> en su ventana "
+"principal, utilizando para ello el método <b>setAttribute</b>)."
 
-#: spyderlib/spyder.py:855
-msgid "Loading outline explorer..."
-msgstr "Cargando el explorador de código..."
+#: spyder/plugins/maininterpreter.py:117
+msgid "Show reloaded modules list"
+msgstr "Mostrar la lista de módulos que fueron recargados"
 
-#: spyderlib/spyder.py:863
-msgid "Loading editor..."
-msgstr "Cargando el editor..."
+#: spyder/plugins/maininterpreter.py:118
+msgid "Please note that these changes will be applied only to new consoles"
+msgstr ""
+"Por favor tenga en cuenta que estos cambios sólo se aplicarán a nuevas "
+"terminales"
 
-#: spyderlib/spyder.py:874
-#, fuzzy
-msgid "&Restart"
-msgstr "Restaurar"
+#: spyder/plugins/maininterpreter.py:122
+msgid "Set UMR excluded (not reloaded) modules"
+msgstr "Establecer la lista de módulos excluidos por el RMU"
 
-#: spyderlib/spyder.py:876
-#, fuzzy
-msgid "Restart"
-msgstr "Restaurar"
+#: spyder/plugins/maininterpreter.py:168
+msgid ""
+"You selected a <b>Python %d</b> interpreter for the console but Spyder is "
+"running on <b>Python %d</b>!.<br><br>Although this is possible, we recommend "
+"you to install and run Spyder directly with your selected interpreter, to "
+"avoid seeing false warnings and errors due to the incompatible syntax "
+"between these two Python versions."
+msgstr ""
+"Usted seleccionó un intérprete de <b>Python %d</b> para la terminal, pero "
+"Spyder está corriendo bajo <b>Python %d</b>!.<br><br>Aunque esto es posible, "
+"le recomendamos instalar y correr Spyder directamente con el intérprete "
+"seleccionado, para evitar ver falsos errores y alarmas en el Editor debido a "
+"la sintaxis incompatible entre estas dos versiones de Python."
 
-#: spyderlib/spyder.py:895
-msgid "Loading file explorer..."
-msgstr "Cargando el explorador de archivos..."
+#: spyder/plugins/maininterpreter.py:178 spyder/plugins/maininterpreter.py:191
+#: spyder/plugins/maininterpreter.py:195
+msgid "UMR"
+msgstr "RMU"
 
-#: spyderlib/spyder.py:902
-msgid "Loading history plugin..."
-msgstr "Cargando el historial..."
+#: spyder/plugins/maininterpreter.py:179
+msgid "Set the list of excluded modules as this: <i>numpy, scipy</i>"
+msgstr "Establezca la lista de módulos excluidos como: <i>numpy, scipy</i>"
 
-#: spyderlib/spyder.py:913
-msgid "Loading online help..."
-msgstr "Cargando la ayuda en línea..."
+#: spyder/plugins/maininterpreter.py:192
+msgid ""
+"The following modules are not installed on your machine:\n"
+"%s"
+msgstr ""
+"Los siguientes módulos no están instalados en su computador:\n"
+"%s"
 
-#: spyderlib/spyder.py:919
-msgid "Loading project explorer..."
-msgstr "Cargando el explorador de proyectos..."
+#: spyder/plugins/maininterpreter.py:196
+msgid ""
+"Please note that these changes will be applied only to new Python/IPython "
+"consoles"
+msgstr ""
+"Por favor tenga en cuenta que estos cambios sólo se aplicarán a nuevas "
+"terminales de IPython y Python"
 
-#: spyderlib/spyder.py:930
-msgid "Loading external console..."
-msgstr "Cargando la terminal externa..."
+#: spyder/plugins/onlinehelp.py:70
+msgid "Online help"
+msgstr "Ayuda en línea"
 
-#: spyderlib/spyder.py:939
-msgid "Loading namespace browser..."
-msgstr "Cargando el explorador de variables..."
+#: spyder/plugins/outlineexplorer.py:49 spyder/widgets/editortools.py:195
+msgid "Outline"
+msgstr "Explorador de código"
 
-#: spyderlib/spyder.py:946
-msgid "Loading IPython console..."
-msgstr "Cargando la terminal de IPython..."
+#: spyder/plugins/projects.py:76 spyder/widgets/projects/explorer.py:111
+#: spyder/widgets/projects/explorer.py:125
+msgid "Project explorer"
+msgstr "Explorador de proyectos"
 
-#: spyderlib/spyder.py:956
-msgid "Setting up main window..."
-msgstr "Construyendo la ventana principal..."
+#: spyder/plugins/projects.py:88
+msgid "New Project..."
+msgstr "Nuevo proyecto..."
 
-#: spyderlib/spyder.py:959
-msgid "Optional dependencies..."
-msgstr "Dependencias opcionales..."
+#: spyder/plugins/projects.py:91
+msgid "Open Project..."
+msgstr "Abrir proyecto..."
 
-#: spyderlib/spyder.py:963
-msgid "Report issue..."
-msgstr "Reportar un problema..."
+#: spyder/plugins/projects.py:94
+msgid "Close Project"
+msgstr "Cerrar proyecto"
 
-#: spyderlib/spyder.py:967
-msgid "Spyder support..."
-msgstr "Obtener soporte para Spyder"
+#: spyder/plugins/projects.py:100
+msgid "Project Preferences"
+msgstr "Preferencias del proyecto"
 
-#: spyderlib/spyder.py:970
-msgid "Check for updates..."
-msgstr ""
+#: spyder/plugins/projects.py:102
+msgid "Recent Projects"
+msgstr "Proyectos recientes"
 
-#: spyderlib/spyder.py:993
-msgid "Spyder documentation"
-msgstr "Documentación de Spyder"
+#: spyder/plugins/projects.py:234
+msgid "Open project"
+msgstr "Abrir proyecto"
 
-#: spyderlib/spyder.py:997
-msgid "Spyder tutorial"
-msgstr "Tutorial de Spyder"
+#: spyder/plugins/projects.py:239
+msgid "<b>%s</b> is not a Spyder project!"
+msgstr "<b>%s</b> no es un proyecto de Spyder!"
 
-#: spyderlib/spyder.py:1002
-#, fuzzy
-msgid "Interactive tours"
-msgstr "Introspección"
+#: spyder/plugins/runconfig.py:29
+msgid "Execute in current Python or IPython console"
+msgstr "Ejecutar en la terminal actual de Python o IPython"
 
-#: spyderlib/spyder.py:1031
-msgid "Python documentation"
-msgstr "Documentación de Python"
+#: spyder/plugins/runconfig.py:30
+msgid "Execute in a new dedicated Python console"
+msgstr "Ejecutar en una terminal de Python dedicada"
 
-#: spyderlib/spyder.py:1037 spyderlib/spyder.py:1076
-msgid "IPython documentation"
-msgstr "Documentación de IPython"
+#: spyder/plugins/runconfig.py:31
+msgid "Execute in an external System terminal"
+msgstr "Ejecutar en una terminal de comandos del sistema"
 
-#: spyderlib/spyder.py:1038
-msgid "Intro to IPython"
-msgstr "Ayuda básica"
+#: spyder/plugins/runconfig.py:41
+msgid "Always show %s on a first file run"
+msgstr "Siempre muestre %s en una primera ejecución"
 
-#: spyderlib/spyder.py:1040
-msgid "Quick reference"
-msgstr "Referencia rápida"
+#: spyder/plugins/runconfig.py:160 spyder/plugins/runconfig.py:474
+msgid "General settings"
+msgstr "Ajustes generales"
 
-#: spyderlib/spyder.py:1042
-msgid "Console help"
-msgstr "Ayuda de la terminal"
+#: spyder/plugins/runconfig.py:163 spyder/plugins/runconfig.py:209
+msgid "Command line options:"
+msgstr "Opciones de línea de comandos:"
 
-#: spyderlib/spyder.py:1074
-msgid "Python(x,y) documentation folder"
-msgstr "Carpeta de documentación de Python(x,y)"
+#: spyder/plugins/runconfig.py:169
+msgid "Working directory:"
+msgstr "Directorio de trabajo:"
 
-#: spyderlib/spyder.py:1078
-msgid "guidata documentation"
-msgstr "Documentación de guidata"
+#: spyder/plugins/runconfig.py:181 spyder/plugins/runconfig.py:492
+msgid "Enter debugging mode when errors appear during execution"
+msgstr "Entrar en el modo de depuración cuando aparecen errores"
 
-#: spyderlib/spyder.py:1081
-msgid "guiqwt documentation"
-msgstr "Documentación de guiqwt"
+#: spyder/plugins/runconfig.py:197 spyder/plugins/runconfig.py:502
+msgid "Dedicated Python console"
+msgstr "Terminal de Python dedicada"
 
-#: spyderlib/spyder.py:1087
-msgid "NumPy documentation"
-msgstr "Documentación de NumPy"
+#: spyder/plugins/runconfig.py:201 spyder/plugins/runconfig.py:504
+msgid "Interact with the Python console after execution"
+msgstr "Interactuar con la terminal después de la ejecución"
 
-#: spyderlib/spyder.py:1089
-msgid "NumPy reference guide"
-msgstr "Manual de referencia de NumPy"
+#: spyder/plugins/runconfig.py:205
+msgid "Show warning when killing running process"
+msgstr "Mostrar una advertencia cuando se termine el proceso"
 
-#: spyderlib/spyder.py:1091
-msgid "NumPy user guide"
-msgstr "Guía del usuario de Numpy"
+#: spyder/plugins/runconfig.py:214
+msgid "<b>-u</b> is added to the other options you set here"
+msgstr "La opción <b>-u</b> se añade a estas opciones"
 
-#: spyderlib/spyder.py:1093
-msgid "SciPy documentation"
-msgstr "Documentación de SciPy"
+#: spyder/plugins/runconfig.py:224
+msgid "this dialog"
+msgstr "este diálogo"
 
-#: spyderlib/spyder.py:1100
-msgid "Installed Python modules"
-msgstr "Módulos instalados de Python"
+#: spyder/plugins/runconfig.py:283
+msgid "Run configuration"
+msgstr "Opciones de ejecución"
 
-#: spyderlib/spyder.py:1104
-msgid "Online documentation"
-msgstr "Documentación en línea"
+#: spyder/plugins/runconfig.py:284
+msgid "The following working directory is not valid:<br><b>%s</b>"
+msgstr "El siguiente directorio de trabajo no es válido:<br><b>%s</b>"
 
-#: spyderlib/spyder.py:1116
-msgid "Qt documentation"
-msgstr "Documentación de Qt"
+#: spyder/plugins/runconfig.py:362
+msgid "Run settings for %s"
+msgstr "Ajustes de ejecución para %s"
 
-#: spyderlib/spyder.py:1122
-msgid "About %s..."
-msgstr "Acerca de %s..."
+#: spyder/plugins/runconfig.py:394
+msgid "Select a run configuration:"
+msgstr "Seleccionar una configuración de ejecución:"
 
-#: spyderlib/spyder.py:1146
-msgid "Panes"
-msgstr "Paneles"
+#: spyder/plugins/runconfig.py:423 spyder/plugins/runconfig.py:448
+msgid "Run Settings"
+msgstr "Ajustes de ejecución"
 
-#: spyderlib/spyder.py:1147
-msgid "Toolbars"
-msgstr "Barras de herramientas"
+#: spyder/plugins/runconfig.py:450
+msgid ""
+"The following are the default <i>%s</i>. These options may be overriden "
+"using the <b>%s</b> dialog box (see the <b>%s</b> menu)"
+msgstr ""
+"Las siguientes son los <i>%s</i> por defecto. Estos ajustes pueden "
+"modificarse usando el diálogo <b>%s</b> (ver el menú <b>%s</b>)"
 
-#: spyderlib/spyder.py:1148
-#, fuzzy
-msgid "Window layouts"
-msgstr "Disposiciones personalizadas de componentes"
+#: spyder/plugins/runconfig.py:476
+msgid "Default working directory is:"
+msgstr "Directorio de trabajo:"
 
-#: spyderlib/spyder.py:1157 spyderlib/spyder.py:1910 spyderlib/spyder.py:1911
-#, fuzzy
-msgid "Show toolbars"
-msgstr "Mostrar barra de herramientas"
+#: spyder/plugins/runconfig.py:478
+msgid "the script directory"
+msgstr "El directorio en  el que se encuentra el archivo actual"
 
-#: spyderlib/spyder.py:1171
-msgid "Attached console window (debugging)"
-msgstr "Ventana de terminal anexa (para depuración)"
+#: spyder/plugins/runconfig.py:481 spyder/plugins/workingdirectory.py:57
+msgid "the following directory:"
+msgstr "el siguiente directorio:"
 
-#: spyderlib/spyder.py:1756
-msgid "Spyder Default Layout"
+#: spyder/plugins/runconfig.py:507
+msgid "Show warning when killing running processes"
+msgstr "Mostrar una advertencia cuando se termine el proceso"
+
+#: spyder/plugins/runconfig.py:516
+msgid "Run Settings dialog"
+msgstr "Ajustes de ejecución"
+
+#: spyder/plugins/shortcuts.py:137
+msgid ""
+"Press the new shortcut and select 'Ok': \n"
+"(Press 'Tab' once to switch focus between the shortcut entry \n"
+"and the buttons below it)"
 msgstr ""
+"Teclee el nuevo atajo y seleccione 'Ok': \n"
+"(Presione 'Tab' una vez para cambiar el foco entre la entrada del atajo \n"
+"y los botones que aparecen abajo)"
 
-#: spyderlib/spyder.py:1774 spyderlib/spyder.py:1785
-#, fuzzy
-msgid "Save current layout"
-msgstr "Guardar el archivo actual"
+#: spyder/plugins/shortcuts.py:140
+msgid "Current shortcut:"
+msgstr "Atajo seleccionado:"
 
-#: spyderlib/spyder.py:1778 spyderlib/spyder.py:1787
-#, fuzzy
-msgid "Layout preferences"
-msgstr "Preferencias"
+#: spyder/plugins/shortcuts.py:142
+msgid "New shortcut:"
+msgstr "Nuevo atajo:"
 
-#: spyderlib/spyder.py:1782
-#, fuzzy
-msgid "Reset to spyder default"
-msgstr "Restaurar los valores por defecto"
+#: spyder/plugins/shortcuts.py:155
+msgid "Shortcut: {0}"
+msgstr "Atajo: {0}"
 
-#: spyderlib/spyder.py:1804
-msgid ""
-"Window layout will be reset to default settings: this affects window "
-"position, size and dockwidgets.\n"
-"Do you want to continue?"
-msgstr ""
-"La disposición de componentes será restablecida a los ajustes por defecto. "
-"Esto afecta a la posición y tamaño de la ventana y los componentes.\n"
-"¿Desea continuar?"
+#: spyder/plugins/shortcuts.py:276
+msgid "Please introduce a different shortcut"
+msgstr "Por favor introduzca un nuevo atajo"
+
+#: spyder/plugins/shortcuts.py:313
+msgid "The new shorcut conflicts with:"
+msgstr "El nuevo atajo tiene coincide con:"
 
-#: spyderlib/spyder.py:1826
+#: spyder/plugins/shortcuts.py:324
 msgid ""
-"Layout <b>%s</b> will be                                                "
-"overwritten. Do you want to                                                "
-"continue?"
+"A compound sequence can have {break} a maximum of 4 subsequences.{break}"
 msgstr ""
+"Una secuencia compuesta puede tener {break} un máximo de 4 sub-secuencias."
+"{break}"
 
-#: spyderlib/spyder.py:1889
-#, fuzzy
-msgid "Quick switch layout #%s has not yet been defined."
-msgstr "Aún no se ha definido la disposición de componentes #%d"
+#: spyder/plugins/shortcuts.py:329
+msgid "Invalid key entered"
+msgstr "Tecla inválida"
 
-#: spyderlib/spyder.py:1907 spyderlib/spyder.py:1908
-#, fuzzy
-msgid "Hide toolbars"
-msgstr "Barra de archivo"
+#: spyder/plugins/shortcuts.py:531
+msgid "Context"
+msgstr "Contexto"
 
-#: spyderlib/spyder.py:2229 spyderlib/spyder.py:2230
-msgid "Maximize current pane"
-msgstr "Maximizar el panel actual"
+#: spyder/plugins/shortcuts.py:533
+#: spyder/widgets/variableexplorer/collectionseditor.py:118
+msgid "Name"
+msgstr "Nombre"
 
-#: spyderlib/spyder.py:2233
-msgid "Restore current pane"
-msgstr "Restaurar el panel actual"
+#: spyder/plugins/shortcuts.py:535
+msgid "Shortcut"
+msgstr "Atajo"
 
-#: spyderlib/spyder.py:2234
-msgid "Restore pane to its original size"
-msgstr "Restaurar el panel a su tamaño original"
+#: spyder/plugins/shortcuts.py:537
+msgid "Score"
+msgstr "Puntaje"
 
-#: spyderlib/spyder.py:2318
-msgid "About %s"
-msgstr "Acerca de %s"
+#: spyder/plugins/shortcuts.py:697
+msgid "Conflicts"
+msgstr "Conflicto con"
 
-#: spyderlib/spyder.py:2502
-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."
+#: spyder/plugins/shortcuts.py:698
+msgid "The following conflicts have been detected:"
+msgstr "Los siguientes conflictos han sido detectados:"
 
-#: spyderlib/spyder.py:2721
-msgid "Open session"
-msgstr "Abrir sesión"
+#: spyder/plugins/shortcuts.py:783
+msgid "Keyboard shortcuts"
+msgstr "Atajos de teclado"
 
-#: spyderlib/spyder.py:2722 spyderlib/spyder.py:2734
-msgid "Spyder sessions"
-msgstr "Sesiones de Spyder"
+#: spyder/plugins/shortcuts.py:791
+msgid "Search: "
+msgstr "Buscar:"
 
-#: spyderlib/spyder.py:2733
-msgid "Save session"
-msgstr "Guardar sesión"
+#: spyder/plugins/shortcuts.py:792
+msgid "Reset to default values"
+msgstr "Restaurar los valores por defecto"
 
-#: spyderlib/spyder.py:2775
-#, fuzzy
-msgid ""
-"Spyder will restart and reset to default settings: <br><br>Do you want to "
-"continue?"
-msgstr ""
-"El siguiente directorio no está vacío:<br><b>%s</b><br><br>¿Desear continuar?"
+#: spyder/plugins/variableexplorer.py:26
+msgid "Autorefresh"
+msgstr "Actualizar automáticamente"
 
-#: spyderlib/spyder.py:2871 spyderlib/widgets/helperwidgets.py:144
-#, fuzzy
-msgid "Spyder updates"
-msgstr "Archivos de datos de Spyder"
+#: spyder/plugins/variableexplorer.py:27
+msgid "Enable autorefresh"
+msgstr "Activar las actualizaciones automáticas"
 
-#: spyderlib/spyder.py:2890
-msgid ""
-"<b>Spyder %s is available!</b> <br><br>Please use your package manager to "
-"update Spyder or go to our <a href=\"%s\">Releases</a> page to download this "
-"new version. <br><br>If you are not sure how to proceed to update Spyder "
-"please refer to our  <a href=\"%s\">Installation</a> instructions."
-msgstr ""
+#: spyder/plugins/variableexplorer.py:29
+msgid "Refresh interval: "
+msgstr "Intervalo de actualización"
 
-#: spyderlib/spyder.py:2902
-#, fuzzy
-msgid "Spyder is up to date."
-msgstr "Obtener soporte para Spyder"
+#: spyder/plugins/variableexplorer.py:33
+msgid "Filter"
+msgstr "Filtrar"
 
-#: spyderlib/tour.py:121
-#, fuzzy
-msgid "Welcome to the Introduction tour"
-msgstr "Bienvenido a Spyder!"
+#: spyder/plugins/variableexplorer.py:35
+#: spyder/widgets/variableexplorer/namespacebrowser.py:229
+msgid "Exclude private references"
+msgstr "Excluir variables privadas"
 
-#: spyderlib/tour.py:122
-msgid ""
-"<b>Spyder</b> is a powerful Interactive Development Environment (or IDE) for "
-"the Python programming language.<br><br>Here we are going to guide you "
-"through its most important features.<br><br>Please use the arrow keys or "
-"click on the buttons below to move along the tour."
-msgstr ""
+#: spyder/plugins/variableexplorer.py:36
+#: spyder/widgets/variableexplorer/namespacebrowser.py:244
+msgid "Exclude capitalized references"
+msgstr "Excluir variables que comienzan en mayúsculas"
 
-#: spyderlib/tour.py:131
-#, fuzzy
-msgid "The Editor"
-msgstr "Editor de texto"
+#: spyder/plugins/variableexplorer.py:37
+#: spyder/widgets/variableexplorer/namespacebrowser.py:237
+msgid "Exclude all-uppercase references"
+msgstr "Excluir variables en mayúsculas"
 
-#: spyderlib/tour.py:132
-msgid ""
-"This is the pane where you write Python code before evaluating it. You can "
-"get automatic suggestions and completions while writing, by pressing the "
-"<b>Tab</b> key next to a given text.<br><br>The Editor comes with a line "
-"number area (highlighted here in red), where Spyder shows warnings and "
-"syntax errors. They can help you to detect potential problems before running "
-"the code.<br><br>You can also set debug breakpoints in the line number area, "
-"by doing a double click next to a non-empty line."
-msgstr ""
+#: spyder/plugins/variableexplorer.py:38
+#: spyder/widgets/variableexplorer/namespacebrowser.py:252
+msgid "Exclude unsupported data types"
+msgstr "Excluir tipos de datos no soportados"
 
-#: spyderlib/tour.py:147
-#, fuzzy
-msgid "The IPython console"
-msgstr "Terminal de IPython"
+#: spyder/plugins/variableexplorer.py:44
+#: spyder/widgets/variableexplorer/collectionseditor.py:675
+msgid "Truncate values"
+msgstr "Abreviar valores"
 
-#: spyderlib/tour.py:164
-#, fuzzy
-msgid "The Variable Explorer"
-msgstr "Explorador de variables"
+#: spyder/plugins/variableexplorer.py:46
+#: spyder/widgets/variableexplorer/collectionseditor.py:679
+msgid "Show arrays min/max"
+msgstr "Mostrar el máximo y mínimo de arreglos"
+
+#: spyder/plugins/variableexplorer.py:48
+msgid "Edit data in the remote process"
+msgstr "Editar los datos en un proceso remoto"
 
-#: spyderlib/tour.py:165
+#: spyder/plugins/variableexplorer.py:49
 msgid ""
-"In this pane you can view and edit the variables generated during the "
-"execution of a program, or those entered directly in one of Spyder consoles."
-"<br><br>As you can see, the Variable Explorer is showing the variables "
-"generated during the last step of this tour. By doing a double-click on any "
-"of them, a new window will be opened, where you can inspect and modify their "
-"contents."
+"Editors are opened in the remote process for NumPy arrays, PIL images, "
+"lists, tuples and dictionaries.\n"
+"This avoids transfering large amount of data between the remote process and "
+"Spyder (through the socket)."
 msgstr ""
+"Esta opción permite modificar arreglos de NumPy, imágenes de\n"
+"de PIL/Pillow, Dataframes, y listas, tuplas y diccionarios en el\n"
+"proceso remoto. Esto impide transferir grandes cantidades de\n"
+"datos entre el proceso remoto y Spyder."
 
-#: spyderlib/tour.py:177
-#, fuzzy
-msgid "The Python console"
-msgstr "Terminal de IPython"
+#: spyder/plugins/variableexplorer.py:185
+msgid "Variable explorer"
+msgstr "Explorador de variables"
 
-#: spyderlib/tour.py:178
+#: spyder/plugins/workingdirectory.py:38
 msgid ""
-"You can also run your code on a Python console. These consoles are useful "
-"because they let you run a file in a console dedicated only to it.To select "
-"this behavior, please press the <b>F6</b> key.<br><br>By pressing the button "
-"below and then focusing the Variable Explorer, you will notice that Python "
-"consoles are also connected to that pane, and that the Variable Explorer "
-"only shows the variables of the currently focused console."
+"The <b>global working directory</b> is the working directory for newly "
+"opened <i>consoles</i> (Python/IPython consoles and terminals), for the "
+"<i>file explorer</i>, for the <i>find in files</i> plugin and for new files "
+"created in the <i>editor</i>."
 msgstr ""
+"El <b>directorio de trabajo global</b> es el directorio de trabajo para las "
+"<i>terminales</i> que se abran de aquí en adelante (de IPython y Python, y "
+"terminales de comandos), para el <i>Explorador de archivos</i> y <i>Buscar "
+"en archivos</i> y para los nuevos archivos creados en el <i>Editor</i>."
 
-#: spyderlib/tour.py:192
-#, fuzzy
-msgid "The Object Inspector"
-msgstr "Inspector de objetos"
+#: spyder/plugins/workingdirectory.py:47
+msgid "At startup, the global working directory is:"
+msgstr "Al inicio, el directorio de trabajo global es:"
+
+#: spyder/plugins/workingdirectory.py:51
+msgid "the same as in last session"
+msgstr "El mismo de la última sesión"
+
+#: spyder/plugins/workingdirectory.py:53
+msgid "At startup, Spyder will restore the global directory from last session"
+msgstr "Al inicio Spyder restaurará el directorio global de la última sesión"
+
+#: spyder/plugins/workingdirectory.py:59
+msgid "At startup, the global working directory will be the specified path"
+msgstr "Al inicio el directorio de trabajo global será el siguiente"
+
+#: spyder/plugins/workingdirectory.py:71
+msgid "Files are opened from:"
+msgstr "Los archivos deben abrirse desde:"
+
+#: spyder/plugins/workingdirectory.py:75 spyder/plugins/workingdirectory.py:88
+msgid "the current file directory"
+msgstr "El directorio en  el que se encuentra el archivo actual"
+
+#: spyder/plugins/workingdirectory.py:79 spyder/plugins/workingdirectory.py:92
+msgid "the global working directory"
+msgstr "El directorio de trabajo global"
+
+#: spyder/plugins/workingdirectory.py:84
+msgid "Files are created in:"
+msgstr "Los archivos son creados en:"
+
+#: spyder/plugins/workingdirectory.py:98
+msgid "Change to file base directory"
+msgstr "Cambiarse al directorio base de un archivo"
+
+#: spyder/plugins/workingdirectory.py:100
+msgid "When opening a file"
+msgstr "Cuando se abra un archivo"
 
-#: spyderlib/tour.py:193
+#: spyder/plugins/workingdirectory.py:102
+msgid "When saving a file"
+msgstr "Cuando se guarde un archivo"
+
+#: spyder/plugins/workingdirectory.py:172
+msgid "Back"
+msgstr "Anterior"
+
+#: spyder/plugins/workingdirectory.py:180 spyder/widgets/explorer.py:1079
+#: spyder/widgets/variableexplorer/importwizard.py:529
+msgid "Next"
+msgstr "Siguiente"
+
+#: spyder/plugins/workingdirectory.py:191
 msgid ""
-"This pane displays documentation of the functions, classes, methods or "
-"modules you are currently using in the Editor or the Consoles.<br><br>To use "
-"it, you need to press <b>Ctrl+I</b> in front of an object. If that object "
-"has some documentation associated with it, it will be displayed here."
+"This is the working directory for newly\n"
+"opened consoles (Python/IPython consoles and\n"
+"terminals), for the file explorer, for the\n"
+"find in files plugin and for new files\n"
+"created in the editor"
 msgstr ""
+"Este es el directorio de trabajo para las\n"
+"terminales que se abran de aquí en\n"
+"adelante (de IPython y Python y terminales de\n"
+"comandos), para el Explorador de archivos,\n"
+"y Buscar en archivos y para los nuevos\n"
+"archivos creados en el Editor"
 
-#: spyderlib/tour.py:203
-#, fuzzy
-msgid "The File Explorer"
-msgstr "Explorador de archivos"
+#: spyder/plugins/workingdirectory.py:219
+msgid "Browse a working directory"
+msgstr "Seleccionar un directorio de trabajo"
+
+#: spyder/plugins/workingdirectory.py:226
+msgid "Change to parent directory"
+msgstr "Moverse al directorio superior"
 
-#: spyderlib/tour.py:204
+#: spyder/plugins/workingdirectory.py:233
+msgid "Global working directory"
+msgstr "Directorio de trabajo global"
+
+#: spyder/utils/codeanalysis.py:91
+msgid "Real-time code analysis on the Editor"
+msgstr "Análisis del código en tiempo real en el Editor"
+
+#: spyder/utils/codeanalysis.py:95
+msgid "Real-time code style analysis on the Editor"
+msgstr "Análisis de estilo del código en el Editor"
+
+#: spyder/utils/environ.py:101
 msgid ""
-"This pane lets you navigate through the directories and files present in "
-"your computer.<br><br>You can also open any of these files with its "
-"corresponding application, by doing a double click on it.<br><br>There is "
-"one exception to this rule: plain-text files will always be opened in the "
-"Spyder Editor."
+"Module <b>pywin32 was not found</b>.<br>Please restart this Windows "
+"<i>session</i> (not the computer) for changes to take effect."
 msgstr ""
+"No se pudo encontrar el módulo <b>pywin32</b>.<br>Por favor reinicie esta "
+"<i>sesión</i> de Windows (no el computador) para que los cambios surtan "
+"efecto."
 
-#: spyderlib/tour.py:214
-#, fuzzy
-msgid "The History Log"
-msgstr "Historial de comandos"
-
-#: spyderlib/tour.py:215
+#: spyder/utils/environ.py:114
 msgid ""
-"This pane records all commands introduced in the Python and IPython consoles."
+"If you accept changes, this will modify the current user environment "
+"variables directly <b>in Windows registry</b>. Use it with precautions, at "
+"your own risks.<br><br>Note that for changes to take effect, you will need "
+"to restart the parent process of this application (simply restart Spyder if "
+"you have executed it from a Windows shortcut, otherwise restart any "
+"application from which you may have executed it, like <i>Python(x,y) Home</"
+"i> for example)"
 msgstr ""
+"Si acepta los cambios, se modificarán las variables de entorno del usuario "
+"actual directamente <b>en el registro de Windows</b>. Hágalo con precaución "
+"y bajo su propio riesgo.<br><br>Tenga en cuenta que para que los cambios "
+"tengan efecto, deberá reiniciar el proceso padre de esta aplicación "
+"(simplemente reinicie Spyder si lo ejecutó desde un acceso directo, de otra "
+"forma reinicie la aplicación desde la cual lo inició, como por ejemplo "
+"<i>Python(x,y) Home</i>)"
 
-#: spyderlib/tour.py:263
-msgid "<b>Spyder</b> is an interactive development environment based on bla"
+#: spyder/utils/help/sphinxify.py:217 spyder/utils/help/sphinxify.py:227
+msgid ""
+"It was not possible to generate rich text help for this object.</br>Please "
+"see it in plain text."
 msgstr ""
+"No fue posible generar ayuda en texto enriquecido para este objeto.</br>Por "
+"favor véala en texto plano."
 
-#: spyderlib/tour.py:267
-#, fuzzy
-msgid "Welcome to Spyder introduction tour"
-msgstr "Bienvenido a Spyder!"
+#: spyder/utils/introspection/manager.py:33
+#: spyder/utils/introspection/manager.py:38
+msgid "Editor's code completion, go-to-definition and help"
+msgstr "Completado del código y ayuda en el Editor"
 
-#: spyderlib/tour.py:268
-msgid "Spyder is an interactive development environment based on bla"
-msgstr ""
+#: spyder/utils/iofuncs.py:408
+msgid "Supported files"
+msgstr "Archivos soportados"
 
-#: spyderlib/tour.py:273
-#, fuzzy
-msgid "Introduction tour"
-msgstr "Introspección"
+#: spyder/utils/iofuncs.py:410
+msgid "All files (*.*)"
+msgstr "Todos los archivos (*.*)"
 
-#: spyderlib/tour.py:274
-msgid "New features in version 3.0"
+#: spyder/utils/iofuncs.py:420
+msgid "Spyder data files"
+msgstr "Archivos de datos de Spyder"
+
+#: spyder/utils/iofuncs.py:422
+#: spyder/widgets/variableexplorer/collectionseditor.py:1029
+msgid "NumPy arrays"
+msgstr "Arreglos de NumPy"
+
+#: spyder/utils/iofuncs.py:423
+msgid "NumPy zip arrays"
+msgstr "Arreglos comprimidos de NumPy"
+
+#: spyder/utils/iofuncs.py:424
+msgid "Matlab files"
+msgstr "Archivos de Matlab"
+
+#: spyder/utils/iofuncs.py:425
+msgid "CSV text files"
+msgstr "Archivos de texto CSV"
+
+#: spyder/utils/iofuncs.py:427
+msgid "JPEG images"
+msgstr "Imágenes JPEG"
+
+#: spyder/utils/iofuncs.py:428
+msgid "PNG images"
+msgstr "Imágenes PNG"
+
+#: spyder/utils/iofuncs.py:429
+msgid "GIF images"
+msgstr "Imágenes GIF"
+
+#: spyder/utils/iofuncs.py:430
+msgid "TIFF images"
+msgstr "Imágenes TIFF"
+
+#: spyder/utils/iofuncs.py:431 spyder/utils/iofuncs.py:432
+msgid "Pickle files"
+msgstr "Archivos pickle"
+
+#: spyder/utils/iofuncs.py:433
+msgid "JSON files"
+msgstr "Archivos JSON"
+
+#: spyder/utils/iofuncs.py:452 spyder/utils/iofuncs.py:459
+msgid "<b>Unsupported file type '%s'</b>"
+msgstr "<b>Tipo de archivo no soportado '%s'</b>"
+
+#: spyder/utils/programs.py:286
+msgid "It was not possible to run this file in an external terminal"
+msgstr "No fue posible ejecutar este archivo en una terminal del sistema"
+
+#: spyder/utils/syntaxhighlighters.py:33
+msgid "Syntax highlighting for Matlab, Julia and other file types"
 msgstr ""
+"Coloreado del código para archivos tipo Matlab, Julia y varios otros tipos"
+
+#: spyder/utils/syntaxhighlighters.py:42
+msgid "Background:"
+msgstr "Fondo:"
+
+#: spyder/utils/syntaxhighlighters.py:43
+#: spyder/widgets/sourcecode/codeeditor.py:106
+msgid "Current line:"
+msgstr "Línea seleccionada:"
+
+#: spyder/utils/syntaxhighlighters.py:44
+msgid "Current cell:"
+msgstr "Celda seleccionada:"
+
+#: spyder/utils/syntaxhighlighters.py:45
+msgid "Occurrence:"
+msgstr "Ocurrencia:"
+
+#: spyder/utils/syntaxhighlighters.py:46
+msgid "Link:"
+msgstr "Enlace:"
+
+#: spyder/utils/syntaxhighlighters.py:47
+msgid "Side areas:"
+msgstr "Áreas laterales:"
+
+#: spyder/utils/syntaxhighlighters.py:48
+msgid "Matched <br>parens:"
+msgstr "Paréntesis <br>emparejados:"
+
+#: spyder/utils/syntaxhighlighters.py:49
+msgid "Unmatched <br>parens:"
+msgstr "Paréntesis <br>desemparejados:"
+
+#: spyder/utils/syntaxhighlighters.py:50
+msgid "Normal text:"
+msgstr "Texto normal:"
+
+#: spyder/utils/syntaxhighlighters.py:51
+msgid "Keyword:"
+msgstr "Palabra clave:"
+
+#: spyder/utils/syntaxhighlighters.py:52
+msgid "Builtin:"
+msgstr "Objeto integrado:"
+
+#: spyder/utils/syntaxhighlighters.py:53
+msgid "Definition:"
+msgstr "Definición:"
+
+#: spyder/utils/syntaxhighlighters.py:54
+msgid "Comment:"
+msgstr "Comentario:"
+
+#: spyder/utils/syntaxhighlighters.py:55
+msgid "String:"
+msgstr "Cadena:"
+
+#: spyder/utils/syntaxhighlighters.py:56
+msgid "Number:"
+msgstr "Número:"
+
+#: spyder/utils/syntaxhighlighters.py:57
+msgid "Instance:"
+msgstr "Instancia:"
+
+#: spyder/widgets/arraybuilder.py:179
+msgid ""
+"\n"
+"           <b>Numpy Array/Matrix Helper</b><br>\n"
+"           Type an array in Matlab    : <code>[1 2;3 4]</code><br>\n"
+"           or Spyder simplified syntax : <code>1 2;3 4</code>\n"
+"           <br><br>\n"
+"           Hit 'Enter' for array or 'Ctrl+Enter' for matrix.\n"
+"           <br><br>\n"
+"           <b>Hint:</b><br>\n"
+"           Use two spaces or two tabs to generate a ';'.\n"
+"           "
+msgstr ""
+"\n"
+"           <b>Ayuda para arreglos de Numpy</b><br>\n"
+"           Escriba un arreglo en Matlab    : <code>[1 2;3 4]</code><br>\n"
+"           o sintaxis simplificada de Spyder : <code>1 2;3 4</code>\n"
+"           <br><br>\n"
+"           Oprima 'Enter' para un arreglo o 'Ctrl+Enter' para una matriz.\n"
+"           <br><br>\n"
+"           <b>Consejo:</b><br>\n"
+"           Use dos espacios o tabs para generar un ';'.\n"
+"           "
+
+#: spyder/widgets/arraybuilder.py:190
+msgid ""
+"\n"
+"           <b>Numpy Array/Matrix Helper</b><br>\n"
+"           Enter an array in the table. <br>\n"
+"           Use Tab to move between cells.\n"
+"           <br><br>\n"
+"           Hit 'Enter' for array or 'Ctrl+Enter' for matrix.\n"
+"           <br><br>\n"
+"           <b>Hint:</b><br>\n"
+"           Use two tabs at the end of a row to move to the next row.\n"
+"           "
+msgstr ""
+"\n"
+"           <b>Ayuda para arreglos de Numpy</b><br>\n"
+"           Introduzca un arreglo en la tabla. <br>\n"
+"           Use Tab para moverse entre las celdas.\n"
+"           <br><br>\n"
+"           Oprima 'Enter' para un arreglo o 'Ctrl+Enter' para una matriz.\n"
+"           <br><br>\n"
+"           <b>Consejo:</b><br>\n"
+"           Use dos tabs al final de una fila para moverse a la siguiente.\n"
+"           "
+
+#: spyder/widgets/arraybuilder.py:365
+msgid "Array dimensions not valid"
+msgstr "Las dimensiones del arreglo no son válidas"
+
+#: spyder/widgets/browser.py:54 spyder/widgets/sourcecode/codeeditor.py:2518
+msgid "Zoom out"
+msgstr "Alejar"
+
+#: spyder/widgets/browser.py:57 spyder/widgets/sourcecode/codeeditor.py:2514
+msgid "Zoom in"
+msgstr "Acercar"
+
+#: spyder/widgets/browser.py:162
+msgid "Home"
+msgstr "Página de inicio"
+
+#: spyder/widgets/browser.py:198
+msgid "Find text"
+msgstr "Encontrar texto"
+
+#: spyder/widgets/browser.py:216
+msgid "Address:"
+msgstr "Dirección:"
+
+#: spyder/widgets/browser.py:252
+msgid "Unable to load page"
+msgstr "No fue posible cargar la página"
+
+#: spyder/widgets/comboboxes.py:165
+msgid "Press enter to validate this entry"
+msgstr "Presione Enter para validar esta entrada"
+
+#: spyder/widgets/comboboxes.py:166
+msgid "This entry is incorrect"
+msgstr "Esta entrada es incorrecta"
+
+#: spyder/widgets/comboboxes.py:209
+msgid "Press enter to validate this path"
+msgstr "Presione Enter para validar esta ruta"
+
+#: spyder/widgets/dependencies.py:63
+msgid " Required "
+msgstr "Requerido"
+
+#: spyder/widgets/dependencies.py:63
+msgid "Module"
+msgstr "Módulo"
+
+#: spyder/widgets/dependencies.py:64
+msgid " Installed "
+msgstr "Instalado"
+
+#: spyder/widgets/dependencies.py:64
+msgid "Provided features"
+msgstr "Características proporcionadas"
+
+#: spyder/widgets/dependencies.py:134
+msgid "Dependencies"
+msgstr "Dependencias"
+
+#: spyder/widgets/dependencies.py:141
+msgid ""
+"Spyder depends on several Python modules to provide the right functionality "
+"for all its panes. The table below shows the required and installed versions "
+"(if any) of all of them.<br><br><b>Note</b>: You can safely use Spyder "
+"without the following modules installed: <b>%s</b> and <b>%s</b>"
+msgstr ""
+"Spyder depende de varios módulos de Python para proveer la funcionalidad "
+"correcta para todos sus paneles. La tabla que aparece a continuación muestra "
+"las versiones requeridas e instaladas (de existir) de todos ellos."
+"<br><br><b>Nota</b>: Usted puede utilizar Spyder sin problemas si no cuenta "
+"con los siguientes módulos instalados: <b>%s</b> y <b>%s</b>."
+
+#: spyder/widgets/dependencies.py:154
+msgid "Copy to clipboard"
+msgstr "Copiar al portapapeles"
+
+#: spyder/widgets/editor.py:348
+msgid "Copy path to clipboard"
+msgstr "Copiar la ruta al portapapeles"
+
+#: spyder/widgets/editor.py:352
+msgid "Close all to the right"
+msgstr "Cerrar todos a la derecha"
+
+#: spyder/widgets/editor.py:354
+msgid "Close all but this"
+msgstr "Cerrar todos menos éste"
+
+#: spyder/widgets/editor.py:957
+msgid "Temporary file"
+msgstr "Archivo temporal"
+
+#: spyder/widgets/editor.py:1052
+msgid "New window"
+msgstr "Nueva ventana"
+
+#: spyder/widgets/editor.py:1053
+msgid "Create a new editor window"
+msgstr "Crear una nueva ventana de edición"
+
+#: spyder/widgets/editor.py:1056
+msgid "Split vertically"
+msgstr "Dividir verticalmente"
+
+#: spyder/widgets/editor.py:1058
+msgid "Split vertically this editor window"
+msgstr "Dividir verticalmente esta panel o ventana de edición"
+
+#: spyder/widgets/editor.py:1060
+msgid "Split horizontally"
+msgstr "Dividir horizontalmente"
+
+#: spyder/widgets/editor.py:1062
+msgid "Split horizontally this editor window"
+msgstr "Dividir horizontalmente esta ventana o panel de edición"
+
+#: spyder/widgets/editor.py:1064
+msgid "Close this panel"
+msgstr "Cerrar este panel"
+
+#: spyder/widgets/editor.py:1221
+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?"
+
+#: spyder/widgets/editor.py:1283
+msgid "Save"
+msgstr "Guardar"
+
+#: spyder/widgets/editor.py:1284
+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"
+
+#: spyder/widgets/editor.py:1518
+msgid ""
+"<b>%s</b> is unavailable (this file may have been removed, moved or renamed "
+"outside Spyder).<br>Do you want to close it?"
+msgstr ""
+"<b>%s</b> no está disponible (el archivo puede haber sido eliminado, movido "
+"o renombrado por fuera de Spyder).<br>¿Desea cerrarlo?"
+
+#: spyder/widgets/editor.py:1538
+msgid ""
+"<b>%s</b> has been modified outside Spyder.<br>Do you want to reload it and "
+"lose all your changes?"
+msgstr ""
+"<b>%s</b> fue modificado por fuera de Spyder.<br>¿Desea recargarlo y perder "
+"todos sus cambios?"
+
+#: spyder/widgets/editor.py:1634
+msgid ""
+"All changes to <b>%s</b> will be lost.<br>Do you want to revert file from "
+"disk?"
+msgstr ""
+"Todos los cambios a <b>%s</b> se perderán.<br>Desea revertir el archivo del "
+"disco?"
+
+#: spyder/widgets/editor.py:1774
+msgid "Loading %s..."
+msgstr "Cargando %s..."
+
+#: spyder/widgets/editor.py:1784
+msgid ""
+"<b>%s</b> contains mixed end-of-line characters.<br>Spyder will fix this "
+"automatically."
+msgstr ""
+"<b>%s</b> contiene varios tipos de caracteres de fin de línea.<br>Spyder lo "
+"arreglará automáticamente."
+
+#: spyder/widgets/editor.py:2166
+msgid "Close window"
+msgstr "Cerrar ventana"
+
+#: spyder/widgets/editor.py:2168
+msgid "Close this window"
+msgstr "Cierra esta ventana"
+
+#: spyder/widgets/editortools.py:94 spyder/widgets/editortools.py:130
+msgid "Line %s"
+msgstr "Línea %s"
+
+#: spyder/widgets/editortools.py:99
+msgid "Class defined at line %s"
+msgstr "Clase definida en la línea %s"
+
+#: spyder/widgets/editortools.py:107
+msgid "Method defined at line %s"
+msgstr "Método definido en la línea %s"
+
+#: spyder/widgets/editortools.py:117
+msgid "Function defined at line %s"
+msgstr "Función definida en la línea %s"
+
+#: spyder/widgets/editortools.py:149
+msgid "Cell starts at line %s"
+msgstr "La celda empieza en la línea %s"
+
+#: spyder/widgets/editortools.py:202 spyder/widgets/editortools.py:539
+msgid "Go to cursor position"
+msgstr "Ir a la posición del cursor"
+
+#: spyder/widgets/editortools.py:205
+msgid "Show absolute path"
+msgstr "Mostrar la ruta completa"
+
+#: spyder/widgets/editortools.py:208 spyder/widgets/explorer.py:208
+msgid "Show all files"
+msgstr "Mostrar todos los archivos"
+
+#: spyder/widgets/editortools.py:211
+msgid "Show special comments"
+msgstr "Mostrar comentarios especiales"
+
+#: spyder/widgets/explorer.py:204
+msgid "Edit filename filters..."
+msgstr "Editar filtros..."
+
+#: spyder/widgets/explorer.py:218
+msgid "Edit filename filters"
+msgstr "Editar los filtros para nombres de archivo"
+
+#: spyder/widgets/explorer.py:219
+msgid "Name filters:"
+msgstr "Nombres de los filtros:"
+
+#: spyder/widgets/explorer.py:238
+msgid "File..."
+msgstr "Archivo..."
+
+#: spyder/widgets/explorer.py:242
+msgid "Module..."
+msgstr "Módulo"
+
+#: spyder/widgets/explorer.py:246
+msgid "Folder..."
+msgstr "Carpeta..."
+
+#: spyder/widgets/explorer.py:250
+msgid "Package..."
+msgstr "Paquete..."
+
+#: spyder/widgets/explorer.py:271
+#: spyder/widgets/variableexplorer/collectionseditor.py:650
+msgid "Edit"
+msgstr "Editar"
+
+#: spyder/widgets/explorer.py:273
+msgid "Move..."
+msgstr "Mover a..."
+
+#: spyder/widgets/explorer.py:276
+msgid "Delete..."
+msgstr "Eliminar..."
+
+#: spyder/widgets/explorer.py:279
+msgid "Rename..."
+msgstr "Renombrar..."
+
+#: spyder/widgets/explorer.py:282
+msgid "Open"
+msgstr "Abrir"
+
+#: spyder/widgets/explorer.py:283 spyder/widgets/sourcecode/codeeditor.py:2490
+msgid "Convert to Python script"
+msgstr "Convertir a un archivo de Python"
+
+#: spyder/widgets/explorer.py:317
+msgid "Commit"
+msgstr "Consignar"
+
+#: spyder/widgets/explorer.py:320
+msgid "Browse repository"
+msgstr "Explorar repositorio "
+
+#: spyder/widgets/explorer.py:331
+msgid "Open command prompt here"
+msgstr "Abrir símbolo del sistema aquí"
+
+#: spyder/widgets/explorer.py:333
+msgid "Open terminal here"
+msgstr "Abrir terminal del sistema aquí"
+
+#: spyder/widgets/explorer.py:338
+msgid "Open Python console here"
+msgstr "Abrir una terminal de Python aquí"
+
+#: spyder/widgets/explorer.py:352
+msgid "New"
+msgstr "Crear nuevo"
+
+#: spyder/widgets/explorer.py:360
+msgid "Import"
+msgstr "Importar"
+
+#: spyder/widgets/explorer.py:511
+msgid "Do you really want to delete <b>%s</b>?"
+msgstr "¿Realmente desea eliminar <b>%s</b>?"
 
-#: spyderlib/tour.py:821
-#, fuzzy
-msgid "Go to step: "
-msgstr "Ir a la línea"
+#: spyder/widgets/explorer.py:529
+msgid "delete"
+msgstr "eliminar"
 
-#: spyderlib/utils/codeanalysis.py:92
-msgid "Real-time code analysis on the Editor"
-msgstr "Análisis del código en tiempo real en el Editor"
+#: spyder/widgets/explorer.py:530 spyder/widgets/projects/explorer.py:147
+msgid "Project Explorer"
+msgstr "Explorador de proyectos"
 
-#: spyderlib/utils/codeanalysis.py:96
-msgid "Real-time code style analysis on the Editor"
-msgstr "Análisis de estilo del código en el Editor"
+#: spyder/widgets/explorer.py:531 spyder/widgets/projects/explorer.py:148
+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"
 
-#: spyderlib/utils/environ.py:96
-msgid ""
-"Module <b>pywin32 was not found</b>.<br>Please restart this Windows "
-"<i>session</i> (not the computer) for changes to take effect."
-msgstr ""
-"No se pudo encontrar el módulo <b>pywin32</b>.<br>Por favor reinicie esta "
-"<i>sesión</i> de Windows (no el computador) para que los cambios surtan "
-"efecto."
+#: spyder/widgets/explorer.py:554 spyder/widgets/sourcecode/codeeditor.py:2007
+msgid "Conversion error"
+msgstr "Error de conversión"
 
-#: spyderlib/utils/environ.py:109
+#: spyder/widgets/explorer.py:555 spyder/widgets/sourcecode/codeeditor.py:2008
 msgid ""
-"If you accept changes, this will modify the current user environment "
-"variables directly <b>in Windows registry</b>. Use it with precautions, at "
-"your own risks.<br><br>Note that for changes to take effect, you will need "
-"to restart the parent process of this application (simply restart Spyder if "
-"you have executed it from a Windows shortcut, otherwise restart any "
-"application from which you may have executed it, like <i>Python(x,y) Home</"
-"i> for example)"
+"It was not possible to convert this notebook. The error is:\n"
+"\n"
 msgstr ""
-"Si acepta los cambios, se modificarán las variables de entorno del usuario "
-"actual directamente <b>en el registro de Windows</b>. Hágalo con precaución "
-"y bajo su propio riesgo.<br><br>Tenga en cuenta que para que los cambios "
-"tengan efecto, deberá reiniciar el proceso padre de esta aplicación "
-"(simplemente reinicie Spyder si lo ejecutó desde un acceso directo, de otra "
-"forma reinicie la aplicación desde la cual lo inició, como por ejemplo "
-"<i>Python(x,y) Home</i>)"
+"No fue posible convertir este notebook. El error es:\n"
+"\n"
 
-#: spyderlib/utils/inspector/sphinxify.py:212
-#: spyderlib/utils/inspector/sphinxify.py:222
-msgid ""
-"It was not possible to generate rich text help for this object.</br>Please "
-"see it in plain text."
-msgstr ""
-"No fue posible generar ayuda en texto enriquecido para este objeto.</br>Por "
-"favor véala en texto plano."
+#: spyder/widgets/explorer.py:572 spyder/widgets/explorer.py:580
+#: spyder/widgets/explorer.py:591
+#: spyder/widgets/variableexplorer/collectionseditor.py:683
+#: spyder/widgets/variableexplorer/collectionseditor.py:924
+msgid "Rename"
+msgstr "Renombrar"
 
-#: spyderlib/utils/introspection/jedi_plugin.py:32
-msgid "(Experimental) Editor's code completion, go-to-definition and help"
-msgstr "(Experimental) Completado del código y ayuda en el Editor"
+#: spyder/widgets/explorer.py:573
+msgid "New name:"
+msgstr "Nuevo nombre:"
 
-#: spyderlib/utils/introspection/rope_plugin.py:37
-msgid "Editor's code completion, go-to-definition and help"
-msgstr "Completado del código y ayuda en el Editor"
+#: spyder/widgets/explorer.py:581
+msgid ""
+"Do you really want to rename <b>%s</b> and overwrite the existing file <b>"
+"%s</b>?"
+msgstr ""
+"¿Realmente desea renombrar <b>%s</b> y sobrescribir el archivo existente <b>"
+"%s</b>?"
 
-#: spyderlib/utils/iofuncs.py:482
-msgid "Supported files"
-msgstr "Archivos soportados"
+#: spyder/widgets/explorer.py:592
+msgid "<b>Unable to rename file <i>%s</i></b><br><br>Error message:<br>%s"
+msgstr ""
+"<b>No fue posible renombrar el archivo <i>%s</i></b><br><br>Mensaje de error:"
+"<br>%s"
 
-#: spyderlib/utils/iofuncs.py:484
-msgid "All files (*.*)"
-msgstr "Todos los archivos (*.*)"
+#: spyder/widgets/explorer.py:628
+msgid "<b>Unable to move <i>%s</i></b><br><br>Error message:<br>%s"
+msgstr "<b>No fue posible mover <i>%s</i></b><br><br>Mensaje de error:<br>%s"
 
-#: spyderlib/utils/iofuncs.py:494
-msgid "Spyder data files"
-msgstr "Archivos de datos de Spyder"
+#: spyder/widgets/explorer.py:646
+msgid "<b>Unable to create folder <i>%s</i></b><br><br>Error message:<br>%s"
+msgstr ""
+"<b>No fue posible crear la carpeta <i>%s</i></b><br><br>Mensaje de error:<br>"
+"%s"
 
-#: spyderlib/utils/iofuncs.py:496 spyderlib/widgets/dicteditor.py:1056
-msgid "NumPy arrays"
-msgstr "Arreglos de NumPy"
+#: spyder/widgets/explorer.py:659 spyder/widgets/explorer.py:693
+msgid "<b>Unable to create file <i>%s</i></b><br><br>Error message:<br>%s"
+msgstr ""
+"<b>No fue posible crear el archivo <i>%s</i></b><br><br>Mensaje de error:<br>"
+"%s"
 
-#: spyderlib/utils/iofuncs.py:497
-msgid "NumPy zip arrays"
-msgstr "Arreglos comprimidos de NumPy"
+#: spyder/widgets/explorer.py:667
+msgid "New folder"
+msgstr "Nueva carpeta"
 
-#: spyderlib/utils/iofuncs.py:498
-msgid "Matlab files"
-msgstr "Archivos de Matlab"
+#: spyder/widgets/explorer.py:668
+msgid "Folder name:"
+msgstr "Nombre de la carpeta:"
 
-#: spyderlib/utils/iofuncs.py:499
-msgid "CSV text files"
-msgstr "Archivos de texto CSV"
+#: spyder/widgets/explorer.py:673
+msgid "New package"
+msgstr "Nuevo paquete"
 
-#: spyderlib/utils/iofuncs.py:501
-msgid "JPEG images"
-msgstr "Imágenes JPEG"
+#: spyder/widgets/explorer.py:674
+msgid "Package name:"
+msgstr "Nombre del paquete:"
 
-#: spyderlib/utils/iofuncs.py:502
-msgid "PNG images"
-msgstr "Imágenes PNG"
+#: spyder/widgets/explorer.py:714
+msgid "New module"
+msgstr "Nuevo módulo"
 
-#: spyderlib/utils/iofuncs.py:503
-msgid "GIF images"
-msgstr "Imágenes GIF"
+#: spyder/widgets/explorer.py:729
+msgid ""
+"For %s support, please install one of the<br/> following tools:<br/><br/>  %s"
+msgstr ""
+"Para contar con soporte de %s, por favor instale una de<br/> las siguientes "
+"herramientas:<br/><br/>  %s"
 
-#: spyderlib/utils/iofuncs.py:504
-msgid "TIFF images"
-msgstr "Imágenes TIFF"
+#: spyder/widgets/explorer.py:733
+msgid "<b>Unable to find external program.</b><br><br>%s"
+msgstr "<b>No fue posible encontrar el programa externo.</b><br><br>%s"
 
-#: spyderlib/utils/iofuncs.py:505 spyderlib/utils/iofuncs.py:506
-msgid "Pickle files"
-msgstr "Archivos pickle"
+#: spyder/widgets/explorer.py:948
+msgid "Show current directory only"
+msgstr "Mostrar sólo el directorio actual"
 
-#: spyderlib/utils/iofuncs.py:507
-msgid "JSON files"
-msgstr "Archivos JSON"
+#: spyder/widgets/explorer.py:1046
+msgid "You don't have the right permissions to open this directory"
+msgstr "No tiene con permisos para abrir este directorio"
 
-#: spyderlib/utils/iofuncs.py:526 spyderlib/utils/iofuncs.py:533
-msgid "<b>Unsupported file type '%s'</b>"
-msgstr "<b>Tipo de archivo no soportado '%s'</b>"
+#: spyder/widgets/explorer.py:1076
+#: spyder/widgets/variableexplorer/importwizard.py:525
+msgid "Previous"
+msgstr "Anterior"
 
-#: spyderlib/utils/programs.py:176
-msgid "It was not possible to run this file in an external terminal"
-msgstr "No fue posible ejecutar este archivo en una terminal del sistema"
+#: spyder/widgets/explorer.py:1082
+msgid "Parent"
+msgstr "Directorio superior"
 
-#: spyderlib/widgets/arraybuilder.py:162
-msgid ""
-"\n"
-"           <b>Numpy Array/Matrix Helper</b><br>\n"
-"           Type an array in Matlab    : <code>[1 2;3 4]</code><br>\n"
-"           or Spyder simplified syntax : <code>1 2;3 4</code>\n"
-"           <br><br>\n"
-"           Hit 'Enter' for array or 'Ctrl+Enter' for matrix.\n"
-"           <br><br>\n"
-"           <b>Hint:</b><br>\n"
-"           Use two spaces or two tabs to generate a ';'.\n"
-"           "
-msgstr ""
+#: spyder/widgets/externalshell/baseshell.py:129
+msgid "Run again this program"
+msgstr "Ejecutar de nuevo este programa"
 
-#: spyderlib/widgets/arraybuilder.py:173
-msgid ""
-"\n"
-"           <b>Numpy Array/Matrix Helper</b><br>\n"
-"           Enter an array in the table. <br>\n"
-"           Use Tab to move between cells.\n"
-"           <br><br>\n"
-"           Hit 'Enter' for array or 'Ctrl+Enter' for matrix.\n"
-"           <br><br>\n"
-"           <b>Hint:</b><br>\n"
-"           Use two tabs at the end of a row to move to the next row.\n"
-"           "
-msgstr ""
+#: spyder/widgets/externalshell/baseshell.py:132
+msgid "Kill"
+msgstr "Terminar"
 
-#: spyderlib/widgets/arraybuilder.py:337
-msgid "Array dimensions not valid"
+#: spyder/widgets/externalshell/baseshell.py:134
+msgid "Kills the current process, causing it to exit immediately"
 msgstr ""
+"Termina el proceso actual, provocando\n"
+"que culmine inmediatamente"
 
-#: spyderlib/widgets/arrayeditor.py:453 spyderlib/widgets/arrayeditor.py:486
-#: spyderlib/widgets/dataframeeditor.py:508
-#: spyderlib/widgets/dataframeeditor.py:548
-msgid "Format"
-msgstr "Formato"
+#: spyder/widgets/externalshell/baseshell.py:206
+msgid "<span style='color: #44AA44'><b>Running...</b></span>"
+msgstr "<span style='color: #44AA44'><b>Corriendo...</b></span>"
 
-#: spyderlib/widgets/arrayeditor.py:458
-#: spyderlib/widgets/dataframeeditor.py:512
-msgid "Resize"
-msgstr "Redimensionar"
+#: spyder/widgets/externalshell/baseshell.py:213
+msgid "Terminated."
+msgstr "Terminado."
 
-#: spyderlib/widgets/arrayeditor.py:487
-#: spyderlib/widgets/dataframeeditor.py:549
-msgid "Float formatting"
-msgstr "Formato de punto flotante"
+#: spyder/widgets/externalshell/baseshell.py:238
+#: spyder/widgets/ipythonconsole/help.py:125 spyder/widgets/mixins.py:661
+msgid "Arguments"
+msgstr "Argumentos"
 
-#: spyderlib/widgets/arrayeditor.py:494
-#: spyderlib/widgets/dataframeeditor.py:557 spyderlib/widgets/explorer.py:587
-#: spyderlib/widgets/explorer.py:689
-#: spyderlib/widgets/externalshell/pythonshell.py:553
-#: spyderlib/widgets/externalshell/systemshell.py:99
-msgid "Error"
-msgstr "Error"
+#: spyder/widgets/externalshell/baseshell.py:239
+msgid "Command line arguments:"
+msgstr "Argumentos de la línea de comandos:"
 
-#: spyderlib/widgets/arrayeditor.py:495
-#: spyderlib/widgets/dataframeeditor.py:558
-msgid "Format (%s) is incorrect"
-msgstr "El formato (%s) es incorrecto"
+#: spyder/widgets/externalshell/pythonshell.py:277
+msgid "Variables"
+msgstr "Variables"
 
-#: spyderlib/widgets/arrayeditor.py:529
-msgid "Array is empty"
-msgstr "El arreglo está vacío"
+#: spyder/widgets/externalshell/pythonshell.py:278
+msgid "Show/hide global variables explorer"
+msgstr ""
+"Mostrar u ocultar el\n"
+"explorador de variables"
 
-#: spyderlib/widgets/arrayeditor.py:532
-msgid "Arrays with more than 3 dimensions are not supported"
-msgstr "Los arreglos de más de tres dimensiones no están soportados"
+#: spyder/widgets/externalshell/pythonshell.py:282
+msgid "Terminate"
+msgstr "Interrumpir"
 
-#: spyderlib/widgets/arrayeditor.py:535
-msgid "The 'xlabels' argument length do no match array column number"
+#: spyder/widgets/externalshell/pythonshell.py:283
+msgid ""
+"Attempts to stop the process. The process\n"
+"may not exit as a result of clicking this\n"
+"button (it is given the chance to prompt\n"
+"the user for any unsaved files, etc)."
 msgstr ""
-"El argumento de longitud 'xlabels' no coincide con el número de columnas del "
-"arreglo"
+"Intenta interrumpir este proceso, pero éste\n"
+"puede no concluir tras oprimir este botón\n"
+"(pues es posible que se le pida al usuario\n"
+"guardar archivos sin salvar, etc)."
 
-#: spyderlib/widgets/arrayeditor.py:539
-msgid "The 'ylabels' argument length do no match array row number"
-msgstr ""
-"El argumento de longitud 'ylabels' no coincide con el número de filas del "
-"arreglo"
+#: spyder/widgets/externalshell/pythonshell.py:296
+msgid "Interact"
+msgstr "Interactuar"
 
-#: spyderlib/widgets/arrayeditor.py:546
-msgid "%s arrays"
-msgstr "Los arreglos %s"
+#: spyder/widgets/externalshell/pythonshell.py:298
+msgid "Debug"
+msgstr "Depurar"
 
-#: spyderlib/widgets/arrayeditor.py:547
-msgid "%s are currently not supported"
-msgstr "%s no están soportados por el momento"
+#: spyder/widgets/externalshell/pythonshell.py:300
+#: spyder/widgets/externalshell/pythonshell.py:366
+msgid "Arguments..."
+msgstr "Argumentos..."
 
-#: spyderlib/widgets/arrayeditor.py:554
-#, fuzzy
-msgid "NumPy array"
-msgstr "Arreglos de NumPy"
+#: spyder/widgets/externalshell/pythonshell.py:302
+msgid "Post Mortem Debug"
+msgstr "Depuración Post Mortem"
 
-#: spyderlib/widgets/arrayeditor.py:556 spyderlib/widgets/arrayeditor.py:710
-msgid "Array editor"
-msgstr "Editor de arreglos"
+#: spyder/widgets/externalshell/pythonshell.py:308
+msgid "Working directory"
+msgstr "Directorio de trabajo"
 
-#: spyderlib/widgets/arrayeditor.py:558
-msgid "read only"
-msgstr "sólo lectura"
+#: spyder/widgets/externalshell/pythonshell.py:310
+msgid "Set current working directory"
+msgstr "Establece el directorio de trabajo"
 
-#: spyderlib/widgets/arrayeditor.py:588
-msgid "Record array fields:"
-msgstr "Campos del arreglo de records:"
+#: spyder/widgets/externalshell/pythonshell.py:312
+msgid "Environment variables"
+msgstr "Variables de entorno"
 
-#: spyderlib/widgets/arrayeditor.py:600
-msgid "Data"
-msgstr "Datos"
+#: spyder/widgets/externalshell/pythonshell.py:316
+msgid "Show sys.path contents"
+msgstr "Contenidos del sys.path"
 
-#: spyderlib/widgets/arrayeditor.py:600
-msgid "Mask"
-msgstr "Máscara"
+#: spyder/widgets/externalshell/pythonshell.py:362
+msgid "Arguments: %s"
+msgstr "Argumentos: %s"
 
-#: spyderlib/widgets/arrayeditor.py:600
-msgid "Masked data"
-msgstr "Datos enmascarados"
+#: spyder/widgets/externalshell/pythonshell.py:364
+msgid "No argument"
+msgstr "Sin argumentos"
 
-#: spyderlib/widgets/arrayeditor.py:611
-msgid "Axis:"
-msgstr "Eje:"
+#: spyder/widgets/externalshell/pythonshell.py:534
+msgid "A Python console failed to start!"
+msgstr "No se pudo iniciar una terminal de Python!"
 
-#: spyderlib/widgets/arrayeditor.py:616
-msgid "Index:"
-msgstr "Índice:"
+#: spyder/widgets/externalshell/systemshell.py:106
+msgid "Process failed to start"
+msgstr "El proceso falló al empezar"
 
-#: spyderlib/widgets/arrayeditor.py:629
-msgid "<u>Warning</u>: changes are applied separately"
-msgstr "<u>Advertencia</u>: los cambios son aplicados de forma separada"
+#: spyder/widgets/fileswitcher.py:109
+msgid "unsaved file"
+msgstr "Archivo sin guardar"
 
-#: spyderlib/widgets/arrayeditor.py:630
+#: spyder/widgets/fileswitcher.py:230
 msgid ""
-"For performance reasons, changes applied to masked array won't be reflected "
-"in array's data (and vice-versa)."
+"Press <b>Enter</b> to switch files or <b>Esc</b> to cancel.<br><br>Type to "
+"filter filenames.<br><br>Use <b>:number</b> to go to a line, e.g. "
+"<b><code>main:42</code></b><br>Use <b>@symbol_text</b> to go to a symbol, e."
+"g. <b><code>@init</code></b><br><br> Press <b>Ctrl+W</b> to close current "
+"tab.<br>"
 msgstr ""
-"Por razones de rendimiento, los cambios\n"
-"aplicados a arreglos enmascarados no se\n"
-"verán reflejados en los datos del arreglo\n"
-"(y viceversa)."
+"Presione <b>Enter</b> para cambiar entre archivos o <b>Esc</b> para cancelar."
+"<br><br>Escriba un texto para filtrar los nombres de archivos.<br><br>Use "
+"<b>:número</b> para ir a una línea dada, e.g. <b><code>main:42</code></"
+"b><br>Use <b>@símbolo</b> para ir a un símbolo, e.g. <b><code>@init</code></"
+"b><br><br> Presione <b>Ctrl+W</b> para cerrar la pestaña actual.<br>"
 
-#: spyderlib/widgets/browser.py:31
-#: spyderlib/widgets/sourcecode/codeeditor.py:2468
-msgid "Zoom out"
-msgstr "Alejar"
+#: spyder/widgets/fileswitcher.py:508
+msgid "lines"
+msgstr "líneas"
 
-#: spyderlib/widgets/browser.py:34
-#: spyderlib/widgets/sourcecode/codeeditor.py:2465
-msgid "Zoom in"
-msgstr "Acercar"
+#: spyder/widgets/findinfiles.py:158
+msgid "Unexpected error: see internal console"
+msgstr "Error inesperado. Por favor vea la terminal interna."
 
-#: spyderlib/widgets/browser.py:131
-msgid "Home"
-msgstr "Página de inicio"
+#: spyder/widgets/findinfiles.py:209 spyder/widgets/findinfiles.py:233
+#: spyder/widgets/findinfiles.py:280
+msgid "invalid regular expression"
+msgstr "expresión regular inválida"
 
-#: spyderlib/widgets/browser.py:166
-msgid "Find text"
-msgstr "Encontrar texto"
+#: spyder/widgets/findinfiles.py:278
+msgid "permission denied errors were encountered"
+msgstr "permiso denegado, se encontraron errores"
 
-#: spyderlib/widgets/browser.py:184
-msgid "Address:"
-msgstr "Dirección:"
+#: spyder/widgets/findinfiles.py:315
+msgid "Search pattern"
+msgstr "Patrón de búsqueda"
 
-#: spyderlib/widgets/browser.py:220
-msgid "Unable to load page"
-msgstr "No fue posible cargar la página"
+#: spyder/widgets/findinfiles.py:318 spyder/widgets/findinfiles.py:352
+#: spyder/widgets/findinfiles.py:364 spyder/widgets/findreplace.py:81
+msgid "Regular expression"
+msgstr "Expresión regular"
 
-#: spyderlib/widgets/comboboxes.py:118
-msgid "Press enter to validate this entry"
-msgstr "Presione Enter para validar esta entrada"
+#: spyder/widgets/findinfiles.py:327
+msgid "Search"
+msgstr "Buscar"
 
-#: spyderlib/widgets/comboboxes.py:119
-msgid "This entry is incorrect"
-msgstr "Esta entrada es incorrecta"
+#: spyder/widgets/findinfiles.py:330
+msgid "Start search"
+msgstr "Comenzar la búsqueda"
 
-#: spyderlib/widgets/comboboxes.py:174
-msgid "Press enter to validate this path"
-msgstr "Presione Enter para validar esta ruta"
+#: spyder/widgets/findinfiles.py:336
+msgid "Stop search"
+msgstr "Detener la búsqueda"
 
-#: spyderlib/widgets/comboboxes.py:175
-msgid ""
-"This path is incorrect.\n"
-"Enter a correct directory path,\n"
-"then press enter to validate"
+#: spyder/widgets/findinfiles.py:346
+msgid "Included filenames pattern"
 msgstr ""
-"Esta ruta es incorrecta.\n"
-"Introduzca una ruta de\n"
-"directorio correcta y después\n"
-"presione Enter para validarla"
+"Patrones de nombres de\n"
+"archivo a incluir"
 
-#: spyderlib/widgets/dataframeeditor.py:423
-msgid "To bool"
-msgstr "A booleano"
+#: spyder/widgets/findinfiles.py:355
+msgid "Include:"
+msgstr "Incluir:"
 
-#: spyderlib/widgets/dataframeeditor.py:423
-msgid "To complex"
-msgstr "A complejo"
+#: spyder/widgets/findinfiles.py:358
+msgid "Excluded filenames pattern"
+msgstr ""
+"Patrones de nombres de\n"
+"archivo a excluir"
 
-#: spyderlib/widgets/dataframeeditor.py:424
-msgid "To float"
-msgstr "A flotante"
+#: spyder/widgets/findinfiles.py:367
+msgid "Exclude:"
+msgstr "Excluir:"
 
-#: spyderlib/widgets/dataframeeditor.py:424
-msgid "To int"
-msgstr "A entero"
+#: spyder/widgets/findinfiles.py:377
+msgid "PYTHONPATH"
+msgstr "PYTHONPATH"
 
-#: spyderlib/widgets/dataframeeditor.py:425
-msgid "To str"
-msgstr "A cadena"
+#: spyder/widgets/findinfiles.py:379
+msgid ""
+"Search in all directories listed in sys.path which are outside the Python "
+"installation directory"
+msgstr ""
+"Buscar en todos los directorios del\n"
+"sys.path que están por fuera del\n"
+"directorio de instalación de Python"
 
-#: spyderlib/widgets/dataframeeditor.py:490
-msgid "%s editor"
-msgstr "Editor de %s"
+#: spyder/widgets/findinfiles.py:382
+msgid "Hg repository"
+msgstr "Repositorio Hg"
 
-#: spyderlib/widgets/dataframeeditor.py:522
-msgid "Column min/max"
-msgstr "Min/max de columna"
+#: spyder/widgets/findinfiles.py:385
+msgid "Search in current directory hg repository"
+msgstr ""
+"Buscar en el repositorio\n"
+"actual de Mercurial"
 
-#: spyderlib/widgets/dependencies.py:59
-msgid " Required "
-msgstr "Requerido"
+#: spyder/widgets/findinfiles.py:386
+msgid "Here:"
+msgstr "Aquí"
 
-#: spyderlib/widgets/dependencies.py:59
-msgid "Module"
-msgstr "Módulo"
+#: spyder/widgets/findinfiles.py:390
+msgid "Search recursively in this directory"
+msgstr ""
+"Buscar recursivamente\n"
+"en este directorio"
 
-#: spyderlib/widgets/dependencies.py:60
-msgid " Installed "
-msgstr "Instalado"
+#: spyder/widgets/findinfiles.py:395
+msgid "Browse a search directory"
+msgstr ""
+"Seleccionar el directorio\n"
+"de búsqueda"
 
-#: spyderlib/widgets/dependencies.py:60
-msgid "Provided features"
-msgstr "Características proporcionadas"
+#: spyder/widgets/findinfiles.py:425
+msgid "Hide advanced options"
+msgstr "Ocultar opciones avanzadas"
 
-#: spyderlib/widgets/dependencies.py:130
-msgid "Optional Dependencies"
-msgstr "Dependencias opcionales"
+#: spyder/widgets/findinfiles.py:428
+msgid "Show advanced options"
+msgstr "Mostrar opciones avanzadas"
 
-#: spyderlib/widgets/dependencies.py:137
-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> y <b>%s</b> para tener una mejor "
-"experiencia."
+#: spyder/widgets/findinfiles.py:569
+msgid "Search canceled"
+msgstr "Búsqueda cancelada"
 
-#: spyderlib/widgets/dependencies.py:152
-msgid "Copy to clipboard"
-msgstr "Copiar al portapapeles"
+#: spyder/widgets/findinfiles.py:573
+msgid "String not found"
+msgstr "Texto no encontrado"
 
-#: spyderlib/widgets/dicteditor.py:156
-msgid "Index"
-msgstr "Índice"
+#: spyder/widgets/findinfiles.py:575
+msgid "matches in"
+msgstr "coincidencias en"
 
-#: spyderlib/widgets/dicteditor.py:161
-msgid "Tuple"
-msgstr "Tupla"
+#: spyder/widgets/findinfiles.py:576
+msgid "file"
+msgstr "archivo"
 
-#: spyderlib/widgets/dicteditor.py:164
-msgid "List"
-msgstr "Lista"
+#: spyder/widgets/findinfiles.py:584
+msgid "interrupted"
+msgstr "interrumpido"
 
-#: spyderlib/widgets/dicteditor.py:167
-msgid "Dictionary"
-msgstr "Diccionario"
+#: spyder/widgets/findreplace.py:63
+msgid "Search string"
+msgstr "Buscar texto"
 
-#: spyderlib/widgets/dicteditor.py:169
-msgid "Key"
-msgstr "Clave/Tecla"
+#: spyder/widgets/findreplace.py:87
+msgid "Case Sensitive"
+msgstr ""
+"Distinguir mayúsculas\n"
+"de minúsculas"
 
-#: spyderlib/widgets/dicteditor.py:175
-msgid "Attribute"
-msgstr "Atributo"
+#: spyder/widgets/findreplace.py:93
+msgid "Whole words"
+msgstr ""
+"Solamente palabras\n"
+"completas"
 
-#: spyderlib/widgets/dicteditor.py:177
-msgid "elements"
-msgstr "elementos"
+#: spyder/widgets/findreplace.py:99
+msgid "Highlight matches"
+msgstr "Resaltar coincidencias"
 
-#: spyderlib/widgets/dicteditor.py:356
-msgid "Size"
-msgstr "Tamaño"
+#: spyder/widgets/findreplace.py:113
+msgid "Replace with:"
+msgstr "Reemplazar con:"
 
-#: spyderlib/widgets/dicteditor.py:356
-msgid "Type"
-msgstr "Tipo"
+#: spyder/widgets/findreplace.py:115
+msgid "Replace string"
+msgstr "Reemplazar texto"
 
-#: spyderlib/widgets/dicteditor.py:356
-msgid "Value"
-msgstr "Valor"
+#: spyder/widgets/findreplace.py:118
+msgid "Replace/find"
+msgstr "Buscar/reemplazar"
 
-#: spyderlib/widgets/dicteditor.py:453
-msgid ""
-"Opening this variable can be slow\n"
-"\n"
-"Do you want to continue anyway?"
-msgstr ""
-"Abrir e inspeccionar esta variable puede tomar mucho tiempo\n"
-"\n"
-"¿Desea continuar de todas formas?"
+#: spyder/widgets/findreplace.py:125
+msgid "Replace all"
+msgstr "Reemplazar todo"
 
-#: spyderlib/widgets/dicteditor.py:461 spyderlib/widgets/dicteditor.py:612
-msgid "Edit item"
-msgstr "Editar ítem"
+#: spyder/widgets/internalshell.py:262
+msgid "Help..."
+msgstr "Ayuda..."
 
-#: spyderlib/widgets/dicteditor.py:462
-msgid "<b>Unable to retrieve data.</b><br><br>Error message:<br>%s"
-msgstr ""
-"<b>No fue posible obtener los datos.</b><br><br>Mensaje de error:<br>%s"
+#: spyder/widgets/internalshell.py:279
+msgid "Shell special commands:"
+msgstr "Comandos especiales:"
 
-#: spyderlib/widgets/dicteditor.py:613
-msgid "<b>Unable to assign data to item.</b><br><br>Error message:<br>%s"
-msgstr ""
-"<b>No fue posible asignarle los datos al ítem.</b><br><br>Mensaje de error:"
-"<br>%s"
+#: spyder/widgets/internalshell.py:280
+msgid "Internal editor:"
+msgstr "Editor interno:"
 
-#: spyderlib/widgets/dicteditor.py:675
-msgid "Resize rows to contents"
-msgstr "Ajustar filas a los contenidos"
+#: spyder/widgets/internalshell.py:281
+msgid "External editor:"
+msgstr "Editor externo:"
 
-#: spyderlib/widgets/dicteditor.py:683 spyderlib/widgets/explorer.py:242
-msgid "Edit"
-msgstr "Editar"
+#: spyder/widgets/internalshell.py:282
+msgid "Run script:"
+msgstr "Ejecutar un archivo:"
 
-#: spyderlib/widgets/dicteditor.py:686 spyderlib/widgets/dicteditor.py:1025
-#: spyderlib/widgets/dicteditor.py:1042
-msgid "Plot"
-msgstr "Graficar"
+#: spyder/widgets/internalshell.py:283
+msgid "Remove references:"
+msgstr "Eliminar referencias:"
 
-#: spyderlib/widgets/dicteditor.py:690
-msgid "Histogram"
-msgstr "Histograma"
+#: spyder/widgets/internalshell.py:284
+msgid "System commands:"
+msgstr "Comandos del sistema:"
 
-#: spyderlib/widgets/dicteditor.py:694
-msgid "Show image"
-msgstr "Mostrar como imagen"
+#: spyder/widgets/internalshell.py:285
+msgid "Python help:"
+msgstr "Ayuda de Python:"
 
-#: spyderlib/widgets/dicteditor.py:698 spyderlib/widgets/dicteditor.py:1050
-msgid "Save array"
-msgstr "Guardar arreglo"
+#: spyder/widgets/internalshell.py:286
+msgid "GUI-based editor:"
+msgstr "Editor gráfico:"
 
-#: spyderlib/widgets/dicteditor.py:702 spyderlib/widgets/dicteditor.py:989
-#: spyderlib/widgets/dicteditor.py:997
-msgid "Insert"
-msgstr "Insertar"
+#: spyder/widgets/ipythonconsole/client.py:187
+msgid "An error ocurred while starting the kernel"
+msgstr "Ocurrió un error mientras iniciaba el núcleo"
 
-#: spyderlib/widgets/dicteditor.py:705 spyderlib/widgets/dicteditor.py:939
-msgid "Remove"
-msgstr "Eliminar"
+#: spyder/widgets/ipythonconsole/client.py:218
+msgid "Restart kernel"
+msgstr "Reiniciar el núcleo"
 
-#: spyderlib/widgets/dicteditor.py:716 spyderlib/widgets/dicteditor.py:956
-#: spyderlib/widgets/explorer.py:532 spyderlib/widgets/explorer.py:540
-#: spyderlib/widgets/explorer.py:551
-msgid "Rename"
-msgstr "Renombrar"
+#: spyder/widgets/ipythonconsole/client.py:238
+msgid "Stop the current command"
+msgstr "Detener el comando actual"
 
-#: spyderlib/widgets/dicteditor.py:719
-msgid "Duplicate"
-msgstr "Duplicar"
+#: spyder/widgets/ipythonconsole/client.py:261
+msgid "Inspect current object"
+msgstr "Inspeccionar objeto"
 
-#: spyderlib/widgets/dicteditor.py:937
-msgid "Do you want to remove selected item?"
-msgstr "¿Desea eliminar la variable seleccionada?"
+#: spyder/widgets/ipythonconsole/client.py:266
+msgid "Clear line or block"
+msgstr "Limpiar línea o bloque"
 
-#: spyderlib/widgets/dicteditor.py:938
-msgid "Do you want to remove all selected items?"
-msgstr "¿Desea eliminar todas las variables seleccionadas?"
+#: spyder/widgets/ipythonconsole/client.py:270
+msgid "Reset namespace"
+msgstr "Restaurar el namespace"
 
-#: spyderlib/widgets/dicteditor.py:956 spyderlib/widgets/dicteditor.py:989
-msgid "Key:"
-msgstr "Nombre:"
+#: spyder/widgets/ipythonconsole/client.py:273
+msgid "Clear console"
+msgstr "Limpiar la terminal"
 
-#: spyderlib/widgets/dicteditor.py:997
-msgid "Value:"
-msgstr "Valor:"
+#: spyder/widgets/ipythonconsole/client.py:314
+msgid "Are you sure you want to restart the kernel?"
+msgstr "Está seguro de que desea reiniciar el núcleo?"
 
-#: spyderlib/widgets/dicteditor.py:1013
-msgid "Import error"
-msgstr "Error de importación"
+#: spyder/widgets/ipythonconsole/client.py:316
+msgid "Restart kernel?"
+msgstr "Reiniciar el núcleo?"
 
-#: spyderlib/widgets/dicteditor.py:1014
-msgid "Please install <b>matplotlib</b> or <b>guiqwt</b>."
-msgstr "Por favor instale <b>Matplotlib</b> o <b>guiqwt</b>."
+#: spyder/widgets/ipythonconsole/client.py:325
+msgid "Error restarting kernel: %s\n"
+msgstr "Ocurrió un error al reiniciar el núcleo: %s\n"
 
-#: spyderlib/widgets/dicteditor.py:1026
-msgid "<b>Unable to plot data.</b><br><br>Error message:<br>%s"
+#: spyder/widgets/ipythonconsole/client.py:329
+msgid ""
+"<br>Restarting kernel...\n"
+"<hr><br>"
 msgstr ""
-"<b>No fue posible graficar los datos.</b><br><br>Mensaje de error:<br>%s"
+"<br>Reiniciando el núcleo...\n"
+"<hr><br>"
 
-#: spyderlib/widgets/dicteditor.py:1043
-msgid "<b>Unable to show image.</b><br><br>Error message:<br>%s"
-msgstr ""
-"<b>No fue posible generar la gráfica.</b><br><br>Mensaje de error:<br>%s"
+#: spyder/widgets/ipythonconsole/client.py:334
+msgid "Cannot restart a kernel not started by Spyder\n"
+msgstr "No es posible reiniciar un núcleo que no fue iniciado por Spyder\n"
 
-#: spyderlib/widgets/dicteditor.py:1066
-msgid "<b>Unable to save array</b><br><br>Error message:<br>%s"
-msgstr ""
-"<b>No fue posible guardar el arreglo</b><br><br>Mensaje de error:<br>%s"
+#: spyder/widgets/ipythonconsole/client.py:374
+msgid "Changing backend to Qt for Mayavi"
+msgstr "Cambiando la salida gráfica a Qt por Mayavi"
 
-#: spyderlib/widgets/dicteditor.py:1085
-msgid "Clipboard contents"
-msgstr "Contenidos del portapapeles"
+#: spyder/widgets/ipythonconsole/client.py:385
+msgid "Connecting to kernel..."
+msgstr "Conectándose al núcleo..."
 
-#: spyderlib/widgets/dicteditor.py:1100
-msgid "Import from clipboard"
-msgstr "Importar desde el portapapeles"
+#: spyder/widgets/ipythonconsole/namespacebrowser.py:76
+msgid ""
+"Inspecting and setting values while debugging in IPython consoles is not "
+"supported yet by Spyder."
+msgstr ""
+"Spyder aún no soporta inspeccionar y establecer valores mientras se está "
+"depurando."
 
-#: spyderlib/widgets/dicteditor.py:1102
-msgid "Empty clipboard"
-msgstr "Vaciar el portapapeles"
+#: spyder/widgets/ipythonconsole/shell.py:135
+msgid "Reset IPython namespace"
+msgstr "Reiniciar el espacio de trabajo de IPython"
 
-#: spyderlib/widgets/dicteditor.py:1103
-msgid "Nothing to be imported from clipboard."
-msgstr "No hay nada para importar desde el portapapeles."
+#: spyder/widgets/ipythonconsole/shell.py:136
+msgid ""
+"All user-defined variables will be removed.<br>Are you sure you want to "
+"reset the namespace?"
+msgstr ""
+"Todas las variables definidas por el usuario serán eliminadas. ¿Está seguro "
+"de que desea restaurar el namespace?"
 
-#: spyderlib/widgets/dicteditorutils.py:60
-msgid "View and edit DataFrames and Series in the Variable Explorer"
-msgstr "Ver y editar DataFrames y Series en el Explorador de Variables"
+#: spyder/widgets/onecolumntree.py:52
+msgid "Collapse all"
+msgstr "Colapsar resultados"
 
-#: spyderlib/widgets/editor.py:342
-msgid "Copy path to clipboard"
-msgstr "Copiar la ruta al portapapeles"
+#: spyder/widgets/onecolumntree.py:56
+msgid "Expand all"
+msgstr "Expandir resultados"
 
-#: spyderlib/widgets/editor.py:906
-msgid "Temporary file"
-msgstr "Archivo temporal"
+#: spyder/widgets/onecolumntree.py:60
+msgid "Restore"
+msgstr "Restaurar"
 
-#: spyderlib/widgets/editor.py:1003
-msgid "New window"
-msgstr "Nueva ventana"
+#: spyder/widgets/onecolumntree.py:61
+msgid "Restore original tree layout"
+msgstr "Restaurar la disposición original"
 
-#: spyderlib/widgets/editor.py:1004
-msgid "Create a new editor window"
-msgstr "Crear una nueva ventana de edición"
+#: spyder/widgets/onecolumntree.py:65
+msgid "Collapse selection"
+msgstr "Colapsar selección"
 
-#: spyderlib/widgets/editor.py:1007
-msgid "Split vertically"
-msgstr "Dividir verticalmente"
+#: spyder/widgets/onecolumntree.py:69
+msgid "Expand selection"
+msgstr "Expandir selección"
 
-#: spyderlib/widgets/editor.py:1009
-msgid "Split vertically this editor window"
-msgstr "Dividir verticalmente esta panel o ventana de edición"
+#: spyder/widgets/pathmanager.py:87
+msgid "Move to top"
+msgstr "Mover al principio"
 
-#: spyderlib/widgets/editor.py:1011
-msgid "Split horizontally"
-msgstr "Dividir horizontalmente"
+#: spyder/widgets/pathmanager.py:93
+msgid "Move up"
+msgstr "Mover arriba"
 
-#: spyderlib/widgets/editor.py:1013
-msgid "Split horizontally this editor window"
-msgstr "Dividir horizontalmente esta ventana o panel de edición"
+#: spyder/widgets/pathmanager.py:99
+msgid "Move down"
+msgstr "Mover abajo"
 
-#: spyderlib/widgets/editor.py:1015
-msgid "Close this panel"
-msgstr "Cerrar este panel"
+#: spyder/widgets/pathmanager.py:105
+msgid "Move to bottom"
+msgstr "Mover al final"
 
-#: spyderlib/widgets/editor.py:1153
-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?"
+#: spyder/widgets/pathmanager.py:116 spyder/widgets/pathmanager.py:231
+msgid "Add path"
+msgstr "Añadir ruta"
 
-#: spyderlib/widgets/editor.py:1215
-msgid "Save"
-msgstr "Guardar"
+#: spyder/widgets/pathmanager.py:121 spyder/widgets/pathmanager.py:214
+msgid "Remove path"
+msgstr "Eliminar ruta"
 
-#: spyderlib/widgets/editor.py:1216
-msgid "<b>Unable to save script '%s'</b><br><br>Error message:<br>%s"
+#: spyder/widgets/pathmanager.py:131
+msgid "Synchronize..."
+msgstr "Sincronizar..."
+
+#: spyder/widgets/pathmanager.py:133
+msgid "Synchronize Spyder's path list with PYTHONPATH environment variable"
 msgstr ""
-"<b>No fue posible guardar el archivo '%s'</b><br><br>Mensaje de error:<br>%s"
+"Sincronizar la lista de rutas de Spyder con la variable\n"
+"de entorno PYTHONPATH"
 
-#: spyderlib/widgets/editor.py:1238
-msgid "Save Python script"
-msgstr "Guardar archivo de Python"
+#: spyder/widgets/pathmanager.py:145
+msgid "Synchronize"
+msgstr "Sincronizar"
 
-#: spyderlib/widgets/editor.py:1452
+#: spyder/widgets/pathmanager.py:146
 msgid ""
-"<b>%s</b> is unavailable (this file may have been removed, moved or renamed "
-"outside Spyder).<br>Do you want to close it?"
+"This will synchronize Spyder's path list with <b>PYTHONPATH</b> environment "
+"variable for current user, allowing you to run your Python modules outside "
+"Spyder without having to configure sys.path. <br>Do you want to clear "
+"contents of PYTHONPATH before adding Spyder's path list?"
 msgstr ""
-"<b>%s</b> no está disponible (el archivo puede haber sido eliminado, movido "
-"o renombrado por fuera de Spyder).<br>¿Desea cerrarlo?"
+"Esta acción sincronizará la lista de rutas de Spyder con la variable de "
+"entorno <b>PYTHONPATH</b> para el usuario actual, permitiéndole ejecutar sus "
+"módulos de Python por fuera de Spyder sin tener que configurar sys.path."
+"<br>¿Desea borrar los contenidos del PYTHONPATH antes de añadir la lista de "
+"rutas de Spyder?"
 
-#: spyderlib/widgets/editor.py:1472
-msgid ""
-"<b>%s</b> has been modified outside Spyder.<br>Do you want to reload it and "
-"lose all your changes?"
-msgstr ""
-"<b>%s</b> fue modificado por fuera de Spyder.<br>¿Desea recargarlo y perder "
-"todos sus cambios?"
+#: spyder/widgets/pathmanager.py:215
+msgid "Do you really want to remove selected path?"
+msgstr "¿Realmente desea eliminar la ruta seleccionada?"
 
-#: spyderlib/widgets/editor.py:1568
+#: spyder/widgets/pathmanager.py:232
 msgid ""
-"All changes to <b>%s</b> will be lost.<br>Do you want to revert file from "
-"disk?"
+"This directory is already included in Spyder path list.<br>Do you want to "
+"move it to the top of the list?"
 msgstr ""
-"Todos los cambios a <b>%s</b> se perderán.<br>Desea revertir el archivo del "
-"disco?"
+"Este directorio ya está incluido en la lista de rutas de Spyder.<br>¿Desea "
+"moverlo al principio de la lista?"
 
-#: spyderlib/widgets/editor.py:1708
-msgid "Loading %s..."
-msgstr "Cargando %s..."
+#: spyder/widgets/projects/configdialog.py:30
+msgid "Project preferences"
+msgstr "Preferencias del proyecto"
 
-#: spyderlib/widgets/editor.py:1718
-msgid ""
-"<b>%s</b> contains mixed end-of-line characters.<br>Spyder will fix this "
-"automatically."
-msgstr ""
-"<b>%s</b> contiene varios tipos de caracteres de fin de línea.<br>Spyder lo "
-"arreglará automáticamente."
+#: spyder/widgets/projects/configdialog.py:82
+#: spyder/widgets/projects/configdialog.py:119
+msgid "Restore data on startup"
+msgstr "Restaurar datos al inicio"
 
-#: spyderlib/widgets/editor.py:2083
-msgid "Close window"
-msgstr "Cerrar ventana"
+#: spyder/widgets/projects/configdialog.py:84
+#: spyder/widgets/projects/configdialog.py:121
+msgid "Save data on exit"
+msgstr "Guardar datos al salir"
 
-#: spyderlib/widgets/editor.py:2085
-msgid "Close this window"
-msgstr "Cierra esta ventana"
+#: spyder/widgets/projects/configdialog.py:86
+#: spyder/widgets/projects/configdialog.py:123
+msgid "Save history"
+msgstr "Guardar el historial"
 
-#: spyderlib/widgets/editortools.py:94 spyderlib/widgets/editortools.py:130
-msgid "Line %s"
-msgstr "Línea %s"
+#: spyder/widgets/projects/configdialog.py:88
+#: spyder/widgets/projects/configdialog.py:125
+msgid "Save non project files opened"
+msgstr "Guardar archivos abiertos que no pertenecen al proyecto"
 
-#: spyderlib/widgets/editortools.py:99
-msgid "Class defined at line %s"
-msgstr "Clase definida en la línea %s"
+#: spyder/widgets/projects/configdialog.py:111
+msgid "Code"
+msgstr "Código"
 
-#: spyderlib/widgets/editortools.py:107
-msgid "Method defined at line %s"
-msgstr "Método definido en la línea %s"
+#: spyder/widgets/projects/configdialog.py:118
+msgid "Workspace"
+msgstr "Espacio de trabajo"
 
-#: spyderlib/widgets/editortools.py:117
-msgid "Function defined at line %s"
-msgstr "Función definida en la línea %s"
+#: spyder/widgets/projects/configdialog.py:148
+#: spyder/widgets/projects/configdialog.py:155
+msgid "Version control"
+msgstr "Control de versiones"
 
-#: spyderlib/widgets/editortools.py:149
-msgid "Cell starts at line %s"
-msgstr "La celda empieza en la línea %s"
+#: spyder/widgets/projects/configdialog.py:156
+msgid "Use version control"
+msgstr "Usar control de versiones"
 
-#: spyderlib/widgets/editortools.py:202 spyderlib/widgets/editortools.py:539
-msgid "Go to cursor position"
-msgstr "Ir a la posición del cursor"
+#: spyder/widgets/projects/configdialog.py:161
+msgid "Version control system"
+msgstr "Sistema de versión de controles"
 
-#: spyderlib/widgets/editortools.py:205
-msgid "Show absolute path"
-msgstr "Mostrar la ruta completa"
+#: spyder/widgets/projects/explorer.py:50
+msgid "Show horizontal scrollbar"
+msgstr "Mostrar una barra de desplazamiento horizontal"
 
-#: spyderlib/widgets/editortools.py:208 spyderlib/widgets/explorer.py:179
-msgid "Show all files"
-msgstr "Mostrar todos los archivos"
+#: spyder/widgets/projects/explorer.py:112
+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/editortools.py:211
-msgid "Show special comments"
-msgstr "Mostrar comentarios especiales"
+#: spyder/widgets/projects/explorer.py:126
+msgid "Folder <b>%s</b> already exists."
+msgstr "La carpeta <b>%s</b> ya existe."
 
-#: spyderlib/widgets/explorer.py:175
-msgid "Edit filename filters..."
-msgstr "Editar filtros..."
+#: spyder/widgets/projects/explorer.py:144
+msgid "copy"
+msgstr "copiar"
 
-#: spyderlib/widgets/explorer.py:189
-msgid "Edit filename filters"
-msgstr "Editar los filtros para nombres de archivo"
+#: spyder/widgets/projects/explorer.py:146
+msgid "move"
+msgstr "mover"
 
-#: spyderlib/widgets/explorer.py:190
-msgid "Name filters:"
-msgstr "Nombres de los filtros:"
+#: spyder/widgets/projects/projectdialog.py:69
+msgid "New directory"
+msgstr "Nuevo directorio"
 
-#: spyderlib/widgets/explorer.py:209
-msgid "File..."
-msgstr "Archivo..."
+#: spyder/widgets/projects/projectdialog.py:70
+msgid "Existing directory"
+msgstr "Un directorio existente"
 
-#: spyderlib/widgets/explorer.py:213
-msgid "Module..."
-msgstr "Módulo"
+#: spyder/widgets/projects/projectdialog.py:72
+msgid "Project name"
+msgstr "Nombre del proyecto"
 
-#: spyderlib/widgets/explorer.py:217
-msgid "Folder..."
-msgstr "Carpeta..."
+#: spyder/widgets/projects/projectdialog.py:73
+msgid "Location"
+msgstr "Ubicación"
 
-#: spyderlib/widgets/explorer.py:221
-msgid "Package..."
-msgstr "Paquete..."
+#: spyder/widgets/projects/projectdialog.py:74
+msgid "Project type"
+msgstr "Tipo del proyecto"
 
-#: spyderlib/widgets/explorer.py:244
-msgid "Move..."
-msgstr "Mover a..."
+#: spyder/widgets/projects/projectdialog.py:75
+msgid "Python version"
+msgstr "Versión de Python"
 
-#: spyderlib/widgets/explorer.py:247
-msgid "Delete..."
-msgstr "Eliminar..."
+#: spyder/widgets/projects/projectdialog.py:83
+#: spyder/widgets/variableexplorer/importwizard.py:519
+msgid "Cancel"
+msgstr "Cancelar"
 
-#: spyderlib/widgets/explorer.py:250
-msgid "Rename..."
-msgstr "Renombrar..."
+#: spyder/widgets/projects/projectdialog.py:84
+msgid "Create"
+msgstr "Crear"
 
-#: spyderlib/widgets/explorer.py:253
-msgid "Open"
-msgstr "Abrir"
+#: spyder/widgets/projects/projectdialog.py:102
+msgid "Create new project"
+msgstr "Crear nuevo proyecto"
 
-#: spyderlib/widgets/explorer.py:254
-#: spyderlib/widgets/sourcecode/codeeditor.py:2456
-msgid "Convert to Python script"
-msgstr "Convertir a un archivo de Python"
+#: spyder/widgets/projects/type/__init__.py:215
+msgid "Empty project"
+msgstr "Proyecto vacío"
 
-#: spyderlib/widgets/explorer.py:277
-msgid "Commit"
-msgstr "Consignar"
+#: spyder/widgets/projects/type/python.py:20
+msgid "Python project"
+msgstr "Proyecto de Python"
 
-#: spyderlib/widgets/explorer.py:281
-msgid "Browse repository"
-msgstr "Explorar repositorio "
+#: spyder/widgets/projects/type/python.py:76
+msgid "Python package"
+msgstr "Paquete de Python"
 
-#: spyderlib/widgets/explorer.py:293
-msgid "Open command prompt here"
-msgstr "Abrir símbolo del sistema aquí"
+#: spyder/widgets/pydocgui.py:110
+msgid "Module or package:"
+msgstr "Módulo o paquete:"
 
-#: spyderlib/widgets/explorer.py:295
-msgid "Open terminal here"
-msgstr "Abrir terminal del sistema aquí"
+#: spyder/widgets/shell.py:129
+msgid "Save history log..."
+msgstr "Guardar el historial..."
 
-#: spyderlib/widgets/explorer.py:300
-msgid "Open Python console here"
-msgstr "Abrir una terminal de Python aquí"
+#: spyder/widgets/shell.py:131
+msgid "Save current history log (i.e. all inputs and outputs) in a text file"
+msgstr ""
+"Guardar el historial actual (es decir\n"
+"todas las entradas y salidas) en un\n"
+"archivo de texto"
 
-#: spyderlib/widgets/explorer.py:314
-msgid "New"
-msgstr "Crear nuevo"
+#: spyder/widgets/shell.py:257
+msgid "Save history log"
+msgstr "Guardar el historial"
 
-#: spyderlib/widgets/explorer.py:322
-msgid "Import"
-msgstr "Importar"
+#: spyder/widgets/shell.py:260
+msgid "History logs"
+msgstr "Historiales"
 
-#: spyderlib/widgets/explorer.py:471
-msgid "Do you really want to delete <b>%s</b>?"
-msgstr "¿Realmente desea eliminar <b>%s</b>?"
+#: spyder/widgets/shell.py:271
+msgid "<b>Unable to save file '%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/explorer.py:489
-msgid "delete"
-msgstr "eliminar"
+#: spyder/widgets/shell.py:713
+msgid "Copy without prompts"
+msgstr "Copiar sin los prompts"
 
-#: spyderlib/widgets/explorer.py:490 spyderlib/widgets/projectexplorer.py:823
-#: spyderlib/widgets/projectexplorer.py:830
-#: spyderlib/widgets/projectexplorer.py:1101
-#: spyderlib/widgets/projectexplorer.py:1186
-msgid "Project Explorer"
-msgstr "Explorador de proyectos"
+#: spyder/widgets/shell.py:716 spyder/widgets/shell.py:720
+msgid "Clear line"
+msgstr "Limpiar línea"
 
-#: spyderlib/widgets/explorer.py:491 spyderlib/widgets/projectexplorer.py:770
-#: spyderlib/widgets/projectexplorer.py:1187
-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"
+#: spyder/widgets/shell.py:722
+msgid "Clear shell"
+msgstr "Limpiar la terminal"
 
-#: spyderlib/widgets/explorer.py:514
-#: spyderlib/widgets/sourcecode/codeeditor.py:1987
-msgid "Conversion error"
-msgstr "Error de conversión"
+#: spyder/widgets/shell.py:726
+msgid "Clear shell contents ('cls' command)"
+msgstr "Limpia los contenidos de la terminal (equivalente al comando 'cls')"
 
-#: spyderlib/widgets/explorer.py:515
-#: spyderlib/widgets/sourcecode/codeeditor.py:1988
-msgid ""
-"It was not possible to convert this notebook. The error is:\n"
-"\n"
-msgstr ""
-"No fue posible convertir este notebook. El error es:\n"
-"\n"
+#: spyder/widgets/sourcecode/codeeditor.py:100
+msgid "Go to line:"
+msgstr "Ir a la línea"
 
-#: spyderlib/widgets/explorer.py:533
-msgid "New name:"
-msgstr "Nuevo nombre:"
+#: spyder/widgets/sourcecode/codeeditor.py:108
+msgid "Line count:"
+msgstr "Número total de líneas:"
 
-#: spyderlib/widgets/explorer.py:541
-msgid ""
-"Do you really want to rename <b>%s</b> and overwrite the existing file <b>"
-"%s</b>?"
-msgstr ""
-"¿Realmente desea renombrar <b>%s</b> y sobrescribir el archivo existente <b>"
-"%s</b>?"
+#: spyder/widgets/sourcecode/codeeditor.py:1296
+msgid "Breakpoint"
+msgstr "Punto de interrupción"
 
-#: spyderlib/widgets/explorer.py:552
-msgid "<b>Unable to rename file <i>%s</i></b><br><br>Error message:<br>%s"
-msgstr ""
-"<b>No fue posible renombrar el archivo <i>%s</i></b><br><br>Mensaje de error:"
-"<br>%s"
+#: spyder/widgets/sourcecode/codeeditor.py:1297
+msgid "Condition:"
+msgstr "Condición:"
 
-#: spyderlib/widgets/explorer.py:588
-msgid "<b>Unable to move <i>%s</i></b><br><br>Error message:<br>%s"
-msgstr "<b>No fue posible mover <i>%s</i></b><br><br>Mensaje de error:<br>%s"
+#: spyder/widgets/sourcecode/codeeditor.py:1703
+msgid "Code analysis"
+msgstr "Análisis del código"
 
-#: spyderlib/widgets/explorer.py:606
-msgid "<b>Unable to create folder <i>%s</i></b><br><br>Error message:<br>%s"
-msgstr ""
-"<b>No fue posible crear la carpeta <i>%s</i></b><br><br>Mensaje de error:<br>"
-"%s"
+#: spyder/widgets/sourcecode/codeeditor.py:1757
+msgid "To do"
+msgstr "To do"
 
-#: spyderlib/widgets/explorer.py:619 spyderlib/widgets/explorer.py:653
-msgid "<b>Unable to create file <i>%s</i></b><br><br>Error message:<br>%s"
+#: spyder/widgets/sourcecode/codeeditor.py:1994
+msgid "Removal error"
+msgstr "Error de remoción"
+
+#: spyder/widgets/sourcecode/codeeditor.py:1995
+msgid ""
+"It was not possible to remove outputs from this notebook. The error is:\n"
+"\n"
 msgstr ""
-"<b>No fue posible crear el archivo <i>%s</i></b><br><br>Mensaje de error:<br>"
-"%s"
+"No fue posible remover las outputs de este notebook. El error es:\n"
+"\n"
 
-#: spyderlib/widgets/explorer.py:627
-msgid "New folder"
-msgstr "Nueva carpeta"
+#: spyder/widgets/sourcecode/codeeditor.py:2487
+msgid "Clear all ouput"
+msgstr "Eliminar todas las salidas"
 
-#: spyderlib/widgets/explorer.py:628
-msgid "Folder name:"
-msgstr "Nombre de la carpeta:"
+#: spyder/widgets/sourcecode/codeeditor.py:2493
+msgid "Go to definition"
+msgstr "Ir a la definición"
 
-#: spyderlib/widgets/explorer.py:633
-msgid "New package"
-msgstr "Nuevo paquete"
+#: spyder/widgets/sourcecode/codeeditor.py:2522
+msgid "Zoom reset"
+msgstr "Restaurar"
 
-#: spyderlib/widgets/explorer.py:634
-msgid "Package name:"
-msgstr "Nombre del paquete:"
+#: spyder/widgets/status.py:25
+msgid "CPU and memory usage info in the status bar"
+msgstr "Uso de memoria y CPU en la barra de estado"
 
-#: spyderlib/widgets/explorer.py:674
-msgid "New module"
-msgstr "Nuevo módulo"
+#: spyder/widgets/status.py:94
+msgid "Memory:"
+msgstr "Memoria:"
 
-#: spyderlib/widgets/explorer.py:686
+#: spyder/widgets/status.py:95
 msgid ""
-"For %s support, please install one of the<br/> following tools:<br/><br/>  %s"
+"Memory usage status: requires the `psutil` (>=v0.3) library on non-Windows "
+"platforms"
 msgstr ""
-"Para contar con soporte de %s, por favor instale una de<br/> las siguientes "
-"herramientas:<br/><br/>  %s"
-
-#: spyderlib/widgets/explorer.py:690
-msgid "<b>Unable to find external program.</b><br><br>%s"
-msgstr "<b>No fue posible encontrar el programa externo.</b><br><br>%s"
+"Para reportar el uso de memoria se requiere de\n"
+"la librería `psutil` (>=0.3) en plataformas distintas\n"
+"a Windows"
 
-#: spyderlib/widgets/explorer.py:893
-msgid "Show current directory only"
-msgstr "Mostrar sólo el directorio actual"
+#: spyder/widgets/status.py:107
+msgid "CPU:"
+msgstr "CPU:"
 
-#: spyderlib/widgets/explorer.py:989
-msgid "You don't have the right permissions to open this directory"
+#: spyder/widgets/status.py:108
+msgid "CPU usage status: requires the `psutil` (>=v0.3) library"
 msgstr ""
+"Para reportar el estado del CPU se requiere\n"
+"de la librería `psutil` (>=v0.3)"
 
-#: spyderlib/widgets/explorer.py:1018 spyderlib/widgets/importwizard.py:525
-msgid "Previous"
-msgstr "Anterior"
-
-#: spyderlib/widgets/explorer.py:1024
-msgid "Parent"
-msgstr "Directorio superior"
+#: spyder/widgets/status.py:130
+msgid "Permissions:"
+msgstr "Permisos:"
 
-#: spyderlib/widgets/externalshell/baseshell.py:142
-msgid "Run again this program"
-msgstr "Ejecutar de nuevo este programa"
+#: spyder/widgets/status.py:144
+msgid "End-of-lines:"
+msgstr "Fin de línea:"
 
-#: spyderlib/widgets/externalshell/baseshell.py:145
-msgid "Kill"
-msgstr "Terminar"
+#: spyder/widgets/status.py:158
+msgid "Encoding:"
+msgstr "Codificación:"
 
-#: spyderlib/widgets/externalshell/baseshell.py:147
-msgid "Kills the current process, causing it to exit immediately"
-msgstr ""
-"Termina el proceso actual, provocando\n"
-"que culmine inmediatamente"
+#: spyder/widgets/status.py:171
+msgid "Line:"
+msgstr "Línea:"
 
-#: spyderlib/widgets/externalshell/baseshell.py:219
-msgid "<span style='color: #44AA44'><b>Running...</b></span>"
-msgstr "<span style='color: #44AA44'><b>Corriendo...</b></span>"
+#: spyder/widgets/status.py:175
+msgid "Column:"
+msgstr "Columna:"
 
-#: spyderlib/widgets/externalshell/baseshell.py:226
-msgid "Terminated."
-msgstr "Terminado."
+#: spyder/widgets/tabs.py:146
+msgid "Browse tabs"
+msgstr ""
+"Navegar por\n"
+"las pestañas"
 
-#: spyderlib/widgets/externalshell/baseshell.py:251
-#: spyderlib/widgets/ipython.py:351 spyderlib/widgets/ipython.py:368
-#: spyderlib/widgets/mixins.py:656
-msgid "Arguments"
-msgstr "Argumentos"
+#: spyder/widgets/tabs.py:275
+msgid "Close current tab"
+msgstr "Cerrar pestaña actual"
 
-#: spyderlib/widgets/externalshell/baseshell.py:252
-msgid "Command line arguments:"
-msgstr "Argumentos de la línea de comandos:"
+#: spyder/widgets/variableexplorer/arrayeditor.py:497
+msgid "It was not possible to copy values for this array"
+msgstr "No fue posible copiar valores para este arreglo"
 
-#: spyderlib/widgets/externalshell/namespacebrowser.py:191
-msgid "Refresh"
-msgstr "Actualizar"
+#: spyder/widgets/variableexplorer/arrayeditor.py:532
+#: spyder/widgets/variableexplorer/arrayeditor.py:565
+#: spyder/widgets/variableexplorer/dataframeeditor.py:544
+#: spyder/widgets/variableexplorer/dataframeeditor.py:584
+msgid "Format"
+msgstr "Formato"
 
-#: spyderlib/widgets/externalshell/namespacebrowser.py:195
-msgid "Refresh periodically"
-msgstr ""
-"Actualizar\n"
-"periódicamente"
+#: spyder/widgets/variableexplorer/arrayeditor.py:537
+#: spyder/widgets/variableexplorer/dataframeeditor.py:548
+msgid "Resize"
+msgstr "Redimensionar"
 
-#: spyderlib/widgets/externalshell/namespacebrowser.py:199
-#: spyderlib/widgets/externalshell/namespacebrowser.py:453
-msgid "Import data"
-msgstr "Importar datos"
+#: spyder/widgets/variableexplorer/arrayeditor.py:566
+#: spyder/widgets/variableexplorer/dataframeeditor.py:585
+msgid "Float formatting"
+msgstr "Formato de punto flotante"
 
-#: spyderlib/widgets/externalshell/namespacebrowser.py:202
-#: spyderlib/widgets/externalshell/namespacebrowser.py:541
-#: spyderlib/widgets/externalshell/namespacebrowser.py:562
-msgid "Save data"
-msgstr "Guardar datos"
+#: spyder/widgets/variableexplorer/arrayeditor.py:574
+#: spyder/widgets/variableexplorer/dataframeeditor.py:594
+msgid "Format (%s) is incorrect"
+msgstr "El formato (%s) es incorrecto"
 
-#: spyderlib/widgets/externalshell/namespacebrowser.py:207
-msgid "Save data as..."
-msgstr "Guardar datos como..."
+#: spyder/widgets/variableexplorer/arrayeditor.py:609
+msgid "Array is empty"
+msgstr "El arreglo está vacío"
 
-#: spyderlib/widgets/externalshell/namespacebrowser.py:215
-msgid "Exclude references which name starts with an underscore"
-msgstr ""
-"Excluir variables cuyo nombre comienza\n"
-"con un guión abajo"
+#: spyder/widgets/variableexplorer/arrayeditor.py:612
+msgid "Arrays with more than 3 dimensions are not supported"
+msgstr "Los arreglos de más de tres dimensiones no están soportados"
 
-#: spyderlib/widgets/externalshell/namespacebrowser.py:223
-msgid "Exclude references which name is uppercase"
+#: spyder/widgets/variableexplorer/arrayeditor.py:615
+msgid "The 'xlabels' argument length do no match array column number"
 msgstr ""
-"Excluir variables cuyo nombre está\n"
-"por completo en mayúsculas"
-
-#: spyderlib/widgets/externalshell/namespacebrowser.py:230
-msgid "Exclude references which name starts with an uppercase character"
-msgstr "Excluir variables cuyo nombre comienza en mayúsculas"
+"El argumento de longitud 'xlabels' no coincide con el número de columnas del "
+"arreglo"
 
-#: spyderlib/widgets/externalshell/namespacebrowser.py:238
-msgid ""
-"Exclude references to unsupported data types (i.e. which won't be handled/"
-"saved correctly)"
+#: spyder/widgets/variableexplorer/arrayeditor.py:619
+msgid "The 'ylabels' argument length do no match array row number"
 msgstr ""
-"Excluir variables que referencian tipos de datos no soportados\n"
-"(es decir aquellos que no pueden manejarse y guardarse\n"
-"correctamente)"
+"El argumento de longitud 'ylabels' no coincide con el número de filas del "
+"arreglo"
 
-#: spyderlib/widgets/externalshell/namespacebrowser.py:347
-msgid "Object <b>%s</b> is not picklable"
-msgstr "El objeto <b>%s</b> no es picklable"
+#: spyder/widgets/variableexplorer/arrayeditor.py:626
+msgid "%s arrays"
+msgstr "Los arreglos %s"
 
-#: spyderlib/widgets/externalshell/namespacebrowser.py:473
-msgid ""
-"<b>Unsupported file extension '%s'</b><br><br>Would you like to import it "
-"anyway (by selecting a known file format)?"
-msgstr ""
-"<b>Extensión de archivo no soportada: '%s'</b><br><br>¿Desea importar el "
-"archivo de todas formas (seleccionando un formato conocido)?"
+#: spyder/widgets/variableexplorer/arrayeditor.py:627
+msgid "%s are currently not supported"
+msgstr "%s no están soportados por el momento"
 
-#: spyderlib/widgets/externalshell/namespacebrowser.py:481
-msgid "Open file as:"
-msgstr "Abrir archivo como:"
+#: spyder/widgets/variableexplorer/arrayeditor.py:634
+msgid "NumPy array"
+msgstr "Arreglo de NumPy"
 
-#: spyderlib/widgets/externalshell/namespacebrowser.py:529
-msgid "<b>Unable to load '%s'</b><br><br>Error message:<br>%s"
-msgstr "<b>No fue posible cargar '%s'</b><br><br>Mensaje de error:<br>%s"
+#: spyder/widgets/variableexplorer/arrayeditor.py:636
+#: spyder/widgets/variableexplorer/arrayeditor.py:790
+msgid "Array editor"
+msgstr "Editor de arreglos"
 
-#: spyderlib/widgets/externalshell/namespacebrowser.py:563
-msgid "<b>Unable to save current workspace</b><br><br>Error message:<br>%s"
-msgstr ""
-"<b>No fue posible guardar el espacio de trabajo actual</b><br><br>Mensaje de "
-"error:<br>%s"
+#: spyder/widgets/variableexplorer/arrayeditor.py:638
+msgid "read only"
+msgstr "sólo lectura"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:284
-msgid "Variables"
-msgstr "Variables"
+#: spyder/widgets/variableexplorer/arrayeditor.py:668
+msgid "Record array fields:"
+msgstr "Campos del arreglo de records:"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:285
-msgid "Show/hide global variables explorer"
-msgstr ""
-"Mostrar u ocultar el\n"
-"explorador de variables"
+#: spyder/widgets/variableexplorer/arrayeditor.py:680
+msgid "Data"
+msgstr "Datos"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:289
-msgid "Terminate"
-msgstr "Interrumpir"
+#: spyder/widgets/variableexplorer/arrayeditor.py:680
+msgid "Mask"
+msgstr "Máscara"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:290
-msgid ""
-"Attempts to stop the process. The process\n"
-"may not exit as a result of clicking this\n"
-"button (it is given the chance to prompt\n"
-"the user for any unsaved files, etc)."
-msgstr ""
-"Intenta interrumpir este proceso, pero éste\n"
-"puede no concluir tras oprimir este botón\n"
-"(pues es posible que se le pida al usuario\n"
-"guardar archivos sin salvar, etc)."
+#: spyder/widgets/variableexplorer/arrayeditor.py:680
+msgid "Masked data"
+msgstr "Datos enmascarados"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:303
-msgid "Interact"
-msgstr "Interactuar"
+#: spyder/widgets/variableexplorer/arrayeditor.py:691
+msgid "Axis:"
+msgstr "Eje:"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:305
-msgid "Debug"
-msgstr "Depurar"
+#: spyder/widgets/variableexplorer/arrayeditor.py:696
+msgid "Index:"
+msgstr "Índice:"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:307
-#: spyderlib/widgets/externalshell/pythonshell.py:373
-msgid "Arguments..."
-msgstr "Argumentos..."
+#: spyder/widgets/variableexplorer/arrayeditor.py:709
+msgid "<u>Warning</u>: changes are applied separately"
+msgstr "<u>Advertencia</u>: los cambios son aplicados de forma separada"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:309
-msgid "Post Mortem Debug"
+#: spyder/widgets/variableexplorer/arrayeditor.py:710
+msgid ""
+"For performance reasons, changes applied to masked array won't be reflected "
+"in array's data (and vice-versa)."
 msgstr ""
+"Por razones de rendimiento, los cambios\n"
+"aplicados a arreglos enmascarados no se\n"
+"verán reflejados en los datos del arreglo\n"
+"(y viceversa)."
 
-#: spyderlib/widgets/externalshell/pythonshell.py:315
-msgid "Working directory"
-msgstr "Directorio de trabajo"
+#: spyder/widgets/variableexplorer/collectionseditor.py:116
+msgid "Index"
+msgstr "Índice"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:317
-msgid "Set current working directory"
-msgstr "Establece el directorio de trabajo"
+#: spyder/widgets/variableexplorer/collectionseditor.py:121
+msgid "Tuple"
+msgstr "Tupla"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:319
-msgid "Environment variables"
-msgstr "Variables de entorno"
+#: spyder/widgets/variableexplorer/collectionseditor.py:124
+msgid "List"
+msgstr "Lista"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:323
-msgid "Show sys.path contents"
-msgstr "Contenidos del sys.path"
+#: spyder/widgets/variableexplorer/collectionseditor.py:127
+msgid "Dictionary"
+msgstr "Diccionario"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:369
-msgid "Arguments: %s"
-msgstr "Argumentos: %s"
+#: spyder/widgets/variableexplorer/collectionseditor.py:129
+msgid "Key"
+msgstr "Clave/Tecla"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:371
-msgid "No argument"
-msgstr "Sin argumentos"
+#: spyder/widgets/variableexplorer/collectionseditor.py:135
+msgid "Attribute"
+msgstr "Atributo"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:550
-msgid ""
-"The kernel failed to start!! That's all we know... Please close this console "
-"and open a new one."
-msgstr ""
-"No fue posible crear un núcleo!! Es todo lo que sabemos... Por favor cierre "
-"esta terminal y abra una nueva."
+#: spyder/widgets/variableexplorer/collectionseditor.py:137
+msgid "elements"
+msgstr "elementos"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:554
-msgid "A Python console failed to start!"
-msgstr "No se pudo iniciar una terminal de Python!"
+#: spyder/widgets/variableexplorer/collectionseditor.py:313
+msgid "Size"
+msgstr "Tamaño"
 
-#: spyderlib/widgets/externalshell/systemshell.py:100
-msgid "Process failed to start"
-msgstr "El proceso falló al empezar"
+#: spyder/widgets/variableexplorer/collectionseditor.py:313
+msgid "Type"
+msgstr "Tipo"
 
-#: spyderlib/widgets/file_switcher.py:109
-#, fuzzy
-msgid "unsaved file"
-msgstr "Guardar archivo"
+#: spyder/widgets/variableexplorer/collectionseditor.py:313
+msgid "Value"
+msgstr "Valor"
 
-#: spyderlib/widgets/file_switcher.py:229
+#: spyder/widgets/variableexplorer/collectionseditor.py:411
 msgid ""
-"Press <b>Enter</b> to switch files or <b>Esc</b> to cancel.<br><br>Type to "
-"filter filenames.<br><br>Use <b>:number</b> to go to a line, e.g. "
-"<b><code>main:42</code></b><br>Use <b>@symbol_text</b> to go to a symbol, e."
-"g. <b><code>@init</code></b><br><br> Press <b>Ctrl+W</b> to close current "
-"tab.<br>"
+"Opening this variable can be slow\n"
+"\n"
+"Do you want to continue anyway?"
 msgstr ""
+"Abrir e inspeccionar esta variable puede tomar mucho tiempo\n"
+"\n"
+"¿Desea continuar de todas formas?"
 
-#: spyderlib/widgets/file_switcher.py:481
-#, fuzzy
-msgid "lines"
-msgstr "líneas"
+#: spyder/widgets/variableexplorer/collectionseditor.py:420
+msgid ""
+"Spyder was unable to retrieve the value of this variable from the console."
+"<br><br>The error mesage was:<br><i>%s</i>"
+msgstr ""
+"Spyder no fue capaz de extraer el valor de esta variable de la terminal."
+"<br><br>El mensaje de error fue:<br><i>%s</i>"
 
-#: spyderlib/widgets/findinfiles.py:158
-msgid "Unexpected error: see internal console"
-msgstr "Error inesperado. Por favor vea la terminal interna."
+#: spyder/widgets/variableexplorer/collectionseditor.py:579
+msgid "Edit item"
+msgstr "Editar ítem"
 
-#: spyderlib/widgets/findinfiles.py:210 spyderlib/widgets/findinfiles.py:234
-#: spyderlib/widgets/findinfiles.py:281
-msgid "invalid regular expression"
-msgstr "expresión regular inválida"
+#: spyder/widgets/variableexplorer/collectionseditor.py:580
+msgid "<b>Unable to assign data to item.</b><br><br>Error message:<br>%s"
+msgstr ""
+"<b>No fue posible asignarle los datos al ítem.</b><br><br>Mensaje de error:"
+"<br>%s"
 
-#: spyderlib/widgets/findinfiles.py:279
-msgid "permission denied errors were encountered"
-msgstr "permiso denegado, se encontraron errores"
+#: spyder/widgets/variableexplorer/collectionseditor.py:642
+msgid "Resize rows to contents"
+msgstr "Ajustar filas a los contenidos"
 
-#: spyderlib/widgets/findinfiles.py:316
-msgid "Search pattern"
-msgstr "Patrón de búsqueda"
+#: spyder/widgets/variableexplorer/collectionseditor.py:653
+#: spyder/widgets/variableexplorer/collectionseditor.py:998
+#: spyder/widgets/variableexplorer/collectionseditor.py:1015
+msgid "Plot"
+msgstr "Graficar"
 
-#: spyderlib/widgets/findinfiles.py:319 spyderlib/widgets/findinfiles.py:353
-#: spyderlib/widgets/findinfiles.py:365 spyderlib/widgets/findreplace.py:77
-msgid "Regular expression"
-msgstr "Expresión regular"
+#: spyder/widgets/variableexplorer/collectionseditor.py:657
+msgid "Histogram"
+msgstr "Histograma"
 
-#: spyderlib/widgets/findinfiles.py:328
-msgid "Search"
-msgstr "Buscar"
+#: spyder/widgets/variableexplorer/collectionseditor.py:661
+msgid "Show image"
+msgstr "Mostrar como imagen"
 
-#: spyderlib/widgets/findinfiles.py:331
-msgid "Start search"
-msgstr "Comenzar la búsqueda"
+#: spyder/widgets/variableexplorer/collectionseditor.py:665
+#: spyder/widgets/variableexplorer/collectionseditor.py:1023
+msgid "Save array"
+msgstr "Guardar arreglo"
 
-#: spyderlib/widgets/findinfiles.py:334 spyderlib/widgets/ipython.py:555
-msgid "Stop"
-msgstr "Detener"
+#: spyder/widgets/variableexplorer/collectionseditor.py:669
+#: spyder/widgets/variableexplorer/collectionseditor.py:962
+#: spyder/widgets/variableexplorer/collectionseditor.py:970
+msgid "Insert"
+msgstr "Insertar"
 
-#: spyderlib/widgets/findinfiles.py:337
-msgid "Stop search"
-msgstr "Detener la búsqueda"
+#: spyder/widgets/variableexplorer/collectionseditor.py:672
+#: spyder/widgets/variableexplorer/collectionseditor.py:906
+msgid "Remove"
+msgstr "Eliminar"
 
-#: spyderlib/widgets/findinfiles.py:347
-msgid "Included filenames pattern"
-msgstr ""
-"Patrones de nombres de\n"
-"archivo a incluir"
+#: spyder/widgets/variableexplorer/collectionseditor.py:686
+#: spyder/widgets/variableexplorer/collectionseditor.py:927
+msgid "Duplicate"
+msgstr "Duplicar"
 
-#: spyderlib/widgets/findinfiles.py:356
-msgid "Include:"
-msgstr "Incluir:"
+#: spyder/widgets/variableexplorer/collectionseditor.py:904
+msgid "Do you want to remove the selected item?"
+msgstr "¿Desea eliminar la variable seleccionada?"
 
-#: spyderlib/widgets/findinfiles.py:359
-msgid "Excluded filenames pattern"
-msgstr ""
-"Patrones de nombres de\n"
-"archivo a excluir"
+#: spyder/widgets/variableexplorer/collectionseditor.py:905
+msgid "Do you want to remove all selected items?"
+msgstr "¿Desea eliminar todas las variables seleccionadas?"
 
-#: spyderlib/widgets/findinfiles.py:368
-msgid "Exclude:"
-msgstr "Excluir:"
+#: spyder/widgets/variableexplorer/collectionseditor.py:925
+msgid "New variable name:"
+msgstr "Nuevo nombre de variable:"
 
-#: spyderlib/widgets/findinfiles.py:378
-msgid "PYTHONPATH"
-msgstr "PYTHONPATH"
+#: spyder/widgets/variableexplorer/collectionseditor.py:928
+msgid "Variable name:"
+msgstr "Nombre de variable:"
 
-#: spyderlib/widgets/findinfiles.py:380
-msgid ""
-"Search in all directories listed in sys.path which are outside the Python "
-"installation directory"
-msgstr ""
-"Buscar en todos los directorios del\n"
-"sys.path que están por fuera del\n"
-"directorio de instalación de Python"
+#: spyder/widgets/variableexplorer/collectionseditor.py:962
+msgid "Key:"
+msgstr "Nombre:"
 
-#: spyderlib/widgets/findinfiles.py:383
-msgid "Hg repository"
-msgstr "Repositorio Hg"
+#: spyder/widgets/variableexplorer/collectionseditor.py:970
+msgid "Value:"
+msgstr "Valor:"
 
-#: spyderlib/widgets/findinfiles.py:386
-msgid "Search in current directory hg repository"
-msgstr ""
-"Buscar en el repositorio\n"
-"actual de Mercurial"
+#: spyder/widgets/variableexplorer/collectionseditor.py:986
+msgid "Import error"
+msgstr "Error de importación"
 
-#: spyderlib/widgets/findinfiles.py:387
-msgid "Here:"
-msgstr "Aquí"
+#: spyder/widgets/variableexplorer/collectionseditor.py:987
+msgid "Please install <b>matplotlib</b> or <b>guiqwt</b>."
+msgstr "Por favor instale <b>Matplotlib</b> o <b>guiqwt</b>."
 
-#: spyderlib/widgets/findinfiles.py:391
-msgid "Search recursively in this directory"
+#: spyder/widgets/variableexplorer/collectionseditor.py:999
+msgid "<b>Unable to plot data.</b><br><br>Error message:<br>%s"
 msgstr ""
-"Buscar recursivamente\n"
-"en este directorio"
+"<b>No fue posible graficar los datos.</b><br><br>Mensaje de error:<br>%s"
 
-#: spyderlib/widgets/findinfiles.py:396
-msgid "Browse a search directory"
+#: spyder/widgets/variableexplorer/collectionseditor.py:1016
+msgid "<b>Unable to show image.</b><br><br>Error message:<br>%s"
 msgstr ""
-"Seleccionar el directorio\n"
-"de búsqueda"
-
-#: spyderlib/widgets/findinfiles.py:426
-msgid "Hide advanced options"
-msgstr "Ocultar opciones avanzadas"
-
-#: spyderlib/widgets/findinfiles.py:429
-msgid "Show advanced options"
-msgstr "Mostrar opciones avanzadas"
+"<b>No fue posible generar la gráfica.</b><br><br>Mensaje de error:<br>%s"
 
-#: spyderlib/widgets/findinfiles.py:570
-msgid "Search canceled"
-msgstr "Búsqueda cancelada"
+#: spyder/widgets/variableexplorer/collectionseditor.py:1039
+msgid "<b>Unable to save array</b><br><br>Error message:<br>%s"
+msgstr ""
+"<b>No fue posible guardar el arreglo</b><br><br>Mensaje de error:<br>%s"
 
-#: spyderlib/widgets/findinfiles.py:574
-msgid "String not found"
-msgstr "Texto no encontrado"
+#: spyder/widgets/variableexplorer/collectionseditor.py:1064
+msgid "It was not possible to copy this array"
+msgstr "No fue posible copiar este arreglo"
 
-#: spyderlib/widgets/findinfiles.py:576
-msgid "matches in"
-msgstr "coincidencias en"
+#: spyder/widgets/variableexplorer/collectionseditor.py:1089
+msgid "Clipboard contents"
+msgstr "Contenidos del portapapeles"
 
-#: spyderlib/widgets/findinfiles.py:577
-msgid "file"
-msgstr "archivo"
+#: spyder/widgets/variableexplorer/collectionseditor.py:1104
+msgid "Import from clipboard"
+msgstr "Importar desde el portapapeles"
 
-#: spyderlib/widgets/findinfiles.py:585
-msgid "interrupted"
-msgstr "interrumpido"
+#: spyder/widgets/variableexplorer/collectionseditor.py:1106
+msgid "Empty clipboard"
+msgstr "Vaciar el portapapeles"
 
-#: spyderlib/widgets/findreplace.py:59
-msgid "Search string"
-msgstr "Buscar texto"
+#: spyder/widgets/variableexplorer/collectionseditor.py:1107
+msgid "Nothing to be imported from clipboard."
+msgstr "No hay nada para importar desde el portapapeles."
 
-#: spyderlib/widgets/findreplace.py:83
-msgid "Case Sensitive"
-msgstr ""
-"Distinguir mayúsculas\n"
-"de minúsculas"
+#: spyder/widgets/variableexplorer/dataframeeditor.py:450
+msgid "To bool"
+msgstr "A booleano"
 
-#: spyderlib/widgets/findreplace.py:89
-msgid "Whole words"
-msgstr ""
-"Solamente palabras\n"
-"completas"
+#: spyder/widgets/variableexplorer/dataframeeditor.py:450
+msgid "To complex"
+msgstr "A complejo"
 
-#: spyderlib/widgets/findreplace.py:95
-msgid "Highlight matches"
-msgstr "Resaltar coincidencias"
+#: spyder/widgets/variableexplorer/dataframeeditor.py:451
+msgid "To float"
+msgstr "A flotante"
 
-#: spyderlib/widgets/findreplace.py:109
-msgid "Replace with:"
-msgstr "Reemplazar con:"
+#: spyder/widgets/variableexplorer/dataframeeditor.py:451
+msgid "To int"
+msgstr "A entero"
 
-#: spyderlib/widgets/findreplace.py:111
-msgid "Replace string"
-msgstr "Reemplazar texto"
+#: spyder/widgets/variableexplorer/dataframeeditor.py:452
+msgid "To str"
+msgstr "A cadena"
 
-#: spyderlib/widgets/findreplace.py:114
-msgid "Replace/find"
-msgstr "Buscar/reemplazar"
+#: spyder/widgets/variableexplorer/dataframeeditor.py:526
+msgid "%s editor"
+msgstr "Editor de %s"
 
-#: spyderlib/widgets/findreplace.py:121
-msgid "Replace all"
-msgstr "Reemplazar todo"
+#: spyder/widgets/variableexplorer/dataframeeditor.py:558
+msgid "Column min/max"
+msgstr "Min/max de columna"
 
-#: spyderlib/widgets/importwizard.py:116 spyderlib/widgets/importwizard.py:431
+#: spyder/widgets/variableexplorer/importwizard.py:116
+#: spyder/widgets/variableexplorer/importwizard.py:431
 msgid "Import as"
 msgstr "Importar como"
 
-#: spyderlib/widgets/importwizard.py:118
+#: spyder/widgets/variableexplorer/importwizard.py:118
 msgid "data"
 msgstr "datos"
 
-#: spyderlib/widgets/importwizard.py:122
+#: spyder/widgets/variableexplorer/importwizard.py:122
 msgid "code"
 msgstr "código"
 
-#: spyderlib/widgets/importwizard.py:125 spyderlib/widgets/importwizard.py:504
+#: spyder/widgets/variableexplorer/importwizard.py:125
+#: spyder/widgets/variableexplorer/importwizard.py:504
 msgid "text"
 msgstr "texto"
 
-#: spyderlib/widgets/importwizard.py:138
+#: spyder/widgets/variableexplorer/importwizard.py:138
 msgid "Column separator:"
 msgstr "Separador de columnas:"
 
-#: spyderlib/widgets/importwizard.py:142
+#: spyder/widgets/variableexplorer/importwizard.py:142
 msgid "Tab"
 msgstr "Tabulación"
 
-#: spyderlib/widgets/importwizard.py:145 spyderlib/widgets/importwizard.py:163
+#: spyder/widgets/variableexplorer/importwizard.py:145
+#: spyder/widgets/variableexplorer/importwizard.py:163
 msgid "other"
 msgstr "otro"
 
-#: spyderlib/widgets/importwizard.py:156
+#: spyder/widgets/variableexplorer/importwizard.py:156
 msgid "Row separator:"
 msgstr "Separador de filas:"
 
-#: spyderlib/widgets/importwizard.py:160
+#: spyder/widgets/variableexplorer/importwizard.py:160
 msgid "EOL"
 msgstr "Fin de línea"
 
-#: spyderlib/widgets/importwizard.py:175
+#: spyder/widgets/variableexplorer/importwizard.py:175
 msgid "Additional options"
 msgstr "Opciones adicionales"
 
-#: spyderlib/widgets/importwizard.py:179
+#: spyder/widgets/variableexplorer/importwizard.py:179
 msgid "Skip rows:"
 msgstr "Saltar filas:"
 
-#: spyderlib/widgets/importwizard.py:190
+#: spyder/widgets/variableexplorer/importwizard.py:190
 msgid "Comments:"
 msgstr "Comentarios:"
 
-#: spyderlib/widgets/importwizard.py:196
+#: spyder/widgets/variableexplorer/importwizard.py:196
 msgid "Transpose"
 msgstr "Trasponer"
 
-#: spyderlib/widgets/importwizard.py:434
+#: spyder/widgets/variableexplorer/importwizard.py:434
 msgid "array"
 msgstr "arreglo"
 
-#: spyderlib/widgets/importwizard.py:439
+#: spyder/widgets/variableexplorer/importwizard.py:439
 msgid "list"
 msgstr "lista"
 
-#: spyderlib/widgets/importwizard.py:444
+#: spyder/widgets/variableexplorer/importwizard.py:444
 msgid "DataFrame"
 msgstr "DataFrame"
 
-#: spyderlib/widgets/importwizard.py:487 spyderlib/widgets/importwizard.py:569
+#: spyder/widgets/variableexplorer/importwizard.py:487
+#: spyder/widgets/variableexplorer/importwizard.py:571
 msgid "Import wizard"
 msgstr "Asistente de importación"
 
-#: spyderlib/widgets/importwizard.py:492
+#: spyder/widgets/variableexplorer/importwizard.py:492
 msgid "Raw text"
 msgstr "Texto sin formato"
 
-#: spyderlib/widgets/importwizard.py:495
+#: spyder/widgets/variableexplorer/importwizard.py:495
 msgid "variable_name"
 msgstr "nombre_de_variable"
 
-#: spyderlib/widgets/importwizard.py:506
+#: spyder/widgets/variableexplorer/importwizard.py:506
 msgid "table"
 msgstr "tabla"
 
-#: spyderlib/widgets/importwizard.py:507
+#: spyder/widgets/variableexplorer/importwizard.py:507
 msgid "Preview"
 msgstr "Vista previa"
 
-#: spyderlib/widgets/importwizard.py:511
+#: spyder/widgets/variableexplorer/importwizard.py:511
 msgid "Variable Name"
 msgstr "Nombre de variable"
 
-#: spyderlib/widgets/importwizard.py:519
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: spyderlib/widgets/importwizard.py:532
+#: spyder/widgets/variableexplorer/importwizard.py:534
 msgid "Done"
 msgstr "Hecho"
 
-#: spyderlib/widgets/importwizard.py:570
+#: spyder/widgets/variableexplorer/importwizard.py:572
 msgid ""
 "<b>Unable to proceed to next step</b><br><br>Please check your entries."
 "<br><br>Error message:<br>%s"
@@ -4748,588 +5182,444 @@ msgstr ""
 "<b>No fue posible pasar al siguiente paso</b><br><br>Por favor revise sus "
 "daros.<br><br>Mensaje de error:<br>%s"
 
-#: spyderlib/widgets/internalshell.py:258
-msgid "Help..."
-msgstr "Ayuda..."
-
-#: spyderlib/widgets/internalshell.py:266
-msgid "Help"
-msgstr "Ayuda"
-
-#: spyderlib/widgets/internalshell.py:275
-msgid "Shell special commands:"
-msgstr "Comandos especiales:"
-
-#: spyderlib/widgets/internalshell.py:276
-msgid "Internal editor:"
-msgstr "Editor interno:"
-
-#: spyderlib/widgets/internalshell.py:277
-msgid "External editor:"
-msgstr "Editor externo:"
-
-#: spyderlib/widgets/internalshell.py:278
-msgid "Run script:"
-msgstr "Ejecutar un archivo:"
-
-#: spyderlib/widgets/internalshell.py:279
-msgid "Remove references:"
-msgstr "Eliminar referencias:"
-
-#: spyderlib/widgets/internalshell.py:280
-msgid "System commands:"
-msgstr "Comandos del sistema:"
-
-#: spyderlib/widgets/internalshell.py:281
-msgid "Python help:"
-msgstr "Ayuda de Python:"
-
-#: spyderlib/widgets/internalshell.py:282
-msgid "GUI-based editor:"
-msgstr "Editor gráfico:"
-
-#: spyderlib/widgets/ipython.py:506
-msgid "An error ocurred while starting the kernel"
-msgstr "Ocurrió un error mientras iniciaba el núcleo"
-
-#: spyderlib/widgets/ipython.py:535
-msgid "Restart kernel"
-msgstr "Reiniciar el núcleo"
-
-#: spyderlib/widgets/ipython.py:557
-msgid "Stop the current command"
-msgstr "Detener el comando actual"
-
-#: spyderlib/widgets/ipython.py:581
-msgid "Inspect current object"
-msgstr "Inspeccionar objeto"
-
-#: spyderlib/widgets/ipython.py:586
-msgid "Clear line or block"
-msgstr "Limpiar línea o bloque"
-
-#: spyderlib/widgets/ipython.py:590
-msgid "Clear console"
-msgstr "Limpiar la terminal"
-
-#: spyderlib/widgets/ipython.py:640
-msgid ""
-"It seems the kernel died unexpectedly. Use 'Restart kernel' to continue "
-"using this console."
-msgstr ""
-"Al parecer el núcleo murió de forma inesperada. Use 'Reiniciar el núcleo' "
-"para continuar usando esta terminal."
-
-#: spyderlib/widgets/ipython.py:660
-msgid "Changing backend to Qt for Mayavi"
-msgstr "Cambiando la salida gráfica a Qt por Mayavi"
-
-#: spyderlib/widgets/ipython.py:669
-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."
+#: spyder/widgets/variableexplorer/namespacebrowser.py:199
+msgid "Refresh"
+msgstr "Actualizar"
 
-#: spyderlib/widgets/ipython.py:678
-msgid "Kernel process is either remote or unspecified. Cannot restart."
+#: spyder/widgets/variableexplorer/namespacebrowser.py:203
+msgid "Refresh periodically"
 msgstr ""
-"El núcleo es remoto o no está especificado. Por ello no se puede reiniciar."
-
-#: spyderlib/widgets/ipython.py:757
-msgid "Connecting to kernel..."
-msgstr "Conectándose al núcleo..."
-
-#: spyderlib/widgets/onecolumntree.py:60
-msgid "Collapse all"
-msgstr "Colapsar resultados"
-
-#: spyderlib/widgets/onecolumntree.py:64
-msgid "Expand all"
-msgstr "Expandir resultados"
-
-#: spyderlib/widgets/onecolumntree.py:68
-msgid "Restore"
-msgstr "Restaurar"
-
-#: spyderlib/widgets/onecolumntree.py:69
-msgid "Restore original tree layout"
-msgstr "Restaurar la disposición original"
-
-#: spyderlib/widgets/onecolumntree.py:73
-msgid "Collapse selection"
-msgstr "Colapsar selección"
-
-#: spyderlib/widgets/onecolumntree.py:77
-msgid "Expand selection"
-msgstr "Expandir selección"
-
-#: spyderlib/widgets/pathmanager.py:86
-msgid "Move to top"
-msgstr "Mover al principio"
-
-#: spyderlib/widgets/pathmanager.py:92
-msgid "Move up"
-msgstr "Mover arriba"
-
-#: spyderlib/widgets/pathmanager.py:98
-msgid "Move down"
-msgstr "Mover abajo"
-
-#: spyderlib/widgets/pathmanager.py:104
-msgid "Move to bottom"
-msgstr "Mover al final"
+"Actualizar\n"
+"periódicamente"
 
-#: spyderlib/widgets/pathmanager.py:115 spyderlib/widgets/pathmanager.py:230
-msgid "Add path"
-msgstr "Añadir ruta"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:210
+#: spyder/widgets/variableexplorer/namespacebrowser.py:490
+msgid "Import data"
+msgstr "Importar datos"
 
-#: spyderlib/widgets/pathmanager.py:120 spyderlib/widgets/pathmanager.py:213
-msgid "Remove path"
-msgstr "Eliminar ruta"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:213
+#: spyder/widgets/variableexplorer/namespacebrowser.py:568
+#: spyder/widgets/variableexplorer/namespacebrowser.py:587
+msgid "Save data"
+msgstr "Guardar datos"
 
-#: spyderlib/widgets/pathmanager.py:130
-msgid "Synchronize..."
-msgstr "Sincronizar..."
+#: spyder/widgets/variableexplorer/namespacebrowser.py:218
+msgid "Save data as..."
+msgstr "Guardar datos como..."
 
-#: spyderlib/widgets/pathmanager.py:132
-msgid "Synchronize Spyder's path list with PYTHONPATH environment variable"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:230
+msgid "Exclude references which name starts with an underscore"
 msgstr ""
-"Sincronizar la lista de rutas de Spyder con la variable\n"
-"de entorno PYTHONPATH"
+"Excluir variables cuyo nombre comienza\n"
+"con un guión abajo"
 
-#: spyderlib/widgets/pathmanager.py:144
-msgid "Synchronize"
-msgstr "Sincronizar"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:238
+msgid "Exclude references which name is uppercase"
+msgstr ""
+"Excluir variables cuyo nombre está\n"
+"por completo en mayúsculas"
 
-#: spyderlib/widgets/pathmanager.py:145
+#: spyder/widgets/variableexplorer/namespacebrowser.py:245
+msgid "Exclude references which name starts with an uppercase character"
+msgstr "Excluir variables cuyo nombre comienza en mayúsculas"
+
+#: spyder/widgets/variableexplorer/namespacebrowser.py:253
 msgid ""
-"This will synchronize Spyder's path list with <b>PYTHONPATH</b> environment "
-"variable for current user, allowing you to run your Python modules outside "
-"Spyder without having to configure sys.path. <br>Do you want to clear "
-"contents of PYTHONPATH before adding Spyder's path list?"
+"Exclude references to unsupported data types (i.e. which won't be handled/"
+"saved correctly)"
 msgstr ""
-"Esta acción sincronizará la lista de rutas de Spyder con la variable de "
-"entorno <b>PYTHONPATH</b> para el usuario actual, permitiéndole ejecutar sus "
-"módulos de Python por fuera de Spyder sin tener que configurar sys.path."
-"<br>¿Desea borrar los contenidos del PYTHONPATH antes de añadir la lista de "
-"rutas de Spyder?"
+"Excluir variables que referencian tipos de datos no soportados\n"
+"(es decir aquellos que no pueden manejarse y guardarse\n"
+"correctamente)"
 
-#: spyderlib/widgets/pathmanager.py:214
-msgid "Do you really want to remove selected path?"
-msgstr "¿Realmente desea eliminar la ruta seleccionada?"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:348
+msgid "Object <b>%s</b> is not picklable"
+msgstr "El objeto <b>%s</b> no es picklable"
 
-#: spyderlib/widgets/pathmanager.py:231
+#: spyder/widgets/variableexplorer/namespacebrowser.py:510
 msgid ""
-"This directory is already included in Spyder path list.<br>Do you want to "
-"move it to the top of the list?"
+"<b>Unsupported file extension '%s'</b><br><br>Would you like to import it "
+"anyway (by selecting a known file format)?"
 msgstr ""
-"Este directorio ya está incluido en la lista de rutas de Spyder.<br>¿Desea "
-"moverlo al principio de la lista?"
+"<b>Extensión de archivo no soportada: '%s'</b><br><br>¿Desea importar el "
+"archivo de todas formas (seleccionando un formato conocido)?"
 
-#: spyderlib/widgets/projectexplorer.py:335
-msgid "its own configuration file"
-msgstr "su propio archivo de configuración"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:518
+msgid "Open file as:"
+msgstr "Abrir archivo como:"
 
-#: spyderlib/widgets/projectexplorer.py:337
-msgid " and "
-msgstr " y"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:556
+msgid "<b>Unable to load '%s'</b><br><br>Error message:<br>%s"
+msgstr "<b>No fue posible cargar '%s'</b><br><br>Mensaje de error:<br>%s"
 
-#: spyderlib/widgets/projectexplorer.py:341
-msgid "the following projects:<br>%s"
-msgstr "los siguientes proyectos:<br>%s"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:588
+msgid "<b>Unable to save current workspace</b><br><br>Error message:<br>%s"
+msgstr ""
+"<b>No fue posible guardar el espacio de trabajo actual</b><br><br>Mensaje de "
+"error:<br>%s"
 
-#: spyderlib/widgets/projectexplorer.py:545
-msgid "Project..."
-msgstr "Proyecto..."
+#: spyder/widgets/variableexplorer/texteditor.py:74
+msgid "Text editor"
+msgstr "Editor de texto"
 
-#: spyderlib/widgets/projectexplorer.py:558
-msgid "Existing directory"
-msgstr "Un directorio existente"
+#: spyder/widgets/variableexplorer/utils.py:29
+msgid "View and edit DataFrames and Series in the Variable Explorer"
+msgstr "Ver y editar DataFrames y Series en el Explorador de Variables"
 
-#: spyderlib/widgets/projectexplorer.py:562
-msgid "Existing Spyder project"
-msgstr "Un proyecto de Spyder existente"
+#: spyder/widgets/variableexplorer/utils.py:34
+msgid "View and edit two and three dimensional arrays in the Variable Explorer"
+msgstr ""
+"Ver y editar arreglos bi y tridimensionales en el Explorador de Variables"
 
-#: spyderlib/widgets/projectexplorer.py:566
-msgid "Existing Pydev project"
-msgstr "Un proyecto de Pydev existente"
+#: spyder/workers/updates.py:89 spyder/workers/updates.py:91
+msgid "Unable to retrieve information."
+msgstr "No fue posible recuperar la información"
 
-#: spyderlib/widgets/projectexplorer.py:583
-msgid "Open project"
-msgstr "Abrir proyecto"
+#: spyder/workers/updates.py:93
+msgid ""
+"Unable to connect to the internet. <br><br>Make sure the connection is "
+"working properly."
+msgstr ""
+"No fue posible conectarse a Internet. <br><br>Por favor asegúrese de que la "
+"conexión está funcionando apropiadamente."
 
-#: spyderlib/widgets/projectexplorer.py:588
-msgid "Close project"
-msgstr "Cerrar proyecto"
+#: spyder/workers/updates.py:96
+msgid "Unable to check for updates."
+msgstr "No fue posible buscar actualizaciones"
 
-#: spyderlib/widgets/projectexplorer.py:593
-msgid "Close unrelated projects"
-msgstr "Cerrar proyectos no relacionados"
+#~ msgid "Reload last session"
+#~ msgstr "Recargar la última sesión"
 
-#: spyderlib/widgets/projectexplorer.py:602
-msgid "Edit related projects"
-msgstr "Editar proyectos relacionados"
+#~ msgid "Load session..."
+#~ msgstr "Cargar sesión..."
 
-#: spyderlib/widgets/projectexplorer.py:610
-msgid "Add to PYTHONPATH"
-msgstr "Añadir al PYTHONPATH"
+#~ msgid "Load Spyder session"
+#~ msgstr "Cargar sesión de Spyder"
 
-#: spyderlib/widgets/projectexplorer.py:615
-msgid "Remove from PYTHONPATH"
-msgstr "Eliminar del PYTHONPATH"
+#~ msgid "Save session..."
+#~ msgstr "Guardar sesión..."
 
-#: spyderlib/widgets/projectexplorer.py:620
-msgid "Properties"
-msgstr "Propiedades"
+#~ msgid "Save current session and quit application"
+#~ msgstr "Guardar sesión actual y salir de la aplicación"
 
-#: spyderlib/widgets/projectexplorer.py:655
-msgid "Show horizontal scrollbar"
-msgstr "Mostrar una barra de desplazamiento horizontal"
+#~ msgid "Open session"
+#~ msgstr "Abrir sesión"
 
-#: spyderlib/widgets/projectexplorer.py:692
-msgid "Workspace"
-msgstr "Espacio de trabajo"
+#~ msgid "Spyder sessions"
+#~ msgstr "Sesiones de Spyder"
 
-#: spyderlib/widgets/projectexplorer.py:693
-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."
-msgstr ""
-"No fue posible cargar o guardar el espacio de trabajo%s<br><br>Por favor "
-"verifique si cuenta con los permisos necesarios para escribir los archivos "
-"de configuración del proyecto al disco."
+#~ msgid "Save session"
+#~ msgstr "Guardar sesión"
 
-#: spyderlib/widgets/projectexplorer.py:752
-msgid "Import directory"
-msgstr "Importar directorio"
+#~ msgid "Jupyter Qtconsole integration"
+#~ msgstr "Integración con la terminal de IPython"
 
-#: spyderlib/widgets/projectexplorer.py:754
-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)?"
-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)?"
+#~ msgid "Python executable"
+#~ msgstr "Archivo ejecutable de Python"
 
-#: spyderlib/widgets/projectexplorer.py:772
-#: spyderlib/widgets/projectexplorer.py:1183
-msgid "copy"
-msgstr "copiar"
+#~ msgid "Trying to kill a kernel?"
+#~ msgstr "Desea cerrar un núcleo?"
 
-#: spyderlib/widgets/projectexplorer.py:824
-msgid "The project <b>%s</b> is already opened!"
-msgstr "El proyecto <b>%s</b> ya está abierto!"
+#~ 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 the second button from right to left."
+#~ msgstr ""
+#~ "No puede cerrar este núcleo porque tiene una o más terminales conectadas "
+#~ "a él.<br><br>Debe cerrarlas previamente o puede terminar el proceso "
+#~ "usando el segundo botón ubicado de derecha a izquierda."
 
-#: spyderlib/widgets/projectexplorer.py:831
-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>"
-msgstr ""
-"La ruta del directorio del proyecto está dentro del espacio de trabajo pero "
-"no al nivel esperado de profundidad, pues no es un directorio sino un "
-"subdirectorio del espacio de trabajo:<br><b>%s</b>"
+#~ msgid "Kernel"
+#~ msgstr "Núcleo"
 
-#: spyderlib/widgets/projectexplorer.py:842
-msgid "Project name:"
-msgstr "Nombre del proyecto:"
+#~ msgid ""
+#~ "Either:<ol><li>Your IPython frontend and kernel versions are "
+#~ "<b>incompatible</b> or</li><li>You <b>don't have</b> IPython installed in "
+#~ "your external interpreter.</li></ol>In any case, we're sorry but we can't "
+#~ "create a console for you."
+#~ msgstr ""
+#~ "O bien:<ol><li>Sus versiones del núcleo y la interfaz gráfica de IPython "
+#~ "son <b>incompatibles</b> o</li><li>Usted <b>no tiene</b> IPython "
+#~ "instalado en su intérprete externo.</li></ol>Lo lamentamos, pero en "
+#~ "cualquier caso no podemos crear una terminal de IPython para usted."
 
-#: spyderlib/widgets/projectexplorer.py:851
-msgid "A project named <b>%s</b> already exists"
-msgstr "Un proyecto llamado <b>%s</b> ya existe"
+#~ msgid "Kernel %s"
+#~ msgstr "Núcleo %s"
 
-#: spyderlib/widgets/projectexplorer.py:856
-msgid ""
-"Invalid project name.<br><br>Name must match the following regular "
-"expression:<br><b>%s</b>"
-msgstr ""
-"Nombre de proyecto inválido.<br><br>El nombre debe ajustarse a una expresión "
-"del tipo:<br><b>%s</b>"
+#~ msgid "Open an IPython console"
+#~ msgstr "Abrir una terminal de IPython"
 
-#: spyderlib/widgets/projectexplorer.py:863
-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?"
+#~ 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 ""
+#~ "El monitor está desactivado, por tanto se creará un kernel de IPython "
+#~ "pero usted deberá conectar manualmente un intérprete al mismo."
 
-#: spyderlib/widgets/projectexplorer.py:876
-msgid "New project"
-msgstr "Nuevo proyecto"
+#~ msgid ""
+#~ "UMR excluded modules:\n"
+#~ "(example: guidata, guiqwt)"
+#~ msgstr ""
+#~ "Módulos excluidos del RMU:\n"
+#~ "(por ejemplo: guidata, guiqwt)"
 
-#: spyderlib/widgets/projectexplorer.py:884
-msgid ""
-"The current workspace has not been configured yet.\n"
-"Do you want to do this now?"
-msgstr ""
-"El siguiente espacio de trabajo no ha sido configurado.\n"
-"¿Desea hacerlo ahora?"
+#~ msgid ""
+#~ "This feature requires the Matplotlib library.\n"
+#~ "It seems you don't have it installed."
+#~ msgstr ""
+#~ "Esta característica requiere la librería Matplotlib.\n"
+#~ "Al parecer no la tiene instalada."
 
-#: spyderlib/widgets/projectexplorer.py:922
-msgid "Import existing project"
-msgstr "Importar proyecto existente"
+#~ msgid ""
+#~ "This feature requires the Sympy library.\n"
+#~ "It seems you don't have it installed."
+#~ msgstr ""
+#~ "Esta característica requiere la librería Sympy.\n"
+#~ "Al parecer no la tiene instalada."
 
-#: spyderlib/widgets/projectexplorer.py:935
-msgid "Select projects to import"
-msgstr "Seleccionar proyectos a importar"
+#~ msgid "&Font..."
+#~ msgstr "&Tipo de letra..."
 
-#: spyderlib/widgets/projectexplorer.py:947
-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"
+#~ msgid "Set font style"
+#~ msgstr "Establece el tipo de fuente"
 
-#: spyderlib/widgets/projectexplorer.py:977
-msgid "Import existing Pydev project"
-msgstr "Importar un proyecto existente de Pydev"
+#~ msgid "Select a new font"
+#~ msgstr "Seleccionar una nueva fuente"
 
-#: spyderlib/widgets/projectexplorer.py:978
-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"
+#~ msgid ""
+#~ "The kernel failed to start!! That's all we know... Please close this "
+#~ "console and open a new one."
+#~ msgstr ""
+#~ "No fue posible crear un núcleo!! Es todo lo que sabemos... Por favor "
+#~ "cierre esta terminal y abra una nueva."
 
-#: spyderlib/widgets/projectexplorer.py:1016
-msgid ""
-"Do you really want to delete project <b>%s</b>?<br><br>Note: project files "
-"won't be deleted from disk."
-msgstr ""
-"¿Realmente desea eliminar el proyecto <b>%s</b>?<br><br>Nota: Los archivos "
-"del proyecto no serán eliminados del disco."
+#~ msgid ""
+#~ "It seems the kernel died unexpectedly. Use 'Restart kernel' to continue "
+#~ "using this console."
+#~ msgstr ""
+#~ "Al parecer el núcleo murió de forma inesperada. Use 'Reiniciar el núcleo' "
+#~ "para continuar usando esta terminal."
 
-#: spyderlib/widgets/projectexplorer.py:1069
-msgid "Related projects"
-msgstr "Proyectos relacionados"
+#~ 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/widgets/projectexplorer.py:1077
-msgid "Select projects which are related to <b>%s</b>"
-msgstr "Seleccionar los proyectos que están relacionados a <b>%s</b>"
+#~ 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/widgets/projectexplorer.py:1102
-#, fuzzy
-msgid ""
-"Statistics on source files only:<br>(Python, Cython, IPython, Enaml,C/C++, "
-"Fortran)<br><br><b>%s</b> files.<br><b>%s</b> lines of code."
-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."
+#~ msgid "its own configuration file"
+#~ msgstr "su propio archivo de configuración"
 
-#: spyderlib/widgets/projectexplorer.py:1151
-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?"
+#~ msgid " and "
+#~ msgstr " y"
 
-#: spyderlib/widgets/projectexplorer.py:1165
-msgid "Folder <b>%s</b> already exists."
-msgstr "La carpeta <b>%s</b> ya existe."
+#~ msgid "the following projects:<br>%s"
+#~ msgstr "los siguientes proyectos:<br>%s"
 
-#: spyderlib/widgets/projectexplorer.py:1185
-msgid "move"
-msgstr "mover"
+#~ msgid "Existing Pydev project"
+#~ msgstr "Un proyecto de Pydev existente"
 
-#: spyderlib/widgets/projectexplorer.py:1195
-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"
+#~ msgid "Close unrelated projects"
+#~ msgstr "Cerrar proyectos no relacionados"
 
-#: spyderlib/widgets/projectexplorer.py:1196
-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>."
-"spyderworkspace</b> configuration file.<br><br>A <b>Spyder project</b> is a "
-"directory with source code (and other related files) and a configuration "
-"file (named <b>.spyderproject</b>) with project settings (PYTHONPATH, linked "
-"projects, ...).<br>"
-msgstr ""
-"<u><b>¿Qué es un espacio de trabajo?</b></u><br><br>Un <b>espacio de trabajo "
-"de Spyder</b> es un directorio en su sistema de archivos que contiene un "
-"proyecto de Spyder y un archivo de configuración <b>.spyderworkspace</b>."
-"<br><br>Un <b>proyecto de Spyder</b> es un directorio con código fuente (y "
-"otros archivos relacionados) y un archivo de configuración (llamado <b>."
-"spyderproject</b>) con los ajustes del proyecto (PYTHONPATH, proyectos "
-"referenciados, etc).<br>"
-
-#: spyderlib/widgets/projectexplorer.py:1225
-msgid "This is the current workspace directory"
-msgstr "Este es el directorio actual del espacio de trabajo"
-
-#: spyderlib/widgets/projectexplorer.py:1255
-msgid ""
-"The following directory is not a Spyder workspace:<br>%s<br><br>Do you want "
-"to create a new workspace in this directory?"
-msgstr ""
-"El siguiente directorio no es un espacio de trabajo de Spyder:<br>"
-"%s<br><br>¿Desea crear un nuevo espacio de trabajo en este directorio?"
+#~ msgid "Edit related projects"
+#~ msgstr "Editar proyectos relacionados"
 
-#: spyderlib/widgets/pydocgui.py:107
-msgid "Module or package:"
-msgstr "Módulo o paquete:"
+#~ msgid "Add to PYTHONPATH"
+#~ msgstr "Añadir al PYTHONPATH"
 
-#: spyderlib/widgets/shell.py:134
-msgid "Save history log..."
-msgstr "Guardar el historial..."
+#~ msgid "Remove from PYTHONPATH"
+#~ msgstr "Eliminar del PYTHONPATH"
 
-#: spyderlib/widgets/shell.py:136
-msgid "Save current history log (i.e. all inputs and outputs) in a text file"
-msgstr ""
-"Guardar el historial actual (es decir\n"
-"todas las entradas y salidas) en un\n"
-"archivo de texto"
+#~ msgid "Properties"
+#~ msgstr "Propiedades"
 
-#: spyderlib/widgets/shell.py:262
-msgid "Save history log"
-msgstr "Guardar el historial"
+#~ 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."
+#~ msgstr ""
+#~ "No fue posible cargar o guardar el espacio de trabajo%s<br><br>Por favor "
+#~ "verifique si cuenta con los permisos necesarios para escribir los "
+#~ "archivos de configuración del proyecto al disco."
 
-#: spyderlib/widgets/shell.py:265
-msgid "History logs"
-msgstr "Historiales"
+#~ msgid "Import directory"
+#~ msgstr "Importar directorio"
 
-#: spyderlib/widgets/shell.py:276
-msgid "<b>Unable to save file '%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"
+#~ 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)?"
+#~ 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/shell.py:718
-msgid "Copy without prompts"
-msgstr "Copiar sin los prompts"
+#~ msgid "The project <b>%s</b> is already opened!"
+#~ msgstr "El proyecto <b>%s</b> ya está abierto!"
 
-#: spyderlib/widgets/shell.py:721 spyderlib/widgets/shell.py:725
-msgid "Clear line"
-msgstr "Limpiar línea"
+#~ 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>"
+#~ msgstr ""
+#~ "La ruta del directorio del proyecto está dentro del espacio de trabajo "
+#~ "pero no al nivel esperado de profundidad, pues no es un directorio sino "
+#~ "un subdirectorio del espacio de trabajo:<br><b>%s</b>"
 
-#: spyderlib/widgets/shell.py:727
-msgid "Clear shell"
-msgstr "Limpiar la terminal"
+#~ msgid "A project named <b>%s</b> already exists"
+#~ msgstr "Un proyecto llamado <b>%s</b> ya existe"
 
-#: spyderlib/widgets/shell.py:731
-msgid "Clear shell contents ('cls' command)"
-msgstr "Limpia los contenidos de la terminal (equivalente al comando 'cls')"
+#~ msgid ""
+#~ "Invalid project name.<br><br>Name must match the following regular "
+#~ "expression:<br><b>%s</b>"
+#~ msgstr ""
+#~ "Nombre de proyecto inválido.<br><br>El nombre debe ajustarse a una "
+#~ "expresión del tipo:<br><b>%s</b>"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:98
-msgid "Go to line:"
-msgstr "Ir a la línea"
+#~ 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/sourcecode/codeeditor.py:106
-msgid "Line count:"
-msgstr "Número total de líneas:"
+#~ msgid "New project"
+#~ msgstr "Nuevo proyecto"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:1270
-msgid "Breakpoint"
-msgstr "Punto de interrupción"
+#~ msgid ""
+#~ "The current workspace has not been configured yet.\n"
+#~ "Do you want to do this now?"
+#~ msgstr ""
+#~ "El siguiente espacio de trabajo no ha sido configurado.\n"
+#~ "¿Desea hacerlo ahora?"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:1271
-msgid "Condition:"
-msgstr "Condición:"
+#~ msgid "Import existing project"
+#~ msgstr "Importar proyecto existente"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:1679
-msgid "Code analysis"
-msgstr "Análisis del código"
+#~ msgid "Select projects to import"
+#~ msgstr "Seleccionar proyectos a importar"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:1733
-msgid "To do"
-msgstr "To do"
+#~ 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/sourcecode/codeeditor.py:1974
-msgid "Removal error"
-msgstr "Error de remoción"
+#~ msgid "Import existing Pydev project"
+#~ msgstr "Importar un proyecto existente de Pydev"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:1975
-msgid ""
-"It was not possible to remove outputs from this notebook. The error is:\n"
-"\n"
-msgstr ""
-"No fue posible remover las outputs de este notebook. El error es:\n"
-"\n"
+#~ 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/sourcecode/codeeditor.py:2453
-msgid "Clear all ouput"
-msgstr "Eliminar todas las salidas"
+#~ msgid ""
+#~ "Do you really want to delete project <b>%s</b>?<br><br>Note: project "
+#~ "files won't be deleted from disk."
+#~ msgstr ""
+#~ "¿Realmente desea eliminar el proyecto <b>%s</b>?<br><br>Nota: Los "
+#~ "archivos del proyecto no serán eliminados del disco."
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:2459
-msgid "Go to definition"
-msgstr "Ir a la definición"
+#~ msgid "Select projects which are related to <b>%s</b>"
+#~ msgstr "Seleccionar los proyectos que están relacionados a <b>%s</b>"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:2471
-msgid "Zoom reset"
-msgstr "Restaurar"
+#~ msgid ""
+#~ "Statistics on source files only:<br>(Python, Cython, IPython, Enaml,C/C+"
+#~ "+, Fortran)<br><br><b>%s</b> files.<br><b>%s</b> lines of code."
+#~ msgstr ""
+#~ "Estadísticas para los archivos de código únicamente:<br>(Python, Cython, "
+#~ "IPython, Enaml, C/C++, Fortran)<br><br><b>%s</b> archivos.<br><b>%s</b> "
+#~ "líneas de código."
 
-#: spyderlib/widgets/sourcecode/syntaxhighlighters.py:32
-msgid "Syntax highlighting for Matlab, Julia and other file types"
-msgstr ""
-"Coloreado del código para archivos tipo Matlab, Julia y varios otros tipos"
+#~ 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/status.py:23
-msgid "CPU and memory usage info in the status bar"
-msgstr "Uso de memoria y CPU en la barra de estado"
+#~ 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>."
+#~ "spyderworkspace</b> configuration file.<br><br>A <b>Spyder project</b> is "
+#~ "a directory with source code (and other related files) and a "
+#~ "configuration file (named <b>.spyderproject</b>) with project settings "
+#~ "(PYTHONPATH, linked projects, ...).<br>"
+#~ msgstr ""
+#~ "<u><b>¿Qué es un espacio de trabajo?</b></u><br><br>Un <b>espacio de "
+#~ "trabajo de Spyder</b> es un directorio en su sistema de archivos que "
+#~ "contiene un proyecto de Spyder y un archivo de configuración <b>."
+#~ "spyderworkspace</b>.<br><br>Un <b>proyecto de Spyder</b> es un directorio "
+#~ "con código fuente (y otros archivos relacionados) y un archivo de "
+#~ "configuración (llamado <b>.spyderproject</b>) con los ajustes del "
+#~ "proyecto (PYTHONPATH, proyectos referenciados, etc).<br>"
 
-#: spyderlib/widgets/status.py:92
-msgid "Memory:"
-msgstr "Memoria:"
+#~ msgid "This is the current workspace directory"
+#~ msgstr "Este es el directorio actual del espacio de trabajo"
 
-#: spyderlib/widgets/status.py:93
-msgid ""
-"Memory usage status: requires the `psutil` (>=v0.3) library on non-Windows "
-"platforms"
-msgstr ""
-"Para reportar el uso de memoria se requiere de\n"
-"la librería `psutil` (>=0.3) en plataformas distintas\n"
-"a Windows"
+#~ msgid ""
+#~ "The following directory is not a Spyder workspace:<br>%s<br><br>Do you "
+#~ "want to create a new workspace in this directory?"
+#~ msgstr ""
+#~ "El siguiente directorio no es un espacio de trabajo de Spyder:<br>"
+#~ "%s<br><br>¿Desea crear un nuevo espacio de trabajo en este directorio?"
 
-#: spyderlib/widgets/status.py:105
-msgid "CPU:"
-msgstr "CPU:"
+#~ msgid "<b>Unable to retrieve data.</b><br><br>Error message:<br>%s"
+#~ msgstr ""
+#~ "<b>No fue posible obtener los datos.</b><br><br>Mensaje de error:<br>%s"
 
-#: spyderlib/widgets/status.py:106
-msgid "CPU usage status: requires the `psutil` (>=v0.3) library"
-msgstr ""
-"Para reportar el estado del CPU se requiere\n"
-"de la librería `psutil` (>=v0.3)"
+#~ msgid "Set shell font style"
+#~ msgstr "Establece el tipo de fuente de la terminal"
 
-#: spyderlib/widgets/status.py:128
-msgid "Permissions:"
-msgstr "Permisos:"
+#~ msgid "Text and margin font style"
+#~ msgstr "Tipo de letra para el texto y las márgenes"
 
-#: spyderlib/widgets/status.py:142
-msgid "End-of-lines:"
-msgstr "Fin de línea:"
+#~ msgid "tab"
+#~ msgstr "tabulador"
 
-#: spyderlib/widgets/status.py:156
-msgid "Encoding:"
-msgstr "Codificación:"
+#~ msgid "Breakpoints"
+#~ msgstr "Puntos de interrupción (Breakpoints)"
 
-#: spyderlib/widgets/status.py:169
-msgid "Line:"
-msgstr "Línea:"
+#~ msgid "Exit"
+#~ msgstr "Terminar"
 
-#: spyderlib/widgets/status.py:173
-msgid "Column:"
-msgstr "Columna:"
+#~ msgid "Exit Debug"
+#~ msgstr "Terminar depuración"
 
-#: spyderlib/widgets/tabs.py:142
-msgid "Browse tabs"
-msgstr ""
-"Navegar por\n"
-"las pestañas"
+#~ msgid "Rich text help on the Object Inspector"
+#~ msgstr "Ayuda en texto enriquecido en el Inspector de Objetos"
 
-#: spyderlib/widgets/tabs.py:270
-msgid "Close current tab"
-msgstr "Cerrar pestaña actual"
+#~ msgid "Object inspector"
+#~ msgstr "Inspector de objetos"
 
-#: spyderlib/widgets/texteditor.py:72
-msgid "Text editor"
-msgstr "Editor de texto"
+#~ msgid "Preferences > Object Inspector"
+#~ msgstr "Preferencias > Inspector de objetos"
 
-#: spyderlib/workers/updates.py:79 spyderlib/workers/updates.py:81
-msgid "Unable to retrieve information."
-msgstr ""
+#~ msgid "Set as current console's working directory"
+#~ msgstr "Establece el directorio de trabajo para la terminal actual"
 
-#: spyderlib/workers/updates.py:83
-msgid ""
-"Unable to connect to the internet. <br><br>Make sure the connection is "
-"working properly."
-msgstr ""
+#~ msgid "Save session and quit..."
+#~ msgstr "Guardar sesión y salir..."
+
+#~ msgid "Loading object inspector..."
+#~ msgstr "Cargando el inspector de objetos..."
 
-#: spyderlib/workers/updates.py:86
 #, fuzzy
-msgid "Unable to check for updates."
-msgstr "No fue posible cargar la página"
+#~ msgid "The Object Inspector"
+#~ msgstr "Inspector de objetos"
+
+#~ msgid "(Experimental) Editor's code completion, go-to-definition and help"
+#~ msgstr "(Experimental) Completado del código y ayuda en el Editor"
+
+#~ msgid ""
+#~ "This path is incorrect.\n"
+#~ "Enter a correct directory path,\n"
+#~ "then press enter to validate"
+#~ msgstr ""
+#~ "Esta ruta es incorrecta.\n"
+#~ "Introduzca una ruta de\n"
+#~ "directorio correcta y después\n"
+#~ "presione Enter para validarla"
+
+#~ msgid "Save Python script"
+#~ msgstr "Guardar archivo de Python"
 
 #~ msgid "PyQt"
 #~ msgstr "PyQt"
@@ -5584,9 +5874,6 @@ msgstr "No fue posible cargar la página"
 #~ msgid "Open a Python interpreter at startup"
 #~ msgstr "Abrir un intérprete de Python al inicio"
 
-#~ msgid "Open a Python &interpreter"
-#~ msgstr "Abrir un &intérprete de Python"
-
 #~ msgid "<br><u>Installed version</u>: %s"
 #~ msgstr "<br><u>Versión instalada</u>: %s"
 
@@ -5619,9 +5906,6 @@ msgstr "No fue posible cargar la página"
 #~ msgid "Windows and toolbars"
 #~ msgstr "Componentes y barras de herramientas"
 
-#~ msgid "Documentation"
-#~ msgstr "Documentación"
-
 #~ msgid "Create a new Python script"
 #~ msgstr "Crear un nuevo archivo de Python"
 
diff --git a/spyder/locale/fr/LC_MESSAGES/spyder.mo b/spyder/locale/fr/LC_MESSAGES/spyder.mo
new file mode 100644
index 0000000..1a6c08b
Binary files /dev/null and b/spyder/locale/fr/LC_MESSAGES/spyder.mo differ
diff --git a/spyderlib/locale/fr/LC_MESSAGES/spyderlib.po b/spyder/locale/fr/LC_MESSAGES/spyder.po
similarity index 62%
rename from spyderlib/locale/fr/LC_MESSAGES/spyderlib.po
rename to spyder/locale/fr/LC_MESSAGES/spyder.po
index ea83732..0db2e2b 100644
--- a/spyderlib/locale/fr/LC_MESSAGES/spyderlib.po
+++ b/spyder/locale/fr/LC_MESSAGES/spyder.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.1\n"
-"POT-Creation-Date: 2015-08-29 22:49+COT\n"
+"POT-Creation-Date: 2016-09-24 04:45+COT\n"
 "PO-Revision-Date: 2015-03-16 22:59-0500\n"
 "Last-Translator: Sylvain Corlay <sylvain.corlay at gmail.com>\n"
 "Language-Team: Python\n"
@@ -16,4716 +16,5153 @@ msgstr ""
 "Generated-By: pygettext.py 1.5\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#: spyderlib/config/base.py:241
-msgid ""
-"Update LANGUAGE_CODES (inside config/base.py) if a new translation has been "
-"added to Spyder"
-msgstr ""
+#: spyder/app/mainwindow.py:120
+msgid "Initializing..."
+msgstr "Initialisation..."
 
-#: spyderlib/config/ipython.py:23 spyderlib/config/ipython.py:25
-#: spyderlib/config/ipython.py:32
-msgid "IPython Console integration"
-msgstr "Intégration de la console IPython"
+#: spyder/app/mainwindow.py:236
+msgid "Numpy and Scipy documentation"
+msgstr "Documentation de Numpy et Scipy"
 
-#: spyderlib/config/main.py:29
-msgid "Python files"
-msgstr "Fichiers Python"
+#: spyder/app/mainwindow.py:238 spyder/app/mainwindow.py:1022
+msgid "Matplotlib documentation"
+msgstr "Documentation de Matplotlib"
 
-#: spyderlib/config/main.py:30
-msgid "Cython/Pyrex files"
-msgstr "Fichiers Cython/Pyrex"
+#: spyder/app/mainwindow.py:241
+msgid "PyQt4 Reference Guide"
+msgstr "Guide de référence de PyQt4"
 
-#: spyderlib/config/main.py:31
-msgid "C files"
-msgstr "Fichiers C"
+#: spyder/app/mainwindow.py:244
+msgid "PyQt4 API Reference"
+msgstr "Documentation de l'API de PyQt4"
 
-#: spyderlib/config/main.py:32
-msgid "C++ files"
-msgstr "Fichiers C++"
+#: spyder/app/mainwindow.py:246
+msgid "Python(x,y)"
+msgstr "Python(x,y)"
 
-#: spyderlib/config/main.py:33
-msgid "OpenCL files"
-msgstr "Fichiers OpenCL"
+#: spyder/app/mainwindow.py:248
+msgid "WinPython"
+msgstr "WinPython"
 
-#: spyderlib/config/main.py:34
-msgid "Fortran files"
-msgstr "Fichiers Fortran"
+#: spyder/app/mainwindow.py:519
+msgid "Close current pane"
+msgstr "Fermer le volet courant"
 
-#: spyderlib/config/main.py:35
-msgid "IDL files"
-msgstr "Fichiers IDL"
+#: spyder/app/mainwindow.py:524
+msgid "Lock panes"
+msgstr ""
 
-#: spyderlib/config/main.py:36
-msgid "MATLAB files"
-msgstr "Fichiers MATLAB"
+#: spyder/app/mainwindow.py:531
+#, fuzzy
+msgid "Use next layout"
+msgstr "Réinitialiser la disposition des fenêtres"
 
-#: spyderlib/config/main.py:37
-msgid "Julia files"
-msgstr "Fichiers Julia"
+#: spyder/app/mainwindow.py:535
+#, fuzzy
+msgid "Use previous layout"
+msgstr "Réinitialiser la disposition des fenêtres"
 
-#: spyderlib/config/main.py:38
-msgid "Yaml files"
-msgstr "Fichiers Yaml"
+#: spyder/app/mainwindow.py:554 spyder/widgets/sourcecode/codeeditor.py:2464
+msgid "Undo"
+msgstr "Annuler"
 
-#: spyderlib/config/main.py:39
-msgid "Patch and diff files"
-msgstr "Fichiers patch et diff"
+#: spyder/app/mainwindow.py:556 spyder/widgets/sourcecode/codeeditor.py:2467
+msgid "Redo"
+msgstr "Répéter"
 
-#: spyderlib/config/main.py:40
-msgid "Batch files"
-msgstr "Fichiers Batch"
+#: spyder/app/mainwindow.py:558 spyder/widgets/shell.py:121
+#: spyder/widgets/sourcecode/codeeditor.py:2473
+#: spyder/widgets/variableexplorer/arrayeditor.py:453
+#: spyder/widgets/variableexplorer/collectionseditor.py:647
+#: spyder/widgets/variableexplorer/dataframeeditor.py:445
+msgid "Copy"
+msgstr "Copier"
 
-#: spyderlib/config/main.py:41 spyderlib/utils/iofuncs.py:500
-msgid "Text files"
-msgstr "Fichiers texte"
+#: spyder/app/mainwindow.py:560 spyder/widgets/shell.py:117
+#: spyder/widgets/sourcecode/codeeditor.py:2470
+msgid "Cut"
+msgstr "Couper"
 
-#: spyderlib/config/main.py:42
-msgid "reStructuredText files"
-msgstr "Fichiers reST"
+#: spyder/app/mainwindow.py:562 spyder/widgets/shell.py:125
+#: spyder/widgets/sourcecode/codeeditor.py:2476
+#: spyder/widgets/variableexplorer/collectionseditor.py:644
+msgid "Paste"
+msgstr "Coller"
 
-#: spyderlib/config/main.py:43
-msgid "gettext files"
-msgstr "Fichiers gettext"
+#: spyder/app/mainwindow.py:565 spyder/widgets/shell.py:138
+#: spyder/widgets/sourcecode/codeeditor.py:2479
+msgid "Select All"
+msgstr "Sélectionner tout"
 
-#: spyderlib/config/main.py:44
-msgid "NSIS files"
-msgstr "Fichiers NSIS"
+#: spyder/app/mainwindow.py:575 spyder/plugins/editor.py:1342
+msgid "&File"
+msgstr "&Fichier"
 
-#: spyderlib/config/main.py:45
-msgid "Web page files"
-msgstr "Fichiers web"
+#: spyder/app/mainwindow.py:576 spyder/plugins/editor.py:1334
+msgid "File toolbar"
+msgstr "Barre d'outil fichiers"
 
-#: spyderlib/config/main.py:46
-msgid "XML files"
-msgstr "Fichiers XML"
+#: spyder/app/mainwindow.py:580 spyder/plugins/editor.py:1343
+msgid "&Edit"
+msgstr "&Édition"
 
-#: spyderlib/config/main.py:47
-msgid "Javascript files"
-msgstr "Fichiers Javascript"
+#: spyder/app/mainwindow.py:581 spyder/plugins/editor.py:1339
+msgid "Edit toolbar"
+msgstr "Barre d'outil édition"
 
-#: spyderlib/config/main.py:48
-msgid "Json files"
-msgstr "Fichiers Json"
+#: spyder/app/mainwindow.py:585 spyder/plugins/editor.py:1344
+msgid "&Search"
+msgstr "&Recherche"
 
-#: spyderlib/config/main.py:49
-msgid "IPython notebooks"
-msgstr "Documents IPython "
+#: spyder/app/mainwindow.py:586 spyder/plugins/editor.py:1335
+msgid "Search toolbar"
+msgstr "Barre d'outil de recherche"
 
-#: spyderlib/config/main.py:50
-msgid "Enaml files"
-msgstr "Fichiers Enaml"
+#: spyder/app/mainwindow.py:590 spyder/plugins/editor.py:1345
+msgid "Sour&ce"
+msgstr "Sour&ce"
 
-#: spyderlib/config/main.py:51
-msgid "Configuration files"
-msgstr "Configurations"
+#: spyder/app/mainwindow.py:591 spyder/plugins/editor.py:1336
+msgid "Source toolbar"
+msgstr "Barre d'outils code source"
 
-#: spyderlib/config/main.py:58 spyderlib/widgets/explorer.py:660
-msgid "All files"
-msgstr "Tous les fichiers"
+#: spyder/app/mainwindow.py:595 spyder/plugins/editor.py:780
+#: spyder/plugins/editor.py:1346
+msgid "&Run"
+msgstr "E&xécution"
 
-#: spyderlib/plugins/__init__.py:513 spyderlib/plugins/editor.py:95
-#: spyderlib/plugins/editor.py:551 spyderlib/plugins/editor.py:1600
-#: spyderlib/plugins/inspector.py:139 spyderlib/plugins/inspector.py:419
-#: spyderlib/widgets/editor.py:357
-#: spyderlib/widgets/sourcecode/codeeditor.py:95
-#: spyderlib/widgets/sourcecode/codeeditor.py:2902
-msgid "Editor"
-msgstr "Éditeur"
+#: spyder/app/mainwindow.py:596 spyder/plugins/editor.py:1337
+msgid "Run toolbar"
+msgstr "Barre d'outil exécution"
 
-#: spyderlib/plugins/configdialog.py:133
-#, fuzzy
-msgid "Reset to defaults"
-msgstr "Rétablir les valeurs par défaut"
+#: spyder/app/mainwindow.py:600 spyder/plugins/editor.py:739
+msgid "&Debug"
+msgstr "&Déboguer"
 
-#: spyderlib/plugins/configdialog.py:145
-msgid "Preferences"
-msgstr "Préférences"
+#: spyder/app/mainwindow.py:601 spyder/plugins/editor.py:1338
+msgid "Debug toolbar"
+msgstr "Barre d'outil de débogage"
 
-#: spyderlib/plugins/configdialog.py:473
-msgid "Invalid directory path"
-msgstr "Chemin d'accès de répertoire incorrect"
+#: spyder/app/mainwindow.py:605
+msgid "C&onsoles"
+msgstr "C&onsoles"
 
-#: spyderlib/plugins/configdialog.py:476 spyderlib/plugins/configdialog.py:491
-#: spyderlib/plugins/runconfig.py:176 spyderlib/plugins/runconfig.py:240
-#: spyderlib/plugins/workingdirectory.py:295 spyderlib/widgets/explorer.py:574
-#: spyderlib/widgets/externalshell/pythonshell.py:640
-#: spyderlib/widgets/findinfiles.py:505 spyderlib/widgets/pathmanager.py:223
-#: spyderlib/widgets/projectexplorer.py:899
-msgid "Select directory"
-msgstr "Sélectionner un répertoire"
+#: spyder/app/mainwindow.py:608
+#, fuzzy
+msgid "&Projects"
+msgstr "projet"
 
-#: spyderlib/plugins/configdialog.py:503
-msgid "Invalid file path"
-msgstr "Chemin d'accès de fichier incorrect"
+#: spyder/app/mainwindow.py:611 spyder/plugins/editor.py:1347
+msgid "&Tools"
+msgstr "Ou&tils"
 
-#: spyderlib/plugins/configdialog.py:506 spyderlib/plugins/configdialog.py:523
-msgid "Select file"
-msgstr "Sélectionner un fichier"
+#: spyder/app/mainwindow.py:614
+msgid "&View"
+msgstr "&Affichage"
 
-#: spyderlib/plugins/configdialog.py:522
-msgid "All files (*)"
-msgstr "Tous les fichiers (*)"
+#: spyder/app/mainwindow.py:617
+msgid "&Help"
+msgstr "A&ide"
 
-#: spyderlib/plugins/configdialog.py:595 spyderlib/widgets/formlayout.py:214
-msgid "Bold"
-msgstr "Gras"
+#: spyder/app/mainwindow.py:622
+msgid "Welcome to Spyder!"
+msgstr "Bienvenue dans Spyder !"
 
-#: spyderlib/plugins/configdialog.py:598 spyderlib/widgets/formlayout.py:209
-msgid "Italic"
-msgstr "Italique"
+#: spyder/app/mainwindow.py:627
+msgid "Pre&ferences"
+msgstr "Pré&férences"
 
-#: spyderlib/plugins/configdialog.py:640
-msgid "Font: "
-msgstr "Police : "
+#: spyder/app/mainwindow.py:634 spyder/widgets/pathmanager.py:49
+msgid "PYTHONPATH manager"
+msgstr "Gestionnaire de PYTHONPATH"
 
-#: spyderlib/plugins/configdialog.py:644
-msgid "Size: "
-msgstr "Taille : "
+#: spyder/app/mainwindow.py:637
+msgid "Python Path Manager"
+msgstr "Gestionnaire de chemins d'accès Python"
 
-#: spyderlib/plugins/configdialog.py:653 spyderlib/plugins/history.py:48
-msgid "Font style"
-msgstr "Police d'écriture"
+#: spyder/app/mainwindow.py:640
+msgid "Update module names list"
+msgstr "Mise à jour de la liste des modules"
 
-#: spyderlib/plugins/configdialog.py:708
-msgid "Spyder needs to restart to change the following setting:"
+#: spyder/app/mainwindow.py:643
+msgid "Refresh list of module names available in PYTHONPATH"
 msgstr ""
+"Mise à jour de la liste des modules disponibles notamment à travers "
+"PYTHONPATH"
 
-#: spyderlib/plugins/configdialog.py:711
-msgid "Spyder needs to restart to change the following settings:"
-msgstr ""
+#: spyder/app/mainwindow.py:646
+#, fuzzy
+msgid "Reset Spyder to factory defaults"
+msgstr "Rétablir les valeurs par défaut"
 
-#: spyderlib/plugins/configdialog.py:713
-msgid "Do you wish to restart now?"
-msgstr ""
+#: spyder/app/mainwindow.py:651
+msgid "Current user environment variables..."
+msgstr "Variables d'environnement de l'utilisateur..."
 
-#: spyderlib/plugins/configdialog.py:719
-msgid "Information"
+#: spyder/app/mainwindow.py:653
+msgid ""
+"Show and edit current user environment variables in Windows registry (i.e. "
+"for all sessions)"
 msgstr ""
+"Afficher et modifier les variables d'environnement de l'utilisateur courant "
+"dans Windows (c'est-à-dire directement dans la base de registre)"
 
-#: spyderlib/plugins/configdialog.py:734
-msgid "General"
-msgstr "Général"
+#: spyder/app/mainwindow.py:662 spyder/app/mainwindow.py:1118
+msgid "External Tools"
+msgstr "Outils externes"
 
-#: spyderlib/plugins/configdialog.py:741 spyderlib/plugins/editor.py:104
-#: spyderlib/plugins/externalconsole.py:67
-#: spyderlib/plugins/ipythonconsole.py:162
-msgid "Interface"
-msgstr "Interface"
+#: spyder/app/mainwindow.py:666
+msgid "Python(x,y) launcher"
+msgstr "Accueil de Python(x,y)"
 
-#: spyderlib/plugins/configdialog.py:744
-msgid "Qt windows style"
-msgstr "Style de fenêtres Qt"
+#: spyder/app/mainwindow.py:673
+msgid "WinPython control panel"
+msgstr "Panneau de contrôle WinPython"
 
-#: spyderlib/plugins/configdialog.py:750
-msgid "Icon theme"
-msgstr ""
+#: spyder/app/mainwindow.py:682
+msgid "Qt Designer"
+msgstr "Qt Designer"
 
-#: spyderlib/plugins/configdialog.py:755
-msgid "Language"
-msgstr ""
+#: spyder/app/mainwindow.py:687
+msgid "Qt Linguist"
+msgstr "Qt Linguist"
 
-#: spyderlib/plugins/configdialog.py:759
-msgid "Use a single instance"
-msgstr "Ouvrir une seule instance de Spyder"
+#: spyder/app/mainwindow.py:693
+msgid "Qt examples"
+msgstr "Exemples Qt"
 
-#: spyderlib/plugins/configdialog.py:761
-msgid ""
-"Set this to open external<br> Python files in an already running instance "
-"(Requires a restart)"
-msgstr ""
-"Activer cette option afin que les fichiers ouverts<br>depuis l'extérieur "
-"soit affichés dans une instance unique de Spyder<br>(redémarrage requis)"
+#: spyder/app/mainwindow.py:714
+msgid "guidata examples"
+msgstr "Exemples guidata"
 
-#: spyderlib/plugins/configdialog.py:764
-#, fuzzy
-msgid "Vertical title bars in panes"
-msgstr "Barres de titre orientées verticalement"
+#: spyder/app/mainwindow.py:725
+msgid "guiqwt examples"
+msgstr "Exemples guiqwt"
 
-#: spyderlib/plugins/configdialog.py:766
-msgid "Vertical tabs in panes"
-msgstr ""
+#: spyder/app/mainwindow.py:730
+msgid "Sift"
+msgstr "Sift"
 
-#: spyderlib/plugins/configdialog.py:768
-#, fuzzy
-msgid "Animated toolbars and panes"
-msgstr "Panneaux et barres d'outils animés"
+#: spyder/app/mainwindow.py:740
+msgid "ViTables"
+msgstr "ViTables"
 
-#: spyderlib/plugins/configdialog.py:770
-msgid "Tear off menus"
-msgstr "Menus détachables"
+#: spyder/app/mainwindow.py:754
+msgid "Fullscreen mode"
+msgstr "Mode plein écran"
 
-#: spyderlib/plugins/configdialog.py:771
-msgid "Set this to detach any<br> menu from the main window"
-msgstr ""
-"Activer cette option rend détachables tous les menus de la fenêtre principale"
+#: spyder/app/mainwindow.py:766
+msgid "Main toolbar"
+msgstr "Barre d'outil principale"
 
-#: spyderlib/plugins/configdialog.py:773
-msgid "Custom margin for panes:"
+#: spyder/app/mainwindow.py:775
+msgid ""
+"Spyder Internal Console\n"
+"\n"
+"This console is used to report application\n"
+"internal errors and to inspect Spyder\n"
+"internals with the following commands:\n"
+"  spy.app, spy.window, dir(spy)\n"
+"\n"
+"Please don't use it to run your code\n"
+"\n"
 msgstr ""
+"Console interne de Spyder\n"
+"\n"
+"Il s'agit d'une console de débogage\n"
+"utilisée par Spyder pour signaler des erreurs\n"
+"internes ou pour inspecter les entrailles de\n"
+"l'application avec les commandes ci-dessous :\n"
+"  spy.app, spy.window, dir(spy)\n"
+"\n"
+"Ne l'utilisez pas pour exécuter votre propre code.\n"
+"\n"
 
-#: spyderlib/plugins/configdialog.py:782
+#: spyder/app/mainwindow.py:792
 #, fuzzy
-msgid "Prompt when exiting"
-msgstr "Éditeurs dans le processus distant"
+msgid "Loading help..."
+msgstr "Chargement de l'aide en ligne..."
 
-#: spyderlib/plugins/configdialog.py:813
-msgid "Status bar"
-msgstr "Barre d'état"
+#: spyder/app/mainwindow.py:799
+msgid "Loading outline explorer..."
+msgstr "Chargement de l'explorateur de structure..."
 
-#: spyderlib/plugins/configdialog.py:814
-#, fuzzy
-msgid "Show status bar"
-msgstr "Afficher la barre d'onglets"
+#: spyder/app/mainwindow.py:807
+msgid "Loading editor..."
+msgstr "Chargement de l'éditeur..."
 
-#: spyderlib/plugins/configdialog.py:816
-msgid "Show memory usage every"
-msgstr "Afficher l'occupation mémoire toutes les"
+#: spyder/app/mainwindow.py:813 spyder/plugins/console.py:134
+#: spyder/widgets/ipythonconsole/client.py:278
+msgid "&Quit"
+msgstr "&Quitter"
 
-#: spyderlib/plugins/configdialog.py:825
-msgid "Show CPU usage every"
-msgstr "Afficher la charge du CPU toutes les"
+#: spyder/app/mainwindow.py:815 spyder/plugins/console.py:136
+msgid "Quit"
+msgstr "Quitter"
 
-#: spyderlib/plugins/configdialog.py:858
-msgid "Debugging"
-msgstr "Débogage"
+#: spyder/app/mainwindow.py:819
+#, fuzzy
+msgid "&Restart"
+msgstr "Restaurer"
 
-#: spyderlib/plugins/configdialog.py:859
-msgid "Pop up internal console when internal errors appear"
-msgstr "Afficher la console interne en cas d'erreur inattendue"
+#: spyder/app/mainwindow.py:821
+#, fuzzy
+msgid "Restart"
+msgstr "Restaurer"
 
-#: spyderlib/plugins/configdialog.py:868
-msgid "Updates"
-msgstr ""
+#: spyder/app/mainwindow.py:838
+msgid "Loading file explorer..."
+msgstr "Chargement de l'explorateur de fichiers..."
 
-#: spyderlib/plugins/configdialog.py:869 spyderlib/spyder.py:2872
-msgid "Check for updates on startup"
-msgstr ""
+#: spyder/app/mainwindow.py:845
+msgid "Loading history plugin..."
+msgstr "Chargement du journal d'historique..."
 
-#: spyderlib/plugins/configdialog.py:902
-msgid "Syntax coloring"
-msgstr "Coloration syntaxique"
+#: spyder/app/mainwindow.py:856
+msgid "Loading online help..."
+msgstr "Chargement de l'aide en ligne..."
 
-#: spyderlib/plugins/configdialog.py:911
-msgid "Background:"
-msgstr "Fond :"
+#: spyder/app/mainwindow.py:862
+msgid "Loading project explorer..."
+msgstr "Chargement de l'explorateur de projet..."
 
-#: spyderlib/plugins/configdialog.py:912
-#: spyderlib/widgets/sourcecode/codeeditor.py:104
-msgid "Current line:"
-msgstr "Ligne actuelle :"
+#: spyder/app/mainwindow.py:869
+msgid "Loading external console..."
+msgstr "Chargement de la console externe..."
 
-#: spyderlib/plugins/configdialog.py:913
-msgid "Current cell:"
-msgstr "Cellule actuelle :"
+#: spyder/app/mainwindow.py:875
+msgid "Loading namespace browser..."
+msgstr "Chargement de l'explorateur d'espace de noms..."
 
-#: spyderlib/plugins/configdialog.py:914
-msgid "Occurrence:"
-msgstr "Occurrence :"
+#: spyder/app/mainwindow.py:882
+msgid "Loading IPython console..."
+msgstr "Chargement de la console IPython..."
 
-#: spyderlib/plugins/configdialog.py:915
-msgid "Link:"
-msgstr "Lien :"
+#: spyder/app/mainwindow.py:887
+msgid "Setting up main window..."
+msgstr "Configuration de la fenêtre principale..."
 
-#: spyderlib/plugins/configdialog.py:916
-msgid "Side areas:"
-msgstr "Zones latérales :"
+#: spyder/app/mainwindow.py:890
+#, fuzzy
+msgid "Dependencies..."
+msgstr "Dépendances optionnelles..."
 
-#: spyderlib/plugins/configdialog.py:917
-msgid "Matched parentheses:"
-msgstr "Parenthèse fermée :"
+#: spyder/app/mainwindow.py:894
+msgid "Report issue..."
+msgstr "Rapport d'erreur..."
 
-#: spyderlib/plugins/configdialog.py:918
-msgid "Unmatched parentheses:"
-msgstr "Parenthèse non fermée :"
+#: spyder/app/mainwindow.py:898
+msgid "Spyder support..."
+msgstr "Support technique de Spyder..."
 
-#: spyderlib/plugins/configdialog.py:919
-msgid "Normal text:"
-msgstr "Texte normal :"
+#: spyder/app/mainwindow.py:901
+msgid "Check for updates..."
+msgstr ""
 
-#: spyderlib/plugins/configdialog.py:920
-msgid "Keyword:"
-msgstr "Mot-clé :"
+#: spyder/app/mainwindow.py:924
+msgid "Spyder documentation"
+msgstr "Documentation de Spyder"
 
-#: spyderlib/plugins/configdialog.py:921
-msgid "Builtin:"
-msgstr "Objet intégré :"
+#: spyder/app/mainwindow.py:929
+msgid "Spyder tutorial"
+msgstr "Tutoriel de Spyder"
 
-#: spyderlib/plugins/configdialog.py:922
-msgid "Definition:"
-msgstr "Définition :"
+#: spyder/app/mainwindow.py:936
+#, fuzzy
+msgid "Interactive tours"
+msgstr "Barre d'outil d'interaction"
 
-#: spyderlib/plugins/configdialog.py:923
-msgid "Comment:"
-msgstr "Commentaire :"
+#: spyder/app/mainwindow.py:964
+msgid "Python documentation"
+msgstr "Documentation de Python"
 
-#: spyderlib/plugins/configdialog.py:924
-msgid "String:"
-msgstr "Chaîne :"
+#: spyder/app/mainwindow.py:970 spyder/app/mainwindow.py:1014
+msgid "IPython documentation"
+msgstr "Documentation de IPython"
 
-#: spyderlib/plugins/configdialog.py:925
-msgid "Number:"
-msgstr "Nombre :"
+#: spyder/app/mainwindow.py:971
+msgid "Intro to IPython"
+msgstr "Introduction à IPython"
 
-#: spyderlib/plugins/configdialog.py:926
-msgid "Instance:"
-msgstr "Instance :"
+#: spyder/app/mainwindow.py:973
+msgid "Quick reference"
+msgstr "Référence rapide"
 
-#: spyderlib/plugins/configdialog.py:932
-msgid "Color scheme"
-msgstr "Paramètres de coloration syntaxique"
+#: spyder/app/mainwindow.py:975
+msgid "Console help"
+msgstr "Aide sur la console"
 
-#: spyderlib/plugins/configdialog.py:954 spyderlib/plugins/shortcuts.py:776
-msgid "Reset to default values"
-msgstr "Rétablir les valeurs par défaut"
+#: spyder/app/mainwindow.py:1012
+msgid "Python(x,y) documentation folder"
+msgstr "Dossier de documentation Python(x,y)"
 
-#: spyderlib/plugins/console.py:109
-msgid "Internal console"
-msgstr "Console interne"
+#: spyder/app/mainwindow.py:1016
+msgid "guidata documentation"
+msgstr "Documentation de guidata"
 
-#: spyderlib/plugins/console.py:129 spyderlib/spyder.py:869
-#: spyderlib/widgets/ipython.py:595
-msgid "&Quit"
-msgstr "&Quitter"
+#: spyder/app/mainwindow.py:1019
+msgid "guiqwt documentation"
+msgstr "Documentation de guiqwt"
 
-#: spyderlib/plugins/console.py:131 spyderlib/spyder.py:871
-msgid "Quit"
-msgstr "Quitter"
+#: spyder/app/mainwindow.py:1025
+msgid "NumPy documentation"
+msgstr "Documentation de NumPy"
 
-#: spyderlib/plugins/console.py:134 spyderlib/plugins/externalconsole.py:1039
-msgid "&Run..."
-msgstr "Exécute&r..."
+#: spyder/app/mainwindow.py:1027
+msgid "NumPy reference guide"
+msgstr "Manuel de référence de NumPy"
 
-#: spyderlib/plugins/console.py:136 spyderlib/plugins/externalconsole.py:1040
-msgid "Run a Python script"
-msgstr "Exécuter un script Python"
+#: spyder/app/mainwindow.py:1029
+msgid "NumPy user guide"
+msgstr "Manuel de l'utilisateur de NumPy"
 
-#: spyderlib/plugins/console.py:139
-msgid "Environment variables..."
-msgstr "Variables d'environnement..."
+#: spyder/app/mainwindow.py:1031
+msgid "SciPy documentation"
+msgstr "Documentation de SciPy"
 
-#: spyderlib/plugins/console.py:141
-msgid "Show and edit environment variables (for current session)"
-msgstr ""
-"Afficher et modifier les variables d'environnement (pour la session en cours)"
+#: spyder/app/mainwindow.py:1038
+msgid "Installed Python modules"
+msgstr "Modules Python installés"
 
-#: spyderlib/plugins/console.py:145
-msgid "Show sys.path contents..."
-msgstr "Afficher le contenu de sys.path..."
+#: spyder/app/mainwindow.py:1042
+msgid "Online documentation"
+msgstr "Documentation en ligne"
 
-#: spyderlib/plugins/console.py:147
-msgid "Show (read-only) sys.path"
-msgstr "Afficher le contenu de sys.path (lecture seule)"
+#: spyder/app/mainwindow.py:1054
+msgid "Qt documentation"
+msgstr "Documentation de Qt"
 
-#: spyderlib/plugins/console.py:150
-msgid "Buffer..."
-msgstr "Tampon..."
+#: spyder/app/mainwindow.py:1060
+msgid "About %s..."
+msgstr "À propos de %s..."
 
-#: spyderlib/plugins/console.py:151 spyderlib/plugins/externalconsole.py:87
-#: spyderlib/plugins/history.py:41
-msgid "Set maximum line count"
-msgstr "Modifier le nombre maximum de lignes"
+#: spyder/app/mainwindow.py:1084
+msgid "Panes"
+msgstr "Volets"
 
-#: spyderlib/plugins/console.py:154 spyderlib/plugins/explorer.py:67
-#: spyderlib/plugins/history.py:169 spyderlib/plugins/inspector.py:388
-#: spyderlib/plugins/projectexplorer.py:68
-msgid "&Font..."
-msgstr "&Police..."
+#: spyder/app/mainwindow.py:1086
+msgid "Toolbars"
+msgstr "Barres d'outils"
 
-#: spyderlib/plugins/console.py:155 spyderlib/plugins/history.py:170
-msgid "Set shell font style"
-msgstr "Changer la police d'écriture de la console"
+#: spyder/app/mainwindow.py:1087
+#, fuzzy
+msgid "Window layouts"
+msgstr "Dispositions de fenêtres personnalisées"
 
-#: spyderlib/plugins/console.py:158
-msgid "External editor path..."
-msgstr "Éditeur externe..."
+#: spyder/app/mainwindow.py:1096 spyder/app/mainwindow.py:1893
+#: spyder/app/mainwindow.py:1894
+#, fuzzy
+msgid "Show toolbars"
+msgstr "Afficher la barre d'outils"
 
-#: spyderlib/plugins/console.py:159
-msgid "Set external editor executable path"
-msgstr "Modifier le chemin d'accès de l'éditeur externe"
+#: spyder/app/mainwindow.py:1111
+msgid "Attached console window (debugging)"
+msgstr "Invite de commandes attaché (débogage)"
 
-#: spyderlib/plugins/console.py:162 spyderlib/plugins/editor.py:139
-#: spyderlib/plugins/externalconsole.py:88 spyderlib/plugins/history.py:44
-#: spyderlib/plugins/history.py:172 spyderlib/plugins/inspector.py:180
-#: spyderlib/plugins/inspector.py:391
-msgid "Wrap lines"
-msgstr "Retour à la ligne automatique"
+#: spyder/app/mainwindow.py:1294 spyder/plugins/projects.py:238
+#: spyder/widgets/explorer.py:627 spyder/widgets/explorer.py:732
+#: spyder/widgets/externalshell/pythonshell.py:533
+#: spyder/widgets/externalshell/systemshell.py:105
+#: spyder/widgets/variableexplorer/arrayeditor.py:573
+#: spyder/widgets/variableexplorer/collectionseditor.py:419
+#: spyder/widgets/variableexplorer/dataframeeditor.py:593
+msgid "Error"
+msgstr "Erreur"
 
-#: spyderlib/plugins/console.py:165 spyderlib/plugins/editor.py:181
-#: spyderlib/plugins/externalconsole.py:133
-#: spyderlib/plugins/ipythonconsole.py:172
-msgid "Display balloon tips"
-msgstr "Afficher des info-bulles"
+#: spyder/app/mainwindow.py:1295
+msgid ""
+"<b>You have missing dependencies!</b><br><br><tt>%s</tt><br><br><b>Please "
+"install them to avoid this message.</b><br><br><i>Note</i>: Spyder could "
+"work without some of these dependencies, however to have a smooth experience "
+"when using Spyder we <i>strongly</i> recommend you to install all the listed "
+"missing dependencies.<br><br>Failing to install these dependencies might "
+"result in bugs. Please be sure that any found bugs are not the direct result "
+"of missing dependencies, prior to reporting a new issue."
+msgstr ""
 
-#: spyderlib/plugins/console.py:169 spyderlib/plugins/editor.py:175
-#: spyderlib/plugins/externalconsole.py:127
-msgid "Automatic code completion"
-msgstr "Complétion de code automatique"
+#: spyder/app/mainwindow.py:1740
+msgid "Spyder Default Layout"
+msgstr ""
 
-#: spyderlib/plugins/console.py:173 spyderlib/plugins/editor.py:179
-#: spyderlib/plugins/externalconsole.py:131
-msgid "Enter key selects completion"
-msgstr "Entrée valide la complétion de code"
+#: spyder/app/mainwindow.py:1758
+#, fuzzy
+msgid "Save current layout"
+msgstr "Enregistrer le fichier en cours d'édition"
 
-#: spyderlib/plugins/console.py:178
-msgid "Internal console settings"
-msgstr "Options de la console interne"
+#: spyder/app/mainwindow.py:1762
+#, fuzzy
+msgid "Layout preferences"
+msgstr "Préférences"
 
-#: spyderlib/plugins/console.py:231 spyderlib/plugins/externalconsole.py:1220
-msgid "Run Python script"
-msgstr "Exécuter un script Python"
+#: spyder/app/mainwindow.py:1766
+#, fuzzy
+msgid "Reset to spyder default"
+msgstr "Rétablir les valeurs par défaut"
 
-#: spyderlib/plugins/console.py:232 spyderlib/plugins/externalconsole.py:226
-#: spyderlib/plugins/externalconsole.py:1221 spyderlib/widgets/explorer.py:675
-msgid "Python scripts"
-msgstr "Scripts Python"
+#: spyder/app/mainwindow.py:1786 spyder/app/mainwindow.py:1808
+#: spyder/app/mainwindow.py:1871 spyder/app/mainwindow.py:2655
+#: spyder/plugins/configdialog.py:1250 spyder/plugins/externalconsole.py:446
+#: spyder/plugins/ipythonconsole.py:119 spyder/plugins/ipythonconsole.py:835
+#: spyder/plugins/maininterpreter.py:167 spyder/utils/environ.py:100
+#: spyder/utils/environ.py:113
+#: spyder/widgets/variableexplorer/arrayeditor.py:496
+#: spyder/widgets/variableexplorer/collectionseditor.py:410
+#: spyder/widgets/variableexplorer/collectionseditor.py:1063
+msgid "Warning"
+msgstr "Attention"
 
-#: spyderlib/plugins/console.py:278 spyderlib/plugins/explorer.py:117
-#: spyderlib/plugins/history.py:285 spyderlib/plugins/inspector.py:665
-#: spyderlib/plugins/projectexplorer.py:126
-msgid "Select a new font"
-msgstr "Sélectionner une police d'écriture"
+#: spyder/app/mainwindow.py:1787
+msgid ""
+"Window layout will be reset to default settings: this affects window "
+"position, size and dockwidgets.\n"
+"Do you want to continue?"
+msgstr ""
+"La disposition des fenêtres sera réinitialisée selon les réglages par "
+"défaut.\n"
+"Souhaitez-vous continuer ?"
 
-#: spyderlib/plugins/console.py:286
-msgid "Buffer"
-msgstr "Tampon"
+#: spyder/app/mainwindow.py:1809
+msgid ""
+"Layout <b>%s</b> will be                                                "
+"overwritten. Do you want to                                                "
+"continue?"
+msgstr ""
 
-#: spyderlib/plugins/console.py:287
-msgid "Maximum line count"
-msgstr "Nombre maximum de lignes"
+#: spyder/app/mainwindow.py:1872
+#, fuzzy
+msgid "Quick switch layout #%s has not yet been defined."
+msgstr ""
+"La disposition de fenêtre personnalisée n°%d n'a pas encore été définie."
 
-#: spyderlib/plugins/console.py:297
-msgid "External editor"
-msgstr "Éditeur externe"
+#: spyder/app/mainwindow.py:1890 spyder/app/mainwindow.py:1891
+#, fuzzy
+msgid "Hide toolbars"
+msgstr "Barre d'outil fichiers"
 
-#: spyderlib/plugins/console.py:298
-msgid "External editor executable path:"
-msgstr "Chemin d'accès de l'exécutable :"
+#: spyder/app/mainwindow.py:2184 spyder/app/mainwindow.py:2185
+msgid "Maximize current pane"
+msgstr "Agrandir le volet courant"
 
-#: spyderlib/plugins/editor.py:101
-msgid "Edit template for new modules"
-msgstr "Modifier le modèle (nouveaux modules)"
+#: spyder/app/mainwindow.py:2188
+msgid "Restore current pane"
+msgstr "Restaurer le volet courant"
 
-#: spyderlib/plugins/editor.py:106
-msgid "Text and margin font style"
-msgstr "Police d'écriture du texte et de la marge"
+#: spyder/app/mainwindow.py:2189
+msgid "Restore pane to its original size"
+msgstr "Restaurer le volet à sa taille d'origine"
 
-#: spyderlib/plugins/editor.py:109
-msgid "Sort files according to full path"
-msgstr "Classer les fichiers suivant leur chemin complet"
+#: spyder/app/mainwindow.py:2273
+msgid "About %s"
+msgstr "À propos de %s"
 
-#: spyderlib/plugins/editor.py:111
-msgid "Show tab bar"
-msgstr "Afficher la barre d'onglets"
+#: spyder/app/mainwindow.py:2400 spyder/plugins/editor.py:158
+#: spyder/plugins/runconfig.py:322 spyder/plugins/runconfig.py:444
+#: spyder/plugins/runconfig.py:449 spyder/utils/programs.py:285
+#: spyder/widgets/explorer.py:269 spyder/widgets/externalshell/baseshell.py:127
+msgid "Run"
+msgstr "Exécuter"
 
-#: spyderlib/plugins/editor.py:118 spyderlib/plugins/editor.py:195
-#: spyderlib/plugins/externalconsole.py:83
-#: spyderlib/plugins/externalconsole.py:126 spyderlib/plugins/history.py:43
-#: spyderlib/plugins/inspector.py:179 spyderlib/plugins/ipythonconsole.py:206
-msgid "Source code"
-msgstr "Code source"
+#: spyder/app/mainwindow.py:2401
+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/plugins/editor.py:119
-msgid "Show line numbers"
-msgstr "Afficher les numéros de ligne"
+#: spyder/app/mainwindow.py:2656
+#, fuzzy
+msgid ""
+"Spyder will restart and reset to default settings: <br><br>Do you want to "
+"continue?"
+msgstr ""
+"Le répertoire suivant n'est pas vide :<br><b>%s</b><br><br>Souhaitez-vous "
+"néanmoins continuer ?"
 
-#: spyderlib/plugins/editor.py:120 spyderlib/plugins/editor.py:916
-msgid "Show blank spaces"
-msgstr "Afficher les espaces"
+#: spyder/app/mainwindow.py:2753 spyder/widgets/helperwidgets.py:250
+#, fuzzy
+msgid "Spyder updates"
+msgstr "Fichiers Spyder"
 
-#: spyderlib/plugins/editor.py:121
-msgid "Show vertical line after"
-msgstr "Afficher une ligne verticale après"
+#: spyder/app/mainwindow.py:2754 spyder/plugins/configdialog.py:819
+msgid "Check for updates on startup"
+msgstr ""
 
-#: spyderlib/plugins/editor.py:122
-msgid "characters"
-msgstr "caractères"
+#: spyder/app/mainwindow.py:2772
+msgid ""
+"<b>Spyder %s is available!</b> <br><br>Please use your package manager to "
+"update Spyder or go to our <a href=\"%s\">Releases</a> page to download this "
+"new version. <br><br>If you are not sure how to proceed to update Spyder "
+"please refer to our  <a href=\"%s\">Installation</a> instructions."
+msgstr ""
 
-#: spyderlib/plugins/editor.py:127
-msgid "Highlight current line"
-msgstr "Surligner la ligne en cours d'édition"
+#: spyder/app/mainwindow.py:2784
+#, fuzzy
+msgid "Spyder is up to date."
+msgstr "Support technique de Spyder..."
 
-#: spyderlib/plugins/editor.py:129
-msgid "Highlight current cell"
-msgstr "Surligner la cellule en cours d'édition"
+#: spyder/app/restart.py:133
+#, fuzzy
+msgid ""
+"It was not possible to close the previous Spyder instance.\n"
+"Restart aborted."
+msgstr "Impossible d'exécuter ce fichier dans un terminal externe"
 
-#: spyderlib/plugins/editor.py:131
-msgid "Highlight occurrences after"
-msgstr "Surligner les occurrences après"
+#: spyder/app/restart.py:135
+msgid ""
+"Spyder could not reset to factory defaults.\n"
+"Restart aborted."
+msgstr ""
 
-#: spyderlib/plugins/editor.py:142 spyderlib/plugins/history.py:52
-#: spyderlib/plugins/inspector.py:183
-msgid "Syntax color scheme: "
-msgstr "Thème de coloration syntaxique : "
+#: spyder/app/restart.py:137
+msgid ""
+"It was not possible to restart Spyder.\n"
+"Operation aborted."
+msgstr ""
 
-#: spyderlib/plugins/editor.py:164 spyderlib/plugins/runconfig.py:321
-#: spyderlib/plugins/runconfig.py:443 spyderlib/plugins/runconfig.py:448
-#: spyderlib/spyder.py:2501 spyderlib/utils/programs.py:175
-#: spyderlib/widgets/explorer.py:240
-#: spyderlib/widgets/externalshell/baseshell.py:140
-msgid "Run"
-msgstr "Exécuter"
+#: spyder/app/restart.py:139
+#, fuzzy
+msgid "Spyder exit error"
+msgstr "Éditeur de Spyder"
 
-#: spyderlib/plugins/editor.py:165
-msgid "Save all files before running script"
-msgstr "Enregistrer tous les fichiers avant l'exécution d'un script"
+#: spyder/app/restart.py:140
+#, fuzzy
+msgid "Spyder reset error"
+msgstr "Éditeur de Spyder"
 
-#: spyderlib/plugins/editor.py:168
-msgid "Run selection"
-msgstr "Exécuter la sélection"
+#: spyder/app/restart.py:141
+#, fuzzy
+msgid "Spyder restart error"
+msgstr "Démarrage de Spyder"
 
-#: spyderlib/plugins/editor.py:169
-msgid "Maintain focus in the Editor after running cells or selections"
-msgstr ""
-"Garder le focus dans l'éditeur après l'exécution d'une cellule ou d'une "
-"sélection"
+#: spyder/app/restart.py:165
+#, fuzzy
+msgid "Closing Spyder"
+msgstr "Ouvrir en dehors de Spyder"
 
-#: spyderlib/plugins/editor.py:172 spyderlib/plugins/externalconsole.py:334
-msgid "Introspection"
-msgstr "Introspection"
+#: spyder/app/restart.py:239
+#, fuzzy
+msgid "Resetting Spyder to defaults"
+msgstr "Rétablir les valeurs par défaut"
 
-#: spyderlib/plugins/editor.py:177 spyderlib/plugins/externalconsole.py:129
-msgid "Case sensitive code completion"
-msgstr "Complétion de code sensible à la casse"
+#: spyder/app/restart.py:271
+#, fuzzy
+msgid "Restarting"
+msgstr "Restaurer"
 
-#: spyderlib/plugins/editor.py:182
-msgid "Link to object definition"
-msgstr "Lien vers la définition d'un objet"
+#: spyder/app/tour.py:124
+#, fuzzy
+msgid "Welcome to the Introduction tour"
+msgstr "Bienvenue dans Spyder !"
 
-#: spyderlib/plugins/editor.py:184
+#: spyder/app/tour.py:125
 msgid ""
-"If this option is enabled, clicking on an object\n"
-"name (left-click + Ctrl key) will go this object\n"
-"definition (if resolved)."
+"<b>Spyder</b> is a powerful Interactive Development Environment (or IDE) for "
+"the Python programming language.<br><br>Here we are going to guide you "
+"through its most important features.<br><br>Please use the arrow keys or "
+"click on the buttons below to move along the tour."
 msgstr ""
-"Si cette option est activée, cliquer sur le nom\n"
-"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:188
+#: spyder/app/tour.py:134
+#, fuzzy
+msgid "The Editor"
+msgstr "Éditeur de texte"
+
+#: spyder/app/tour.py:135
 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."
+"This is the pane where you write Python code before evaluating it. You can "
+"get automatic suggestions and completions while writing, by pressing the "
+"<b>Tab</b> key next to a given text.<br><br>The Editor comes with a line "
+"number area (highlighted here in red), where Spyder shows warnings and "
+"syntax errors. They can help you to detect potential problems before running "
+"the code.<br><br>You can also set debug breakpoints in the line number area, "
+"by doing a double click next to a non-empty line."
 msgstr ""
-"<b>Avertissement :</b><br>Le module Python <i>rope</i> n'est pas installé "
-"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:196
-msgid "Automatic insertion of parentheses, braces and brackets"
-msgstr "Insertion automatique des parenthèses, crochets et accolades"
-
-#: spyderlib/plugins/editor.py:199
-msgid "Automatic insertion of closing quotes"
-msgstr "Insertion automatique de guillemets de clôture"
-
-#: spyderlib/plugins/editor.py:201
-msgid "Automatic insertion of colons after 'for', 'if', 'def', etc"
-msgstr "Insertion automatique de ':' après 'for', 'if', 'def', etc."
-
-#: spyderlib/plugins/editor.py:204
-msgid "Automatic indentation after 'else', 'elif', etc."
-msgstr "Indentation automatique après 'else', 'elif', etc."
-
-#: spyderlib/plugins/editor.py:206
-msgid "Indentation characters: "
-msgstr "Caractères d'indentation : "
-
-#: spyderlib/plugins/editor.py:207
-msgid "4 spaces"
-msgstr "4 espaces"
 
-#: spyderlib/plugins/editor.py:208
-msgid "2 spaces"
-msgstr "2 espaces"
+#: spyder/app/tour.py:150
+#, fuzzy
+msgid "The IPython console"
+msgstr "Console IPython"
 
-#: spyderlib/plugins/editor.py:209
-msgid "tab"
-msgstr "tabulation"
+#: spyder/app/tour.py:151
+msgid ""
+"This is one of panes where you can run or execute the code you wrote on the "
+"Editor. To do it you need to press the <b>F5</b> key.<br><br>This console "
+"comes with several useful features that greatly improve your programming "
+"workflow (like syntax highlighting and inline plots). If you want to know "
+"more about them, please follow this <a href=\"{0}\">link</a>.<br><br>Please "
+"click on the button below to run some simple code in this console. This will "
+"be useful to show you other important features."
+msgstr ""
 
-#: spyderlib/plugins/editor.py:210
-msgid "Tab stop width:"
-msgstr "Largeur des tabulations :"
+#: spyder/app/tour.py:167
+#, fuzzy
+msgid "The Variable Explorer"
+msgstr "Explorateur de variables"
 
-#: spyderlib/plugins/editor.py:210
-msgid "pixels"
-msgstr "pixels"
+#: spyder/app/tour.py:168
+msgid ""
+"In this pane you can view and edit the variables generated during the "
+"execution of a program, or those entered directly in one of Spyder consoles."
+"<br><br>As you can see, the Variable Explorer is showing the variables "
+"generated during the last step of this tour. By doing a double-click on any "
+"of them, a new window will be opened, where you can inspect and modify their "
+"contents."
+msgstr ""
 
-#: spyderlib/plugins/editor.py:212
-msgid "Tab always indent"
-msgstr "Toujours indenter avec la touche Tab"
+#: spyder/app/tour.py:180
+#, fuzzy
+msgid "The Python console"
+msgstr "Console IPython"
 
-#: spyderlib/plugins/editor.py:214
+#: spyder/app/tour.py:181
 msgid ""
-"If enabled, pressing Tab will always indent,\n"
-"even when the cursor is not at the beginning\n"
-"of a line (when this option is enabled, code\n"
-"completion may be triggered using the alternate\n"
-"shortcut: Ctrl+Space)"
+"You can also run your code on a Python console. These consoles are useful "
+"because they let you run a file in a console dedicated only to it.To select "
+"this behavior, please press the <b>F6</b> key.<br><br>By pressing the button "
+"below and then focusing the Variable Explorer, you will notice that Python "
+"consoles are also connected to that pane, and that the Variable Explorer "
+"only shows the variables of the currently focused console."
 msgstr ""
-"Si cette option est activée, presser la touche Tab\n"
-"provoquera toujours l'indentation de la ligne,\n"
-"quelle que soit la position du curseur (lorsque cette\n"
-"option est activée, la complétion de code reste \n"
-"accessible via le raccourci Ctrl+Espace)"
 
-#: spyderlib/plugins/editor.py:219
-msgid "Intelligent backspace"
-msgstr "Retour arrière (\"backspace\") intelligent"
+#: spyder/app/tour.py:195 spyder/plugins/help.py:485 spyder/plugins/help.py:929
+#: spyder/widgets/internalshell.py:270
+msgid "Help"
+msgstr "Aide"
 
-#: spyderlib/plugins/editor.py:221
-msgid "Automatically remove trailing spaces when saving files"
+#: spyder/app/tour.py:196
+msgid ""
+"This pane displays documentation of the functions, classes, methods or "
+"modules you are currently using in the Editor or the Consoles.<br><br>To use "
+"it, you need to press <b>Ctrl+I</b> in front of an object. If that object "
+"has some documentation associated with it, it will be displayed here."
 msgstr ""
-"Supprimer automatiquement les espaces en fin de ligne lors de "
-"l'enregistrement"
 
-#: spyderlib/plugins/editor.py:225
-msgid "Analysis"
-msgstr "Analyse"
+#: spyder/app/tour.py:206
+#, fuzzy
+msgid "The File Explorer"
+msgstr "Explorateur de fichiers"
 
-#: spyderlib/plugins/editor.py:227
-msgid "<i>(Refer to the {} page)</i>"
+#: spyder/app/tour.py:207
+msgid ""
+"This pane lets you navigate through the directories and files present in "
+"your computer.<br><br>You can also open any of these files with its "
+"corresponding application, by doing a double click on it.<br><br>There is "
+"one exception to this rule: plain-text files will always be opened in the "
+"Spyder Editor."
 msgstr ""
 
-#: spyderlib/plugins/editor.py:231
+#: spyder/app/tour.py:217
 #, fuzzy
-msgid "Real-time code analysis"
-msgstr "Analyse de code temps réel dans l'éditeur"
+msgid "The History Log"
+msgstr "Historique"
 
-#: spyderlib/plugins/editor.py:233
-#, fuzzy
+#: spyder/app/tour.py:218
 msgid ""
-"<p>If enabled, Python source code will be analyzedusing pyflakes, lines "
-"containing errors or warnings will be highlighted.</p><p><u>Note</u>: add "
-"<b>analysis:ignore</b> in a comment to ignore code analysis warnings.</p>"
+"This pane records all commands introduced in the Python and IPython consoles."
 msgstr ""
-"Si cette option est activée, le code source Python sera analysé\n"
-"avec des outils l'outil d'introspection de code pyflakes\n"
-"et les lignes contenant des erreurs seront indiquées"
 
-#: spyderlib/plugins/editor.py:241
-msgid "Code analysis requires pyflakes %s+"
-msgstr "L'analyse de code requiert pyflakes %s+"
+#: spyder/app/tour.py:266
+msgid "<b>Spyder</b> is an interactive development environment based on bla"
+msgstr ""
 
-#: spyderlib/plugins/editor.py:243
+#: spyder/app/tour.py:270
 #, fuzzy
-msgid "Real-time code style analysis"
-msgstr "Analyse de code temps réel dans l'éditeur"
+msgid "Welcome to Spyder introduction tour"
+msgstr "Bienvenue dans Spyder !"
 
-#: spyderlib/plugins/editor.py:245
-#, fuzzy
-msgid ""
-"<p>If enabled, Python source code will be analyzedusing pep8, lines that are "
-"not following PEP8 style guide will be highlighted.</p><p><u>Note</u>: add "
-"<b>analysis:ignore</b> in a comment to ignore style analysis warnings.</p>"
+#: spyder/app/tour.py:271
+msgid "Spyder is an interactive development environment based on bla"
 msgstr ""
-"Si cette option est activée, le style du code source Python sera analysé\n"
-"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:252
+#: spyder/app/tour.py:276
 #, fuzzy
-msgid "Code annotations (TODO, FIXME, XXX, HINT, TIP, @todo)"
-msgstr "Tâches (TODO, FIXME, XXX, HINT, TIP, @todo)"
+msgid "Introduction tour"
+msgstr "Introspection"
 
-#: spyderlib/plugins/editor.py:255
-msgid "Perform analysis when saving file and every"
-msgstr "Analyser lors de l'enregistrement et toutes les"
+#: spyder/app/tour.py:277
+msgid "New features in version 3.0"
+msgstr ""
 
-#: spyderlib/plugins/editor.py:259
-msgid "Perform analysis only when saving file"
-msgstr "Analyser uniquement lors de l'enregistrement"
+#: spyder/app/tour.py:555 spyder/plugins/ipythonconsole.py:431
+msgid "Run code"
+msgstr "Exécuter du code"
 
-#: spyderlib/plugins/editor.py:318
-msgid "End-of-line characters"
-msgstr "Caractères de fin de ligne"
+#: spyder/app/tour.py:824
+#, fuzzy
+msgid "Go to step: "
+msgstr "Aller à la ligne :"
 
-#: spyderlib/plugins/editor.py:319
+#: spyder/config/base.py:249
 msgid ""
-"When opening a text file containing mixed end-of-line characters (this may "
-"raise syntax errors in the consoles on Windows platforms), Spyder may fix "
-"the file automatically."
+"Update LANGUAGE_CODES (inside config/base.py) if a new translation has been "
+"added to Spyder"
 msgstr ""
-"Lors de l'ouverture d'un fichier contenant différents types de caractères de "
-"fin de ligne (ce qui peut se traduire par des erreurs de syntaxe dans les "
-"consoles Python sous Windows), Spyder peut réparer le fichier "
-"automatiquement."
 
-#: spyderlib/plugins/editor.py:325
-msgid "Fix automatically and show warning message box"
-msgstr "Réparer automatiquement et afficher un message d'avertissement"
+#: spyder/config/ipython.py:23
+#, fuzzy
+msgid "Integrate the IPython console"
+msgstr "Console IPython"
 
-#: spyderlib/plugins/editor.py:336 spyderlib/plugins/externalconsole.py:332
-#: spyderlib/plugins/ipythonconsole.py:463
-#: spyderlib/plugins/variableexplorer.py:41
-msgid "Display"
-msgstr "Affichage"
+#: spyder/config/ipython.py:25
+msgid "Manipulate Jupyter notebooks on the Editor"
+msgstr ""
 
-#: spyderlib/plugins/editor.py:338
-msgid "Code Introspection/Analysis"
-msgstr "Introspection et analyse de code"
+#: spyder/config/utils.py:24
+msgid "Python files"
+msgstr "Fichiers Python"
 
-#: spyderlib/plugins/editor.py:341 spyderlib/plugins/externalconsole.py:336
-msgid "Advanced settings"
-msgstr "Options avancées"
+#: spyder/config/utils.py:25
+msgid "Cython/Pyrex files"
+msgstr "Fichiers Cython/Pyrex"
 
-#: spyderlib/plugins/editor.py:607 spyderlib/widgets/editortools.py:510
-msgid "Show/hide outline explorer"
-msgstr "Afficher/masquer l'explorateur de structure"
+#: spyder/config/utils.py:26
+msgid "C files"
+msgstr "Fichiers C"
 
-#: spyderlib/plugins/editor.py:613
-msgid "Show/hide project explorer"
-msgstr "Afficher/masquer l'explorateur de projets"
+#: spyder/config/utils.py:27
+msgid "C++ files"
+msgstr "Fichiers C++"
 
-#: spyderlib/plugins/editor.py:621
-msgid "&New file..."
-msgstr "&Nouveau fichier..."
+#: spyder/config/utils.py:28
+msgid "OpenCL files"
+msgstr "Fichiers OpenCL"
 
-#: spyderlib/plugins/editor.py:622 spyderlib/plugins/workingdirectory.py:82
-#: spyderlib/widgets/explorer.py:652 spyderlib/widgets/explorer.py:659
-msgid "New file"
-msgstr "Nouveau fichier"
+#: spyder/config/utils.py:29
+msgid "Fortran files"
+msgstr "Fichiers Fortran"
 
-#: spyderlib/plugins/editor.py:629
-msgid "&Open..."
-msgstr "&Ouvrir..."
+#: spyder/config/utils.py:30
+msgid "IDL files"
+msgstr "Fichiers IDL"
 
-#: spyderlib/plugins/editor.py:630 spyderlib/plugins/editor.py:1643
-#: spyderlib/plugins/workingdirectory.py:69
-msgid "Open file"
-msgstr "Ouvrir un fichier"
+#: spyder/config/utils.py:31
+msgid "MATLAB files"
+msgstr "Fichiers MATLAB"
 
-#: spyderlib/plugins/editor.py:637
-msgid "&Revert"
-msgstr "&Réinitialiser"
+#: spyder/config/utils.py:32
+msgid "Julia files"
+msgstr "Fichiers Julia"
 
-#: spyderlib/plugins/editor.py:638
-msgid "Revert file from disk"
-msgstr "Revenir à la version du fichier enregistrée sur le disque"
+#: spyder/config/utils.py:33
+msgid "Yaml files"
+msgstr "Fichiers Yaml"
 
-#: spyderlib/plugins/editor.py:641
-msgid "&Save"
-msgstr "&Enregistrer"
+#: spyder/config/utils.py:34
+msgid "Patch and diff files"
+msgstr "Fichiers patch et diff"
 
-#: spyderlib/plugins/editor.py:642
-msgid "Save file"
-msgstr "Enregitrer un fichier"
+#: spyder/config/utils.py:35
+msgid "Batch files"
+msgstr "Fichiers Batch"
 
-#: spyderlib/plugins/editor.py:649
-msgid "Sav&e all"
-msgstr "Enregistrer &tout"
+#: spyder/config/utils.py:36 spyder/utils/iofuncs.py:426
+msgid "Text files"
+msgstr "Fichiers texte"
 
-#: spyderlib/plugins/editor.py:650
-msgid "Save all files"
-msgstr "Enregistrer tous les fichiers"
+#: spyder/config/utils.py:37
+msgid "reStructuredText files"
+msgstr "Fichiers reST"
 
-#: spyderlib/plugins/editor.py:658
-msgid "Save &as..."
-msgstr "Enregistrer &sous..."
+#: spyder/config/utils.py:38
+msgid "gettext files"
+msgstr "Fichiers gettext"
 
-#: spyderlib/plugins/editor.py:659
-msgid "Save current file as..."
-msgstr "Enregistrer le fichier en cours d'édition sous un autre nom..."
+#: spyder/config/utils.py:39
+msgid "NSIS files"
+msgstr "Fichiers NSIS"
 
-#: spyderlib/plugins/editor.py:663 spyderlib/plugins/editor.py:664
-msgid "Print preview..."
-msgstr "Aperçu avant impression..."
+#: spyder/config/utils.py:40
+msgid "Web page files"
+msgstr "Fichiers web"
 
-#: spyderlib/plugins/editor.py:665
-msgid "&Print..."
-msgstr "Im&primer..."
+#: spyder/config/utils.py:41
+msgid "XML files"
+msgstr "Fichiers XML"
 
-#: spyderlib/plugins/editor.py:666
-msgid "Print current file..."
-msgstr "Imprimer le fichier en cours d'édition..."
+#: spyder/config/utils.py:42
+msgid "Javascript files"
+msgstr "Fichiers Javascript"
 
-#: spyderlib/plugins/editor.py:669
-msgid "&Close"
-msgstr "&Fermer"
+#: spyder/config/utils.py:43
+msgid "Json files"
+msgstr "Fichiers Json"
 
-#: spyderlib/plugins/editor.py:670
-msgid "Close current file"
-msgstr "Fermer le fichier en cours d'édition"
+#: spyder/config/utils.py:44
+msgid "IPython notebooks"
+msgstr "Documents IPython "
 
-#: spyderlib/plugins/editor.py:673
-msgid "C&lose all"
-msgstr "Fermer t&out"
+#: spyder/config/utils.py:45
+msgid "Enaml files"
+msgstr "Fichiers Enaml"
 
-#: spyderlib/plugins/editor.py:674
-msgid "Close all opened files"
-msgstr "Fermer tous les fichiers ouverts"
+#: spyder/config/utils.py:46
+msgid "Configuration files"
+msgstr "Configurations"
 
-#: spyderlib/plugins/editor.py:681
-msgid "Set/Clear breakpoint"
-msgstr "Ajouter/supprimer un point d'arrêt"
+#: spyder/config/utils.py:51 spyder/widgets/explorer.py:700
+msgid "All files"
+msgstr "Tous les fichiers"
 
-#: spyderlib/plugins/editor.py:688
-msgid "Set/Edit conditional breakpoint"
-msgstr "Ajouter/modifier un point d'arrêt conditionnel"
+#: spyder/config/utils.py:121
+#, fuzzy
+msgid "Supported text files"
+msgstr "Fichiers compatibles"
 
-#: spyderlib/plugins/editor.py:695
-msgid "Clear breakpoints in all files"
-msgstr "Supprimer les points d'arrêt dans tous les fichiers"
+#: spyder/plugins/__init__.py:508 spyder/plugins/editor.py:98
+#: spyder/plugins/editor.py:545 spyder/plugins/editor.py:1718
+#: spyder/plugins/help.py:118 spyder/plugins/help.py:385
+#: spyder/widgets/editor.py:369 spyder/widgets/sourcecode/codeeditor.py:97
+#: spyder/widgets/sourcecode/codeeditor.py:2960
+msgid "Editor"
+msgstr "Éditeur"
 
-#: spyderlib/plugins/editor.py:697
-msgid "Breakpoints"
-msgstr "Points d'arrêt"
+#: spyder/plugins/configdialog.py:139
+#, fuzzy
+msgid "Reset to defaults"
+msgstr "Rétablir les valeurs par défaut"
 
-#: spyderlib/plugins/editor.py:701
-msgid "Debug with winpdb"
-msgstr "Déboguer avec winpdb"
+#: spyder/plugins/configdialog.py:151
+msgid "Preferences"
+msgstr "Préférences"
 
-#: spyderlib/plugins/editor.py:708 spyderlib/spyder.py:659
-msgid "&Debug"
-msgstr "&Déboguer"
+#: spyder/plugins/configdialog.py:491
+msgid "Invalid directory path"
+msgstr "Chemin d'accès de répertoire incorrect"
 
-#: spyderlib/plugins/editor.py:709
-msgid "Debug file"
-msgstr "Déboguer le script"
+#: spyder/plugins/configdialog.py:494 spyder/plugins/configdialog.py:509
+#: spyder/plugins/runconfig.py:177 spyder/plugins/runconfig.py:241
+#: spyder/plugins/workingdirectory.py:291 spyder/widgets/explorer.py:614
+#: spyder/widgets/externalshell/pythonshell.py:616
+#: spyder/widgets/findinfiles.py:504 spyder/widgets/pathmanager.py:224
+#: spyder/widgets/projects/projectdialog.py:155
+msgid "Select directory"
+msgstr "Sélectionner un répertoire"
 
-#: spyderlib/plugins/editor.py:713
-msgid "Step"
-msgstr "Pas"
+#: spyder/plugins/configdialog.py:521
+msgid "Invalid file path"
+msgstr "Chemin d'accès de fichier incorrect"
 
-#: spyderlib/plugins/editor.py:714
-msgid "Run current line"
-msgstr "Exécuter la ligne en cours"
+#: spyder/plugins/configdialog.py:524 spyder/plugins/configdialog.py:541
+msgid "Select file"
+msgstr "Sélectionner un fichier"
 
-#: spyderlib/plugins/editor.py:720
-msgid "Continue"
-msgstr "Continuer"
+#: spyder/plugins/configdialog.py:540
+msgid "All files (*)"
+msgstr "Tous les fichiers (*)"
 
-#: spyderlib/plugins/editor.py:721
-msgid "Continue execution until next breakpoint"
-msgstr "Continuer l'exécution jusqu'au prochain point d'arrêt"
+#: spyder/plugins/configdialog.py:613 spyder/widgets/formlayout.py:215
+msgid "Bold"
+msgstr "Gras"
 
-#: spyderlib/plugins/editor.py:728
-msgid "Step Into"
-msgstr "Pas vers l'intérieur"
+#: spyder/plugins/configdialog.py:616 spyder/widgets/formlayout.py:210
+msgid "Italic"
+msgstr "Italique"
 
-#: spyderlib/plugins/editor.py:729
-msgid "Step into function or method of current line"
-msgstr ""
-"Avancer dans la fonction, méthode \n"
-"ou classe de la ligne en cours"
+#: spyder/plugins/configdialog.py:670
+msgid "Font: "
+msgstr "Police : "
 
-#: spyderlib/plugins/editor.py:736
-msgid "Step Return"
-msgstr "Pas vers l'extérieur"
+#: spyder/plugins/configdialog.py:676
+msgid "Size: "
+msgstr "Taille : "
 
-#: spyderlib/plugins/editor.py:737
-msgid "Run until current function or method returns"
-msgstr "Exécuter jusqu'au retour de la fonction ou méthode"
+#: spyder/plugins/configdialog.py:695
+msgid "Font style"
+msgstr "Police d'écriture"
 
-#: spyderlib/plugins/editor.py:744
-msgid "Exit"
-msgstr "Sortir"
+#: spyder/plugins/configdialog.py:772
+msgid "Spyder needs to restart to change the following setting:"
+msgstr ""
 
-#: spyderlib/plugins/editor.py:745
-msgid "Exit Debug"
-msgstr "Quitter le débogage"
+#: spyder/plugins/configdialog.py:775
+msgid "Spyder needs to restart to change the following settings:"
+msgstr ""
 
-#: spyderlib/plugins/editor.py:756
-msgid "Debugging control"
-msgstr "Contrôle du débogage"
+#: spyder/plugins/configdialog.py:777
+msgid "Do you wish to restart now?"
+msgstr ""
 
-#: spyderlib/plugins/editor.py:760 spyderlib/plugins/editor.py:1236
-#: spyderlib/spyder.py:654
-msgid "&Run"
-msgstr "E&xécution"
+#: spyder/plugins/configdialog.py:783
+msgid "Information"
+msgstr ""
 
-#: spyderlib/plugins/editor.py:761
-msgid "Run file"
-msgstr "Exécuter le fichier"
+#: spyder/plugins/configdialog.py:797 spyder/plugins/configdialog.py:804
+#: spyder/widgets/projects/configdialog.py:74
+msgid "General"
+msgstr "Général"
 
-#: spyderlib/plugins/editor.py:766
-msgid "&Configure..."
-msgstr "&Configurer..."
+#: spyder/plugins/configdialog.py:807
+msgid "Language"
+msgstr ""
 
-#: spyderlib/plugins/editor.py:768
-#: spyderlib/widgets/externalshell/pythonshell.py:311
-msgid "Run settings"
-msgstr "Options d'exécution"
+#: spyder/plugins/configdialog.py:810
+msgid "Use a single instance"
+msgstr "Ouvrir une seule instance de Spyder"
 
-#: spyderlib/plugins/editor.py:776
-msgid "Re-run &last script"
-msgstr "Exécuter de nouveau le &dernier script"
+#: spyder/plugins/configdialog.py:812
+msgid ""
+"Set this to open external<br> Python files in an already running instance "
+"(Requires a restart)"
+msgstr ""
+"Activer cette option afin que les fichiers ouverts<br>depuis l'extérieur "
+"soit affichés dans une instance unique de Spyder<br>(redémarrage requis)"
 
-#: spyderlib/plugins/editor.py:778
-msgid "Run again last file"
-msgstr "Exécuter de nouveau le dernier fichier"
+#: spyder/plugins/configdialog.py:815
+#, fuzzy
+msgid "Prompt when exiting"
+msgstr "Éditeurs dans le processus distant"
 
-#: spyderlib/plugins/editor.py:785
-#: spyderlib/widgets/sourcecode/codeeditor.py:2462
-msgid "Run &selection or current line"
-msgstr "Exécuter la &sélection ou la ligne courante"
+#: spyder/plugins/configdialog.py:816
+msgid "Pop up internal console when internal errors appear"
+msgstr "Afficher la console interne en cas d'erreur inattendue"
 
-#: spyderlib/plugins/editor.py:788
-msgid "Run selection or current line"
-msgstr "Exécuter la sélection ou le bloc de lignes"
+#: spyder/plugins/configdialog.py:836 spyder/plugins/editor.py:107
+#: spyder/plugins/externalconsole.py:57 spyder/plugins/ipythonconsole.py:273
+#: spyder/widgets/projects/configdialog.py:81
+msgid "Interface"
+msgstr "Interface"
 
-#: spyderlib/plugins/editor.py:801
-msgid "Run cell"
-msgstr "Exécuter la cellule"
+#: spyder/plugins/configdialog.py:844
+msgid "Qt windows style"
+msgstr "Style de fenêtres Qt"
 
-#: spyderlib/plugins/editor.py:804
-msgid ""
-"Run current cell (Ctrl+Enter)\n"
-"[Use #%% to create cells]"
+#: spyder/plugins/configdialog.py:850
+msgid "Icon theme"
 msgstr ""
-"Exécuter la cellule courante \n"
-"[Utiliser #%% pour délimiter les cellules]"
 
-#: spyderlib/plugins/editor.py:809
-msgid "Run cell and advance"
-msgstr "Exécuter la cellule et avancer"
+#: spyder/plugins/configdialog.py:854
+#, fuzzy
+msgid "Vertical title bars in panes"
+msgstr "Barres de titre orientées verticalement"
 
-#: spyderlib/plugins/editor.py:812
-msgid "Run current cell and go to the next one (Shift+Enter)"
+#: spyder/plugins/configdialog.py:856
+msgid "Vertical tabs in panes"
 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)"
 
-#: spyderlib/plugins/editor.py:818
-msgid "Show todo list"
-msgstr "Afficher la liste des tâches"
+#: spyder/plugins/configdialog.py:858
+#, fuzzy
+msgid "Animated toolbars and panes"
+msgstr "Panneaux et barres d'outils animés"
 
-#: spyderlib/plugins/editor.py:819
-msgid "Show TODO/FIXME/XXX/HINT/TIP/@todo comments list"
-msgstr ""
-"Afficher la liste des commentaires du type TODO/FIXME/XXX/HINT/TIP/@todo"
+#: spyder/plugins/configdialog.py:860
+msgid "Tear off menus"
+msgstr "Menus détachables"
 
-#: spyderlib/plugins/editor.py:826
-msgid "Show warning/error list"
-msgstr "Afficher la liste des avertissements/erreurs"
+#: spyder/plugins/configdialog.py:861
+msgid "Set this to detach any<br> menu from the main window"
+msgstr ""
+"Activer cette option rend détachables tous les menus de la fenêtre principale"
 
-#: spyderlib/plugins/editor.py:827
-msgid "Show code analysis warnings/errors"
+#: spyder/plugins/configdialog.py:863
+msgid "Custom margin for panes:"
 msgstr ""
-"Afficher la liste des avertissements/erreurs provenant de l'analyse de code"
 
-#: spyderlib/plugins/editor.py:833
-msgid "Previous warning/error"
-msgstr "Avertissement suivant"
+#: spyder/plugins/configdialog.py:865 spyder/plugins/editor.py:209
+msgid "pixels"
+msgstr "pixels"
 
-#: spyderlib/plugins/editor.py:834
-msgid "Go to previous code analysis warning/error"
-msgstr "Afficher le message d'avertissement ou d'erreur suivant"
+#: spyder/plugins/configdialog.py:893
+msgid "Status bar"
+msgstr "Barre d'état"
 
-#: spyderlib/plugins/editor.py:837
-msgid "Next warning/error"
-msgstr "Avertissement précédent"
+#: spyder/plugins/configdialog.py:894
+#, fuzzy
+msgid "Show status bar"
+msgstr "Afficher la barre d'onglets"
 
-#: spyderlib/plugins/editor.py:838
-msgid "Go to next code analysis warning/error"
-msgstr "Afficher le message d'avertissement ou d'erreur précédent"
+#: spyder/plugins/configdialog.py:896
+msgid "Show memory usage every"
+msgstr "Afficher l'occupation mémoire toutes les"
 
-#: spyderlib/plugins/editor.py:842
-msgid "Last edit location"
-msgstr "Dernière position d'édition"
+#: spyder/plugins/configdialog.py:898 spyder/plugins/configdialog.py:907
+#: spyder/plugins/editor.py:133 spyder/plugins/editor.py:261
+#: spyder/plugins/variableexplorer.py:30
+msgid " ms"
+msgstr " ms"
 
-#: spyderlib/plugins/editor.py:843
-msgid "Go to last edit location"
-msgstr "Aller à la dernière position d'édition"
+#: spyder/plugins/configdialog.py:905
+msgid "Show CPU usage every"
+msgstr "Afficher la charge du CPU toutes les"
 
-#: spyderlib/plugins/editor.py:849
-msgid "Previous cursor position"
-msgstr "Position suivante du curseur"
+#: spyder/plugins/configdialog.py:940
+#, fuzzy
+msgid "Plain text font"
+msgstr "Police d'écriture du texte brut"
 
-#: spyderlib/plugins/editor.py:850
-msgid "Go to previous cursor position"
-msgstr "Aller à la position précédente du curseur"
+#: spyder/plugins/configdialog.py:946
+#, fuzzy
+msgid "Rich text font"
+msgstr "Police d'écriture du texte enrichi"
 
-#: spyderlib/plugins/editor.py:856
-msgid "Next cursor position"
-msgstr "Position suivante du curseur"
+#: spyder/plugins/configdialog.py:949
+#, fuzzy
+msgid "Fonts"
+msgstr "Police : "
 
-#: spyderlib/plugins/editor.py:857
-msgid "Go to next cursor position"
-msgstr "Aller à la position suivante du curseur"
+#: spyder/plugins/configdialog.py:963
+msgid "Appearance"
+msgstr ""
 
-#: spyderlib/plugins/editor.py:864
-#: spyderlib/widgets/sourcecode/codeeditor.py:2449
-msgid "Comment"
-msgstr "Commenter"
+#: spyder/plugins/configdialog.py:965 spyder/plugins/ipythonconsole.py:564
+msgid "Advanced Settings"
+msgstr "Options avancées"
 
-#: spyderlib/plugins/editor.py:864
-#: spyderlib/widgets/sourcecode/codeeditor.py:2449
-msgid "Uncomment"
-msgstr "Décommenter"
+#: spyder/plugins/configdialog.py:1001
+msgid "Syntax coloring"
+msgstr "Coloration syntaxique"
 
-#: spyderlib/plugins/editor.py:865
-msgid "Comment current line or selection"
-msgstr "Commenter la sélection ou la ligne en cours d'édition"
+#: spyder/plugins/configdialog.py:1014
+msgid ""
+"Here you can select the color scheme used in the Editor and all other Spyder "
+"plugins.<br><br>You can also edit the color schemes provided by Spyder or "
+"create your own ones by using the options provided below.<br>"
+msgstr ""
 
-#: spyderlib/plugins/editor.py:869
-msgid "Add &block comment"
-msgstr "Ajouter un &bloc de commentaires"
+#: spyder/plugins/configdialog.py:1019
+#, fuzzy
+msgid "Edit selected"
+msgstr "Modifier le filtre"
 
-#: spyderlib/plugins/editor.py:870
-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"
+#: spyder/plugins/configdialog.py:1020
+#, fuzzy
+msgid "Create new scheme"
+msgstr "Paramètres de coloration syntaxique"
 
-#: spyderlib/plugins/editor.py:876
-msgid "R&emove block comment"
-msgstr "&Supprimer un bloc de commentaires"
+#: spyder/plugins/configdialog.py:1021 spyder/widgets/explorer.py:510
+#: spyder/widgets/shell.py:134
+msgid "Delete"
+msgstr "Supprimer"
 
-#: spyderlib/plugins/editor.py:877
-msgid "Remove comment block around current line or selection"
+#: spyder/plugins/configdialog.py:1024
+msgid "Reset"
 msgstr ""
-"Supprimer le bloc de commentaires autour de la ligne en cours d'édition"
-
-#: spyderlib/plugins/editor.py:888
-msgid "Indent"
-msgstr "Indenter"
 
-#: spyderlib/plugins/editor.py:889
-msgid "Indent current line or selection"
-msgstr "Indenter la sélection ou la ligne en cours d'édition"
+#: spyder/plugins/configdialog.py:1031
+msgid "Scheme:"
+msgstr ""
 
-#: spyderlib/plugins/editor.py:892
-msgid "Unindent"
-msgstr "Désindenter"
+#: spyder/plugins/configdialog.py:1062
+#, fuzzy
+msgid "Manage color schemes"
+msgstr "Thème de coloration syntaxique : "
 
-#: spyderlib/plugins/editor.py:893
-msgid "Unindent current line or selection"
-msgstr "Désindenter la sélection ou la ligne en cours d'édition"
+#: spyder/plugins/configdialog.py:1251
+#, fuzzy
+msgid "Are you sure you want to delete this scheme?"
+msgstr "Souhaitez-vous vraiment redémarrer le noyau ?"
 
-#: spyderlib/plugins/editor.py:898
-msgid "Carriage return and line feed (Windows)"
-msgstr "Retour chariot et retour à la ligne (Windows)"
+#: spyder/plugins/configdialog.py:1368
+#, fuzzy
+msgid "Text"
+msgstr "Texte enrichi"
 
-#: spyderlib/plugins/editor.py:901
-msgid "Line feed (UNIX)"
-msgstr "Retour à la ligne (UNIX)"
+#: spyder/plugins/configdialog.py:1370
+#, fuzzy
+msgid "Highlight"
+msgstr "Surligner les résultats"
 
-#: spyderlib/plugins/editor.py:904
-msgid "Carriage return (Mac)"
-msgstr "Retour chariot (Mac)"
+#: spyder/plugins/configdialog.py:1372
+#, fuzzy
+msgid "Background"
+msgstr "Fond :"
 
-#: spyderlib/plugins/editor.py:910
-msgid "Convert end-of-line characters"
-msgstr "Convertir les caractères de fin de ligne"
+#: spyder/plugins/configdialog.py:1376
+#, fuzzy
+msgid "Scheme name:"
+msgstr "Nouveau nom :"
 
-#: spyderlib/plugins/editor.py:914
-msgid "Remove trailing spaces"
-msgstr "Supprimer les espaces en fin de ligne"
+#: spyder/plugins/configdialog.py:1383
+#, fuzzy
+msgid "Color scheme editor"
+msgstr "Paramètres de coloration syntaxique"
 
-#: spyderlib/plugins/editor.py:918
-msgid "Fix indentation"
-msgstr "Corriger l'indentation"
+#: spyder/plugins/console.py:109
+msgid "Internal console"
+msgstr "Console interne"
 
-#: spyderlib/plugins/editor.py:919
-msgid "Replace tab characters by space characters"
-msgstr "Remplacer les caractères de tabulation par des espaces"
+#: spyder/plugins/console.py:139 spyder/plugins/externalconsole.py:743
+msgid "&Run..."
+msgstr "Exécute&r..."
 
-#: spyderlib/plugins/editor.py:922
-msgid "Go to line..."
-msgstr "Aller à la ligne..."
+#: spyder/plugins/console.py:141 spyder/plugins/externalconsole.py:744
+msgid "Run a Python script"
+msgstr "Exécuter un script Python"
 
-#: spyderlib/plugins/editor.py:930
-msgid "Set console working directory"
-msgstr "Répertoire de travail de la console"
+#: spyder/plugins/console.py:144
+msgid "Environment variables..."
+msgstr "Variables d'environnement..."
 
-#: spyderlib/plugins/editor.py:932
-msgid ""
-"Set current console (and file explorer) working directory to current script "
-"directory"
+#: spyder/plugins/console.py:146
+msgid "Show and edit environment variables (for current session)"
 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:937
-msgid "Maximum number of recent files..."
-msgstr "Nombre maximum de fichiers récents..."
+"Afficher et modifier les variables d'environnement (pour la session en cours)"
 
-#: spyderlib/plugins/editor.py:940
-msgid "Clear recent files list"
-msgstr "Effacer la liste des fichiers récents"
+#: spyder/plugins/console.py:150
+msgid "Show sys.path contents..."
+msgstr "Afficher le contenu de sys.path..."
 
-#: spyderlib/plugins/editor.py:940
-msgid "Clear this list"
-msgstr "Effacer cette liste"
+#: spyder/plugins/console.py:152
+msgid "Show (read-only) sys.path"
+msgstr "Afficher le contenu de sys.path (lecture seule)"
 
-#: spyderlib/plugins/editor.py:942
-msgid "Open &recent"
-msgstr "Fichiers &récents"
+#: spyder/plugins/console.py:155
+msgid "Buffer..."
+msgstr "Tampon..."
 
-#: spyderlib/plugins/editor.py:1224 spyderlib/spyder.py:635
-msgid "File toolbar"
-msgstr "Barre d'outil fichiers"
+#: spyder/plugins/console.py:156 spyder/plugins/externalconsole.py:75
+#: spyder/plugins/history.py:43
+msgid "Set maximum line count"
+msgstr "Modifier le nombre maximum de lignes"
 
-#: spyderlib/plugins/editor.py:1225 spyderlib/spyder.py:645
-msgid "Search toolbar"
-msgstr "Barre d'outil de recherche"
+#: spyder/plugins/console.py:159
+msgid "External editor path..."
+msgstr "Éditeur externe..."
 
-#: spyderlib/plugins/editor.py:1226 spyderlib/spyder.py:650
-msgid "Source toolbar"
-msgstr "Barre d'outils code source"
+#: spyder/plugins/console.py:160
+msgid "Set external editor executable path"
+msgstr "Modifier le chemin d'accès de l'éditeur externe"
 
-#: spyderlib/plugins/editor.py:1227 spyderlib/spyder.py:655
-msgid "Run toolbar"
-msgstr "Barre d'outil exécution"
+#: spyder/plugins/console.py:163 spyder/plugins/editor.py:139
+#: spyder/plugins/externalconsole.py:76 spyder/plugins/help.py:157
+#: spyder/plugins/help.py:360 spyder/plugins/history.py:46
+#: spyder/plugins/history.py:157
+msgid "Wrap lines"
+msgstr "Retour à la ligne automatique"
 
-#: spyderlib/plugins/editor.py:1228 spyderlib/spyder.py:660
-msgid "Debug toolbar"
-msgstr "Barre d'outil de débogage"
+#: spyder/plugins/console.py:166 spyder/plugins/editor.py:175
+#: spyder/plugins/externalconsole.py:121 spyder/plugins/ipythonconsole.py:283
+msgid "Display balloon tips"
+msgstr "Afficher des info-bulles"
 
-#: spyderlib/plugins/editor.py:1229 spyderlib/spyder.py:640
-msgid "Edit toolbar"
-msgstr "Barre d'outil édition"
+#: spyder/plugins/console.py:170 spyder/plugins/editor.py:169
+#: spyder/plugins/externalconsole.py:115
+msgid "Automatic code completion"
+msgstr "Complétion de code automatique"
 
-#: spyderlib/plugins/editor.py:1232 spyderlib/spyder.py:633
-msgid "&File"
-msgstr "&Fichier"
+#: spyder/plugins/console.py:174 spyder/plugins/editor.py:173
+#: spyder/plugins/externalconsole.py:119
+msgid "Enter key selects completion"
+msgstr "Entrée valide la complétion de code"
 
-#: spyderlib/plugins/editor.py:1233 spyderlib/spyder.py:639
-msgid "&Edit"
-msgstr "&Édition"
+#: spyder/plugins/console.py:179
+msgid "Internal console settings"
+msgstr "Options de la console interne"
 
-#: spyderlib/plugins/editor.py:1234 spyderlib/spyder.py:644
-msgid "&Search"
-msgstr "&Recherche"
+#: spyder/plugins/console.py:232 spyder/plugins/externalconsole.py:918
+msgid "Run Python script"
+msgstr "Exécuter un script Python"
 
-#: spyderlib/plugins/editor.py:1235 spyderlib/spyder.py:649
-msgid "Sour&ce"
-msgstr "Sour&ce"
+#: spyder/plugins/console.py:233 spyder/plugins/externalconsole.py:146
+#: spyder/plugins/externalconsole.py:919 spyder/widgets/explorer.py:715
+msgid "Python scripts"
+msgstr "Scripts Python"
 
-#: spyderlib/plugins/editor.py:1237 spyderlib/spyder.py:667
-msgid "&Tools"
-msgstr "Ou&tils"
+#: spyder/plugins/console.py:278
+msgid "Buffer"
+msgstr "Tampon"
 
-#: spyderlib/plugins/editor.py:1238
-msgid "?"
-msgstr "?"
+#: spyder/plugins/console.py:279
+msgid "Maximum line count"
+msgstr "Nombre maximum de lignes"
 
-#: spyderlib/plugins/editor.py:1458
-msgid "Spyder Editor"
-msgstr "Éditeur de Spyder"
+#: spyder/plugins/console.py:289
+msgid "External editor"
+msgstr "Éditeur externe"
 
-#: spyderlib/plugins/editor.py:1459
-msgid "This is a temporary script file."
-msgstr "Ceci est un script temporaire."
+#: spyder/plugins/console.py:290
+msgid "External editor executable path:"
+msgstr "Chemin d'accès de l'exécutable :"
 
-#: spyderlib/plugins/editor.py:1527
-msgid "untitled"
-msgstr "sanstitre"
+#: spyder/plugins/editor.py:104
+msgid "Edit template for new modules"
+msgstr "Modifier le modèle (nouveaux modules)"
 
-#: spyderlib/plugins/editor.py:1601
-msgid "Maximum number of recent files"
-msgstr "Nombre maximum de fichiers récents"
+#: spyder/plugins/editor.py:109
+msgid "Sort files according to full path"
+msgstr "Classer les fichiers suivant leur chemin complet"
 
-#: spyderlib/plugins/editor.py:1726
-msgid "Printing..."
-msgstr "Impression en cours..."
+#: spyder/plugins/editor.py:111
+msgid "Show tab bar"
+msgstr "Afficher la barre d'onglets"
 
-#: spyderlib/plugins/explorer.py:55
-msgid "File explorer"
-msgstr "Explorateur de fichiers"
+#: spyder/plugins/editor.py:118 spyder/plugins/editor.py:189
+#: spyder/plugins/externalconsole.py:71 spyder/plugins/externalconsole.py:114
+#: spyder/plugins/help.py:156 spyder/plugins/history.py:45
+#: spyder/plugins/ipythonconsole.py:317
+msgid "Source code"
+msgstr "Code source"
 
-#: spyderlib/plugins/explorer.py:68 spyderlib/plugins/inspector.py:389
-#: spyderlib/plugins/projectexplorer.py:69
-msgid "Set font style"
-msgstr "Changer la police d'écriture"
+#: spyder/plugins/editor.py:119
+msgid "Show line numbers"
+msgstr "Afficher les numéros de ligne"
 
-#: spyderlib/plugins/externalconsole.py:49
-msgid "Interactive data plotting in the consoles"
-msgstr "Visualisation interactive de données"
+#: spyder/plugins/editor.py:120 spyder/plugins/editor.py:937
+msgid "Show blank spaces"
+msgstr "Afficher les espaces"
 
-#: spyderlib/plugins/externalconsole.py:57
-#: spyderlib/plugins/externalconsole.py:1005
-#: spyderlib/plugins/inspector.py:419 spyderlib/plugins/runconfig.py:185
-#: spyderlib/plugins/runconfig.py:455
-#: spyderlib/widgets/externalshell/baseshell.py:107
-#: spyderlib/widgets/ipython.py:521
-msgid "Console"
-msgstr "Console"
+#: spyder/plugins/editor.py:121
+msgid "Show vertical line after"
+msgstr "Afficher une ligne verticale après"
 
-#: spyderlib/plugins/externalconsole.py:71
-msgid "One tab per script"
-msgstr "Un onglet par script"
+#: spyder/plugins/editor.py:122
+msgid "characters"
+msgstr "caractères"
 
-#: spyderlib/plugins/externalconsole.py:72
-#: spyderlib/widgets/externalshell/baseshell.py:173
-msgid "Show elapsed time"
-msgstr "Afficher le temps écoulé"
+#: spyder/plugins/editor.py:127
+msgid "Highlight current line"
+msgstr "Surligner la ligne en cours d'édition"
 
-#: spyderlib/plugins/externalconsole.py:73 spyderlib/widgets/explorer.py:1016
-msgid "Show icons and text"
-msgstr "Afficher icônes et textes"
+#: spyder/plugins/editor.py:129
+msgid "Highlight current cell"
+msgstr "Surligner la cellule en cours d'édition"
 
-#: spyderlib/plugins/externalconsole.py:85
-msgid "Buffer: "
-msgstr "Tampon : "
+#: spyder/plugins/editor.py:131
+msgid "Highlight occurrences after"
+msgstr "Surligner les occurrences après"
 
-#: spyderlib/plugins/externalconsole.py:85
-#: spyderlib/plugins/ipythonconsole.py:208
-msgid " lines"
-msgstr " lignes"
+#: spyder/plugins/editor.py:159
+msgid "Save all files before running script"
+msgstr "Enregistrer tous les fichiers avant l'exécution d'un script"
 
-#: spyderlib/plugins/externalconsole.py:90
-msgid "Merge process standard output/error channels"
-msgstr "Fusionner les canaux de sortie et d'erreur du processus"
+#: spyder/plugins/editor.py:162
+msgid "Run selection"
+msgstr "Exécuter la sélection"
 
-#: spyderlib/plugins/externalconsole.py:92
-msgid ""
-"Merging the output channels of the process means that\n"
-"the standard error won't be written in red anymore,\n"
-"but this has the effect of speeding up display."
+#: spyder/plugins/editor.py:163
+msgid "Maintain focus in the Editor after running cells or selections"
 msgstr ""
-"Fusionner les canaux de sortie et d'erreur du processus\n"
-"signifie que les erreurs ne seront plus affichées en rouge,\n"
-"mais cela entraînera également une amélioration des performances\n"
-"d'affichage et une meilleure réactivité de la console."
+"Garder le focus dans l'éditeur après l'exécution d'une cellule ou d'une "
+"sélection"
 
-#: spyderlib/plugins/externalconsole.py:96
-msgid "Colorize standard error channel using ANSI escape codes"
-msgstr "Coloriser le canal d'erreur standard (codes d'échappement ANSI)"
+#: spyder/plugins/editor.py:166 spyder/plugins/externalconsole.py:252
+msgid "Introspection"
+msgstr "Introspection"
 
-#: spyderlib/plugins/externalconsole.py:98
-msgid ""
-"This method is the only way to have colorized standard\n"
-"error channel when the output channels have been merged."
-msgstr ""
-"Cette méthode est le seul moyen de coloriser le canal\n"
-"d'erreur standard lorsque les canaux de sorties ont été fusionnés."
+#: spyder/plugins/editor.py:171 spyder/plugins/externalconsole.py:117
+msgid "Case sensitive code completion"
+msgstr "Complétion de code sensible à la casse"
 
-#: spyderlib/plugins/externalconsole.py:114
-#: spyderlib/plugins/ipythonconsole.py:195
-#: spyderlib/widgets/arrayeditor.py:461
-#: spyderlib/widgets/dataframeeditor.py:516
-msgid "Background color"
-msgstr "Couleur de fond"
+#: spyder/plugins/editor.py:176
+msgid "Link to object definition"
+msgstr "Lien vers la définition d'un objet"
 
-#: spyderlib/plugins/externalconsole.py:115
+#: spyder/plugins/editor.py:178
 msgid ""
-"This option will be applied the next time a Python console or a terminal is "
-"opened."
+"If this option is enabled, clicking on an object\n"
+"name (left-click + Ctrl key) will go this object\n"
+"definition (if resolved)."
 msgstr ""
-"Cette option sera prise en compte lors de la prochaine ouverture de console "
-"(interpréteur Python ou terminal)."
-
-#: spyderlib/plugins/externalconsole.py:118
-msgid "Light background (white color)"
-msgstr "Fond blanc"
+"Si cette option est activée, cliquer sur le nom\n"
+"d'un objet (click gauche + touche Ctrl) ira à la\n"
+"définition de cet objet (si celle-ci est trouvée)."
 
-#: spyderlib/plugins/externalconsole.py:143
-msgid "User Module Reloader (UMR)"
-msgstr "User Module Reloader (UMR)"
-
-#: spyderlib/plugins/externalconsole.py:144
-msgid ""
-"UMR forces Python to reload modules which were imported when executing a \n"
-"script in the external console with the 'runfile' function."
-msgstr ""
-"L'UMR force Python à recharger les modules importés lors de l'exécution "
-"d'un\n"
-"script dans la console interne avec la fonction 'runfile'."
-
-#: spyderlib/plugins/externalconsole.py:147
-msgid "Enable UMR"
-msgstr "Activer l'UMR"
-
-#: spyderlib/plugins/externalconsole.py:148
+#: spyder/plugins/editor.py:182
 msgid ""
-"This option will enable the User Module Reloader (UMR) in Python/IPython "
-"consoles. UMR forces Python to reload deeply modules during import when "
-"running a Python script using the Spyder's builtin function <b>runfile</b>."
-"<br><br><b>1.</b> UMR may require to restart the console in which it will be "
-"called (otherwise only newly imported modules will be reloaded when "
-"executing scripts).<br><br><b>2.</b> If errors occur when re-running a PyQt-"
-"based program, please check that the Qt objects are properly destroyed (e.g. "
-"you may have to use the attribute <b>Qt.WA_DeleteOnClose</b> on your main "
-"window, using the <b>setAttribute</b> method)"
+"<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 ""
-"Cette option active le User Module Deleter (UMR) dans les consoles Python. "
-"L'UMR force Python à recharger complètement les modules lors de leur "
-"importation, dans le cadre de l'exécution d'un script Python avec la "
-"fonction Spyder <b>runfile</b>.<br><br><b>1.</b> UMR peut nécessiter le "
-"redémarrage de la console Python dans lequel il va être utilisé (dans le cas "
-"contraire, seuls les modules importés après activation de l'UMR seront "
-"rechargés complètement lors de l'exécution de scripts).<br><br><b>2.</b> Si "
-"des erreurs survenaient lors de la réexécution de programmes utilisant PyQt, "
-"veuillez vérifier que les objets Qt sont correctement détruits à la sortie "
-"du programme (par exemple, il sera probablement nécessaire d'utiliser "
-"l'attribut <b>Qt.WA_DeleteOnClose</b> sur votre objet fenêtre principale "
-"grâce à la méthode <b>setAttribute</b>)"
-
-#: spyderlib/plugins/externalconsole.py:164
-msgid "Show reloaded modules list"
-msgstr "Afficher les modules rechargés"
+"<b>Avertissement :</b><br>Le module Python <i>rope</i> n'est pas installé "
+"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/externalconsole.py:165
-msgid "Please note that these changes will be applied only to new consoles"
-msgstr ""
-"Veuillez noter que ces changements ne seront pris en compte que dans les "
-"nouvelles consoles Python"
+#: spyder/plugins/editor.py:190
+msgid "Automatic insertion of parentheses, braces and brackets"
+msgstr "Insertion automatique des parenthèses, crochets et accolades"
 
-#: spyderlib/plugins/externalconsole.py:169
-msgid "Set UMR excluded (not reloaded) modules"
-msgstr "Définir la liste des modules non rechargés par l'UMR"
+#: spyder/plugins/editor.py:193
+msgid "Automatic insertion of closing quotes"
+msgstr "Insertion automatique de guillemets de clôture"
 
-#: spyderlib/plugins/externalconsole.py:180
-msgid "Python executable"
-msgstr "Exécutable Python"
+#: spyder/plugins/editor.py:195
+msgid "Automatic insertion of colons after 'for', 'if', 'def', etc"
+msgstr "Insertion automatique de ':' après 'for', 'if', 'def', etc."
 
-#: spyderlib/plugins/externalconsole.py:182
-msgid ""
-"Select the Python interpreter executable binary in which Spyder will run "
-"scripts:"
-msgstr "Sélectionner l'interpréteur Python utilisé pour exécuter des scripts:"
+#: spyder/plugins/editor.py:198
+msgid "Automatic indentation after 'else', 'elif', etc."
+msgstr "Indentation automatique après 'else', 'elif', etc."
 
-#: spyderlib/plugins/externalconsole.py:185
-msgid "Default (i.e. the same as Spyder's)"
-msgstr ""
-"Par défaut (interpréteur identique à celui dans lequel Spyder est exécuté)"
+#: spyder/plugins/editor.py:200
+msgid "Indentation characters: "
+msgstr "Caractères d'indentation : "
 
-#: spyderlib/plugins/externalconsole.py:189
-msgid "Use the following Python interpreter:"
-msgstr "Utiliser l'interpréteur Python suivant :"
+#: spyder/plugins/editor.py:201
+msgid "2 spaces"
+msgstr "2 espaces"
 
-#: spyderlib/plugins/externalconsole.py:193
-msgid "Executables"
-msgstr "Exécutables"
+#: spyder/plugins/editor.py:202
+#, fuzzy
+msgid "3 spaces"
+msgstr "4 espaces"
 
-#: spyderlib/plugins/externalconsole.py:211
-msgid "PYTHONSTARTUP replacement"
-msgstr "Substitution de PYTHONSTARTUP"
+#: spyder/plugins/editor.py:203
+msgid "4 spaces"
+msgstr "4 espaces"
 
-#: spyderlib/plugins/externalconsole.py:213
-msgid ""
-"This option will override the PYTHONSTARTUP environment variable which\n"
-"defines the script to be executed during the Python console startup."
-msgstr ""
-"Cette option permet de remplacer le script de démarrage des consoles Python "
-"défini par la\n"
-"variable d'environnement PYTHONSTARTUP."
+#: spyder/plugins/editor.py:204
+#, fuzzy
+msgid "5 spaces"
+msgstr "4 espaces"
 
-#: spyderlib/plugins/externalconsole.py:218
-msgid "Default PYTHONSTARTUP script"
-msgstr "Script PYTHONSTARTUP par défaut"
+#: spyder/plugins/editor.py:205
+#, fuzzy
+msgid "6 spaces"
+msgstr "4 espaces"
 
-#: spyderlib/plugins/externalconsole.py:222
-msgid "Use the following startup script:"
-msgstr "Utiliser le script de démarrage suivant :"
+#: spyder/plugins/editor.py:206
+#, fuzzy
+msgid "7 spaces"
+msgstr "4 espaces"
 
-#: spyderlib/plugins/externalconsole.py:239
-msgid "Monitor"
-msgstr "Moniteur"
+#: spyder/plugins/editor.py:207
+#, fuzzy
+msgid "8 spaces"
+msgstr "4 espaces"
 
-#: spyderlib/plugins/externalconsole.py:240
-msgid ""
-"The monitor provides introspection features to console: code completion, "
-"calltips and variable explorer. Because it relies on several modules, "
-"disabling the monitor may be useful to accelerate console startup."
+#: spyder/plugins/editor.py:208
+msgid "Tabulations"
 msgstr ""
-"Le moniteur fournit à la console des fonctionnalités d'introspection telles "
-"que la complétion de code, les info-bulles et l'explorateur de variables. "
-"Parce qu'il nécessite l'import de nombreux modules, désactiver le moniteur "
-"permet d'accélérer le démarrage de la console."
-
-#: spyderlib/plugins/externalconsole.py:247
-msgid "Enable monitor"
-msgstr "Activer le moniteur"
-
-#: spyderlib/plugins/externalconsole.py:260
-msgid "Default library"
-msgstr "Bibliothèque par défaut"
 
-#: spyderlib/plugins/externalconsole.py:265
-#, fuzzy
-msgid "Qt-Python Bindings"
-msgstr "Sélection de la bibliothèque d'interfaçage Qt :"
+#: spyder/plugins/editor.py:209
+msgid "Tab stop width:"
+msgstr "Largeur des tabulations :"
 
-#: spyderlib/plugins/externalconsole.py:267
-msgid "Library:"
-msgstr ""
+#: spyder/plugins/editor.py:211
+msgid "Tab always indent"
+msgstr "Toujours indenter avec la touche Tab"
 
-#: spyderlib/plugins/externalconsole.py:269
+#: spyder/plugins/editor.py:213
 msgid ""
-"This option will act on<br> libraries such as Matplotlib, guidata or ETS"
+"If enabled, pressing Tab will always indent,\n"
+"even when the cursor is not at the beginning\n"
+"of a line (when this option is enabled, code\n"
+"completion may be triggered using the alternate\n"
+"shortcut: Ctrl+Space)"
 msgstr ""
-"Cette option est prise en charge par les bibliothèques telles que "
-"Matplotlib, guidata ou ETS"
+"Si cette option est activée, presser la touche Tab\n"
+"provoquera toujours l'indentation de la ligne,\n"
+"quelle que soit la position du curseur (lorsque cette\n"
+"option est activée, la complétion de code reste \n"
+"accessible via le raccourci Ctrl+Espace)"
 
-#: spyderlib/plugins/externalconsole.py:278
-#: spyderlib/plugins/ipythonconsole.py:465
-msgid "Graphics"
-msgstr "Graphiques"
+#: spyder/plugins/editor.py:218
+msgid "Intelligent backspace"
+msgstr "Retour arrière (\"backspace\") intelligent"
 
-#: spyderlib/plugins/externalconsole.py:279
-msgid ""
-"Decide which backend to use to display graphics. If unsure, please select "
-"the <b>Automatic</b> backend.<br><br><b>Note:</b> We support a very limited "
-"number of backends in our Python consoles. If you prefer to work with a "
-"different one, please use an IPython console."
+#: spyder/plugins/editor.py:220
+msgid "Automatically remove trailing spaces when saving files"
 msgstr ""
+"Supprimer automatiquement les espaces en fin de ligne lors de "
+"l'enregistrement"
 
-#: spyderlib/plugins/externalconsole.py:295
-#: spyderlib/plugins/ipythonconsole.py:270
-msgid "Backend:"
-msgstr "Sortie :"
+#: spyder/plugins/editor.py:224
+msgid "Analysis"
+msgstr "Analyse"
 
-#: spyderlib/plugins/externalconsole.py:297
-#: spyderlib/plugins/ipythonconsole.py:272
-msgid "This option will be applied the next time a console is opened."
+#: spyder/plugins/editor.py:226
+msgid "<i>(Refer to the {} page)</i>"
 msgstr ""
-"Cette option sera prise en compte lors de la prochaine ouverture de console."
 
-#: spyderlib/plugins/externalconsole.py:308
-msgid "Enthought Tool Suite"
-msgstr "Enthought Tool Suite"
+#: spyder/plugins/editor.py:230
+#, fuzzy
+msgid "Real-time code analysis"
+msgstr "Analyse de code temps réel dans l'éditeur"
 
-#: spyderlib/plugins/externalconsole.py:309
+#: spyder/plugins/editor.py:232
+#, fuzzy
 msgid ""
-"Enthought Tool Suite (ETS) supports PyQt4 (qt4) and wxPython (wx) graphical "
-"user interfaces."
+"<p>If enabled, Python source code will be analyzed using pyflakes, lines "
+"containing errors or warnings will be highlighted.</p><p><u>Note</u>: add "
+"<b>analysis:ignore</b> in a comment to ignore code analysis warnings.</p>"
 msgstr ""
-"Le logiciel Enthought Tool Suite (ETS) prend en charge les interfaces "
-"graphiques PyQt4 (qt4) et wxPython (wx)."
-
-#: spyderlib/plugins/externalconsole.py:313
-msgid "ETS_TOOLKIT:"
-msgstr "ETS_TOOLKIT:"
+"Si cette option est activée, le code source Python sera analysé\n"
+"avec des outils l'outil d'introspection de code pyflakes\n"
+"et les lignes contenant des erreurs seront indiquées"
 
-#: spyderlib/plugins/externalconsole.py:338
-msgid "External modules"
-msgstr "Modules externes"
+#: spyder/plugins/editor.py:240
+msgid "Code analysis requires pyflakes %s+"
+msgstr "L'analyse de code requiert pyflakes %s+"
 
-#: spyderlib/plugins/externalconsole.py:374
-#: spyderlib/plugins/externalconsole.py:617
-#: spyderlib/plugins/ipythonconsole.py:114
-#: spyderlib/plugins/ipythonconsole.py:832 spyderlib/spyder.py:1803
-#: spyderlib/spyder.py:1825 spyderlib/spyder.py:1888 spyderlib/spyder.py:2774
-#: spyderlib/utils/environ.py:95 spyderlib/utils/environ.py:108
-#: spyderlib/widgets/dicteditor.py:452
-msgid "Warning"
-msgstr "Attention"
+#: spyder/plugins/editor.py:242
+#, fuzzy
+msgid "Real-time code style analysis"
+msgstr "Analyse de code temps réel dans l'éditeur"
 
-#: spyderlib/plugins/externalconsole.py:375
+#: spyder/plugins/editor.py:244
+#, fuzzy
 msgid ""
-"You selected a <b>Python %d</b> interpreter for the console but Spyder is "
-"running on <b>Python %d</b>!.<br><br>Although this is possible, we recommend "
-"you to install and run Spyder directly with your selected interpreter, to "
-"avoid seeing false warnings and errors due to the incompatible syntax "
-"between these two Python versions."
+"<p>If enabled, Python source code will be analyzedusing pep8, lines that are "
+"not following PEP8 style guide will be highlighted.</p><p><u>Note</u>: add "
+"<b>analysis:ignore</b> in a comment to ignore style analysis warnings.</p>"
 msgstr ""
-"Vous avez sélectionné un interpréteur <b>Python %d</b> pour la console. Or "
-"cette version de Spyder est exécutée par <b>Python %d</b>!.<br><br> Même si "
-"c'est techniquement possible, il est recommandé d'installer et d'exécuter "
-"Spyder directement dans la version de l'interpréteur sélectionnée, afin "
-"d'éviter l'apparition d'avertissements ou d'erreurs liées à une syntaxe "
-"incompatible entre ces deux versions de Python"
-
-#: spyderlib/plugins/externalconsole.py:538
-msgid "Trying to kill a kernel?"
-msgstr "Tentative d'arrêt d'un noyau"
+"Si cette option est activée, le style du code source Python sera analysé\n"
+"avec l'outil d'introspection de code pep8 et les lignes ne suivant pas\n"
+"les recommandations officielles seront indiquées"
 
-#: spyderlib/plugins/externalconsole.py:539
-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 "
-"the second button from right to left."
-msgstr ""
-"Le noyau ne peut pas être fermé car au moins une console y est connectée. "
-"<br><br> Veuillez soit fermer toutes les consoles connectées ou appuyer sur "
-"le second bouton en partant de la droite pour tuer le processus du noyau."
+#: spyder/plugins/editor.py:251
+#, fuzzy
+msgid "Code annotations (TODO, FIXME, XXX, HINT, TIP, @todo)"
+msgstr "Tâches (TODO, FIXME, XXX, HINT, TIP, @todo)"
 
-#: spyderlib/plugins/externalconsole.py:618
-msgid ""
-"No Python console is currently selected to run <b>%s</b>.<br><br>Please "
-"select or open a new Python console and try again."
-msgstr ""
-"Aucune console Python n'est actuellement sélectionnée pour exécuter <b>%s</"
-"b>.<br><br>Merci de sélectionner ou d'ouvrir une nouvelle console Python et "
-"de réessayer."
+#: spyder/plugins/editor.py:254
+msgid "Perform analysis when saving file and every"
+msgstr "Analyser lors de l'enregistrement et toutes les"
 
-#: spyderlib/plugins/externalconsole.py:698
-msgid ""
-"%s is already running in a separate process.\n"
-"Do you want to kill the process before starting a new one?"
-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 ?"
+#: spyder/plugins/editor.py:258
+msgid "Perform analysis only when saving file"
+msgstr "Analyser uniquement lors de l'enregistrement"
 
-#: spyderlib/plugins/externalconsole.py:858
-msgid "Kernel"
-msgstr "Noyau"
+#: spyder/plugins/editor.py:317
+msgid "End-of-line characters"
+msgstr "Caractères de fin de ligne"
 
-#: spyderlib/plugins/externalconsole.py:868
+#: spyder/plugins/editor.py:318
 msgid ""
-"Either:<ol><li>Your IPython frontend and kernel versions are "
-"<b>incompatible</b> or</li><li>You <b>don't have</b> IPython installed in "
-"your external interpreter.</li></ol>In any case, we're sorry but we can't "
-"create a console for you."
+"When opening a text file containing mixed end-of-line characters (this may "
+"raise syntax errors in the consoles on Windows platforms), Spyder may fix "
+"the file automatically."
 msgstr ""
-"<ol><li>Soit les versions de votre interface IPython et du noyau sont "
-"<b>incompatibles</b>,</li><li>soit IPython <b>n'est pas</b> installé pour "
-"votre interpréteur externe.</li></ol>Dans tous les cas nous sommes désolés "
-"mais nous ne pouvons ouvrir une console pour vous."
+"Lors de l'ouverture d'un fichier contenant différents types de caractères de "
+"fin de ligne (ce qui peut se traduire par des erreurs de syntaxe dans les "
+"consoles Python sous Windows), Spyder peut réparer le fichier "
+"automatiquement."
 
-#: spyderlib/plugins/externalconsole.py:892
-msgid "Command Window"
-msgstr "Invite de commandes"
+#: spyder/plugins/editor.py:324
+msgid "Fix automatically and show warning message box"
+msgstr "Réparer automatiquement et afficher un message d'avertissement"
 
-#: spyderlib/plugins/externalconsole.py:894
-msgid "Terminal"
-msgstr "Terminal"
+#: spyder/plugins/editor.py:335 spyder/plugins/externalconsole.py:250
+#: spyder/plugins/ipythonconsole.py:558 spyder/plugins/variableexplorer.py:43
+msgid "Display"
+msgstr "Affichage"
 
-#: spyderlib/plugins/externalconsole.py:947
-msgid "Kernel %s"
-msgstr "Noyau %s"
+#: spyder/plugins/editor.py:337
+msgid "Code Introspection/Analysis"
+msgstr "Introspection et analyse de code"
 
-#: spyderlib/plugins/externalconsole.py:1027
-msgid "Open a &Python console"
-msgstr "Ouvrir une console &Python"
+#: spyder/plugins/editor.py:340 spyder/plugins/externalconsole.py:253
+msgid "Advanced settings"
+msgstr "Options avancées"
 
-#: spyderlib/plugins/externalconsole.py:1031
-msgid "Open &command prompt"
-msgstr "Ouvrir un invite de &commandes"
+#: spyder/plugins/editor.py:613 spyder/widgets/editortools.py:510
+msgid "Show/hide outline explorer"
+msgstr "Afficher/masquer l'explorateur de structure"
 
-#: spyderlib/plugins/externalconsole.py:1032
-msgid "Open a Windows command prompt"
-msgstr "Ouvrir un invite de commandes Windows"
+#: spyder/plugins/editor.py:619
+msgid "Show/hide project explorer"
+msgstr "Afficher/masquer l'explorateur de projets"
 
-#: spyderlib/plugins/externalconsole.py:1034
-msgid "Open a &terminal"
-msgstr "Ouvrir un &terminal"
+#: spyder/plugins/editor.py:627
+msgid "&New file..."
+msgstr "&Nouveau fichier..."
 
-#: spyderlib/plugins/externalconsole.py:1035
-msgid "Open a terminal window"
-msgstr "Ouvrir un terminal de commandes dans Spyder"
+#: spyder/plugins/editor.py:628 spyder/plugins/workingdirectory.py:83
+#: spyder/widgets/explorer.py:692 spyder/widgets/explorer.py:699
+msgid "New file"
+msgstr "Nouveau fichier"
 
-#: spyderlib/plugins/externalconsole.py:1196
-msgid "Open an IPython console"
-msgstr "Ouvrir une console IPython"
+#: spyder/plugins/editor.py:634
+msgid "&Open..."
+msgstr "&Ouvrir..."
 
-#: spyderlib/plugins/externalconsole.py:1197
-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 ""
-"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."
+#: spyder/plugins/editor.py:635 spyder/plugins/editor.py:1767
+#: spyder/plugins/workingdirectory.py:70
+msgid "Open file"
+msgstr "Ouvrir un fichier"
 
-#: spyderlib/plugins/externalconsole.py:1229
-#: spyderlib/plugins/externalconsole.py:1242
-#: spyderlib/plugins/externalconsole.py:1246
-msgid "UMR"
-msgstr "UMR"
+#: spyder/plugins/editor.py:641 spyder/widgets/editor.py:345
+#, fuzzy
+msgid "File switcher..."
+msgstr "Fichier..."
 
-#: spyderlib/plugins/externalconsole.py:1230
-msgid ""
-"UMR excluded modules:\n"
-"(example: guidata, guiqwt)"
+#: spyder/plugins/editor.py:643
+msgid "Fast switch between files"
 msgstr ""
-"Modules non rechargés par l'UMR :\n"
-"(exemple: guidata, guiqwt)"
 
-#: spyderlib/plugins/externalconsole.py:1243
-msgid ""
-"The following modules are not installed on your machine:\n"
-"%s"
-msgstr ""
-"Les modules suivants ne sont pas installés sur votre ordinateur :\n"
-"%s"
+#: spyder/plugins/editor.py:649
+msgid "&Revert"
+msgstr "&Réinitialiser"
 
-#: spyderlib/plugins/externalconsole.py:1247
-msgid ""
-"Please note that these changes will be applied only to new Python/IPython "
-"consoles"
-msgstr ""
-"Veuillez noter que ces changements ne seront pris en compte que dans les "
-"nouvelles consoles Python/IPython"
+#: spyder/plugins/editor.py:650
+msgid "Revert file from disk"
+msgstr "Revenir à la version du fichier enregistrée sur le disque"
 
-#: spyderlib/plugins/findinfiles.py:96 spyderlib/widgets/findinfiles.py:690
-msgid "Find in files"
-msgstr "Recherche dans des fichiers"
+#: spyder/plugins/editor.py:653
+msgid "&Save"
+msgstr "&Enregistrer"
 
-#: spyderlib/plugins/findinfiles.py:117
-msgid "&Find in files"
-msgstr "Rechercher dans des &fichiers"
+#: spyder/plugins/editor.py:654 spyder/widgets/editor.py:1304
+msgid "Save file"
+msgstr "Enregitrer un fichier"
 
-#: spyderlib/plugins/findinfiles.py:120
-msgid "Search text in multiple files"
-msgstr "Rechercher une chaîne de caractères dans plusieurs fichiers à la fois"
+#: spyder/plugins/editor.py:660
+msgid "Sav&e all"
+msgstr "Enregistrer &tout"
 
-#: spyderlib/plugins/history.py:37
-msgid "Settings"
-msgstr "Options"
+#: spyder/plugins/editor.py:661
+msgid "Save all files"
+msgstr "Enregistrer tous les fichiers"
 
-#: spyderlib/plugins/history.py:39
-msgid " entries"
-msgstr " lignes"
+#: spyder/plugins/editor.py:667
+msgid "Save &as..."
+msgstr "Enregistrer &sous..."
 
-#: spyderlib/plugins/history.py:39
-msgid "History depth: "
-msgstr "Taille de l'historique : "
+#: spyder/plugins/editor.py:668
+msgid "Save current file as..."
+msgstr "Enregistrer le fichier en cours d'édition sous un autre nom..."
 
-#: spyderlib/plugins/history.py:46
-msgid "Scroll automatically to last entry"
-msgstr "Défiler automatiquement jusqu'à la dernière ligne"
+#: spyder/plugins/editor.py:673 spyder/plugins/editor.py:674
+msgid "Print preview..."
+msgstr "Aperçu avant impression..."
 
-#: spyderlib/plugins/history.py:118 spyderlib/plugins/inspector.py:472
-#: spyderlib/widgets/editor.py:459 spyderlib/widgets/explorer.py:1027
-#: spyderlib/widgets/externalshell/baseshell.py:153
-#: spyderlib/widgets/externalshell/namespacebrowser.py:139
-#: spyderlib/widgets/ipython.py:568
-msgid "Options"
-msgstr "Options"
+#: spyder/plugins/editor.py:675
+msgid "&Print..."
+msgstr "Im&primer..."
 
-#: spyderlib/plugins/history.py:138
-msgid "History log"
-msgstr "Historique"
+#: spyder/plugins/editor.py:676
+msgid "Print current file..."
+msgstr "Imprimer le fichier en cours d'édition..."
 
-#: spyderlib/plugins/history.py:165
-msgid "History..."
-msgstr "Historique..."
+#: spyder/plugins/editor.py:679
+msgid "&Close"
+msgstr "&Fermer"
 
-#: spyderlib/plugins/history.py:167
-msgid "Set history maximum entries"
-msgstr "Modifier le nombre d'entrées maximum de l'historique"
+#: spyder/plugins/editor.py:680
+msgid "Close current file"
+msgstr "Fermer le fichier en cours d'édition"
 
-#: spyderlib/plugins/history.py:274
-msgid "History"
-msgstr "Historique"
+#: spyder/plugins/editor.py:683
+msgid "C&lose all"
+msgstr "Fermer t&out"
 
-#: spyderlib/plugins/history.py:275
-msgid "Maximum entries"
-msgstr "Nombre maximum d'entrées"
+#: spyder/plugins/editor.py:684
+msgid "Close all opened files"
+msgstr "Fermer tous les fichiers ouverts"
 
-#: spyderlib/plugins/inspector.py:58
-msgid "Rich text help on the Object Inspector"
-msgstr "Texte enrichi dans l'inspecteur d'objets"
+#: spyder/plugins/editor.py:691
+msgid "&Find text"
+msgstr "Rec&hercher"
 
-#: spyderlib/plugins/inspector.py:125
-msgid "Plain text font style"
-msgstr "Police d'écriture du texte brut"
+#: spyder/plugins/editor.py:697
+msgid "Find &next"
+msgstr "Rechercher le &suivant"
 
-#: spyderlib/plugins/inspector.py:128
-msgid "Rich text font style"
-msgstr "Police d'écriture du texte enrichi"
+#: spyder/plugins/editor.py:703
+msgid "Find &previous"
+msgstr "Rechercher le &précédent"
 
-#: spyderlib/plugins/inspector.py:131
-msgid "Automatic connections"
-msgstr "Connexions automatiques"
+#: spyder/plugins/editor.py:709
+msgid "&Replace text"
+msgstr "&Remplacer"
 
-#: spyderlib/plugins/inspector.py:132
-msgid ""
-"The Object Inspector can automatically show an object's help information "
-"after a left parenthesis is written next to it. Below you can decide to "
-"which plugin you want to connect it to turn on this feature."
-msgstr ""
-"L'inspecteur d'objet peut automatiquement afficher l'aide sur un objet dès "
-"l'ouverture d'une parenthèse."
+#: spyder/plugins/editor.py:718
+msgid "Set/Clear breakpoint"
+msgstr "Ajouter/supprimer un point d'arrêt"
 
-#: spyderlib/plugins/inspector.py:144
-msgid ""
-"This feature requires the Rope or Jedi libraries.\n"
-"It seems you don't have either installed."
-msgstr ""
-"Cette fonctionnalité nécessite Rope ou Jedi.\n"
-"Il semble qu'aucun de ces modules ne soit présent."
+#: spyder/plugins/editor.py:725
+msgid "Set/Edit conditional breakpoint"
+msgstr "Ajouter/modifier un point d'arrêt conditionnel"
 
-#: spyderlib/plugins/inspector.py:147
-msgid "Python Console"
-msgstr "Console Python"
+#: spyder/plugins/editor.py:732
+msgid "Clear breakpoints in all files"
+msgstr "Supprimer les points d'arrêt dans tous les fichiers"
 
-#: spyderlib/plugins/inspector.py:149
-msgid "IPython Console"
-msgstr "Console IPython"
+#: spyder/plugins/editor.py:734
+msgid "Debug with winpdb"
+msgstr "Déboguer avec winpdb"
 
-#: spyderlib/plugins/inspector.py:161
-msgid "Additional features"
-msgstr "Options supplémentaires"
+#: spyder/plugins/editor.py:741
+msgid "Debug file"
+msgstr "Déboguer le script"
 
-#: spyderlib/plugins/inspector.py:162
-msgid "Render mathematical equations"
-msgstr "Styliser les équations mathématiques"
+#: spyder/plugins/editor.py:746
+msgid "Step"
+msgstr "Pas"
 
-#: spyderlib/plugins/inspector.py:168
-msgid "This feature requires Sphinx 1.1 or superior."
-msgstr "Cette fonctionnalité nécessite l'installation de Sphinx 1.1+."
+#: spyder/plugins/editor.py:747
+msgid "Run current line"
+msgstr "Exécuter la ligne en cours"
 
-#: spyderlib/plugins/inspector.py:170
-msgid "Sphinx %s is currently installed."
-msgstr "Sphinx %s n'est pas installé."
+#: spyder/plugins/editor.py:752
+msgid "Continue"
+msgstr "Continuer"
 
-#: spyderlib/plugins/inspector.py:373
-msgid "No further documentation available"
-msgstr "Aucune documentation disponible"
+#: spyder/plugins/editor.py:754
+msgid "Continue execution until next breakpoint"
+msgstr "Continuer l'exécution jusqu'au prochain point d'arrêt"
 
-#: spyderlib/plugins/inspector.py:412
-msgid "Source"
-msgstr "Source"
+#: spyder/plugins/editor.py:759
+msgid "Step Into"
+msgstr "Pas vers l'intérieur"
 
-#: spyderlib/plugins/inspector.py:427 spyderlib/widgets/dicteditor.py:173
-msgid "Object"
-msgstr "Objet"
+#: spyder/plugins/editor.py:761
+msgid "Step into function or method of current line"
+msgstr ""
+"Avancer dans la fonction, méthode \n"
+"ou classe de la ligne en cours"
 
-#: spyderlib/plugins/inspector.py:442
-msgid "Plain Text"
-msgstr "Texte brut"
+#: spyder/plugins/editor.py:766
+msgid "Step Return"
+msgstr "Pas vers l'extérieur"
 
-#: spyderlib/plugins/inspector.py:446
-msgid "Show Source"
-msgstr "Afficher les sources"
+#: spyder/plugins/editor.py:768
+msgid "Run until current function or method returns"
+msgstr "Exécuter jusqu'au retour de la fonction ou méthode"
 
-#: spyderlib/plugins/inspector.py:450
-msgid "Rich Text"
-msgstr "Texte enrichi"
+#: spyder/plugins/editor.py:773 spyder/widgets/findinfiles.py:333
+#: spyder/widgets/ipythonconsole/client.py:236
+msgid "Stop"
+msgstr "Arrêter"
 
-#: spyderlib/plugins/inspector.py:460
-msgid "Automatic import"
-msgstr "Import automatique"
+#: spyder/plugins/editor.py:774
+#, fuzzy
+msgid "Stop debugging"
+msgstr "Débogage"
 
-#: spyderlib/plugins/inspector.py:520 spyderlib/plugins/inspector.py:983
-msgid "Object inspector"
-msgstr "Inspecteur d'objets"
+#: spyder/plugins/editor.py:781
+msgid "Run file"
+msgstr "Exécuter le fichier"
 
-#: spyderlib/plugins/inspector.py:740
-msgid ""
-"Here you can get help of any object by pressing %s in front of it, either on "
-"the Editor or the Console.%sHelp can also be shown automatically after "
-"writing a left parenthesis next to an object. You can activate this behavior "
-"in %s."
-msgstr ""
-"Pour obtenir de l'aide ici, sélectionner (ou placer le curseur sur) un objet "
-"dans l'éditeur ou la console, puis appuyer sur %s.%sL'aide apparaît "
-"automatiquement après la saisie d'une parenthèse gauche après un objet si "
-"l'option correspondante est activée dans %s."
+#: spyder/plugins/editor.py:786
+msgid "&Configure..."
+msgstr "&Configurer..."
+
+#: spyder/plugins/editor.py:788 spyder/widgets/externalshell/pythonshell.py:304
+msgid "Run settings"
+msgstr "Options d'exécution"
 
-#: spyderlib/plugins/inspector.py:746
-msgid "Preferences > Object Inspector"
-msgstr "Préférences > Inspecteur d'objets"
+#: spyder/plugins/editor.py:794
+msgid "Re-run &last script"
+msgstr "Exécuter de nouveau le &dernier script"
 
-#: spyderlib/plugins/inspector.py:753
-msgid "Usage"
-msgstr "Utilisation"
+#: spyder/plugins/editor.py:796
+msgid "Run again last file"
+msgstr "Exécuter de nouveau le dernier fichier"
 
-#: spyderlib/plugins/inspector.py:754
-msgid "New to Spyder? Read our"
-msgstr "Vous découvrez Spyder ? Lisez notre"
+#: spyder/plugins/editor.py:802 spyder/widgets/sourcecode/codeeditor.py:2507
+msgid "Run &selection or current line"
+msgstr "Exécuter la &sélection ou la ligne courante"
 
-#: spyderlib/plugins/inspector.py:755
-msgid "tutorial"
-msgstr "Tutoriel"
+#: spyder/plugins/editor.py:805
+msgid "Run selection or current line"
+msgstr "Exécuter la sélection ou le bloc de lignes"
 
-#: spyderlib/plugins/inspector.py:762
+#: spyder/plugins/editor.py:813 spyder/widgets/sourcecode/codeeditor.py:2499
+msgid "Run cell"
+msgstr "Exécuter la cellule"
+
+#: spyder/plugins/editor.py:816
 msgid ""
-"Please consider installing Sphinx to get documentation rendered in rich text."
+"Run current cell (Ctrl+Enter)\n"
+"[Use #%% to create cells]"
 msgstr ""
-"Merci d'installer Sphinx pour obtenir la documentation en texte enrichi."
-
-#: spyderlib/plugins/inspector.py:939
-msgid "Lock"
-msgstr "Verrouiller"
+"Exécuter la cellule courante \n"
+"[Utiliser #%% pour délimiter les cellules]"
 
-#: spyderlib/plugins/inspector.py:939
-msgid "Unlock"
-msgstr "Déverrouiller"
+#: spyder/plugins/editor.py:822 spyder/widgets/sourcecode/codeeditor.py:2503
+msgid "Run cell and advance"
+msgstr "Exécuter la cellule et avancer"
 
-#: spyderlib/plugins/inspector.py:984
-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"
+#: spyder/plugins/editor.py:825
+msgid "Run current cell and go to the next one (Shift+Enter)"
 msgstr ""
-"L'erreur suivante s'est produite lors de l'exécution de <b>Sphinx %s</b>. "
-"<br>Veuillez vérifier si cette version de Sphinx est bien prise en charge "
-"par Spyder. <br><br>Message d'erreur :<br>%s"
+"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/inspector.py:1028
-msgid "No source code available."
-msgstr "Aucun code source disponible."
+#: spyder/plugins/editor.py:832
+msgid "Show todo list"
+msgstr "Afficher la liste des tâches"
 
-#: spyderlib/plugins/ipythonconsole.py:62
-msgid "Symbolic mathematics in the IPython Console"
-msgstr "Mathématiques symboliques pour la console IPython"
+#: spyder/plugins/editor.py:833
+msgid "Show TODO/FIXME/XXX/HINT/TIP/@todo comments list"
+msgstr ""
+"Afficher la liste des commentaires du type TODO/FIXME/XXX/HINT/TIP/@todo"
 
-#: spyderlib/plugins/ipythonconsole.py:111
-msgid ""
-"The authenticity of host <b>%s</b> can't be established. Are you sure you "
-"want to continue connecting?"
+#: spyder/plugins/editor.py:840
+msgid "Show warning/error list"
+msgstr "Afficher la liste des avertissements/erreurs"
+
+#: spyder/plugins/editor.py:841
+msgid "Show code analysis warnings/errors"
 msgstr ""
-"L'identité du serveur <b>%s</b> ne peut pas être confirmée. Êtes-vous sûr de "
-"vouloir poursuivre ?"
+"Afficher la liste des avertissements/erreurs provenant de l'analyse de code"
 
-#: spyderlib/plugins/ipythonconsole.py:123
-msgid "The authenticity of the host can't be established"
-msgstr "L'identité du serveur ne peut pas être confirmée"
+#: spyder/plugins/editor.py:847
+msgid "Previous warning/error"
+msgstr "Avertissement suivant"
 
-#: spyderlib/plugins/ipythonconsole.py:130
-msgid "Tunnel '%s' failed to start"
-msgstr "Impossible d'ouvrir le tunnel '%s'"
+#: spyder/plugins/editor.py:848
+msgid "Go to previous code analysis warning/error"
+msgstr "Afficher le message d'avertissement ou d'erreur suivant"
 
-#: spyderlib/plugins/ipythonconsole.py:135
-msgid "Could not connect to remote host"
-msgstr "Impossible d'établir la connection au serveur distant"
+#: spyder/plugins/editor.py:851
+msgid "Next warning/error"
+msgstr "Avertissement précédent"
 
-#: spyderlib/plugins/ipythonconsole.py:151
-#: spyderlib/plugins/ipythonconsole.py:689
-msgid "IPython console"
-msgstr "Console IPython"
+#: spyder/plugins/editor.py:852
+msgid "Go to next code analysis warning/error"
+msgstr "Afficher le message d'avertissement ou d'erreur précédent"
 
-#: spyderlib/plugins/ipythonconsole.py:163
-msgid "Display initial banner"
-msgstr "Afficher le message d'accueil"
+#: spyder/plugins/editor.py:856
+msgid "Last edit location"
+msgstr "Dernière position d'édition"
 
-#: spyderlib/plugins/ipythonconsole.py:164
-msgid ""
-"This option lets you hide the message shown at\n"
-"the top of the console when it's opened."
-msgstr ""
-"Cette option permet de masquer la message d'accueil\n"
-"qui s'affiche à l'ouverture de la console."
+#: spyder/plugins/editor.py:857
+msgid "Go to last edit location"
+msgstr "Aller à la dernière position d'édition"
 
-#: spyderlib/plugins/ipythonconsole.py:166
-msgid "Use a pager to display additional text inside the console"
-msgstr "Utiliser un pager pour afficher l'aide"
+#: spyder/plugins/editor.py:865
+msgid "Previous cursor position"
+msgstr "Position suivante du curseur"
 
-#: spyderlib/plugins/ipythonconsole.py:168
-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 ""
-"Le pager permet d'éviter de remplir la console de texte d'aide.\n"
-"Note : utiliser la touche Q pour quitter le pager."
+#: spyder/plugins/editor.py:866
+msgid "Go to previous cursor position"
+msgstr "Aller à la position précédente du curseur"
 
-#: spyderlib/plugins/ipythonconsole.py:173
-msgid "Ask for confirmation before closing"
-msgstr "Demander confirmation avant de fermer une console"
+#: spyder/plugins/editor.py:874
+msgid "Next cursor position"
+msgstr "Position suivante du curseur"
 
-#: spyderlib/plugins/ipythonconsole.py:183
-msgid "Completion Type"
+#: spyder/plugins/editor.py:875
+msgid "Go to next cursor position"
+msgstr "Aller à la position suivante du curseur"
+
+#: spyder/plugins/editor.py:885 spyder/widgets/sourcecode/codeeditor.py:2483
+msgid "Comment"
+msgstr "Commenter"
+
+#: spyder/plugins/editor.py:885 spyder/widgets/sourcecode/codeeditor.py:2483
+msgid "Uncomment"
+msgstr "Décommenter"
+
+#: spyder/plugins/editor.py:886
+msgid "Comment current line or selection"
+msgstr "Commenter la sélection ou la ligne en cours d'édition"
+
+#: spyder/plugins/editor.py:890
+msgid "Add &block comment"
+msgstr "Ajouter un &bloc de commentaires"
+
+#: spyder/plugins/editor.py:891
+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/ipythonconsole.py:184
-msgid "Decide what type of completion to use"
+#: spyder/plugins/editor.py:897
+msgid "R&emove block comment"
+msgstr "&Supprimer un bloc de commentaires"
+
+#: spyder/plugins/editor.py:898
+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/ipythonconsole.py:187
-#, fuzzy
-msgid "Completion:"
-msgstr "Condition :"
+#: spyder/plugins/editor.py:909
+msgid "Indent"
+msgstr "Indenter"
 
-#: spyderlib/plugins/ipythonconsole.py:196
-msgid "Light background"
-msgstr "Fond blanc"
+#: spyder/plugins/editor.py:910
+msgid "Indent current line or selection"
+msgstr "Indenter la sélection ou la ligne en cours d'édition"
 
-#: spyderlib/plugins/ipythonconsole.py:198
-msgid "Dark background"
-msgstr "Fond noir"
+#: spyder/plugins/editor.py:913
+msgid "Unindent"
+msgstr "Désindenter"
 
-#: spyderlib/plugins/ipythonconsole.py:208
-msgid "Buffer:  "
-msgstr "Tampon :  "
+#: spyder/plugins/editor.py:914
+msgid "Unindent current line or selection"
+msgstr "Désindenter la sélection ou la ligne en cours d'édition"
 
-#: spyderlib/plugins/ipythonconsole.py:210
-msgid ""
-"Set the maximum number of lines of text shown in the\n"
-"console before truncation. Specifying -1 disables it\n"
-"(not recommended!)"
-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é)."
+#: spyder/plugins/editor.py:919
+msgid "Carriage return and line feed (Windows)"
+msgstr "Retour chariot et retour à la ligne (Windows)"
 
-#: spyderlib/plugins/ipythonconsole.py:219
-msgid "Support for graphics (Matplotlib)"
-msgstr "Prise en charge des graphes (Matplotlib)"
+#: spyder/plugins/editor.py:922
+msgid "Line feed (UNIX)"
+msgstr "Retour à la ligne (UNIX)"
 
-#: spyderlib/plugins/ipythonconsole.py:220
-msgid "Activate support"
-msgstr "Activer"
+#: spyder/plugins/editor.py:925
+msgid "Carriage return (Mac)"
+msgstr "Retour chariot (Mac)"
 
-#: spyderlib/plugins/ipythonconsole.py:221
-msgid "Automatically load Pylab and NumPy modules"
-msgstr "Importer automatiquement Pylab et NumPy"
+#: spyder/plugins/editor.py:931
+msgid "Convert end-of-line characters"
+msgstr "Convertir les caractères de fin de ligne"
 
-#: spyderlib/plugins/ipythonconsole.py:224
-msgid ""
-"This lets you load graphics support without importing \n"
-"the commands to do plots. Useful to work with other\n"
-"plotting libraries different to Matplotlib or to develop \n"
-"GUIs with Spyder."
-msgstr ""
-"Import automatique de toutes les fonctions de représentation graphique et de "
-"calcul numérique"
+#: spyder/plugins/editor.py:935
+msgid "Remove trailing spaces"
+msgstr "Supprimer les espaces en fin de ligne"
 
-#: spyderlib/plugins/ipythonconsole.py:242
-msgid ""
-"This feature requires the Matplotlib library.\n"
-"It seems you don't have it installed."
-msgstr ""
-"Cette fonctionnalité nécessite l'installation du module Matplotlib.\n"
-"Ce dernier n'est apparemment pas installé."
+#: spyder/plugins/editor.py:939
+msgid "Fix indentation"
+msgstr "Corriger l'indentation"
 
-#: spyderlib/plugins/ipythonconsole.py:247
-msgid "Inline"
-msgstr "En ligne"
+#: spyder/plugins/editor.py:940
+msgid "Replace tab characters by space characters"
+msgstr "Remplacer les caractères de tabulation par des espaces"
 
-#: spyderlib/plugins/ipythonconsole.py:248
-msgid "Automatic"
-msgstr "Automatique"
+#: spyder/plugins/editor.py:943
+msgid "Go to line..."
+msgstr "Aller à la ligne..."
 
-#: spyderlib/plugins/ipythonconsole.py:249
-msgid "Graphics backend"
-msgstr "Sortie graphique"
+#: spyder/plugins/editor.py:951
+msgid "Set console working directory"
+msgstr "Répertoire de travail de la console"
 
-#: spyderlib/plugins/ipythonconsole.py:250
+#: spyder/plugins/editor.py:953
 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."
+"Set current console (and file explorer) working directory to current script "
+"directory"
 msgstr ""
-"Cette option permet de régler la manière dont les graphes seront affichés "
-"dans la console. Par exemple, le mode <b>%s</b> permet l'affichage en ligne "
-"des graphes tandis que le mode <b>%s</b> permet d'interagir avec (zoom/pan) "
-"dans une fenêtre séparée."
+"Choisir le répertoire du script comme répertoire de travail de la console "
+"courante (et de l'explorateur de fichier)"
 
-#: spyderlib/plugins/ipythonconsole.py:283
-msgid "Inline backend"
-msgstr "Backend intégré"
+#: spyder/plugins/editor.py:958
+msgid "Maximum number of recent files..."
+msgstr "Nombre maximum de fichiers récents..."
 
-#: spyderlib/plugins/ipythonconsole.py:284
-msgid "Decide how to render the figures created by this backend"
-msgstr "Option relative au rendu des figures dans ce backend"
+#: spyder/plugins/editor.py:961
+msgid "Clear recent files list"
+msgstr "Effacer la liste des fichiers récents"
 
-#: spyderlib/plugins/ipythonconsole.py:288
-msgid "Format:"
-msgstr "Format :"
+#: spyder/plugins/editor.py:961 spyder/plugins/projects.py:97
+msgid "Clear this list"
+msgstr "Effacer cette liste"
 
-#: spyderlib/plugins/ipythonconsole.py:291
-msgid "Resolution:"
-msgstr "Résolution :"
+#: spyder/plugins/editor.py:965
+msgid "Open &recent"
+msgstr "Fichiers &récents"
 
-#: spyderlib/plugins/ipythonconsole.py:291
-msgid "dpi"
-msgstr "ppp"
+#: spyder/plugins/editor.py:1348
+msgid "?"
+msgstr "?"
 
-#: spyderlib/plugins/ipythonconsole.py:293
-msgid "Only used when the format is PNG. Default is 72"
-msgstr "Utilisé uniquement dans le cas du format PNG. Par défaut: 72"
+#: spyder/plugins/editor.py:1575
+msgid "Spyder Editor"
+msgstr "Éditeur de Spyder"
 
-#: spyderlib/plugins/ipythonconsole.py:296
-msgid "Width:"
-msgstr "Largeur :"
+#: spyder/plugins/editor.py:1576
+msgid "This is a temporary script file."
+msgstr "Ceci est un script temporaire."
 
-#: spyderlib/plugins/ipythonconsole.py:296
-#: spyderlib/plugins/ipythonconsole.py:300
-msgid "inches"
-msgstr "pouces"
+#: spyder/plugins/editor.py:1645
+msgid "untitled"
+msgstr "sanstitre"
 
-#: spyderlib/plugins/ipythonconsole.py:298
-msgid "Default is 6"
-msgstr "Par défaut : 6"
+#: spyder/plugins/editor.py:1719
+msgid "Maximum number of recent files"
+msgstr "Nombre maximum de fichiers récents"
 
-#: spyderlib/plugins/ipythonconsole.py:300
-msgid "Height:"
-msgstr "Hauteur :"
+#: spyder/plugins/editor.py:1852
+msgid "Printing..."
+msgstr "Impression en cours..."
 
-#: spyderlib/plugins/ipythonconsole.py:302
-msgid "Default is 4"
-msgstr "Par défaut : 4"
+#: spyder/plugins/explorer.py:53
+msgid "File explorer"
+msgstr "Explorateur de fichiers"
 
-#: spyderlib/plugins/ipythonconsole.py:328 spyderlib/tour.py:552
-msgid "Run code"
-msgstr "Exécuter du code"
+#: spyder/plugins/externalconsole.py:46
+msgid "Interactive data plotting in the consoles"
+msgstr "Visualisation interactive de données"
 
-#: spyderlib/plugins/ipythonconsole.py:329
-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 ""
-"Plusieurs lignes de code peuvent être exécutées lors du démarrage de la "
-"console. Veuillez séparer deux lignes consécutives par une virgule - par "
-"exemple :<br><i>import os, import sys</i>"
+#: spyder/plugins/externalconsole.py:54 spyder/plugins/externalconsole.py:709
+#, fuzzy
+msgid "Python console"
+msgstr "Console IPython"
 
-#: spyderlib/plugins/ipythonconsole.py:335
-msgid "Lines:"
-msgstr "Lignes :"
+#: spyder/plugins/externalconsole.py:59
+msgid "One tab per script"
+msgstr "Un onglet par script"
 
-#: spyderlib/plugins/ipythonconsole.py:344
-msgid "Run a file"
-msgstr "Exécuter un fichier"
+#: spyder/plugins/externalconsole.py:60
+#: spyder/widgets/externalshell/baseshell.py:160
+msgid "Show elapsed time"
+msgstr "Afficher le temps écoulé"
 
-#: spyderlib/plugins/ipythonconsole.py:345
-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"
+#: spyder/plugins/externalconsole.py:61 spyder/widgets/explorer.py:1074
+msgid "Show icons and text"
+msgstr "Afficher icônes et textes"
 
-#: spyderlib/plugins/ipythonconsole.py:349
-msgid "Use the following file:"
-msgstr "Utiliser le fichier suivant :"
+#: spyder/plugins/externalconsole.py:73
+msgid "Buffer: "
+msgstr "Tampon : "
 
-#: spyderlib/plugins/ipythonconsole.py:363
-msgid "Greedy completion"
-msgstr "Complétion avancée"
+#: spyder/plugins/externalconsole.py:73 spyder/plugins/ipythonconsole.py:319
+msgid " lines"
+msgstr " lignes"
+
+#: spyder/plugins/externalconsole.py:78
+msgid "Merge process standard output/error channels"
+msgstr "Fusionner les canaux de sortie et d'erreur du processus"
 
-#: spyderlib/plugins/ipythonconsole.py:364
+#: spyder/plugins/externalconsole.py:80
 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>"
+"Merging the output channels of the process means that\n"
+"the standard error won't be written in red anymore,\n"
+"but this has the effect of speeding up display."
 msgstr ""
-"Active la complétion par <tt>Tab</tt> sur les éléments de liste, les "
-"résultats de fonctions, etc... <i>sans</i> les avoir assignés à une variable."
-"<br>Par exemple vous pourrez avoir la complétion pour des expressions du "
-"type <tt>li[0].<Tab></tt> ou <tt>ins.meth().<Tab></tt>."
-
-#: spyderlib/plugins/ipythonconsole.py:372
-msgid "Use the greedy completer"
-msgstr "Utiliser la complétion avancée"
+"Fusionner les canaux de sortie et d'erreur du processus\n"
+"signifie que les erreurs ne seront plus affichées en rouge,\n"
+"mais cela entraînera également une amélioration des performances\n"
+"d'affichage et une meilleure réactivité de la console."
 
-#: spyderlib/plugins/ipythonconsole.py:383
-msgid "Autocall"
-msgstr "Appel automatique"
+#: spyder/plugins/externalconsole.py:84
+msgid "Colorize standard error channel using ANSI escape codes"
+msgstr "Coloriser le canal d'erreur standard (codes d'échappement ANSI)"
 
-#: spyderlib/plugins/ipythonconsole.py:384
+#: spyder/plugins/externalconsole.py:86
 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."
+"This method is the only way to have colorized standard\n"
+"error channel when the output channels have been merged."
 msgstr ""
-"L'appel automatique dans IPython va automatiquement appeler les objets "
-"appelables même sans parenthèses explicites.<br>Par exemple <tt>str 43</tt> "
-"deviendra automatiquement <tt>str(43)</tt>."
+"Cette méthode est le seul moyen de coloriser le canal\n"
+"d'erreur standard lorsque les canaux de sorties ont été fusionnés."
 
-#: spyderlib/plugins/ipythonconsole.py:391
-msgid "Smart"
-msgstr "Intelligent"
+#: spyder/plugins/externalconsole.py:102 spyder/plugins/ipythonconsole.py:306
+#: spyder/widgets/variableexplorer/arrayeditor.py:540
+#: spyder/widgets/variableexplorer/dataframeeditor.py:552
+msgid "Background color"
+msgstr "Couleur de fond"
 
-#: spyderlib/plugins/ipythonconsole.py:392
-msgid "Full"
-msgstr "Toujours"
+#: spyder/plugins/externalconsole.py:103
+msgid ""
+"This option will be applied the next time a Python console or a terminal is "
+"opened."
+msgstr ""
+"Cette option sera prise en compte lors de la prochaine ouverture de console "
+"(interpréteur Python ou terminal)."
 
-#: spyderlib/plugins/ipythonconsole.py:393
-msgid "Off"
-msgstr "Désactivé"
+#: spyder/plugins/externalconsole.py:106
+msgid "Light background (white color)"
+msgstr "Fond blanc"
 
-#: spyderlib/plugins/ipythonconsole.py:395
-msgid "Autocall:  "
-msgstr "Appel automatique :"
+#: spyder/plugins/externalconsole.py:131
+msgid "PYTHONSTARTUP replacement"
+msgstr "Substitution de PYTHONSTARTUP"
 
-#: spyderlib/plugins/ipythonconsole.py:396
+#: spyder/plugins/externalconsole.py:133
 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)."
+"This option will override the PYTHONSTARTUP environment variable which\n"
+"defines the script to be executed during the Python console startup."
 msgstr ""
-"En mode <b>%s</b>, l'appel automatique n'est pas activé si il n'y a pas "
-"d'arguments. En mode <b>%s</b>, tous les objets appelables sont "
-"automatiquement appelés (même s'il n'y a pas d'arguments)"
+"Cette option permet de remplacer le script de démarrage des consoles Python "
+"défini par la\n"
+"variable d'environnement PYTHONSTARTUP."
 
-#: spyderlib/plugins/ipythonconsole.py:408
-msgid "Symbolic Mathematics"
-msgstr "Calcul formel"
+#: spyder/plugins/externalconsole.py:138
+msgid "Default PYTHONSTARTUP script"
+msgstr "Script PYTHONSTARTUP par défaut"
 
-#: spyderlib/plugins/ipythonconsole.py:409
-msgid ""
-"Perfom symbolic operations in the console (e.g. integrals, derivatives, "
-"vector calculus, etc) and get the outputs in a beautifully printed style."
-msgstr ""
-"Utilise le calcul formel pour réaliser des opérations dans la console (par "
-"exemple intégrales, dérivées, calcul vectoriel, etc...) et affiche les "
-"résultats de manière élégante."
+#: spyder/plugins/externalconsole.py:142
+msgid "Use the following startup script:"
+msgstr "Utiliser le script de démarrage suivant :"
 
-#: spyderlib/plugins/ipythonconsole.py:414
-msgid "Use symbolic math"
-msgstr "Utiliser le calcul formel"
+#: spyder/plugins/externalconsole.py:159
+msgid "Monitor"
+msgstr "Moniteur"
 
-#: spyderlib/plugins/ipythonconsole.py:415
+#: spyder/plugins/externalconsole.py:160
 msgid ""
-"This option loads the Sympy library to work with.<br>Please refer to its "
-"documentation to learn how to use it."
+"The monitor provides introspection features to console: code completion, "
+"calltips and variable explorer. Because it relies on several modules, "
+"disabling the monitor may be useful to accelerate console startup."
 msgstr ""
-"Activer cette option permet de travailler avec la bibliothèque Sympy."
-"<br>Merci de consulter la documentation pour savoir comment l'utiliser."
+"Le moniteur fournit à la console des fonctionnalités d'introspection telles "
+"que la complétion de code, les info-bulles et l'explorateur de variables. "
+"Parce qu'il nécessite l'import de nombreux modules, désactiver le moniteur "
+"permet d'accélérer le démarrage de la console."
 
-#: spyderlib/plugins/ipythonconsole.py:428
-msgid ""
-"This feature requires the Sympy library.\n"
-"It seems you don't have it installed."
-msgstr ""
-"Cette fonctionnalité nécessite l'installation du module Sympy.\n"
-"Ce dernier n'est apparemment pas installé."
+#: spyder/plugins/externalconsole.py:167
+msgid "Enable monitor"
+msgstr "Activer le moniteur"
 
-#: spyderlib/plugins/ipythonconsole.py:433
-msgid "Prompts"
-msgstr "Invites de commande"
+#: spyder/plugins/externalconsole.py:180
+msgid "Default library"
+msgstr "Bibliothèque par défaut"
 
-#: spyderlib/plugins/ipythonconsole.py:434
-msgid "Modify how Input and Output prompts are shown in the console."
-msgstr ""
-"Change l'affichage des invites de commande d'entrée et de sortie de la "
-"console."
+#: spyder/plugins/externalconsole.py:185
+#, fuzzy
+msgid "Qt-Python Bindings"
+msgstr "Sélection de la bibliothèque d'interfaçage Qt :"
 
-#: spyderlib/plugins/ipythonconsole.py:437
-msgid "Input prompt:"
-msgstr "En entrée :"
+#: spyder/plugins/externalconsole.py:187
+msgid "Library:"
+msgstr ""
 
-#: spyderlib/plugins/ipythonconsole.py:439
+#: spyder/plugins/externalconsole.py:189
 msgid ""
-"Default is<br>In [<span class=\"in-prompt-number\">%i</span>]:"
+"This option will act on<br> libraries such as Matplotlib, guidata or ETS"
 msgstr ""
-"Par défaut :<br>In [<span class=\"in-prompt-number\">%i</span>]:"
+"Cette option est prise en charge par les bibliothèques telles que "
+"Matplotlib, guidata ou ETS"
 
-#: spyderlib/plugins/ipythonconsole.py:443
-msgid "Output prompt:"
-msgstr "En sortie :"
+#: spyder/plugins/externalconsole.py:198 spyder/plugins/ipythonconsole.py:560
+msgid "Graphics"
+msgstr "Graphiques"
 
-#: spyderlib/plugins/ipythonconsole.py:445
+#: spyder/plugins/externalconsole.py:199
 msgid ""
-"Default is<br>Out[<span class=\"out-prompt-number\">%i</span>]:"
+"Decide which backend to use to display graphics. If unsure, please select "
+"the <b>Automatic</b> backend.<br><br><b>Note:</b> We support a very limited "
+"number of backends in our Python consoles. If you prefer to work with a "
+"different one, please use an IPython console."
 msgstr ""
-"Par défaut :<br>Out[<span class=\"out-prompt-number\">%i</span>]:"
 
-#: spyderlib/plugins/ipythonconsole.py:467
-#: spyderlib/plugins/workingdirectory.py:44
-msgid "Startup"
-msgstr "Démarrage"
+#: spyder/plugins/externalconsole.py:208
+msgid "None"
+msgstr ""
 
-#: spyderlib/plugins/ipythonconsole.py:469
-msgid "Advanced Settings"
-msgstr "Options avancées"
+#: spyder/plugins/externalconsole.py:208 spyder/plugins/ipythonconsole.py:351
+msgid "Automatic"
+msgstr "Automatique"
 
-#: spyderlib/plugins/ipythonconsole.py:481
-#: spyderlib/plugins/ipythonconsole.py:749
-msgid "Connect to an existing kernel"
-msgstr "Connecter à un noyau existant"
+#: spyder/plugins/externalconsole.py:213 spyder/plugins/ipythonconsole.py:373
+msgid "Backend:"
+msgstr "Sortie :"
+
+#: spyder/plugins/externalconsole.py:215 spyder/plugins/ipythonconsole.py:375
+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."
+
+#: spyder/plugins/externalconsole.py:226
+msgid "Enthought Tool Suite"
+msgstr "Enthought Tool Suite"
 
-#: spyderlib/plugins/ipythonconsole.py:483
+#: spyder/plugins/externalconsole.py:227
 msgid ""
-"Please enter the connection info of the kernel you want to connect to. For "
-"that you can either select its JSON connection file using the <tt>Browse</"
-"tt> button, or write directly its id, in case it's a local kernel (for "
-"example <tt>kernel-3764.json</tt> or just <tt>3764</tt>)."
+"Enthought Tool Suite (ETS) supports PyQt4 (qt4) and wxPython (wx) graphical "
+"user interfaces."
 msgstr ""
-"Entrez les informations de connexion du noyau auquel vous voulez vous "
-"connecter. Pour cela vous pouvez soit sélectionner son fichier de connexion "
-"JSON en utilisant le bouton <tt>Parcourir</tt>, ou écrivez directement son "
-"identifiant si c'est un noyau local (Exemple : <tt>kernel-3764.json</tt> ou "
-"juste <tt>3764</tt>)."
+"Le logiciel Enthought Tool Suite (ETS) prend en charge les interfaces "
+"graphiques PyQt4 (qt4) et wxPython (wx)."
 
-#: spyderlib/plugins/ipythonconsole.py:494
-msgid "Connection info:"
-msgstr "Information de connexion :"
+#: spyder/plugins/externalconsole.py:231
+msgid "ETS_TOOLKIT:"
+msgstr "ETS_TOOLKIT:"
 
-#: spyderlib/plugins/ipythonconsole.py:496
-msgid "Path to connection file or kernel id"
-msgstr "Chemin vers un fichier de connexion ou identifiant de noyau"
+#: spyder/plugins/externalconsole.py:255
+msgid "External modules"
+msgstr "Modules externes"
 
-#: spyderlib/plugins/ipythonconsole.py:498
-#: spyderlib/plugins/ipythonconsole.py:515
-msgid "Browse"
-msgstr "Parcourir"
+#: spyder/plugins/externalconsole.py:447
+msgid ""
+"No Python console is currently selected to run <b>%s</b>.<br><br>Please "
+"select or open a new Python console and try again."
+msgstr ""
+"Aucune console Python n'est actuellement sélectionnée pour exécuter <b>%s</"
+"b>.<br><br>Merci de sélectionner ou d'ouvrir une nouvelle console Python et "
+"de réessayer."
 
-#: spyderlib/plugins/ipythonconsole.py:507
-msgid "This is a remote kernel"
-msgstr "Noyau distant"
+#: spyder/plugins/externalconsole.py:518
+msgid ""
+"%s is already running in a separate process.\n"
+"Do you want to kill the process before starting a new one?"
+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/ipythonconsole.py:511
-msgid "username at hostname:port"
-msgstr "utilisateur at hôte:port"
+#: spyder/plugins/externalconsole.py:647
+msgid "Command Window"
+msgstr "Invite de commandes"
 
-#: spyderlib/plugins/ipythonconsole.py:514
-msgid "Path to ssh key file"
-msgstr "Chemin vers la clé ssh"
+#: spyder/plugins/externalconsole.py:649 spyder/plugins/ipythonconsole.py:297
+msgid "Terminal"
+msgstr "Terminal"
 
-#: spyderlib/plugins/ipythonconsole.py:523
-msgid "Password or ssh key passphrase"
-msgstr "Mot de passe ou passphrase de clé ssh"
+#: spyder/plugins/externalconsole.py:731
+msgid "Open a &Python console"
+msgstr "Ouvrir une console &Python"
 
-#: spyderlib/plugins/ipythonconsole.py:527
-msgid "Host name"
-msgstr "Nom d'hôte"
+#: spyder/plugins/externalconsole.py:735
+msgid "Open &command prompt"
+msgstr "Ouvrir un invite de &commandes"
 
-#: spyderlib/plugins/ipythonconsole.py:528
-msgid "Ssh key"
-msgstr "Clé ssh"
+#: spyder/plugins/externalconsole.py:736
+msgid "Open a Windows command prompt"
+msgstr "Ouvrir un invite de commandes Windows"
 
-#: spyderlib/plugins/ipythonconsole.py:529
-msgid "Password"
-msgstr "Mot de passe"
+#: spyder/plugins/externalconsole.py:738
+msgid "Open a &terminal"
+msgstr "Ouvrir un &terminal"
 
-#: spyderlib/plugins/ipythonconsole.py:558
-msgid "Open IPython connection file"
-msgstr "Ouvrir un fichier de connexion IPython"
+#: spyder/plugins/externalconsole.py:739
+msgid "Open a terminal window"
+msgstr "Ouvrir un terminal de commandes dans Spyder"
 
-#: spyderlib/plugins/ipythonconsole.py:564
-msgid "Select ssh key"
-msgstr "Sélectionner une clé ssh"
+#: spyder/plugins/findinfiles.py:127 spyder/widgets/findinfiles.py:689
+msgid "Find in files"
+msgstr "Recherche dans des fichiers"
 
-#: spyderlib/plugins/ipythonconsole.py:737
-msgid "Open an &IPython console"
-msgstr "Ouvrir une console &IPython"
+#: spyder/plugins/findinfiles.py:148
+msgid "&Find in files"
+msgstr "Rechercher dans des &fichiers"
 
-#: spyderlib/plugins/ipythonconsole.py:740
-msgid "Use %s+T when the console is selected to open a new one"
-msgstr ""
-"Quand la console est sélectionnée, utiliser %s+T pour ouvrir une nouvelle "
-"console"
+#: spyder/plugins/findinfiles.py:151
+msgid "Search text in multiple files"
+msgstr "Rechercher une chaîne de caractères dans plusieurs fichiers à la fois"
 
-#: spyderlib/plugins/ipythonconsole.py:743
-#, fuzzy
-msgid "Open a new console"
-msgstr "Ouvrir une nouvelle console"
+#: spyder/plugins/help.py:44
+msgid "Show help for objects in the Editor and Consoles in a dedicated pane"
+msgstr ""
 
-#: spyderlib/plugins/ipythonconsole.py:750
-msgid "Open a new IPython console connected to an existing kernel"
-msgstr "Ouvrir une nouvelle console IPython connecté à un noyau existant"
+#: spyder/plugins/help.py:110
+msgid "Automatic connections"
+msgstr "Connexions automatiques"
 
-#: spyderlib/plugins/ipythonconsole.py:833
+#: spyder/plugins/help.py:111
+#, fuzzy
 msgid ""
-"No IPython console is currently available to run <b>%s</b>.<br><br>Please "
-"open a new one and try again."
+"This pane can automatically show an object's help information after a left "
+"parenthesis is written next to it. Below you can decide to which plugin you "
+"want to connect it to turn on this feature."
 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."
+"L'inspecteur d'objet peut automatiquement afficher l'aide sur un objet dès "
+"l'ouverture d'une parenthèse."
 
-#: spyderlib/plugins/ipythonconsole.py:968
+#: spyder/plugins/help.py:123
 msgid ""
-"Do you want to close all other consoles connected to the same kernel as this "
-"one?"
+"This feature requires the Rope or Jedi libraries.\n"
+"It seems you don't have either installed."
 msgstr ""
-"Voulez-vous fermer les toutes les autres consoles connectées au même noyau "
-"que celle-ci ?"
+"Cette fonctionnalité nécessite Rope ou Jedi.\n"
+"Il semble qu'aucun de ces modules ne soit présent."
 
-#: spyderlib/plugins/ipythonconsole.py:1050
-msgid "Connection error"
-msgstr "Erreur de connexion"
+#: spyder/plugins/help.py:126
+msgid "Python Console"
+msgstr "Console Python"
 
-#: spyderlib/plugins/ipythonconsole.py:1051
-msgid ""
-"Could not open ssh tunnel. The error was:\n"
-"\n"
-msgstr ""
-"Impossible d'ouvrir un tunnel ssh. L'erreur rencontrée est:\n"
-"\n"
+#: spyder/plugins/help.py:128
+msgid "IPython Console"
+msgstr "Console IPython"
 
-#: spyderlib/plugins/ipythonconsole.py:1088
-msgid "IPython"
-msgstr "IPython"
+#: spyder/plugins/help.py:140
+msgid "Additional features"
+msgstr "Options supplémentaires"
 
-#: spyderlib/plugins/ipythonconsole.py:1089
-msgid "Unable to connect to IPython <b>%s"
-msgstr "Impossible de se connecter au noyau IPython <b>`%s`"
+#: spyder/plugins/help.py:141
+msgid "Render mathematical equations"
+msgstr "Styliser les équations mathématiques"
 
-#: spyderlib/plugins/ipythonconsole.py:1140
-msgid "Are you sure you want to restart the kernel?"
-msgstr "Souhaitez-vous vraiment redémarrer le noyau ?"
+#: spyder/plugins/help.py:147
+msgid "This feature requires Sphinx 1.1 or superior."
+msgstr "Cette fonctionnalité nécessite l'installation de Sphinx 1.1+."
 
-#: spyderlib/plugins/ipythonconsole.py:1142
-msgid "Restart kernel?"
-msgstr "Redémarrer le noyau"
+#: spyder/plugins/help.py:148
+msgid "Sphinx %s is currently installed."
+msgstr "Sphinx %s n'est pas installé."
 
-#: spyderlib/plugins/layoutdialog.py:174
-#, fuzzy
-msgid "Move Up"
-msgstr "Monter"
+#: spyder/plugins/help.py:309
+msgid "No further documentation available"
+msgstr "Aucune documentation disponible"
 
-#: spyderlib/plugins/layoutdialog.py:175
+#: spyder/plugins/help.py:347
 #, fuzzy
-msgid "Move Down"
-msgstr "Descendre"
+msgid "No documentation available"
+msgstr "Aucune documentation disponible"
 
-#: spyderlib/plugins/layoutdialog.py:176
-#, fuzzy
-msgid "Delete Layout"
-msgstr "Supprimer"
+#: spyder/plugins/help.py:378
+msgid "Source"
+msgstr "Source"
 
-#: spyderlib/plugins/layoutdialog.py:180
-msgid "Layout Dispay and Order"
-msgstr ""
+#: spyder/plugins/help.py:385 spyder/plugins/runconfig.py:186
+#: spyder/plugins/runconfig.py:456 spyder/widgets/externalshell/baseshell.py:94
+#: spyder/widgets/ipythonconsole/client.py:200
+msgid "Console"
+msgstr "Console"
 
-#: spyderlib/plugins/onlinehelp.py:68
-msgid "Online help"
-msgstr "Aide en ligne"
+#: spyder/plugins/help.py:393
+#: spyder/widgets/variableexplorer/collectionseditor.py:133
+msgid "Object"
+msgstr "Objet"
 
-#: spyderlib/plugins/outlineexplorer.py:48
-#: spyderlib/widgets/editortools.py:195
-msgid "Outline"
-msgstr "Structure"
+#: spyder/plugins/help.py:407
+msgid "Plain Text"
+msgstr "Texte brut"
 
-#: spyderlib/plugins/projectexplorer.py:53
-#: spyderlib/widgets/projectexplorer.py:1150
-#: spyderlib/widgets/projectexplorer.py:1164
-msgid "Project explorer"
-msgstr "Explorateur de projets"
+#: spyder/plugins/help.py:411
+msgid "Show Source"
+msgstr "Afficher les sources"
 
-#: spyderlib/plugins/projectexplorer.py:64
-#: spyderlib/widgets/projectexplorer.py:549
-msgid "New project..."
-msgstr "Nouveau projet..."
+#: spyder/plugins/help.py:415
+msgid "Rich Text"
+msgstr "Texte enrichi"
 
-#: spyderlib/plugins/runconfig.py:28
-msgid "Execute in current Python or IPython console"
-msgstr "Exécuter dans la console Python ou IPython active"
-
-#: spyderlib/plugins/runconfig.py:29
-msgid "Execute in a new dedicated Python console"
-msgstr "Exécuter dans une nouvelle console Python dédiée"
-
-#: spyderlib/plugins/runconfig.py:30
-msgid "Execute in an external System terminal"
-msgstr "Exécuter dans un terminal système externe"
-
-#: spyderlib/plugins/runconfig.py:40
-msgid "Always show %s on a first file run"
-msgstr "Toujours afficher %s lors de la première exécution d'un script"
-
-#: spyderlib/plugins/runconfig.py:159
-msgid "General settings"
-msgstr "Options générales"
-
-#: spyderlib/plugins/runconfig.py:162 spyderlib/plugins/runconfig.py:208
-msgid "Command line options:"
-msgstr "Options en ligne de commande :"
+#: spyder/plugins/help.py:425
+msgid "Automatic import"
+msgstr "Import automatique"
 
-#: spyderlib/plugins/runconfig.py:168
-msgid "Working directory:"
-msgstr "Répertoire de travail :"
+#: spyder/plugins/help.py:437 spyder/plugins/history.py:106
+#: spyder/widgets/editor.py:502 spyder/widgets/explorer.py:1085
+#: spyder/widgets/externalshell/baseshell.py:140
+#: spyder/widgets/ipythonconsole/client.py:249
+#: spyder/widgets/variableexplorer/namespacebrowser.py:162
+msgid "Options"
+msgstr "Options"
 
-#: spyderlib/plugins/runconfig.py:180 spyderlib/plugins/runconfig.py:491
-msgid "Enter debugging mode when errors appear during execution"
+#: spyder/plugins/help.py:695
+msgid ""
+"Here you can get help of any object by pressing %s in front of it, either on "
+"the Editor or the Console.%sHelp can also be shown automatically after "
+"writing a left parenthesis next to an object. You can activate this behavior "
+"in %s."
 msgstr ""
+"Pour obtenir de l'aide ici, sélectionner (ou placer le curseur sur) un objet "
+"dans l'éditeur ou la console, puis appuyer sur %s.%sL'aide apparaît "
+"automatiquement après la saisie d'une parenthèse gauche après un objet si "
+"l'option correspondante est activée dans %s."
 
-#: spyderlib/plugins/runconfig.py:196 spyderlib/plugins/runconfig.py:501
-msgid "Dedicated Python console"
-msgstr "Console Python dédiée"
-
-#: spyderlib/plugins/runconfig.py:200 spyderlib/plugins/runconfig.py:503
-msgid "Interact with the Python console after execution"
-msgstr "Interagir avec la console Python après l'exécution"
-
-#: spyderlib/plugins/runconfig.py:204
-msgid "Show warning when killing running process"
-msgstr "Afficher un avertissement à l'interruption d'un processus"
-
-#: spyderlib/plugins/runconfig.py:213
-msgid "<b>-u</b> is added to the other options you set here"
-msgstr "L'option <b>-u</b> est ajoutée aux autres options spécifiées ici"
+#: spyder/plugins/help.py:701
+#, fuzzy
+msgid "Preferences > Help"
+msgstr "Préférences"
 
-#: spyderlib/plugins/runconfig.py:223
-msgid "this dialog"
-msgstr "cette fenêtre"
+#: spyder/plugins/help.py:708
+msgid "Usage"
+msgstr "Utilisation"
 
-#: spyderlib/plugins/runconfig.py:282
-msgid "Run configuration"
-msgstr "Configuration d'exécution"
+#: spyder/plugins/help.py:709
+msgid "New to Spyder? Read our"
+msgstr "Vous découvrez Spyder ? Lisez notre"
 
-#: spyderlib/plugins/runconfig.py:283
-msgid "The following working directory is not valid:<br><b>%s</b>"
-msgstr "Le répertoire de travail suivant n'est pas valide :<br><b>%s</b>"
+#: spyder/plugins/help.py:710
+msgid "tutorial"
+msgstr "Tutoriel"
 
-#: spyderlib/plugins/runconfig.py:361
-msgid "Run settings for %s"
-msgstr "Options d'exécution pour %s"
+#: spyder/plugins/help.py:717
+msgid ""
+"Please consider installing Sphinx to get documentation rendered in rich text."
+msgstr ""
+"Merci d'installer Sphinx pour obtenir la documentation en texte enrichi."
 
-#: spyderlib/plugins/runconfig.py:393
-msgid "Select a run configuration:"
-msgstr "Sélectionner une configuration d'exécution :"
+#: spyder/plugins/help.py:886
+msgid "Lock"
+msgstr "Verrouiller"
 
-#: spyderlib/plugins/runconfig.py:422 spyderlib/plugins/runconfig.py:447
-msgid "Run Settings"
-msgstr "Options d'exécution"
+#: spyder/plugins/help.py:886
+msgid "Unlock"
+msgstr "Déverrouiller"
 
-#: spyderlib/plugins/runconfig.py:449
+#: spyder/plugins/help.py:930
 msgid ""
-"The following are the default <i>%s</i>. These options may be overriden "
-"using the <b>%s</b> dialog box (see the <b>%s</b> menu)"
+"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 ""
-"La page suivante présente les réglages par défaut pour les <i>%s</i>. Ces "
-"réglages peuvent être remplacés à tout moment en utilisant la boîte de "
-"dialogue <b>%s</b> (voir le menu <b>%s</b>)"
+"L'erreur suivante s'est produite lors de l'exécution de <b>Sphinx %s</b>. "
+"<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/runconfig.py:475
-msgid "Default working directory is:"
-msgstr "Le répertoire de travail par défaut est :"
+#: spyder/plugins/help.py:974
+msgid "No source code available."
+msgstr "Aucun code source disponible."
 
-#: spyderlib/plugins/runconfig.py:477
-msgid "the script directory"
-msgstr "le répertoire du fichier à exécuter"
+#: spyder/plugins/history.py:39
+msgid "Settings"
+msgstr "Options"
 
-#: spyderlib/plugins/runconfig.py:480 spyderlib/plugins/workingdirectory.py:56
-msgid "the following directory:"
-msgstr "le répertoire suivant :"
+#: spyder/plugins/history.py:41
+msgid " entries"
+msgstr " lignes"
 
-#: spyderlib/plugins/runconfig.py:506
-#, fuzzy
-msgid "Show warning when killing running processes"
-msgstr "Afficher un avertissement à l'interruption d'un processus"
+#: spyder/plugins/history.py:41
+msgid "History depth: "
+msgstr "Taille de l'historique : "
 
-#: spyderlib/plugins/runconfig.py:515
-msgid "Run Settings dialog"
-msgstr "la fenêtre Options d'exécution"
+#: spyder/plugins/history.py:48
+msgid "Scroll automatically to last entry"
+msgstr "Défiler automatiquement jusqu'à la dernière ligne"
 
-#: spyderlib/plugins/shortcuts.py:134
-msgid ""
-"Press the new shortcut and select 'Ok': \n"
-"(Press 'Tab' once to switch focus between the shortcut entry \n"
-"and the buttons below it)"
-msgstr ""
+#: spyder/plugins/history.py:126
+msgid "History log"
+msgstr "Historique"
 
-#: spyderlib/plugins/shortcuts.py:137
-#, fuzzy
-msgid "Current shortcut:"
-msgstr "Cellule actuelle :"
+#: spyder/plugins/history.py:153
+msgid "History..."
+msgstr "Historique..."
 
-#: spyderlib/plugins/shortcuts.py:139
-#, fuzzy
-msgid "New shortcut:"
-msgstr "Raccourcis clavier"
+#: spyder/plugins/history.py:155
+msgid "Set history maximum entries"
+msgstr "Modifier le nombre d'entrées maximum de l'historique"
 
-#: spyderlib/plugins/shortcuts.py:152
-msgid "Shortcut: {0}"
-msgstr ""
+#: spyder/plugins/history.py:260
+msgid "History"
+msgstr "Historique"
 
-#: spyderlib/plugins/shortcuts.py:273
-msgid "Please introduce a different shortcut"
-msgstr ""
+#: spyder/plugins/history.py:261
+msgid "Maximum entries"
+msgstr "Nombre maximum d'entrées"
 
-#: spyderlib/plugins/shortcuts.py:310
-msgid "The new shorcut conflicts with:"
-msgstr ""
+#: spyder/plugins/ipythonconsole.py:64
+msgid "Symbolic mathematics in the IPython Console"
+msgstr "Mathématiques symboliques pour la console IPython"
 
-#: spyderlib/plugins/shortcuts.py:321
+#: spyder/plugins/ipythonconsole.py:116
 msgid ""
-"A compound sequence can have {break} a maximum of 4 subsequences.{break}"
+"The authenticity of host <b>%s</b> can't be established. Are you sure you "
+"want to continue connecting?"
 msgstr ""
+"L'identité du serveur <b>%s</b> ne peut pas être confirmée. Êtes-vous sûr de "
+"vouloir poursuivre ?"
 
-#: spyderlib/plugins/shortcuts.py:326
-#, fuzzy
-msgid "Invalid key entered"
-msgstr "Chemin d'accès de fichier incorrect"
+#: spyder/plugins/ipythonconsole.py:128
+msgid "The authenticity of the host can't be established"
+msgstr "L'identité du serveur ne peut pas être confirmée"
 
-#: spyderlib/plugins/shortcuts.py:515
-msgid "Context"
-msgstr "Contexte"
+#: spyder/plugins/ipythonconsole.py:135
+msgid "Tunnel '%s' failed to start"
+msgstr "Impossible d'ouvrir le tunnel '%s'"
 
-#: spyderlib/plugins/shortcuts.py:517 spyderlib/widgets/dicteditor.py:158
-msgid "Name"
-msgstr "Nom"
+#: spyder/plugins/ipythonconsole.py:140
+msgid "Could not connect to remote host"
+msgstr "Impossible d'établir la connection au serveur distant"
 
-#: spyderlib/plugins/shortcuts.py:519
-msgid "Shortcut"
-msgstr ""
+#: spyder/plugins/ipythonconsole.py:157 spyder/plugins/ipythonconsole.py:747
+msgid "Connect to an existing kernel"
+msgstr "Connecter à un noyau existant"
 
-#: spyderlib/plugins/shortcuts.py:521
-msgid "Score"
+#: spyder/plugins/ipythonconsole.py:159
+msgid ""
+"Please enter the connection info of the kernel you want to connect to. For "
+"that you can either select its JSON connection file using the <tt>Browse</"
+"tt> button, or write directly its id, in case it's a local kernel (for "
+"example <tt>kernel-3764.json</tt> or just <tt>3764</tt>)."
 msgstr ""
+"Entrez les informations de connexion du noyau auquel vous voulez vous "
+"connecter. Pour cela vous pouvez soit sélectionner son fichier de connexion "
+"JSON en utilisant le bouton <tt>Parcourir</tt>, ou écrivez directement son "
+"identifiant si c'est un noyau local (Exemple : <tt>kernel-3764.json</tt> ou "
+"juste <tt>3764</tt>)."
 
-#: spyderlib/plugins/shortcuts.py:681
-msgid "Conflicts"
-msgstr "Conflits"
-
-#: spyderlib/plugins/shortcuts.py:682
-msgid "The following conflicts have been detected:"
-msgstr "Les conflits suivants ont été détectés :"
-
-#: spyderlib/plugins/shortcuts.py:767
-msgid "Keyboard shortcuts"
-msgstr "Raccourcis clavier"
+#: spyder/plugins/ipythonconsole.py:170
+msgid "Connection info:"
+msgstr "Information de connexion :"
 
-#: spyderlib/plugins/shortcuts.py:775
-#, fuzzy
-msgid "Search: "
-msgstr "Rechercher"
+#: spyder/plugins/ipythonconsole.py:172
+msgid "Path to connection file or kernel id"
+msgstr "Chemin vers un fichier de connexion ou identifiant de noyau"
 
-#: spyderlib/plugins/variableexplorer.py:24
-msgid "Autorefresh"
-msgstr "Rafraîchissement automatique"
+#: spyder/plugins/ipythonconsole.py:174 spyder/plugins/ipythonconsole.py:191
+msgid "Browse"
+msgstr "Parcourir"
 
-#: spyderlib/plugins/variableexplorer.py:25
-msgid "Enable autorefresh"
-msgstr "Activer le rafraîchissement automatique"
+#: spyder/plugins/ipythonconsole.py:183
+msgid "This is a remote kernel"
+msgstr "Noyau distant"
 
-#: spyderlib/plugins/variableexplorer.py:27
-msgid "Refresh interval: "
-msgstr "Période de rafraîchissement : "
+#: spyder/plugins/ipythonconsole.py:187
+msgid "username at hostname:port"
+msgstr "utilisateur at hôte:port"
 
-#: spyderlib/plugins/variableexplorer.py:28
-msgid " ms"
-msgstr " ms"
+#: spyder/plugins/ipythonconsole.py:190
+msgid "Path to ssh key file"
+msgstr "Chemin vers la clé ssh"
 
-#: spyderlib/plugins/variableexplorer.py:31
-msgid "Filter"
-msgstr "Filtre"
+#: spyder/plugins/ipythonconsole.py:199
+msgid "Password or ssh key passphrase"
+msgstr "Mot de passe ou passphrase de clé ssh"
 
-#: spyderlib/plugins/variableexplorer.py:33
-#: spyderlib/widgets/externalshell/namespacebrowser.py:214
-msgid "Exclude private references"
-msgstr "Exclure les références privées"
+#: spyder/plugins/ipythonconsole.py:203
+msgid "Host name"
+msgstr "Nom d'hôte"
 
-#: spyderlib/plugins/variableexplorer.py:34
-#: spyderlib/widgets/externalshell/namespacebrowser.py:229
-msgid "Exclude capitalized references"
-msgstr "Exclure les références commençant par une majuscule"
+#: spyder/plugins/ipythonconsole.py:204
+msgid "Ssh key"
+msgstr "Clé ssh"
 
-#: spyderlib/plugins/variableexplorer.py:35
-#: spyderlib/widgets/externalshell/namespacebrowser.py:222
-msgid "Exclude all-uppercase references"
-msgstr "Exclure les références en lettres capitales"
+#: spyder/plugins/ipythonconsole.py:205
+msgid "Password"
+msgstr "Mot de passe"
 
-#: spyderlib/plugins/variableexplorer.py:36
-#: spyderlib/widgets/externalshell/namespacebrowser.py:237
-msgid "Exclude unsupported data types"
-msgstr "Exclure les types non supportés"
+#: spyder/plugins/ipythonconsole.py:234
+#, fuzzy
+msgid "Open connection file"
+msgstr "Ouvrir un fichier de connexion IPython"
 
-#: spyderlib/plugins/variableexplorer.py:42
-#: spyderlib/widgets/dicteditor.py:708
-msgid "Truncate values"
-msgstr "Tronquer les valeurs"
+#: spyder/plugins/ipythonconsole.py:239
+msgid "Select ssh key"
+msgstr "Sélectionner une clé ssh"
 
-#: spyderlib/plugins/variableexplorer.py:44
-#: spyderlib/widgets/dicteditor.py:712
-msgid "Show arrays min/max"
-msgstr "Afficher les min/max des tableaux"
+#: spyder/plugins/ipythonconsole.py:267 spyder/plugins/ipythonconsole.py:686
+msgid "IPython console"
+msgstr "Console IPython"
 
-#: spyderlib/plugins/variableexplorer.py:46
-msgid "Edit data in the remote process"
-msgstr "Éditeurs dans le processus distant"
+#: spyder/plugins/ipythonconsole.py:274
+msgid "Display initial banner"
+msgstr "Afficher le message d'accueil"
 
-#: spyderlib/plugins/variableexplorer.py:47
+#: spyder/plugins/ipythonconsole.py:275
 msgid ""
-"Editors are opened in the remote process for NumPy arrays, PIL images, "
-"lists, tuples and dictionaries.\n"
-"This avoids transfering large amount of data between the remote process and "
-"Spyder (through the socket)."
+"This option lets you hide the message shown at\n"
+"the top of the console when it's opened."
 msgstr ""
-"Les tableaux NumPy, images PIL, listes, tuples et dictionnaires seront "
-"modifiés dans un éditeur exécuté dans le processus distant.\n"
-"Cela permet d'éviter de transférer de gros volumes de données entre le "
-"processus distant et Spyder (à travers le socket)."
+"Cette option permet de masquer la message d'accueil\n"
+"qui s'affiche à l'ouverture de la console."
 
-#: spyderlib/plugins/variableexplorer.py:183
-msgid "Variable explorer"
-msgstr "Explorateur de variables"
+#: spyder/plugins/ipythonconsole.py:277
+msgid "Use a pager to display additional text inside the console"
+msgstr "Utiliser un pager pour afficher l'aide"
 
-#: spyderlib/plugins/workingdirectory.py:37
+#: spyder/plugins/ipythonconsole.py:279
 msgid ""
-"The <b>global working directory</b> is the working directory for newly "
-"opened <i>consoles</i> (Python/IPython consoles and terminals), for the "
-"<i>file explorer</i>, for the <i>find in files</i> plugin and for new files "
-"created in the <i>editor</i>."
+"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 ""
-"Le <b>répertoire de travail global</b> est le répertoire de travail utilisé "
-"pour les nouvelles <i>consoles</i> (consoles Python/IPython et terminaux), "
-"pour l'<i>explorateur de fichiers</i>, pour la <i>recherche dans les "
-"fichiers</i> et pour les fichiers créés dans l'<i>éditeur</i>."
+"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/workingdirectory.py:46
-msgid "At startup, the global working directory is:"
-msgstr "Au démarrage, le répertoire de travail global est :"
-
-#: spyderlib/plugins/workingdirectory.py:50
-msgid "the same as in last session"
-msgstr "celui utilisé lors de la dernière session"
+#: spyder/plugins/ipythonconsole.py:284
+msgid "Ask for confirmation before closing"
+msgstr "Demander confirmation avant de fermer une console"
 
-#: spyderlib/plugins/workingdirectory.py:52
-msgid "At startup, Spyder will restore the global directory from last session"
+#: spyder/plugins/ipythonconsole.py:294
+msgid "Completion Type"
 msgstr ""
-"Au démarrage, Spyder reprendra le répertoire de travail global de la "
-"dernière session"
 
-#: spyderlib/plugins/workingdirectory.py:58
-msgid "At startup, the global working directory will be the specified path"
+#: spyder/plugins/ipythonconsole.py:295
+msgid "Decide what type of completion to use"
 msgstr ""
-"Au démarrage, le répertoire de travail global sera le chemin d'accès "
-"spécifié ici"
-
-#: spyderlib/plugins/workingdirectory.py:70
-msgid "Files are opened from:"
-msgstr "Les fichiers sont ouverts depuis :"
-
-#: spyderlib/plugins/workingdirectory.py:74
-#: spyderlib/plugins/workingdirectory.py:87
-msgid "the current file directory"
-msgstr "le répertoire du fichier en cours d'édition"
 
-#: spyderlib/plugins/workingdirectory.py:78
-#: spyderlib/plugins/workingdirectory.py:91
-msgid "the global working directory"
-msgstr "le répertoire de travail global"
-
-#: spyderlib/plugins/workingdirectory.py:83
-msgid "Files are created in:"
-msgstr "Les fichiers sont créés dans :"
+#: spyder/plugins/ipythonconsole.py:297
+#, fuzzy
+msgid "Graphical"
+msgstr "Graphiques"
 
-#: spyderlib/plugins/workingdirectory.py:97
-msgid "Change to file base directory"
-msgstr "Sélectionner le répertoire de base du fichier"
+#: spyder/plugins/ipythonconsole.py:297
+#, fuzzy
+msgid "Plain"
+msgstr "Texte brut"
 
-#: spyderlib/plugins/workingdirectory.py:99
-msgid "When opening a file"
-msgstr "Lors de l'ouverture d'un fichier"
+#: spyder/plugins/ipythonconsole.py:298
+#, fuzzy
+msgid "Completion:"
+msgstr "Condition :"
 
-#: spyderlib/plugins/workingdirectory.py:101
-msgid "When saving a file"
-msgstr "Lors de l'enregistrement d'un fichier"
+#: spyder/plugins/ipythonconsole.py:307
+msgid "Light background"
+msgstr "Fond blanc"
 
-#: spyderlib/plugins/workingdirectory.py:171
-msgid "Back"
-msgstr "Retour"
+#: spyder/plugins/ipythonconsole.py:309
+msgid "Dark background"
+msgstr "Fond noir"
 
-#: spyderlib/plugins/workingdirectory.py:179
-#: spyderlib/widgets/explorer.py:1021 spyderlib/widgets/importwizard.py:529
-msgid "Next"
-msgstr "Suivant"
+#: spyder/plugins/ipythonconsole.py:319
+msgid "Buffer:  "
+msgstr "Tampon :  "
 
-#: spyderlib/plugins/workingdirectory.py:190
+#: spyder/plugins/ipythonconsole.py:321
 msgid ""
-"This is the working directory for newly\n"
-"opened consoles (Python/IPython consoles and\n"
-"terminals), for the file explorer, for the\n"
-"find in files plugin and for new files\n"
-"created in the editor"
+"Set the maximum number of lines of text shown in the\n"
+"console before truncation. Specifying -1 disables it\n"
+"(not recommended!)"
 msgstr ""
-"Ceci est le répertoire de travail utilisé pour\n"
-"les nouvelles consoles (consoles Python/IPython\n"
-"et fenêtres de commandes), pour l'explorateur\n"
-"de fichiers, pour la recherche dans les fichiers\n"
-"et pour les fichiers créés dans l'éditeur"
-
-#: spyderlib/plugins/workingdirectory.py:216
-msgid "Browse a working directory"
-msgstr "Sélectionner un répertoire de travail"
-
-#: spyderlib/plugins/workingdirectory.py:222
-msgid "Set as current console's working directory"
-msgstr "Changer le répertoire de travail de la console actuelle"
+"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/workingdirectory.py:230
-msgid "Change to parent directory"
-msgstr "Aller au répertoire parent"
+#: spyder/plugins/ipythonconsole.py:330
+msgid "Support for graphics (Matplotlib)"
+msgstr "Prise en charge des graphes (Matplotlib)"
 
-#: spyderlib/plugins/workingdirectory.py:237
-msgid "Global working directory"
-msgstr "Répertoire de travail global"
+#: spyder/plugins/ipythonconsole.py:331
+msgid "Activate support"
+msgstr "Activer"
 
-#: spyderlib/restart_app.py:129
-#, fuzzy
-msgid ""
-"It was not possible to close the previous Spyder instance.\n"
-"Restart aborted."
-msgstr "Impossible d'exécuter ce fichier dans un terminal externe"
+#: spyder/plugins/ipythonconsole.py:332
+msgid "Automatically load Pylab and NumPy modules"
+msgstr "Importer automatiquement Pylab et NumPy"
 
-#: spyderlib/restart_app.py:131
+#: spyder/plugins/ipythonconsole.py:335
 msgid ""
-"Spyder could not reset to factory defaults.\n"
-"Restart aborted."
+"This lets you load graphics support without importing \n"
+"the commands to do plots. Useful to work with other\n"
+"plotting libraries different to Matplotlib or to develop \n"
+"GUIs with Spyder."
 msgstr ""
+"Import automatique de toutes les fonctions de représentation graphique et de "
+"calcul numérique"
 
-#: spyderlib/restart_app.py:133
-msgid ""
-"It was not possible to restart Spyder.\n"
-"Operation aborted."
-msgstr ""
+#: spyder/plugins/ipythonconsole.py:350
+msgid "Inline"
+msgstr "En ligne"
 
-#: spyderlib/restart_app.py:135
-#, fuzzy
-msgid "Spyder exit error"
-msgstr "Éditeur de Spyder"
+#: spyder/plugins/ipythonconsole.py:352
+msgid "Graphics backend"
+msgstr "Sortie graphique"
 
-#: spyderlib/restart_app.py:136
-#, fuzzy
-msgid "Spyder reset error"
-msgstr "Éditeur de Spyder"
+#: spyder/plugins/ipythonconsole.py:353
+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 ""
+"Cette option permet de régler la manière dont les graphes seront affichés "
+"dans la console. Par exemple, le mode <b>%s</b> permet l'affichage en ligne "
+"des graphes tandis que le mode <b>%s</b> permet d'interagir avec (zoom/pan) "
+"dans une fenêtre séparée."
 
-#: spyderlib/restart_app.py:137
-#, fuzzy
-msgid "Spyder restart error"
-msgstr "Démarrage de Spyder"
+#: spyder/plugins/ipythonconsole.py:386
+msgid "Inline backend"
+msgstr "Backend intégré"
 
-#: spyderlib/restart_app.py:161
-#, fuzzy
-msgid "Closing Spyder"
-msgstr "Ouvrir en dehors de Spyder"
+#: spyder/plugins/ipythonconsole.py:387
+msgid "Decide how to render the figures created by this backend"
+msgstr "Option relative au rendu des figures dans ce backend"
 
-#: spyderlib/restart_app.py:234
-#, fuzzy
-msgid "Resetting Spyder to defaults"
-msgstr "Rétablir les valeurs par défaut"
+#: spyder/plugins/ipythonconsole.py:391
+msgid "Format:"
+msgstr "Format :"
 
-#: spyderlib/restart_app.py:266
-#, fuzzy
-msgid "Restarting"
-msgstr "Restaurer"
+#: spyder/plugins/ipythonconsole.py:394
+msgid "Resolution:"
+msgstr "Résolution :"
 
-#: spyderlib/spyder.py:124
-msgid "Initializing..."
-msgstr "Initialisation..."
+#: spyder/plugins/ipythonconsole.py:394
+msgid "dpi"
+msgstr "ppp"
 
-#: spyderlib/spyder.py:247
-msgid "Numpy and Scipy documentation"
-msgstr "Documentation de Numpy et Scipy"
+#: spyder/plugins/ipythonconsole.py:396
+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/spyder.py:249 spyderlib/spyder.py:1084
-msgid "Matplotlib documentation"
-msgstr "Documentation de Matplotlib"
+#: spyder/plugins/ipythonconsole.py:399
+msgid "Width:"
+msgstr "Largeur :"
 
-#: spyderlib/spyder.py:252
-msgid "PyQt4 Reference Guide"
-msgstr "Guide de référence de PyQt4"
+#: spyder/plugins/ipythonconsole.py:399 spyder/plugins/ipythonconsole.py:403
+msgid "inches"
+msgstr "pouces"
 
-#: spyderlib/spyder.py:255
-msgid "PyQt4 API Reference"
-msgstr "Documentation de l'API de PyQt4"
+#: spyder/plugins/ipythonconsole.py:401
+msgid "Default is 6"
+msgstr "Par défaut : 6"
 
-#: spyderlib/spyder.py:257
-msgid "Python(x,y)"
-msgstr "Python(x,y)"
+#: spyder/plugins/ipythonconsole.py:403
+msgid "Height:"
+msgstr "Hauteur :"
 
-#: spyderlib/spyder.py:259
-msgid "WinPython"
-msgstr "WinPython"
+#: spyder/plugins/ipythonconsole.py:405
+msgid "Default is 4"
+msgstr "Par défaut : 4"
 
-#: spyderlib/spyder.py:305
-msgid "Reload last session"
-msgstr "Recharger la session précédente"
+#: spyder/plugins/ipythonconsole.py:432
+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 ""
+"Plusieurs lignes de code peuvent être exécutées lors du démarrage de la "
+"console. Veuillez séparer deux lignes consécutives par une virgule - par "
+"exemple :<br><i>import os, import sys</i>"
 
-#: spyderlib/spyder.py:309
-msgid "Load session..."
-msgstr "Charger une session..."
+#: spyder/plugins/ipythonconsole.py:438
+msgid "Lines:"
+msgstr "Lignes :"
 
-#: spyderlib/spyder.py:312
-msgid "Load Spyder session"
-msgstr "Charger une session Spyder"
+#: spyder/plugins/ipythonconsole.py:447
+msgid "Run a file"
+msgstr "Exécuter un fichier"
 
-#: spyderlib/spyder.py:314
-msgid "Save session and quit..."
-msgstr "Enregistrer la session et quitter..."
+#: spyder/plugins/ipythonconsole.py:448
+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/spyder.py:317
-msgid "Save current session and quit application"
-msgstr "Enregistrer la session en cours et quitter l'application"
+#: spyder/plugins/ipythonconsole.py:452
+msgid "Use the following file:"
+msgstr "Utiliser le fichier suivant :"
 
-#: spyderlib/spyder.py:530
-msgid "Close current pane"
-msgstr "Fermer le volet courant"
+#: spyder/plugins/ipythonconsole.py:466
+msgid "Greedy completion"
+msgstr "Complétion avancée"
 
-#: spyderlib/spyder.py:535
-msgid "Lock panes"
+#: spyder/plugins/ipythonconsole.py:467
+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 ""
+"Active la complétion par <tt>Tab</tt> sur les éléments de liste, les "
+"résultats de fonctions, etc... <i>sans</i> les avoir assignés à une variable."
+"<br>Par exemple vous pourrez avoir la complétion pour des expressions du "
+"type <tt>li[0].<Tab></tt> ou <tt>ins.meth().<Tab></tt>."
 
-#: spyderlib/spyder.py:542
-#, fuzzy
-msgid "Use next layout"
-msgstr "Réinitialiser la disposition des fenêtres"
+#: spyder/plugins/ipythonconsole.py:475
+msgid "Use the greedy completer"
+msgstr "Utiliser la complétion avancée"
 
-#: spyderlib/spyder.py:546
-#, fuzzy
-msgid "Use previous layout"
-msgstr "Réinitialiser la disposition des fenêtres"
+#: spyder/plugins/ipythonconsole.py:486
+msgid "Autocall"
+msgstr "Appel automatique"
 
-#: spyderlib/spyder.py:555
-msgid "&Find text"
-msgstr "Rec&hercher"
+#: spyder/plugins/ipythonconsole.py:487
+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 ""
+"L'appel automatique dans IPython va automatiquement appeler les objets "
+"appelables même sans parenthèses explicites.<br>Par exemple <tt>str 43</tt> "
+"deviendra automatiquement <tt>str(43)</tt>."
 
-#: spyderlib/spyder.py:560
-msgid "Find &next"
-msgstr "Rechercher le &suivant"
+#: spyder/plugins/ipythonconsole.py:494
+msgid "Smart"
+msgstr "Intelligent"
 
-#: spyderlib/spyder.py:567
-msgid "Find &previous"
-msgstr "Rechercher le &précédent"
+#: spyder/plugins/ipythonconsole.py:495
+msgid "Full"
+msgstr "Toujours"
 
-#: spyderlib/spyder.py:573
-msgid "&Replace text"
-msgstr "&Remplacer"
+#: spyder/plugins/ipythonconsole.py:496
+msgid "Off"
+msgstr "Désactivé"
 
-#: spyderlib/spyder.py:580 spyderlib/widgets/editor.py:339
-#, fuzzy
-msgid "File switcher..."
-msgstr "Fichier..."
+#: spyder/plugins/ipythonconsole.py:498
+msgid "Autocall:  "
+msgstr "Appel automatique :"
 
-#: spyderlib/spyder.py:582
-msgid "Fast switch between files"
+#: spyder/plugins/ipythonconsole.py:499
+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 ""
+"En mode <b>%s</b>, l'appel automatique n'est pas activé si il n'y a pas "
+"d'arguments. En mode <b>%s</b>, tous les objets appelables sont "
+"automatiquement appelés (même s'il n'y a pas d'arguments)"
 
-#: spyderlib/spyder.py:600 spyderlib/widgets/sourcecode/codeeditor.py:2425
-msgid "Undo"
-msgstr "Annuler"
+#: spyder/plugins/ipythonconsole.py:511
+msgid "Symbolic Mathematics"
+msgstr "Calcul formel"
 
-#: spyderlib/spyder.py:602 spyderlib/widgets/sourcecode/codeeditor.py:2428
-msgid "Redo"
-msgstr "Répéter"
+#: spyder/plugins/ipythonconsole.py:512
+#, fuzzy
+msgid ""
+"Perfom symbolic operations in the console (e.g. integrals, derivatives, "
+"vector calculus, etc) and get the outputs in a beautifully printed style (it "
+"requires the Sympy module)."
+msgstr ""
+"Utilise le calcul formel pour réaliser des opérations dans la console (par "
+"exemple intégrales, dérivées, calcul vectoriel, etc...) et affiche les "
+"résultats de manière élégante."
 
-#: spyderlib/spyder.py:604 spyderlib/widgets/arrayeditor.py:392
-#: spyderlib/widgets/dataframeeditor.py:418
-#: spyderlib/widgets/dicteditor.py:680 spyderlib/widgets/shell.py:126
-#: spyderlib/widgets/sourcecode/codeeditor.py:2434
-msgid "Copy"
-msgstr "Copier"
+#: spyder/plugins/ipythonconsole.py:517
+msgid "Use symbolic math"
+msgstr "Utiliser le calcul formel"
 
-#: spyderlib/spyder.py:606 spyderlib/widgets/shell.py:122
-#: spyderlib/widgets/sourcecode/codeeditor.py:2431
-msgid "Cut"
-msgstr "Couper"
-
-#: spyderlib/spyder.py:608 spyderlib/widgets/dicteditor.py:677
-#: spyderlib/widgets/shell.py:130
-#: spyderlib/widgets/sourcecode/codeeditor.py:2437
-msgid "Paste"
-msgstr "Coller"
-
-#: spyderlib/spyder.py:610 spyderlib/widgets/explorer.py:470
-#: spyderlib/widgets/projectexplorer.py:1015 spyderlib/widgets/shell.py:139
-#: spyderlib/widgets/sourcecode/codeeditor.py:2440
-msgid "Delete"
-msgstr "Supprimer"
-
-#: spyderlib/spyder.py:614 spyderlib/widgets/shell.py:143
-#: spyderlib/widgets/sourcecode/codeeditor.py:2444
-msgid "Select All"
-msgstr "Sélectionner tout"
+#: spyder/plugins/ipythonconsole.py:518
+msgid ""
+"This option loads the Sympy library to work with.<br>Please refer to its "
+"documentation to learn how to use it."
+msgstr ""
+"Activer cette option permet de travailler avec la bibliothèque Sympy."
+"<br>Merci de consulter la documentation pour savoir comment l'utiliser."
 
-#: spyderlib/spyder.py:664
-msgid "C&onsoles"
-msgstr "C&onsoles"
+#: spyder/plugins/ipythonconsole.py:528
+msgid "Prompts"
+msgstr "Invites de commande"
 
-#: spyderlib/spyder.py:670
-msgid "&View"
-msgstr "&Affichage"
+#: spyder/plugins/ipythonconsole.py:529
+msgid "Modify how Input and Output prompts are shown in the console."
+msgstr ""
+"Change l'affichage des invites de commande d'entrée et de sortie de la "
+"console."
 
-#: spyderlib/spyder.py:673
-msgid "&Help"
-msgstr "A&ide"
+#: spyder/plugins/ipythonconsole.py:532
+msgid "Input prompt:"
+msgstr "En entrée :"
 
-#: spyderlib/spyder.py:678
-msgid "Welcome to Spyder!"
-msgstr "Bienvenue dans Spyder !"
+#: spyder/plugins/ipythonconsole.py:534
+msgid ""
+"Default is<br>In [<span class=\"in-prompt-number\">%i</span>]:"
+msgstr ""
+"Par défaut :<br>In [<span class=\"in-prompt-number\">%i</span>]:"
 
-#: spyderlib/spyder.py:683
-msgid "Pre&ferences"
-msgstr "Pré&férences"
+#: spyder/plugins/ipythonconsole.py:538
+msgid "Output prompt:"
+msgstr "En sortie :"
 
-#: spyderlib/spyder.py:690 spyderlib/widgets/pathmanager.py:48
-#: spyderlib/widgets/projectexplorer.py:598
-msgid "PYTHONPATH manager"
-msgstr "Gestionnaire de PYTHONPATH"
+#: spyder/plugins/ipythonconsole.py:540
+msgid ""
+"Default is<br>Out[<span class=\"out-prompt-number\">%i</span>]:"
+msgstr ""
+"Par défaut :<br>Out[<span class=\"out-prompt-number\">%i</span>]:"
 
-#: spyderlib/spyder.py:693
-msgid "Python Path Manager"
-msgstr "Gestionnaire de chemins d'accès Python"
+#: spyder/plugins/ipythonconsole.py:562 spyder/plugins/workingdirectory.py:45
+msgid "Startup"
+msgstr "Démarrage"
 
-#: spyderlib/spyder.py:696
-msgid "Update module names list"
-msgstr "Mise à jour de la liste des modules"
+#: spyder/plugins/ipythonconsole.py:734
+msgid "Open an &IPython console"
+msgstr "Ouvrir une console &IPython"
 
-#: spyderlib/spyder.py:699
-msgid "Refresh list of module names available in PYTHONPATH"
+#: spyder/plugins/ipythonconsole.py:737
+msgid "Use %s+T when the console is selected to open a new one"
 msgstr ""
-"Mise à jour de la liste des modules disponibles notamment à travers "
-"PYTHONPATH"
+"Quand la console est sélectionnée, utiliser %s+T pour ouvrir une nouvelle "
+"console"
 
-#: spyderlib/spyder.py:702
+#: spyder/plugins/ipythonconsole.py:740
 #, fuzzy
-msgid "Reset Spyder to factory defaults"
-msgstr "Rétablir les valeurs par défaut"
+msgid "Open a new console"
+msgstr "Ouvrir une nouvelle console"
 
-#: spyderlib/spyder.py:707
-msgid "Current user environment variables..."
-msgstr "Variables d'environnement de l'utilisateur..."
+#: spyder/plugins/ipythonconsole.py:748
+msgid "Open a new IPython console connected to an existing kernel"
+msgstr "Ouvrir une nouvelle console IPython connecté à un noyau existant"
 
-#: spyderlib/spyder.py:709
+#: spyder/plugins/ipythonconsole.py:836
 msgid ""
-"Show and edit current user environment variables in Windows registry (i.e. "
-"for all sessions)"
+"No IPython console is currently available to run <b>%s</b>.<br><br>Please "
+"open a new one and try again."
 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:718 spyderlib/spyder.py:1178
-msgid "External Tools"
-msgstr "Outils externes"
-
-#: spyderlib/spyder.py:722
-msgid "Python(x,y) launcher"
-msgstr "Accueil de Python(x,y)"
-
-#: spyderlib/spyder.py:729
-msgid "WinPython control panel"
-msgstr "Panneau de contrôle WinPython"
-
-#: spyderlib/spyder.py:738
-msgid "Qt Designer"
-msgstr "Qt Designer"
-
-#: spyderlib/spyder.py:743
-msgid "Qt Linguist"
-msgstr "Qt Linguist"
-
-#: spyderlib/spyder.py:749
-msgid "Qt examples"
-msgstr "Exemples Qt"
+"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/spyder.py:770
-msgid "guidata examples"
-msgstr "Exemples guidata"
+#: spyder/plugins/ipythonconsole.py:873
+msgid ""
+"Your Python environment or installation doesn't have the <tt>ipykernel</tt> "
+"module installed on it. Without this module is not possible for Spyder to "
+"create a console for you.<br><br>You can install <tt>ipykernel</tt> by "
+"running in a terminal:<br><br><tt>pip install ipykernel</"
+"tt><br><br>or<br><br><tt>conda install ipykernel</tt>"
+msgstr ""
 
-#: spyderlib/spyder.py:781
-msgid "guiqwt examples"
-msgstr "Exemples guiqwt"
+#: spyder/plugins/ipythonconsole.py:1098
+#, fuzzy
+msgid "Do you want to close this console?"
+msgstr "Souhaitez-vous vraiment redémarrer le noyau ?"
 
-#: spyderlib/spyder.py:786
-msgid "Sift"
-msgstr "Sift"
+#: spyder/plugins/ipythonconsole.py:1104
+msgid ""
+"Do you want to close all other consoles connected to the same kernel as this "
+"one?"
+msgstr ""
+"Voulez-vous fermer les toutes les autres consoles connectées au même noyau "
+"que celle-ci ?"
 
-#: spyderlib/spyder.py:796
-msgid "ViTables"
-msgstr "ViTables"
+#: spyder/plugins/ipythonconsole.py:1364
+msgid "IPython"
+msgstr "IPython"
 
-#: spyderlib/spyder.py:810
-msgid "Fullscreen mode"
-msgstr "Mode plein écran"
+#: spyder/plugins/ipythonconsole.py:1365
+#, fuzzy
+msgid "Unable to connect to <b>%s</b>"
+msgstr "Impossible de se connecter au noyau IPython <b>`%s`"
 
-#: spyderlib/spyder.py:822
-msgid "Main toolbar"
-msgstr "Barre d'outil principale"
+#: spyder/plugins/ipythonconsole.py:1422
+msgid "Connection error"
+msgstr "Erreur de connexion"
 
-#: spyderlib/spyder.py:831
+#: spyder/plugins/ipythonconsole.py:1423
 msgid ""
-"Spyder Internal Console\n"
-"\n"
-"This console is used to report application\n"
-"internal errors and to inspect Spyder\n"
-"internals with the following commands:\n"
-"  spy.app, spy.window, dir(spy)\n"
-"\n"
-"Please don't use it to run your code\n"
+"Could not open ssh tunnel. The error was:\n"
 "\n"
 msgstr ""
-"Console interne de Spyder\n"
-"\n"
-"Il s'agit d'une console de débogage\n"
-"utilisée par Spyder pour signaler des erreurs\n"
-"internes ou pour inspecter les entrailles de\n"
-"l'application avec les commandes ci-dessous :\n"
-"  spy.app, spy.window, dir(spy)\n"
-"\n"
-"Ne l'utilisez pas pour exécuter votre propre code.\n"
+"Impossible d'ouvrir un tunnel ssh. L'erreur rencontrée est:\n"
 "\n"
 
-#: spyderlib/spyder.py:848
-msgid "Loading object inspector..."
-msgstr "Chargement de l'inspecteur d'objet..."
-
-#: spyderlib/spyder.py:855
-msgid "Loading outline explorer..."
-msgstr "Chargement de l'explorateur de structure..."
-
-#: spyderlib/spyder.py:863
-msgid "Loading editor..."
-msgstr "Chargement de l'éditeur..."
+#: spyder/plugins/layoutdialog.py:177
+#, fuzzy
+msgid "Move Up"
+msgstr "Monter"
 
-#: spyderlib/spyder.py:874
+#: spyder/plugins/layoutdialog.py:178
 #, fuzzy
-msgid "&Restart"
-msgstr "Restaurer"
+msgid "Move Down"
+msgstr "Descendre"
 
-#: spyderlib/spyder.py:876
+#: spyder/plugins/layoutdialog.py:179
 #, fuzzy
-msgid "Restart"
-msgstr "Restaurer"
+msgid "Delete Layout"
+msgstr "Supprimer"
 
-#: spyderlib/spyder.py:895
-msgid "Loading file explorer..."
-msgstr "Chargement de l'explorateur de fichiers..."
+#: spyder/plugins/layoutdialog.py:183
+msgid "Layout Display and Order"
+msgstr ""
 
-#: spyderlib/spyder.py:902
-msgid "Loading history plugin..."
-msgstr "Chargement du journal d'historique..."
+#: spyder/plugins/maininterpreter.py:31 spyder/plugins/maininterpreter.py:66
+#, fuzzy
+msgid "Python interpreter"
+msgstr "Ouvrir un interpréteur IPython"
 
-#: spyderlib/spyder.py:913
-msgid "Loading online help..."
-msgstr "Chargement de l'aide en ligne..."
+#: spyder/plugins/maininterpreter.py:68
+#, fuzzy
+msgid "Select the Python interpreter for all Spyder consoles"
+msgstr "Sélectionner l'interpréteur Python utilisé pour exécuter des scripts:"
 
-#: spyderlib/spyder.py:919
-msgid "Loading project explorer..."
-msgstr "Chargement de l'explorateur de projet..."
+#: spyder/plugins/maininterpreter.py:71
+msgid "Default (i.e. the same as Spyder's)"
+msgstr ""
+"Par défaut (interpréteur identique à celui dans lequel Spyder est exécuté)"
 
-#: spyderlib/spyder.py:930
-msgid "Loading external console..."
-msgstr "Chargement de la console externe..."
+#: spyder/plugins/maininterpreter.py:74
+msgid "Use the following Python interpreter:"
+msgstr "Utiliser l'interpréteur Python suivant :"
 
-#: spyderlib/spyder.py:939
-msgid "Loading namespace browser..."
-msgstr "Chargement de l'explorateur d'espace de noms..."
+#: spyder/plugins/maininterpreter.py:77
+msgid "Executables"
+msgstr "Exécutables"
 
-#: spyderlib/spyder.py:946
-msgid "Loading IPython console..."
-msgstr "Chargement de la console IPython..."
+#: spyder/plugins/maininterpreter.py:94
+msgid "User Module Reloader (UMR)"
+msgstr "User Module Reloader (UMR)"
 
-#: spyderlib/spyder.py:956
-msgid "Setting up main window..."
-msgstr "Configuration de la fenêtre principale..."
+#: spyder/plugins/maininterpreter.py:95
+#, fuzzy
+msgid ""
+"UMR forces Python to reload modules which were imported when executing a "
+"file in a Python or IPython console with the <i>runfile</i> function."
+msgstr ""
+"L'UMR force Python à recharger les modules importés lors de l'exécution "
+"d'un\n"
+"script dans la console interne avec la fonction 'runfile'."
 
-#: spyderlib/spyder.py:959
-msgid "Optional dependencies..."
-msgstr "Dépendances optionnelles..."
+#: spyder/plugins/maininterpreter.py:100
+msgid "Enable UMR"
+msgstr "Activer l'UMR"
 
-#: spyderlib/spyder.py:963
-msgid "Report issue..."
-msgstr "Rapport d'erreur..."
+#: spyder/plugins/maininterpreter.py:101
+#, fuzzy
+msgid ""
+"This option will enable the User Module Reloader (UMR) in Python/IPython "
+"consoles. UMR forces Python to reload deeply modules during import when "
+"running a Python script using the Spyder's builtin function <b>runfile</b>."
+"<br><br><b>1.</b> UMR may require to restart the console in which it will be "
+"called (otherwise only newly imported modules will be reloaded when "
+"executing files).<br><br><b>2.</b> If errors occur when re-running a PyQt-"
+"based program, please check that the Qt objects are properly destroyed (e.g. "
+"you may have to use the attribute <b>Qt.WA_DeleteOnClose</b> on your main "
+"window, using the <b>setAttribute</b> method)"
+msgstr ""
+"Cette option active le User Module Deleter (UMR) dans les consoles Python. "
+"L'UMR force Python à recharger complètement les modules lors de leur "
+"importation, dans le cadre de l'exécution d'un script Python avec la "
+"fonction Spyder <b>runfile</b>.<br><br><b>1.</b> UMR peut nécessiter le "
+"redémarrage de la console Python dans lequel il va être utilisé (dans le cas "
+"contraire, seuls les modules importés après activation de l'UMR seront "
+"rechargés complètement lors de l'exécution de scripts).<br><br><b>2.</b> Si "
+"des erreurs survenaient lors de la réexécution de programmes utilisant PyQt, "
+"veuillez vérifier que les objets Qt sont correctement détruits à la sortie "
+"du programme (par exemple, il sera probablement nécessaire d'utiliser "
+"l'attribut <b>Qt.WA_DeleteOnClose</b> sur votre objet fenêtre principale "
+"grâce à la méthode <b>setAttribute</b>)"
 
-#: spyderlib/spyder.py:967
-msgid "Spyder support..."
-msgstr "Support technique de Spyder..."
+#: spyder/plugins/maininterpreter.py:117
+msgid "Show reloaded modules list"
+msgstr "Afficher les modules rechargés"
 
-#: spyderlib/spyder.py:970
-msgid "Check for updates..."
+#: spyder/plugins/maininterpreter.py:118
+msgid "Please note that these changes will be applied only to new consoles"
 msgstr ""
+"Veuillez noter que ces changements ne seront pris en compte que dans les "
+"nouvelles consoles Python"
 
-#: spyderlib/spyder.py:993
-msgid "Spyder documentation"
-msgstr "Documentation de Spyder"
+#: spyder/plugins/maininterpreter.py:122
+msgid "Set UMR excluded (not reloaded) modules"
+msgstr "Définir la liste des modules non rechargés par l'UMR"
 
-#: spyderlib/spyder.py:997
-msgid "Spyder tutorial"
-msgstr "Tutoriel de Spyder"
+#: spyder/plugins/maininterpreter.py:168
+msgid ""
+"You selected a <b>Python %d</b> interpreter for the console but Spyder is "
+"running on <b>Python %d</b>!.<br><br>Although this is possible, we recommend "
+"you to install and run Spyder directly with your selected interpreter, to "
+"avoid seeing false warnings and errors due to the incompatible syntax "
+"between these two Python versions."
+msgstr ""
+"Vous avez sélectionné un interpréteur <b>Python %d</b> pour la console. Or "
+"cette version de Spyder est exécutée par <b>Python %d</b>!.<br><br> Même si "
+"c'est techniquement possible, il est recommandé d'installer et d'exécuter "
+"Spyder directement dans la version de l'interpréteur sélectionnée, afin "
+"d'éviter l'apparition d'avertissements ou d'erreurs liées à une syntaxe "
+"incompatible entre ces deux versions de Python"
 
-#: spyderlib/spyder.py:1002
-#, fuzzy
-msgid "Interactive tours"
-msgstr "Barre d'outil d'interaction"
+#: spyder/plugins/maininterpreter.py:178 spyder/plugins/maininterpreter.py:191
+#: spyder/plugins/maininterpreter.py:195
+msgid "UMR"
+msgstr "UMR"
 
-#: spyderlib/spyder.py:1031
-msgid "Python documentation"
-msgstr "Documentation de Python"
+#: spyder/plugins/maininterpreter.py:179
+msgid "Set the list of excluded modules as this: <i>numpy, scipy</i>"
+msgstr ""
 
-#: spyderlib/spyder.py:1037 spyderlib/spyder.py:1076
-msgid "IPython documentation"
-msgstr "Documentation de IPython"
-
-#: spyderlib/spyder.py:1038
-msgid "Intro to IPython"
-msgstr "Introduction à IPython"
+#: spyder/plugins/maininterpreter.py:192
+msgid ""
+"The following modules are not installed on your machine:\n"
+"%s"
+msgstr ""
+"Les modules suivants ne sont pas installés sur votre ordinateur :\n"
+"%s"
 
-#: spyderlib/spyder.py:1040
-msgid "Quick reference"
-msgstr "Référence rapide"
+#: spyder/plugins/maininterpreter.py:196
+msgid ""
+"Please note that these changes will be applied only to new Python/IPython "
+"consoles"
+msgstr ""
+"Veuillez noter que ces changements ne seront pris en compte que dans les "
+"nouvelles consoles Python/IPython"
 
-#: spyderlib/spyder.py:1042
-msgid "Console help"
-msgstr "Aide sur la console"
+#: spyder/plugins/onlinehelp.py:70
+msgid "Online help"
+msgstr "Aide en ligne"
 
-#: spyderlib/spyder.py:1074
-msgid "Python(x,y) documentation folder"
-msgstr "Dossier de documentation Python(x,y)"
+#: spyder/plugins/outlineexplorer.py:49 spyder/widgets/editortools.py:195
+msgid "Outline"
+msgstr "Structure"
 
-#: spyderlib/spyder.py:1078
-msgid "guidata documentation"
-msgstr "Documentation de guidata"
+#: spyder/plugins/projects.py:76 spyder/widgets/projects/explorer.py:111
+#: spyder/widgets/projects/explorer.py:125
+msgid "Project explorer"
+msgstr "Explorateur de projets"
 
-#: spyderlib/spyder.py:1081
-msgid "guiqwt documentation"
-msgstr "Documentation de guiqwt"
+#: spyder/plugins/projects.py:88
+#, fuzzy
+msgid "New Project..."
+msgstr "Nouveau projet..."
 
-#: spyderlib/spyder.py:1087
-msgid "NumPy documentation"
-msgstr "Documentation de NumPy"
+#: spyder/plugins/projects.py:91
+#, fuzzy
+msgid "Open Project..."
+msgstr "Ouvrir le projet"
 
-#: spyderlib/spyder.py:1089
-msgid "NumPy reference guide"
-msgstr "Manuel de référence de NumPy"
+#: spyder/plugins/projects.py:94
+#, fuzzy
+msgid "Close Project"
+msgstr "Fermer le projet"
 
-#: spyderlib/spyder.py:1091
-msgid "NumPy user guide"
-msgstr "Manuel de l'utilisateur de NumPy"
+#: spyder/plugins/projects.py:100
+#, fuzzy
+msgid "Project Preferences"
+msgstr "Préférences"
 
-#: spyderlib/spyder.py:1093
-msgid "SciPy documentation"
-msgstr "Documentation de SciPy"
+#: spyder/plugins/projects.py:102
+#, fuzzy
+msgid "Recent Projects"
+msgstr "Projets associés"
 
-#: spyderlib/spyder.py:1100
-msgid "Installed Python modules"
-msgstr "Modules Python installés"
+#: spyder/plugins/projects.py:234
+msgid "Open project"
+msgstr "Ouvrir le projet"
 
-#: spyderlib/spyder.py:1104
-msgid "Online documentation"
-msgstr "Documentation en ligne"
+#: spyder/plugins/projects.py:239
+#, fuzzy
+msgid "<b>%s</b> is not a Spyder project!"
+msgstr "Le répertoire <b>%s</b> n'est pas un espace de travail Spyder."
 
-#: spyderlib/spyder.py:1116
-msgid "Qt documentation"
-msgstr "Documentation de Qt"
+#: spyder/plugins/runconfig.py:29
+msgid "Execute in current Python or IPython console"
+msgstr "Exécuter dans la console Python ou IPython active"
 
-#: spyderlib/spyder.py:1122
-msgid "About %s..."
-msgstr "À propos de %s..."
+#: spyder/plugins/runconfig.py:30
+msgid "Execute in a new dedicated Python console"
+msgstr "Exécuter dans une nouvelle console Python dédiée"
 
-#: spyderlib/spyder.py:1146
-msgid "Panes"
-msgstr "Volets"
+#: spyder/plugins/runconfig.py:31
+msgid "Execute in an external System terminal"
+msgstr "Exécuter dans un terminal système externe"
 
-#: spyderlib/spyder.py:1147
-msgid "Toolbars"
-msgstr "Barres d'outils"
+#: spyder/plugins/runconfig.py:41
+msgid "Always show %s on a first file run"
+msgstr "Toujours afficher %s lors de la première exécution d'un script"
 
-#: spyderlib/spyder.py:1148
-#, fuzzy
-msgid "Window layouts"
-msgstr "Dispositions de fenêtres personnalisées"
+#: spyder/plugins/runconfig.py:160 spyder/plugins/runconfig.py:474
+msgid "General settings"
+msgstr "Options générales"
 
-#: spyderlib/spyder.py:1157 spyderlib/spyder.py:1910 spyderlib/spyder.py:1911
-#, fuzzy
-msgid "Show toolbars"
-msgstr "Afficher la barre d'outils"
+#: spyder/plugins/runconfig.py:163 spyder/plugins/runconfig.py:209
+msgid "Command line options:"
+msgstr "Options en ligne de commande :"
 
-#: spyderlib/spyder.py:1171
-msgid "Attached console window (debugging)"
-msgstr "Invite de commandes attaché (débogage)"
+#: spyder/plugins/runconfig.py:169
+msgid "Working directory:"
+msgstr "Répertoire de travail :"
 
-#: spyderlib/spyder.py:1756
-msgid "Spyder Default Layout"
+#: spyder/plugins/runconfig.py:181 spyder/plugins/runconfig.py:492
+msgid "Enter debugging mode when errors appear during execution"
 msgstr ""
 
-#: spyderlib/spyder.py:1774 spyderlib/spyder.py:1785
-#, fuzzy
-msgid "Save current layout"
-msgstr "Enregistrer le fichier en cours d'édition"
-
-#: spyderlib/spyder.py:1778 spyderlib/spyder.py:1787
-#, fuzzy
-msgid "Layout preferences"
-msgstr "Préférences"
+#: spyder/plugins/runconfig.py:197 spyder/plugins/runconfig.py:502
+msgid "Dedicated Python console"
+msgstr "Console Python dédiée"
 
-#: spyderlib/spyder.py:1782
-#, fuzzy
-msgid "Reset to spyder default"
-msgstr "Rétablir les valeurs par défaut"
+#: spyder/plugins/runconfig.py:201 spyder/plugins/runconfig.py:504
+msgid "Interact with the Python console after execution"
+msgstr "Interagir avec la console Python après l'exécution"
 
-#: spyderlib/spyder.py:1804
-msgid ""
-"Window layout will be reset to default settings: this affects window "
-"position, size and dockwidgets.\n"
-"Do you want to continue?"
-msgstr ""
-"La disposition des fenêtres sera réinitialisée selon les réglages par "
-"défaut.\n"
-"Souhaitez-vous continuer ?"
+#: spyder/plugins/runconfig.py:205
+msgid "Show warning when killing running process"
+msgstr "Afficher un avertissement à l'interruption d'un processus"
 
-#: spyderlib/spyder.py:1826
-msgid ""
-"Layout <b>%s</b> will be                                                "
-"overwritten. Do you want to                                                "
-"continue?"
-msgstr ""
+#: spyder/plugins/runconfig.py:214
+msgid "<b>-u</b> is added to the other options you set here"
+msgstr "L'option <b>-u</b> est ajoutée aux autres options spécifiées ici"
 
-#: spyderlib/spyder.py:1889
-#, fuzzy
-msgid "Quick switch layout #%s has not yet been defined."
-msgstr ""
-"La disposition de fenêtre personnalisée n°%d n'a pas encore été définie."
+#: spyder/plugins/runconfig.py:224
+msgid "this dialog"
+msgstr "cette fenêtre"
 
-#: spyderlib/spyder.py:1907 spyderlib/spyder.py:1908
-#, fuzzy
-msgid "Hide toolbars"
-msgstr "Barre d'outil fichiers"
+#: spyder/plugins/runconfig.py:283
+msgid "Run configuration"
+msgstr "Configuration d'exécution"
 
-#: spyderlib/spyder.py:2229 spyderlib/spyder.py:2230
-msgid "Maximize current pane"
-msgstr "Agrandir le volet courant"
+#: spyder/plugins/runconfig.py:284
+msgid "The following working directory is not valid:<br><b>%s</b>"
+msgstr "Le répertoire de travail suivant n'est pas valide :<br><b>%s</b>"
 
-#: spyderlib/spyder.py:2233
-msgid "Restore current pane"
-msgstr "Restaurer le volet courant"
+#: spyder/plugins/runconfig.py:362
+msgid "Run settings for %s"
+msgstr "Options d'exécution pour %s"
 
-#: spyderlib/spyder.py:2234
-msgid "Restore pane to its original size"
-msgstr "Restaurer le volet à sa taille d'origine"
+#: spyder/plugins/runconfig.py:394
+msgid "Select a run configuration:"
+msgstr "Sélectionner une configuration d'exécution :"
 
-#: spyderlib/spyder.py:2318
-msgid "About %s"
-msgstr "À propos de %s"
+#: spyder/plugins/runconfig.py:423 spyder/plugins/runconfig.py:448
+msgid "Run Settings"
+msgstr "Options d'exécution"
 
-#: spyderlib/spyder.py:2502
-msgid "Running an external system terminal is not supported on platform %s."
+#: spyder/plugins/runconfig.py:450
+msgid ""
+"The following are the default <i>%s</i>. These options may be overriden "
+"using the <b>%s</b> dialog box (see the <b>%s</b> menu)"
 msgstr ""
-"L'exécution dans un terminal système externe n'est pas prise en charge sur "
-"la plateforme %s."
+"La page suivante présente les réglages par défaut pour les <i>%s</i>. Ces "
+"réglages peuvent être remplacés à tout moment en utilisant la boîte de "
+"dialogue <b>%s</b> (voir le menu <b>%s</b>)"
 
-#: spyderlib/spyder.py:2721
-msgid "Open session"
-msgstr "Ouvrir une session"
+#: spyder/plugins/runconfig.py:476
+msgid "Default working directory is:"
+msgstr "Le répertoire de travail par défaut est :"
 
-#: spyderlib/spyder.py:2722 spyderlib/spyder.py:2734
-msgid "Spyder sessions"
-msgstr "Sessions Spyder"
+#: spyder/plugins/runconfig.py:478
+msgid "the script directory"
+msgstr "le répertoire du fichier à exécuter"
 
-#: spyderlib/spyder.py:2733
-msgid "Save session"
-msgstr "Enregistrer la session"
+#: spyder/plugins/runconfig.py:481 spyder/plugins/workingdirectory.py:57
+msgid "the following directory:"
+msgstr "le répertoire suivant :"
 
-#: spyderlib/spyder.py:2775
+#: spyder/plugins/runconfig.py:507
 #, fuzzy
-msgid ""
-"Spyder will restart and reset to default settings: <br><br>Do you want to "
-"continue?"
-msgstr ""
-"Le répertoire suivant n'est pas vide :<br><b>%s</b><br><br>Souhaitez-vous "
-"néanmoins continuer ?"
+msgid "Show warning when killing running processes"
+msgstr "Afficher un avertissement à l'interruption d'un processus"
 
-#: spyderlib/spyder.py:2871 spyderlib/widgets/helperwidgets.py:144
-#, fuzzy
-msgid "Spyder updates"
-msgstr "Fichiers Spyder"
+#: spyder/plugins/runconfig.py:516
+msgid "Run Settings dialog"
+msgstr "la fenêtre Options d'exécution"
 
-#: spyderlib/spyder.py:2890
+#: spyder/plugins/shortcuts.py:137
 msgid ""
-"<b>Spyder %s is available!</b> <br><br>Please use your package manager to "
-"update Spyder or go to our <a href=\"%s\">Releases</a> page to download this "
-"new version. <br><br>If you are not sure how to proceed to update Spyder "
-"please refer to our  <a href=\"%s\">Installation</a> instructions."
+"Press the new shortcut and select 'Ok': \n"
+"(Press 'Tab' once to switch focus between the shortcut entry \n"
+"and the buttons below it)"
 msgstr ""
 
-#: spyderlib/spyder.py:2902
+#: spyder/plugins/shortcuts.py:140
 #, fuzzy
-msgid "Spyder is up to date."
-msgstr "Support technique de Spyder..."
+msgid "Current shortcut:"
+msgstr "Cellule actuelle :"
 
-#: spyderlib/tour.py:121
+#: spyder/plugins/shortcuts.py:142
 #, fuzzy
-msgid "Welcome to the Introduction tour"
-msgstr "Bienvenue dans Spyder !"
+msgid "New shortcut:"
+msgstr "Raccourcis clavier"
 
-#: spyderlib/tour.py:122
-msgid ""
-"<b>Spyder</b> is a powerful Interactive Development Environment (or IDE) for "
-"the Python programming language.<br><br>Here we are going to guide you "
-"through its most important features.<br><br>Please use the arrow keys or "
-"click on the buttons below to move along the tour."
+#: spyder/plugins/shortcuts.py:155
+msgid "Shortcut: {0}"
 msgstr ""
 
-#: spyderlib/tour.py:131
-#, fuzzy
-msgid "The Editor"
-msgstr "Éditeur de texte"
-
-#: spyderlib/tour.py:132
-msgid ""
-"This is the pane where you write Python code before evaluating it. You can "
-"get automatic suggestions and completions while writing, by pressing the "
-"<b>Tab</b> key next to a given text.<br><br>The Editor comes with a line "
-"number area (highlighted here in red), where Spyder shows warnings and "
-"syntax errors. They can help you to detect potential problems before running "
-"the code.<br><br>You can also set debug breakpoints in the line number area, "
-"by doing a double click next to a non-empty line."
+#: spyder/plugins/shortcuts.py:276
+msgid "Please introduce a different shortcut"
 msgstr ""
 
-#: spyderlib/tour.py:147
-#, fuzzy
-msgid "The IPython console"
-msgstr "Console IPython"
-
-#: spyderlib/tour.py:164
-#, fuzzy
-msgid "The Variable Explorer"
-msgstr "Explorateur de variables"
+#: spyder/plugins/shortcuts.py:313
+msgid "The new shorcut conflicts with:"
+msgstr ""
 
-#: spyderlib/tour.py:165
+#: spyder/plugins/shortcuts.py:324
 msgid ""
-"In this pane you can view and edit the variables generated during the "
-"execution of a program, or those entered directly in one of Spyder consoles."
-"<br><br>As you can see, the Variable Explorer is showing the variables "
-"generated during the last step of this tour. By doing a double-click on any "
-"of them, a new window will be opened, where you can inspect and modify their "
-"contents."
+"A compound sequence can have {break} a maximum of 4 subsequences.{break}"
 msgstr ""
 
-#: spyderlib/tour.py:177
+#: spyder/plugins/shortcuts.py:329
 #, fuzzy
-msgid "The Python console"
-msgstr "Console IPython"
+msgid "Invalid key entered"
+msgstr "Chemin d'accès de fichier incorrect"
 
-#: spyderlib/tour.py:178
-msgid ""
-"You can also run your code on a Python console. These consoles are useful "
-"because they let you run a file in a console dedicated only to it.To select "
-"this behavior, please press the <b>F6</b> key.<br><br>By pressing the button "
-"below and then focusing the Variable Explorer, you will notice that Python "
-"consoles are also connected to that pane, and that the Variable Explorer "
-"only shows the variables of the currently focused console."
-msgstr ""
+#: spyder/plugins/shortcuts.py:531
+msgid "Context"
+msgstr "Contexte"
 
-#: spyderlib/tour.py:192
-#, fuzzy
-msgid "The Object Inspector"
-msgstr "Inspecteur d'objets"
+#: spyder/plugins/shortcuts.py:533
+#: spyder/widgets/variableexplorer/collectionseditor.py:118
+msgid "Name"
+msgstr "Nom"
 
-#: spyderlib/tour.py:193
-msgid ""
-"This pane displays documentation of the functions, classes, methods or "
-"modules you are currently using in the Editor or the Consoles.<br><br>To use "
-"it, you need to press <b>Ctrl+I</b> in front of an object. If that object "
-"has some documentation associated with it, it will be displayed here."
+#: spyder/plugins/shortcuts.py:535
+msgid "Shortcut"
 msgstr ""
 
-#: spyderlib/tour.py:203
-#, fuzzy
-msgid "The File Explorer"
-msgstr "Explorateur de fichiers"
+#: spyder/plugins/shortcuts.py:537
+msgid "Score"
+msgstr ""
 
-#: spyderlib/tour.py:204
-msgid ""
-"This pane lets you navigate through the directories and files present in "
-"your computer.<br><br>You can also open any of these files with its "
-"corresponding application, by doing a double click on it.<br><br>There is "
-"one exception to this rule: plain-text files will always be opened in the "
-"Spyder Editor."
+#: spyder/plugins/shortcuts.py:697
+msgid "Conflicts"
+msgstr "Conflits"
+
+#: spyder/plugins/shortcuts.py:698
+msgid "The following conflicts have been detected:"
+msgstr "Les conflits suivants ont été détectés :"
+
+#: spyder/plugins/shortcuts.py:783
+msgid "Keyboard shortcuts"
+msgstr "Raccourcis clavier"
+
+#: spyder/plugins/shortcuts.py:791
+#, fuzzy
+msgid "Search: "
+msgstr "Rechercher"
+
+#: spyder/plugins/shortcuts.py:792
+msgid "Reset to default values"
+msgstr "Rétablir les valeurs par défaut"
+
+#: spyder/plugins/variableexplorer.py:26
+msgid "Autorefresh"
+msgstr "Rafraîchissement automatique"
+
+#: spyder/plugins/variableexplorer.py:27
+msgid "Enable autorefresh"
+msgstr "Activer le rafraîchissement automatique"
+
+#: spyder/plugins/variableexplorer.py:29
+msgid "Refresh interval: "
+msgstr "Période de rafraîchissement : "
+
+#: spyder/plugins/variableexplorer.py:33
+msgid "Filter"
+msgstr "Filtre"
+
+#: spyder/plugins/variableexplorer.py:35
+#: spyder/widgets/variableexplorer/namespacebrowser.py:229
+msgid "Exclude private references"
+msgstr "Exclure les références privées"
+
+#: spyder/plugins/variableexplorer.py:36
+#: spyder/widgets/variableexplorer/namespacebrowser.py:244
+msgid "Exclude capitalized references"
+msgstr "Exclure les références commençant par une majuscule"
+
+#: spyder/plugins/variableexplorer.py:37
+#: spyder/widgets/variableexplorer/namespacebrowser.py:237
+msgid "Exclude all-uppercase references"
+msgstr "Exclure les références en lettres capitales"
+
+#: spyder/plugins/variableexplorer.py:38
+#: spyder/widgets/variableexplorer/namespacebrowser.py:252
+msgid "Exclude unsupported data types"
+msgstr "Exclure les types non supportés"
+
+#: spyder/plugins/variableexplorer.py:44
+#: spyder/widgets/variableexplorer/collectionseditor.py:675
+msgid "Truncate values"
+msgstr "Tronquer les valeurs"
+
+#: spyder/plugins/variableexplorer.py:46
+#: spyder/widgets/variableexplorer/collectionseditor.py:679
+msgid "Show arrays min/max"
+msgstr "Afficher les min/max des tableaux"
+
+#: spyder/plugins/variableexplorer.py:48
+msgid "Edit data in the remote process"
+msgstr "Éditeurs dans le processus distant"
+
+#: spyder/plugins/variableexplorer.py:49
+msgid ""
+"Editors are opened in the remote process for NumPy arrays, PIL images, "
+"lists, tuples and dictionaries.\n"
+"This avoids transfering large amount of data between the remote process and "
+"Spyder (through the socket)."
+msgstr ""
+"Les tableaux NumPy, images PIL, listes, tuples et dictionnaires seront "
+"modifiés dans un éditeur exécuté dans le processus distant.\n"
+"Cela permet d'éviter de transférer de gros volumes de données entre le "
+"processus distant et Spyder (à travers le socket)."
+
+#: spyder/plugins/variableexplorer.py:185
+msgid "Variable explorer"
+msgstr "Explorateur de variables"
+
+#: spyder/plugins/workingdirectory.py:38
+msgid ""
+"The <b>global working directory</b> is the working directory for newly "
+"opened <i>consoles</i> (Python/IPython consoles and terminals), for the "
+"<i>file explorer</i>, for the <i>find in files</i> plugin and for new files "
+"created in the <i>editor</i>."
+msgstr ""
+"Le <b>répertoire de travail global</b> est le répertoire de travail utilisé "
+"pour les nouvelles <i>consoles</i> (consoles Python/IPython et terminaux), "
+"pour l'<i>explorateur de fichiers</i>, pour la <i>recherche dans les "
+"fichiers</i> et pour les fichiers créés dans l'<i>éditeur</i>."
+
+#: spyder/plugins/workingdirectory.py:47
+msgid "At startup, the global working directory is:"
+msgstr "Au démarrage, le répertoire de travail global est :"
+
+#: spyder/plugins/workingdirectory.py:51
+msgid "the same as in last session"
+msgstr "celui utilisé lors de la dernière session"
+
+#: spyder/plugins/workingdirectory.py:53
+msgid "At startup, Spyder will restore the global directory from last session"
+msgstr ""
+"Au démarrage, Spyder reprendra le répertoire de travail global de la "
+"dernière session"
+
+#: spyder/plugins/workingdirectory.py:59
+msgid "At startup, the global working directory will be the specified path"
+msgstr ""
+"Au démarrage, le répertoire de travail global sera le chemin d'accès "
+"spécifié ici"
+
+#: spyder/plugins/workingdirectory.py:71
+msgid "Files are opened from:"
+msgstr "Les fichiers sont ouverts depuis :"
+
+#: spyder/plugins/workingdirectory.py:75 spyder/plugins/workingdirectory.py:88
+msgid "the current file directory"
+msgstr "le répertoire du fichier en cours d'édition"
+
+#: spyder/plugins/workingdirectory.py:79 spyder/plugins/workingdirectory.py:92
+msgid "the global working directory"
+msgstr "le répertoire de travail global"
+
+#: spyder/plugins/workingdirectory.py:84
+msgid "Files are created in:"
+msgstr "Les fichiers sont créés dans :"
+
+#: spyder/plugins/workingdirectory.py:98
+msgid "Change to file base directory"
+msgstr "Sélectionner le répertoire de base du fichier"
+
+#: spyder/plugins/workingdirectory.py:100
+msgid "When opening a file"
+msgstr "Lors de l'ouverture d'un fichier"
+
+#: spyder/plugins/workingdirectory.py:102
+msgid "When saving a file"
+msgstr "Lors de l'enregistrement d'un fichier"
+
+#: spyder/plugins/workingdirectory.py:172
+msgid "Back"
+msgstr "Retour"
+
+#: spyder/plugins/workingdirectory.py:180 spyder/widgets/explorer.py:1079
+#: spyder/widgets/variableexplorer/importwizard.py:529
+msgid "Next"
+msgstr "Suivant"
+
+#: spyder/plugins/workingdirectory.py:191
+msgid ""
+"This is the working directory for newly\n"
+"opened consoles (Python/IPython consoles and\n"
+"terminals), for the file explorer, for the\n"
+"find in files plugin and for new files\n"
+"created in the editor"
+msgstr ""
+"Ceci est le répertoire de travail utilisé pour\n"
+"les nouvelles consoles (consoles Python/IPython\n"
+"et fenêtres de commandes), pour l'explorateur\n"
+"de fichiers, pour la recherche dans les fichiers\n"
+"et pour les fichiers créés dans l'éditeur"
+
+#: spyder/plugins/workingdirectory.py:219
+msgid "Browse a working directory"
+msgstr "Sélectionner un répertoire de travail"
+
+#: spyder/plugins/workingdirectory.py:226
+msgid "Change to parent directory"
+msgstr "Aller au répertoire parent"
+
+#: spyder/plugins/workingdirectory.py:233
+msgid "Global working directory"
+msgstr "Répertoire de travail global"
+
+#: spyder/utils/codeanalysis.py:91
+msgid "Real-time code analysis on the Editor"
+msgstr "Analyse de code temps réel dans l'éditeur"
+
+#: spyder/utils/codeanalysis.py:95
+msgid "Real-time code style analysis on the Editor"
+msgstr "Analyse de code temps réel dans l'éditeur"
+
+#: spyder/utils/environ.py:101
+msgid ""
+"Module <b>pywin32 was not found</b>.<br>Please restart this Windows "
+"<i>session</i> (not the computer) for changes to take effect."
+msgstr ""
+"Le module <b>pywin32 n'est pas installé</b>.<br>Merci de redémarrer la "
+"<i>session</i> en cours (et non l'ordinateur) pour que les changements "
+"effectués prennent effet."
+
+#: spyder/utils/environ.py:114
+msgid ""
+"If you accept changes, this will modify the current user environment "
+"variables directly <b>in Windows registry</b>. Use it with precautions, at "
+"your own risks.<br><br>Note that for changes to take effect, you will need "
+"to restart the parent process of this application (simply restart Spyder if "
+"you have executed it from a Windows shortcut, otherwise restart any "
+"application from which you may have executed it, like <i>Python(x,y) Home</"
+"i> for example)"
+msgstr ""
+"Si vous acceptez les changements effectués, cela modifiera les variables "
+"d'environnement de l'utilisateur courant directement <b>dans la base de "
+"registre Windows</b>. Utilisez cette fonctionnalité avec précautions et à "
+"vos risques et périls.<br><br>Notez que pour que les changements effectués "
+"prennent effet, il sera nécessaire de redémarrer le processus parent de "
+"cette application (redémarrez simplement Spyder si vous l'avez exécuté à "
+"partir d'un raccourci Windows, sinon redémarrez toute application ayant "
+"servie à exécuter Spyder : <i>Python(x,y) Home</i> ou un invite de commandes "
+"par exemple)"
+
+#: spyder/utils/help/sphinxify.py:217 spyder/utils/help/sphinxify.py:227
+msgid ""
+"It was not possible to generate rich text help for this object.</br>Please "
+"see it in plain text."
+msgstr ""
+"Le processus de génération de l'aide sous la forme de texte enrichi a échoué."
+"</br>Merci d'activer le mode d'affichage en texte brut."
+
+#: spyder/utils/introspection/manager.py:33
+#: spyder/utils/introspection/manager.py:38
+msgid "Editor's code completion, go-to-definition and help"
+msgstr "Editeur : complétion de code, aller à la définition, etc."
+
+#: spyder/utils/iofuncs.py:408
+msgid "Supported files"
+msgstr "Fichiers compatibles"
+
+#: spyder/utils/iofuncs.py:410
+msgid "All files (*.*)"
+msgstr "Tous les fichiers (*.*)"
+
+#: spyder/utils/iofuncs.py:420
+msgid "Spyder data files"
+msgstr "Fichiers Spyder"
+
+#: spyder/utils/iofuncs.py:422
+#: spyder/widgets/variableexplorer/collectionseditor.py:1029
+msgid "NumPy arrays"
+msgstr "Tableaux NumPy"
+
+#: spyder/utils/iofuncs.py:423
+msgid "NumPy zip arrays"
+msgstr "Tableaux NumPy compressés"
+
+#: spyder/utils/iofuncs.py:424
+msgid "Matlab files"
+msgstr "Fichiers Matlab"
+
+#: spyder/utils/iofuncs.py:425
+msgid "CSV text files"
+msgstr "Fichiers texte CSV"
+
+#: spyder/utils/iofuncs.py:427
+msgid "JPEG images"
+msgstr "Images JPEG"
+
+#: spyder/utils/iofuncs.py:428
+msgid "PNG images"
+msgstr "Images PNG"
+
+#: spyder/utils/iofuncs.py:429
+msgid "GIF images"
+msgstr "Images GIF"
+
+#: spyder/utils/iofuncs.py:430
+msgid "TIFF images"
+msgstr "Images TIFF"
+
+#: spyder/utils/iofuncs.py:431 spyder/utils/iofuncs.py:432
+msgid "Pickle files"
+msgstr "Fichiers pickle"
+
+#: spyder/utils/iofuncs.py:433
+msgid "JSON files"
+msgstr "Fichiers JSON"
+
+#: spyder/utils/iofuncs.py:452 spyder/utils/iofuncs.py:459
+msgid "<b>Unsupported file type '%s'</b>"
+msgstr "<b>Type de fichier non pris en charge '%s'</b>"
+
+#: spyder/utils/programs.py:286
+msgid "It was not possible to run this file in an external terminal"
+msgstr "Impossible d'exécuter ce fichier dans un terminal externe"
+
+#: spyder/utils/syntaxhighlighters.py:33
+msgid "Syntax highlighting for Matlab, Julia and other file types"
+msgstr "Coloration syntaxique pour Matlab, Julia et d'autres types de fichier"
+
+#: spyder/utils/syntaxhighlighters.py:42
+msgid "Background:"
+msgstr "Fond :"
+
+#: spyder/utils/syntaxhighlighters.py:43
+#: spyder/widgets/sourcecode/codeeditor.py:106
+msgid "Current line:"
+msgstr "Ligne actuelle :"
+
+#: spyder/utils/syntaxhighlighters.py:44
+msgid "Current cell:"
+msgstr "Cellule actuelle :"
+
+#: spyder/utils/syntaxhighlighters.py:45
+msgid "Occurrence:"
+msgstr "Occurrence :"
+
+#: spyder/utils/syntaxhighlighters.py:46
+msgid "Link:"
+msgstr "Lien :"
+
+#: spyder/utils/syntaxhighlighters.py:47
+msgid "Side areas:"
+msgstr "Zones latérales :"
+
+#: spyder/utils/syntaxhighlighters.py:48
+#, fuzzy
+msgid "Matched <br>parens:"
+msgstr "Parenthèses correspondantes:"
+
+#: spyder/utils/syntaxhighlighters.py:49
+#, fuzzy
+msgid "Unmatched <br>parens:"
+msgstr "Parenthèse isolée:"
+
+#: spyder/utils/syntaxhighlighters.py:50
+msgid "Normal text:"
+msgstr "Texte normal :"
+
+#: spyder/utils/syntaxhighlighters.py:51
+msgid "Keyword:"
+msgstr "Mot-clé :"
+
+#: spyder/utils/syntaxhighlighters.py:52
+msgid "Builtin:"
+msgstr "Objet intégré :"
+
+#: spyder/utils/syntaxhighlighters.py:53
+msgid "Definition:"
+msgstr "Définition :"
+
+#: spyder/utils/syntaxhighlighters.py:54
+msgid "Comment:"
+msgstr "Commentaire :"
+
+#: spyder/utils/syntaxhighlighters.py:55
+msgid "String:"
+msgstr "Chaîne :"
+
+#: spyder/utils/syntaxhighlighters.py:56
+msgid "Number:"
+msgstr "Nombre :"
+
+#: spyder/utils/syntaxhighlighters.py:57
+msgid "Instance:"
+msgstr "Instance :"
+
+#: spyder/widgets/arraybuilder.py:179
+msgid ""
+"\n"
+"           <b>Numpy Array/Matrix Helper</b><br>\n"
+"           Type an array in Matlab    : <code>[1 2;3 4]</code><br>\n"
+"           or Spyder simplified syntax : <code>1 2;3 4</code>\n"
+"           <br><br>\n"
+"           Hit 'Enter' for array or 'Ctrl+Enter' for matrix.\n"
+"           <br><br>\n"
+"           <b>Hint:</b><br>\n"
+"           Use two spaces or two tabs to generate a ';'.\n"
+"           "
+msgstr ""
+
+#: spyder/widgets/arraybuilder.py:190
+msgid ""
+"\n"
+"           <b>Numpy Array/Matrix Helper</b><br>\n"
+"           Enter an array in the table. <br>\n"
+"           Use Tab to move between cells.\n"
+"           <br><br>\n"
+"           Hit 'Enter' for array or 'Ctrl+Enter' for matrix.\n"
+"           <br><br>\n"
+"           <b>Hint:</b><br>\n"
+"           Use two tabs at the end of a row to move to the next row.\n"
+"           "
+msgstr ""
+
+#: spyder/widgets/arraybuilder.py:365
+msgid "Array dimensions not valid"
 msgstr ""
 
-#: spyderlib/tour.py:214
+#: spyder/widgets/browser.py:54 spyder/widgets/sourcecode/codeeditor.py:2518
+msgid "Zoom out"
+msgstr "Réduire"
+
+#: spyder/widgets/browser.py:57 spyder/widgets/sourcecode/codeeditor.py:2514
+msgid "Zoom in"
+msgstr "Agrandir"
+
+#: spyder/widgets/browser.py:162
+msgid "Home"
+msgstr "Accueil"
+
+#: spyder/widgets/browser.py:198
+msgid "Find text"
+msgstr "Rechercher"
+
+#: spyder/widgets/browser.py:216
+msgid "Address:"
+msgstr "Adresse :"
+
+#: spyder/widgets/browser.py:252
+msgid "Unable to load page"
+msgstr "Impossible de charger la page"
+
+#: spyder/widgets/comboboxes.py:165
+msgid "Press enter to validate this entry"
+msgstr "Appuyer sur Entrée pour valider cette saisie"
+
+#: spyder/widgets/comboboxes.py:166
+msgid "This entry is incorrect"
+msgstr "Cette saisie n'est pas correcte"
+
+#: spyder/widgets/comboboxes.py:209
+msgid "Press enter to validate this path"
+msgstr "Appuyez sur Entrée pour valider ce chemin d'accès"
+
+#: spyder/widgets/dependencies.py:63
+msgid " Required "
+msgstr "  Requis  "
+
+#: spyder/widgets/dependencies.py:63
+msgid "Module"
+msgstr "Module"
+
+#: spyder/widgets/dependencies.py:64
+msgid " Installed "
+msgstr "  Installé  "
+
+#: spyder/widgets/dependencies.py:64
+msgid "Provided features"
+msgstr "Fonctionnalités associées"
+
+#: spyder/widgets/dependencies.py:134
 #, fuzzy
-msgid "The History Log"
-msgstr "Historique"
+msgid "Dependencies"
+msgstr "Dépendances optionnelles"
 
-#: spyderlib/tour.py:215
+#: spyder/widgets/dependencies.py:141
+#, fuzzy
 msgid ""
-"This pane records all commands introduced in the Python and IPython consoles."
+"Spyder depends on several Python modules to provide the right functionality "
+"for all its panes. The table below shows the required and installed versions "
+"(if any) of all of them.<br><br><b>Note</b>: You can safely use Spyder "
+"without the following modules installed: <b>%s</b> and <b>%s</b>"
 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/tour.py:263
-msgid "<b>Spyder</b> is an interactive development environment based on bla"
-msgstr ""
+#: spyder/widgets/dependencies.py:154
+msgid "Copy to clipboard"
+msgstr "Copier dans le presse-papier"
+
+#: spyder/widgets/editor.py:348
+msgid "Copy path to clipboard"
+msgstr "Copier le chemin d'accès dans le presse-papier"
 
-#: spyderlib/tour.py:267
+#: spyder/widgets/editor.py:352
 #, fuzzy
-msgid "Welcome to Spyder introduction tour"
-msgstr "Bienvenue dans Spyder !"
+msgid "Close all to the right"
+msgstr "Fermer tous les fichiers ouverts"
 
-#: spyderlib/tour.py:268
-msgid "Spyder is an interactive development environment based on bla"
+#: spyder/widgets/editor.py:354
+#, fuzzy
+msgid "Close all but this"
+msgstr "Fermer tout"
+
+#: spyder/widgets/editor.py:957
+msgid "Temporary file"
+msgstr "Fichier temporaire"
+
+#: spyder/widgets/editor.py:1052
+msgid "New window"
+msgstr "Nouvelle fenêtre"
+
+#: spyder/widgets/editor.py:1053
+msgid "Create a new editor window"
+msgstr "Créer une nouvelle fenêtre d'édition"
+
+#: spyder/widgets/editor.py:1056
+msgid "Split vertically"
+msgstr "Séparation verticale"
+
+#: spyder/widgets/editor.py:1058
+msgid "Split vertically this editor window"
+msgstr "Séparer en deux verticalement cette fenêtre d'édition"
+
+#: spyder/widgets/editor.py:1060
+msgid "Split horizontally"
+msgstr "Séparation horizontale"
+
+#: spyder/widgets/editor.py:1062
+msgid "Split horizontally this editor window"
+msgstr "Séparer en deux horizontalement cette fenêtre d'édition"
+
+#: spyder/widgets/editor.py:1064
+msgid "Close this panel"
+msgstr "Fermer ce panneau"
+
+#: spyder/widgets/editor.py:1221
+msgid "<b>%s</b> has been modified.<br>Do you want to save changes?"
 msgstr ""
+"<b>%s</b> a été modifié.<br>Souhaitez-vous enregistrer ces changements ?"
 
-#: spyderlib/tour.py:273
-#, fuzzy
-msgid "Introduction tour"
-msgstr "Introspection"
+#: spyder/widgets/editor.py:1283
+msgid "Save"
+msgstr "Enregistrer"
 
-#: spyderlib/tour.py:274
-msgid "New features in version 3.0"
+#: spyder/widgets/editor.py:1284
+msgid "<b>Unable to save script '%s'</b><br><br>Error message:<br>%s"
 msgstr ""
+"<b>Impossible d'enregistrer le script '%s'</b><br><br>Message d'erreur :<br>"
+"%s"
 
-#: spyderlib/tour.py:821
-#, fuzzy
-msgid "Go to step: "
-msgstr "Aller à la ligne :"
+#: spyder/widgets/editor.py:1518
+msgid ""
+"<b>%s</b> is unavailable (this file may have been removed, moved or renamed "
+"outside Spyder).<br>Do you want to close it?"
+msgstr ""
+"<b>%s</b> n'est pas accessible (ce fichier a peut-être été supprimé, déplacé "
+"ou renommé en dehors de Spyder).<br>Souhaitez-vous le fermer ?"
+
+#: spyder/widgets/editor.py:1538
+msgid ""
+"<b>%s</b> has been modified outside Spyder.<br>Do you want to reload it and "
+"lose all your changes?"
+msgstr ""
+"<b>%s</b> a été modifié en dehors de Spyder.<br>Souhaitez-vous le recharger "
+"et perdre ainsi vos modifications ?"
+
+#: spyder/widgets/editor.py:1634
+msgid ""
+"All changes to <b>%s</b> will be lost.<br>Do you want to revert file from "
+"disk?"
+msgstr ""
+"Toutes les modifications effectuées sur <b>%s</b> seront perdues."
+"<br>Souhaitez-vous revenir à la version du fichier enregistrée sur le "
+"disque ?"
+
+#: spyder/widgets/editor.py:1774
+msgid "Loading %s..."
+msgstr "Chargement de \"%s\" en cours..."
+
+#: spyder/widgets/editor.py:1784
+msgid ""
+"<b>%s</b> contains mixed end-of-line characters.<br>Spyder will fix this "
+"automatically."
+msgstr ""
+"<b>%s</b> contient des caractères de fin de ligne mélangés.<br>Spyder va "
+"corriger ceci automatiquement."
+
+#: spyder/widgets/editor.py:2166
+msgid "Close window"
+msgstr "Fermer la fenêtre"
+
+#: spyder/widgets/editor.py:2168
+msgid "Close this window"
+msgstr "Fermer cette fenêtre d'édition"
+
+#: spyder/widgets/editortools.py:94 spyder/widgets/editortools.py:130
+msgid "Line %s"
+msgstr "Ligne %s"
+
+#: spyder/widgets/editortools.py:99
+msgid "Class defined at line %s"
+msgstr "Classe déclarée ligne %s"
+
+#: spyder/widgets/editortools.py:107
+msgid "Method defined at line %s"
+msgstr "Méthode déclarée ligne %s"
+
+#: spyder/widgets/editortools.py:117
+msgid "Function defined at line %s"
+msgstr "Fonction déclarée ligne %s"
+
+#: spyder/widgets/editortools.py:149
+msgid "Cell starts at line %s"
+msgstr "Cellule commençant ligne %s"
+
+#: spyder/widgets/editortools.py:202 spyder/widgets/editortools.py:539
+msgid "Go to cursor position"
+msgstr "Aller à la position du curseur"
+
+#: spyder/widgets/editortools.py:205
+msgid "Show absolute path"
+msgstr "Afficher les chemins complets"
+
+#: spyder/widgets/editortools.py:208 spyder/widgets/explorer.py:208
+msgid "Show all files"
+msgstr "Afficher tous les fichiers"
+
+#: spyder/widgets/editortools.py:211
+msgid "Show special comments"
+msgstr "Afficher les commentaires spéciaux"
+
+#: spyder/widgets/explorer.py:204
+msgid "Edit filename filters..."
+msgstr "Modifier les filtres..."
+
+#: spyder/widgets/explorer.py:218
+msgid "Edit filename filters"
+msgstr "Modifier les filtres"
+
+#: spyder/widgets/explorer.py:219
+msgid "Name filters:"
+msgstr "Filtres sur les noms de fichiers :"
+
+#: spyder/widgets/explorer.py:238
+msgid "File..."
+msgstr "Fichier..."
+
+#: spyder/widgets/explorer.py:242
+msgid "Module..."
+msgstr "Module..."
+
+#: spyder/widgets/explorer.py:246
+msgid "Folder..."
+msgstr "Dossier..."
+
+#: spyder/widgets/explorer.py:250
+msgid "Package..."
+msgstr "Paquet..."
+
+#: spyder/widgets/explorer.py:271
+#: spyder/widgets/variableexplorer/collectionseditor.py:650
+msgid "Edit"
+msgstr "Modifier"
+
+#: spyder/widgets/explorer.py:273
+msgid "Move..."
+msgstr "Déplacer..."
+
+#: spyder/widgets/explorer.py:276
+msgid "Delete..."
+msgstr "Supprimer..."
+
+#: spyder/widgets/explorer.py:279
+msgid "Rename..."
+msgstr "Renommer..."
+
+#: spyder/widgets/explorer.py:282
+msgid "Open"
+msgstr "Ouvrir"
+
+#: spyder/widgets/explorer.py:283 spyder/widgets/sourcecode/codeeditor.py:2490
+msgid "Convert to Python script"
+msgstr "Convertir en fichier Python"
+
+#: spyder/widgets/explorer.py:317
+msgid "Commit"
+msgstr "Commiter"
+
+#: spyder/widgets/explorer.py:320
+msgid "Browse repository"
+msgstr "Explorer le dépôt"
+
+#: spyder/widgets/explorer.py:331
+msgid "Open command prompt here"
+msgstr "Ouvrir un invite de commandes ici"
+
+#: spyder/widgets/explorer.py:333
+msgid "Open terminal here"
+msgstr "Ouvrir un terminal ici"
+
+#: spyder/widgets/explorer.py:338
+msgid "Open Python console here"
+msgstr "Ouvrir une console &Python ici"
+
+#: spyder/widgets/explorer.py:352
+msgid "New"
+msgstr "Nouveau"
+
+#: spyder/widgets/explorer.py:360
+msgid "Import"
+msgstr "Import"
+
+#: spyder/widgets/explorer.py:511
+msgid "Do you really want to delete <b>%s</b>?"
+msgstr "Souhaitez-vous réellement supprimer <b>%s</b> ?"
+
+#: spyder/widgets/explorer.py:529
+msgid "delete"
+msgstr "supprimer"
+
+#: spyder/widgets/explorer.py:530 spyder/widgets/projects/explorer.py:147
+msgid "Project Explorer"
+msgstr "Explorateur de projets"
+
+#: spyder/widgets/explorer.py:531 spyder/widgets/projects/explorer.py:148
+msgid "<b>Unable to %s <i>%s</i></b><br><br>Error message:<br>%s"
+msgstr "<b>Impossible de %s <i>%s</i></b><br><br>Message d'erreur :<br>%s"
+
+#: spyder/widgets/explorer.py:554 spyder/widgets/sourcecode/codeeditor.py:2007
+msgid "Conversion error"
+msgstr "Erreur de conversion"
+
+#: spyder/widgets/explorer.py:555 spyder/widgets/sourcecode/codeeditor.py:2008
+msgid ""
+"It was not possible to convert this notebook. The error is:\n"
+"\n"
+msgstr ""
+"Impossible de convertir ce notebook. Message d'erreur:\n"
+"\n"
 
-#: spyderlib/utils/codeanalysis.py:92
-msgid "Real-time code analysis on the Editor"
-msgstr "Analyse de code temps réel dans l'éditeur"
+#: spyder/widgets/explorer.py:572 spyder/widgets/explorer.py:580
+#: spyder/widgets/explorer.py:591
+#: spyder/widgets/variableexplorer/collectionseditor.py:683
+#: spyder/widgets/variableexplorer/collectionseditor.py:924
+msgid "Rename"
+msgstr "Renommer"
 
-#: spyderlib/utils/codeanalysis.py:96
-msgid "Real-time code style analysis on the Editor"
-msgstr "Analyse de code temps réel dans l'éditeur"
+#: spyder/widgets/explorer.py:573
+msgid "New name:"
+msgstr "Nouveau nom :"
 
-#: spyderlib/utils/environ.py:96
+#: spyder/widgets/explorer.py:581
 msgid ""
-"Module <b>pywin32 was not found</b>.<br>Please restart this Windows "
-"<i>session</i> (not the computer) for changes to take effect."
+"Do you really want to rename <b>%s</b> and overwrite the existing file <b>"
+"%s</b>?"
 msgstr ""
-"Le module <b>pywin32 n'est pas installé</b>.<br>Merci de redémarrer la "
-"<i>session</i> en cours (et non l'ordinateur) pour que les changements "
-"effectués prennent effet."
+"Souhaitez-vous réellement renommer <b>%s</b> et remplacer le ficher existant "
+"<b>%s</b> ?"
 
-#: spyderlib/utils/environ.py:109
-msgid ""
-"If you accept changes, this will modify the current user environment "
-"variables directly <b>in Windows registry</b>. Use it with precautions, at "
-"your own risks.<br><br>Note that for changes to take effect, you will need "
-"to restart the parent process of this application (simply restart Spyder if "
-"you have executed it from a Windows shortcut, otherwise restart any "
-"application from which you may have executed it, like <i>Python(x,y) Home</"
-"i> for example)"
+#: spyder/widgets/explorer.py:592
+msgid "<b>Unable to rename file <i>%s</i></b><br><br>Error message:<br>%s"
 msgstr ""
-"Si vous acceptez les changements effectués, cela modifiera les variables "
-"d'environnement de l'utilisateur courant directement <b>dans la base de "
-"registre Windows</b>. Utilisez cette fonctionnalité avec précautions et à "
-"vos risques et périls.<br><br>Notez que pour que les changements effectués "
-"prennent effet, il sera nécessaire de redémarrer le processus parent de "
-"cette application (redémarrez simplement Spyder si vous l'avez exécuté à "
-"partir d'un raccourci Windows, sinon redémarrez toute application ayant "
-"servie à exécuter Spyder : <i>Python(x,y) Home</i> ou un invite de commandes "
-"par exemple)"
+"<b>Impossible de renommer l'élément <i>%s</i></b><br><br>Message d'erreur :"
+"<br>%s"
 
-#: spyderlib/utils/inspector/sphinxify.py:212
-#: spyderlib/utils/inspector/sphinxify.py:222
-msgid ""
-"It was not possible to generate rich text help for this object.</br>Please "
-"see it in plain text."
+#: spyder/widgets/explorer.py:628
+msgid "<b>Unable to move <i>%s</i></b><br><br>Error message:<br>%s"
 msgstr ""
-"Le processus de génération de l'aide sous la forme de texte enrichi a échoué."
-"</br>Merci d'activer le mode d'affichage en texte brut."
-
-#: spyderlib/utils/introspection/jedi_plugin.py:32
-msgid "(Experimental) Editor's code completion, go-to-definition and help"
-msgstr "(Expérimental) : autocomplétion, aller à la définition, aide."
-
-#: spyderlib/utils/introspection/rope_plugin.py:37
-msgid "Editor's code completion, go-to-definition and help"
-msgstr "Editeur : complétion de code, aller à la définition, etc."
-
-#: spyderlib/utils/iofuncs.py:482
-msgid "Supported files"
-msgstr "Fichiers compatibles"
-
-#: spyderlib/utils/iofuncs.py:484
-msgid "All files (*.*)"
-msgstr "Tous les fichiers (*.*)"
+"<b>Impossible de déplacer <i>%s</i></b><br><br>Message d'erreur :<br>%s"
 
-#: spyderlib/utils/iofuncs.py:494
-msgid "Spyder data files"
-msgstr "Fichiers Spyder"
+#: spyder/widgets/explorer.py:646
+msgid "<b>Unable to create folder <i>%s</i></b><br><br>Error message:<br>%s"
+msgstr ""
+"<b>Impossible de créer le répertoire <i>%s</i></b><br><br>Message d'erreur :"
+"<br>%s"
 
-#: spyderlib/utils/iofuncs.py:496 spyderlib/widgets/dicteditor.py:1056
-msgid "NumPy arrays"
-msgstr "Tableaux NumPy"
+#: spyder/widgets/explorer.py:659 spyder/widgets/explorer.py:693
+msgid "<b>Unable to create file <i>%s</i></b><br><br>Error message:<br>%s"
+msgstr ""
+"<b>Impossible de créer le fichier <i>%s</i></b><br><br>Message d'erreur :<br>"
+"%s"
 
-#: spyderlib/utils/iofuncs.py:497
-msgid "NumPy zip arrays"
-msgstr "Tableaux NumPy compressés"
+#: spyder/widgets/explorer.py:667
+msgid "New folder"
+msgstr "Nouveau répertoire"
 
-#: spyderlib/utils/iofuncs.py:498
-msgid "Matlab files"
-msgstr "Fichiers Matlab"
+#: spyder/widgets/explorer.py:668
+msgid "Folder name:"
+msgstr "Nom du dossier :"
 
-#: spyderlib/utils/iofuncs.py:499
-msgid "CSV text files"
-msgstr "Fichiers texte CSV"
+#: spyder/widgets/explorer.py:673
+msgid "New package"
+msgstr "Nouveau paquet"
 
-#: spyderlib/utils/iofuncs.py:501
-msgid "JPEG images"
-msgstr "Images JPEG"
+#: spyder/widgets/explorer.py:674
+msgid "Package name:"
+msgstr "Nom du paquet :"
 
-#: spyderlib/utils/iofuncs.py:502
-msgid "PNG images"
-msgstr "Images PNG"
+#: spyder/widgets/explorer.py:714
+msgid "New module"
+msgstr "Nouveau module"
 
-#: spyderlib/utils/iofuncs.py:503
-msgid "GIF images"
-msgstr "Images GIF"
+#: spyder/widgets/explorer.py:729
+msgid ""
+"For %s support, please install one of the<br/> following tools:<br/><br/>  %s"
+msgstr ""
+"Pour ajouter la prise en charge de %s, merci d'installer <br/>l'un des "
+"outils suivants :<br/><br/>  %s"
 
-#: spyderlib/utils/iofuncs.py:504
-msgid "TIFF images"
-msgstr "Images TIFF"
+#: spyder/widgets/explorer.py:733
+msgid "<b>Unable to find external program.</b><br><br>%s"
+msgstr "<b>Impossible de trouver un programme externe.</b><br><br>%s"
 
-#: spyderlib/utils/iofuncs.py:505 spyderlib/utils/iofuncs.py:506
-msgid "Pickle files"
-msgstr "Fichiers pickle"
+#: spyder/widgets/explorer.py:948
+msgid "Show current directory only"
+msgstr "Afficher uniquement le répertoire courant"
 
-#: spyderlib/utils/iofuncs.py:507
-msgid "JSON files"
-msgstr "Fichiers JSON"
+#: spyder/widgets/explorer.py:1046
+msgid "You don't have the right permissions to open this directory"
+msgstr ""
 
-#: spyderlib/utils/iofuncs.py:526 spyderlib/utils/iofuncs.py:533
-msgid "<b>Unsupported file type '%s'</b>"
-msgstr "<b>Type de fichier non pris en charge '%s'</b>"
+#: spyder/widgets/explorer.py:1076
+#: spyder/widgets/variableexplorer/importwizard.py:525
+msgid "Previous"
+msgstr "Précédent"
 
-#: spyderlib/utils/programs.py:176
-msgid "It was not possible to run this file in an external terminal"
-msgstr "Impossible d'exécuter ce fichier dans un terminal externe"
+#: spyder/widgets/explorer.py:1082
+msgid "Parent"
+msgstr "Parent"
 
-#: spyderlib/widgets/arraybuilder.py:162
-msgid ""
-"\n"
-"           <b>Numpy Array/Matrix Helper</b><br>\n"
-"           Type an array in Matlab    : <code>[1 2;3 4]</code><br>\n"
-"           or Spyder simplified syntax : <code>1 2;3 4</code>\n"
-"           <br><br>\n"
-"           Hit 'Enter' for array or 'Ctrl+Enter' for matrix.\n"
-"           <br><br>\n"
-"           <b>Hint:</b><br>\n"
-"           Use two spaces or two tabs to generate a ';'.\n"
-"           "
-msgstr ""
+#: spyder/widgets/externalshell/baseshell.py:129
+msgid "Run again this program"
+msgstr "Exécuter de nouveau ce programme"
 
-#: spyderlib/widgets/arraybuilder.py:173
-msgid ""
-"\n"
-"           <b>Numpy Array/Matrix Helper</b><br>\n"
-"           Enter an array in the table. <br>\n"
-"           Use Tab to move between cells.\n"
-"           <br><br>\n"
-"           Hit 'Enter' for array or 'Ctrl+Enter' for matrix.\n"
-"           <br><br>\n"
-"           <b>Hint:</b><br>\n"
-"           Use two tabs at the end of a row to move to the next row.\n"
-"           "
-msgstr ""
+#: spyder/widgets/externalshell/baseshell.py:132
+msgid "Kill"
+msgstr "Terminer"
 
-#: spyderlib/widgets/arraybuilder.py:337
-msgid "Array dimensions not valid"
+#: spyder/widgets/externalshell/baseshell.py:134
+msgid "Kills the current process, causing it to exit immediately"
 msgstr ""
+"Tue le processus, entraînant une sortie brutale et immédiate du programme"
 
-#: spyderlib/widgets/arrayeditor.py:453 spyderlib/widgets/arrayeditor.py:486
-#: spyderlib/widgets/dataframeeditor.py:508
-#: spyderlib/widgets/dataframeeditor.py:548
-msgid "Format"
-msgstr "Format"
+#: spyder/widgets/externalshell/baseshell.py:206
+msgid "<span style='color: #44AA44'><b>Running...</b></span>"
+msgstr "<span style='color: #44AA44'><b>En cours d'exécution...</b></span>"
 
-#: spyderlib/widgets/arrayeditor.py:458
-#: spyderlib/widgets/dataframeeditor.py:512
-msgid "Resize"
-msgstr "Ajuster"
+#: spyder/widgets/externalshell/baseshell.py:213
+msgid "Terminated."
+msgstr "Terminé."
 
-#: spyderlib/widgets/arrayeditor.py:487
-#: spyderlib/widgets/dataframeeditor.py:549
-msgid "Float formatting"
-msgstr "Format de flottant"
+#: spyder/widgets/externalshell/baseshell.py:238
+#: spyder/widgets/ipythonconsole/help.py:125 spyder/widgets/mixins.py:661
+msgid "Arguments"
+msgstr "Arguments"
 
-#: spyderlib/widgets/arrayeditor.py:494
-#: spyderlib/widgets/dataframeeditor.py:557 spyderlib/widgets/explorer.py:587
-#: spyderlib/widgets/explorer.py:689
-#: spyderlib/widgets/externalshell/pythonshell.py:553
-#: spyderlib/widgets/externalshell/systemshell.py:99
-msgid "Error"
-msgstr "Erreur"
+#: spyder/widgets/externalshell/baseshell.py:239
+msgid "Command line arguments:"
+msgstr "Arguments en ligne de commande :"
 
-#: spyderlib/widgets/arrayeditor.py:495
-#: spyderlib/widgets/dataframeeditor.py:558
-msgid "Format (%s) is incorrect"
-msgstr "Le format (%s) n'est pas valide"
+#: spyder/widgets/externalshell/pythonshell.py:277
+msgid "Variables"
+msgstr "Variables"
 
-#: spyderlib/widgets/arrayeditor.py:529
-msgid "Array is empty"
-msgstr "Ce tableau est vide"
+#: spyder/widgets/externalshell/pythonshell.py:278
+msgid "Show/hide global variables explorer"
+msgstr "Afficher/masquer l'explorateur de variables globales"
 
-#: spyderlib/widgets/arrayeditor.py:532
-msgid "Arrays with more than 3 dimensions are not supported"
-msgstr "Les tableaux de plus de trois dimensions ne sont pas pris en charge"
+#: spyder/widgets/externalshell/pythonshell.py:282
+msgid "Terminate"
+msgstr "Quitter"
 
-#: spyderlib/widgets/arrayeditor.py:535
-msgid "The 'xlabels' argument length do no match array column number"
+#: spyder/widgets/externalshell/pythonshell.py:283
+msgid ""
+"Attempts to stop the process. The process\n"
+"may not exit as a result of clicking this\n"
+"button (it is given the chance to prompt\n"
+"the user for any unsaved files, etc)."
 msgstr ""
-"La taille de 'xlabels' ne correspond pas au nombre de colonnes du tableau"
+"Tentative de fermeture du processus. Il est possible que\n"
+"le processus ne s'arrête pas suite à cette tentative,\n"
+"et propose à l'utilisateur de sauvegarder\n"
+"les fichiers non-enregistrés, etc..."
 
-#: spyderlib/widgets/arrayeditor.py:539
-msgid "The 'ylabels' argument length do no match array row number"
-msgstr ""
-"La taille de 'ylabels' ne correspond pas au nombre de lignes du tableau"
+#: spyder/widgets/externalshell/pythonshell.py:296
+msgid "Interact"
+msgstr "Interagir"
 
-#: spyderlib/widgets/arrayeditor.py:546
-msgid "%s arrays"
-msgstr "Les tableaux %s"
+#: spyder/widgets/externalshell/pythonshell.py:298
+msgid "Debug"
+msgstr "Déboguer"
 
-#: spyderlib/widgets/arrayeditor.py:547
-msgid "%s are currently not supported"
-msgstr "%s ne sont actuellement pas pris en charge"
+#: spyder/widgets/externalshell/pythonshell.py:300
+#: spyder/widgets/externalshell/pythonshell.py:366
+msgid "Arguments..."
+msgstr "Arguments..."
 
-#: spyderlib/widgets/arrayeditor.py:554
-#, fuzzy
-msgid "NumPy array"
-msgstr "Tableaux NumPy"
+#: spyder/widgets/externalshell/pythonshell.py:302
+msgid "Post Mortem Debug"
+msgstr ""
 
-#: spyderlib/widgets/arrayeditor.py:556 spyderlib/widgets/arrayeditor.py:710
-msgid "Array editor"
-msgstr "Éditeur de tableaux"
+#: spyder/widgets/externalshell/pythonshell.py:308
+msgid "Working directory"
+msgstr "Répertoire de travail"
 
-#: spyderlib/widgets/arrayeditor.py:558
-msgid "read only"
-msgstr "lecture seule"
+#: spyder/widgets/externalshell/pythonshell.py:310
+msgid "Set current working directory"
+msgstr "Changer le répertoire de travail"
 
-#: spyderlib/widgets/arrayeditor.py:588
-msgid "Record array fields:"
-msgstr "Champs du tableau : "
+#: spyder/widgets/externalshell/pythonshell.py:312
+msgid "Environment variables"
+msgstr "Variables d'environnement"
 
-#: spyderlib/widgets/arrayeditor.py:600
-msgid "Data"
-msgstr "Données"
+#: spyder/widgets/externalshell/pythonshell.py:316
+msgid "Show sys.path contents"
+msgstr "Afficher le contenu de sys.path"
 
-#: spyderlib/widgets/arrayeditor.py:600
-msgid "Mask"
-msgstr "Masque"
+#: spyder/widgets/externalshell/pythonshell.py:362
+msgid "Arguments: %s"
+msgstr "Arguments : %s"
 
-#: spyderlib/widgets/arrayeditor.py:600
-msgid "Masked data"
-msgstr "Données masquées"
+#: spyder/widgets/externalshell/pythonshell.py:364
+msgid "No argument"
+msgstr "Aucun argument"
 
-#: spyderlib/widgets/arrayeditor.py:611
-msgid "Axis:"
-msgstr "Axe :"
+#: spyder/widgets/externalshell/pythonshell.py:534
+msgid "A Python console failed to start!"
+msgstr "Le démarrage d'une console Python a échoué !"
 
-#: spyderlib/widgets/arrayeditor.py:616
-msgid "Index:"
-msgstr "Indice :"
+#: spyder/widgets/externalshell/systemshell.py:106
+msgid "Process failed to start"
+msgstr "Le processus n'a pas pu démarrer"
 
-#: spyderlib/widgets/arrayeditor.py:629
-msgid "<u>Warning</u>: changes are applied separately"
-msgstr "<u>Attention</u>: les changements seront pris en compte séparément"
+#: spyder/widgets/fileswitcher.py:109
+#, fuzzy
+msgid "unsaved file"
+msgstr "Enregitrer un fichier"
 
-#: spyderlib/widgets/arrayeditor.py:630
+#: spyder/widgets/fileswitcher.py:230
 msgid ""
-"For performance reasons, changes applied to masked array won't be reflected "
-"in array's data (and vice-versa)."
+"Press <b>Enter</b> to switch files or <b>Esc</b> to cancel.<br><br>Type to "
+"filter filenames.<br><br>Use <b>:number</b> to go to a line, e.g. "
+"<b><code>main:42</code></b><br>Use <b>@symbol_text</b> to go to a symbol, e."
+"g. <b><code>@init</code></b><br><br> Press <b>Ctrl+W</b> to close current "
+"tab.<br>"
 msgstr ""
-"Pour des questions de performance, les changements effectués sur les données "
-"masquées ne seront pas reflétées sur les données du tableau (et "
-"réciproquement)."
 
-#: spyderlib/widgets/browser.py:31
-#: spyderlib/widgets/sourcecode/codeeditor.py:2468
-msgid "Zoom out"
-msgstr "Réduire"
+#: spyder/widgets/fileswitcher.py:508
+#, fuzzy
+msgid "lines"
+msgstr " lignes"
+
+#: spyder/widgets/findinfiles.py:158
+msgid "Unexpected error: see internal console"
+msgstr "Erreur inattendue : voir console interne"
+
+#: spyder/widgets/findinfiles.py:209 spyder/widgets/findinfiles.py:233
+#: spyder/widgets/findinfiles.py:280
+msgid "invalid regular expression"
+msgstr "expression régulière incorrecte"
+
+#: spyder/widgets/findinfiles.py:278
+msgid "permission denied errors were encountered"
+msgstr "des erreurs d'autorisation d'accès ont été rencontrées"
 
-#: spyderlib/widgets/browser.py:34
-#: spyderlib/widgets/sourcecode/codeeditor.py:2465
-msgid "Zoom in"
-msgstr "Agrandir"
+#: spyder/widgets/findinfiles.py:315
+msgid "Search pattern"
+msgstr "Expression recherchée"
 
-#: spyderlib/widgets/browser.py:131
-msgid "Home"
-msgstr "Accueil"
+#: spyder/widgets/findinfiles.py:318 spyder/widgets/findinfiles.py:352
+#: spyder/widgets/findinfiles.py:364 spyder/widgets/findreplace.py:81
+msgid "Regular expression"
+msgstr "Expression régulière"
 
-#: spyderlib/widgets/browser.py:166
-msgid "Find text"
+#: spyder/widgets/findinfiles.py:327
+msgid "Search"
 msgstr "Rechercher"
 
-#: spyderlib/widgets/browser.py:184
-msgid "Address:"
-msgstr "Adresse :"
+#: spyder/widgets/findinfiles.py:330
+msgid "Start search"
+msgstr "Démarrer la recherche"
 
-#: spyderlib/widgets/browser.py:220
-msgid "Unable to load page"
-msgstr "Impossible de charger la page"
+#: spyder/widgets/findinfiles.py:336
+msgid "Stop search"
+msgstr "Arrêter la recherche"
 
-#: spyderlib/widgets/comboboxes.py:118
-msgid "Press enter to validate this entry"
-msgstr "Appuyer sur Entrée pour valider cette saisie"
+#: spyder/widgets/findinfiles.py:346
+msgid "Included filenames pattern"
+msgstr "Expression des noms de fichier à inclure"
 
-#: spyderlib/widgets/comboboxes.py:119
-msgid "This entry is incorrect"
-msgstr "Cette saisie n'est pas correcte"
+#: spyder/widgets/findinfiles.py:355
+msgid "Include:"
+msgstr "Inclure :"
 
-#: spyderlib/widgets/comboboxes.py:174
-msgid "Press enter to validate this path"
-msgstr "Appuyez sur Entrée pour valider ce chemin d'accès"
+#: spyder/widgets/findinfiles.py:358
+msgid "Excluded filenames pattern"
+msgstr "Expression des noms de fichier à exclure"
+
+#: spyder/widgets/findinfiles.py:367
+msgid "Exclude:"
+msgstr "Exclure :"
+
+#: spyder/widgets/findinfiles.py:377
+msgid "PYTHONPATH"
+msgstr "PYTHONPATH"
 
-#: spyderlib/widgets/comboboxes.py:175
+#: spyder/widgets/findinfiles.py:379
 msgid ""
-"This path is incorrect.\n"
-"Enter a correct directory path,\n"
-"then press enter to validate"
+"Search in all directories listed in sys.path which are outside the Python "
+"installation directory"
 msgstr ""
-"Ce chemin d'accès n'est pas valide :\n"
-"veuillez entrer un chemin d'accès correct,\n"
-"puis appuyer sur Entrée pour le valider"
-
-#: spyderlib/widgets/dataframeeditor.py:423
-msgid "To bool"
-msgstr "Booléen"
+"Rechercher dans tous les répertoires listés dans sys.path qui sont situés en "
+"dehors du répertoire d'installation de Python"
 
-#: spyderlib/widgets/dataframeeditor.py:423
-msgid "To complex"
-msgstr "Complexe"
+#: spyder/widgets/findinfiles.py:382
+msgid "Hg repository"
+msgstr "Dépôt Mercurial"
 
-#: spyderlib/widgets/dataframeeditor.py:424
-msgid "To float"
-msgstr "Flottant"
+#: spyder/widgets/findinfiles.py:385
+msgid "Search in current directory hg repository"
+msgstr "Rechercher dans le dépôt Mercurial du répertoire courant"
 
-#: spyderlib/widgets/dataframeeditor.py:424
-msgid "To int"
-msgstr "Entier"
+#: spyder/widgets/findinfiles.py:386
+msgid "Here:"
+msgstr "Ici :"
 
-#: spyderlib/widgets/dataframeeditor.py:425
-msgid "To str"
-msgstr "Caractères"
+#: spyder/widgets/findinfiles.py:390
+msgid "Search recursively in this directory"
+msgstr "Rechercher de manière récursive dans ce répertoire"
 
-#: spyderlib/widgets/dataframeeditor.py:490
-msgid "%s editor"
-msgstr "Éditeur de %s"
+#: spyder/widgets/findinfiles.py:395
+msgid "Browse a search directory"
+msgstr "Sélectionner un répertoire de recherche"
 
-#: spyderlib/widgets/dataframeeditor.py:522
-msgid "Column min/max"
-msgstr "Colonne min/max"
+#: spyder/widgets/findinfiles.py:425
+msgid "Hide advanced options"
+msgstr "Masquer les options avancées"
 
-#: spyderlib/widgets/dependencies.py:59
-msgid " Required "
-msgstr "  Requis  "
+#: spyder/widgets/findinfiles.py:428
+msgid "Show advanced options"
+msgstr "Afficher les options avancées"
 
-#: spyderlib/widgets/dependencies.py:59
-msgid "Module"
-msgstr "Module"
+#: spyder/widgets/findinfiles.py:569
+msgid "Search canceled"
+msgstr "Recherche annulée"
 
-#: spyderlib/widgets/dependencies.py:60
-msgid " Installed "
-msgstr "  Installé  "
+#: spyder/widgets/findinfiles.py:573
+msgid "String not found"
+msgstr "Chaîne de caractères non trouvée"
 
-#: spyderlib/widgets/dependencies.py:60
-msgid "Provided features"
-msgstr "Fonctionnalités associées"
+#: spyder/widgets/findinfiles.py:575
+msgid "matches in"
+msgstr "correspondances trouvées dans"
 
-#: spyderlib/widgets/dependencies.py:130
-msgid "Optional Dependencies"
-msgstr "Dépendances optionnelles"
+#: spyder/widgets/findinfiles.py:576
+msgid "file"
+msgstr "fichier"
 
-#: spyderlib/widgets/dependencies.py:137
-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."
+#: spyder/widgets/findinfiles.py:584
+msgid "interrupted"
+msgstr "interrompu"
 
-#: spyderlib/widgets/dependencies.py:152
-msgid "Copy to clipboard"
-msgstr "Copier dans le presse-papier"
+#: spyder/widgets/findreplace.py:63
+msgid "Search string"
+msgstr "Chaîne de caractères à rechercher"
 
-#: spyderlib/widgets/dicteditor.py:156
-msgid "Index"
-msgstr "Indice"
+#: spyder/widgets/findreplace.py:87
+msgid "Case Sensitive"
+msgstr "Respecter la casse"
 
-#: spyderlib/widgets/dicteditor.py:161
-msgid "Tuple"
-msgstr "Tuple"
+#: spyder/widgets/findreplace.py:93
+msgid "Whole words"
+msgstr "Mots entiers"
 
-#: spyderlib/widgets/dicteditor.py:164
-msgid "List"
-msgstr "Liste"
+#: spyder/widgets/findreplace.py:99
+msgid "Highlight matches"
+msgstr "Surligner les résultats"
 
-#: spyderlib/widgets/dicteditor.py:167
-msgid "Dictionary"
-msgstr "Dictionnaire"
+#: spyder/widgets/findreplace.py:113
+msgid "Replace with:"
+msgstr "Remplacer par :"
 
-#: spyderlib/widgets/dicteditor.py:169
-msgid "Key"
-msgstr "Clé"
+#: spyder/widgets/findreplace.py:115
+msgid "Replace string"
+msgstr "Chaîne de caractères de remplacement"
 
-#: spyderlib/widgets/dicteditor.py:175
-msgid "Attribute"
-msgstr "Attribut"
+#: spyder/widgets/findreplace.py:118
+msgid "Replace/find"
+msgstr "Remplacer/rechercher"
 
-#: spyderlib/widgets/dicteditor.py:177
-msgid "elements"
-msgstr "éléments"
+#: spyder/widgets/findreplace.py:125
+msgid "Replace all"
+msgstr "Remplacer tout"
 
-#: spyderlib/widgets/dicteditor.py:356
-msgid "Size"
-msgstr "Taille"
+#: spyder/widgets/internalshell.py:262
+msgid "Help..."
+msgstr "Aide..."
 
-#: spyderlib/widgets/dicteditor.py:356
-msgid "Type"
-msgstr "Type"
+#: spyder/widgets/internalshell.py:279
+msgid "Shell special commands:"
+msgstr "Commandes spéciales de la console :"
 
-#: spyderlib/widgets/dicteditor.py:356
-msgid "Value"
-msgstr "Valeur"
+#: spyder/widgets/internalshell.py:280
+msgid "Internal editor:"
+msgstr "Éditeur interne :"
 
-#: spyderlib/widgets/dicteditor.py:453
-msgid ""
-"Opening this variable can be slow\n"
-"\n"
-"Do you want to continue anyway?"
-msgstr ""
-"Afficher cette variable peut prendre du temps.\n"
-"\n"
-"Souhaitez-vous néanmoins continuer ?"
+#: spyder/widgets/internalshell.py:281
+msgid "External editor:"
+msgstr "Éditeur externe :"
 
-#: spyderlib/widgets/dicteditor.py:461 spyderlib/widgets/dicteditor.py:612
-msgid "Edit item"
-msgstr "Modifier"
+#: spyder/widgets/internalshell.py:282
+msgid "Run script:"
+msgstr "Exécuter un script :"
 
-#: spyderlib/widgets/dicteditor.py:462
-msgid "<b>Unable to retrieve data.</b><br><br>Error message:<br>%s"
-msgstr ""
-"<b>Impossible d'accéder aux données</b><br><br>Message d'erreur :<br>%s"
+#: spyder/widgets/internalshell.py:283
+msgid "Remove references:"
+msgstr "Supprimer des références :"
 
-#: spyderlib/widgets/dicteditor.py:613
-msgid "<b>Unable to assign data to item.</b><br><br>Error message:<br>%s"
-msgstr ""
-"<b>Impossible d'assigner la valeur de l'objet.</b><br><br>Message d'erreur :"
-"<br>%s"
+#: spyder/widgets/internalshell.py:284
+msgid "System commands:"
+msgstr "Commandes systèmes :"
 
-#: spyderlib/widgets/dicteditor.py:675
-msgid "Resize rows to contents"
-msgstr "Ajuster la hauteur des lignes"
+#: spyder/widgets/internalshell.py:285
+msgid "Python help:"
+msgstr "Aide Python :"
 
-#: spyderlib/widgets/dicteditor.py:683 spyderlib/widgets/explorer.py:242
-msgid "Edit"
-msgstr "Modifier"
+#: spyder/widgets/internalshell.py:286
+msgid "GUI-based editor:"
+msgstr "Éditeur graphique :"
 
-#: spyderlib/widgets/dicteditor.py:686 spyderlib/widgets/dicteditor.py:1025
-#: spyderlib/widgets/dicteditor.py:1042
-msgid "Plot"
-msgstr "Tracer"
+#: spyder/widgets/ipythonconsole/client.py:187
+msgid "An error ocurred while starting the kernel"
+msgstr "Une erreur est survenue lors du démarrage du noyau."
 
-#: spyderlib/widgets/dicteditor.py:690
-msgid "Histogram"
-msgstr "Histogramme"
+#: spyder/widgets/ipythonconsole/client.py:218
+msgid "Restart kernel"
+msgstr "Redémarrer le noyau"
 
-#: spyderlib/widgets/dicteditor.py:694
-msgid "Show image"
-msgstr "Afficher l'image"
+#: spyder/widgets/ipythonconsole/client.py:238
+msgid "Stop the current command"
+msgstr "Interrompre la commande en cours"
 
-#: spyderlib/widgets/dicteditor.py:698 spyderlib/widgets/dicteditor.py:1050
-msgid "Save array"
-msgstr "Enregistrer le tableau"
+#: spyder/widgets/ipythonconsole/client.py:261
+msgid "Inspect current object"
+msgstr "Inspecter l'onglet courant"
 
-#: spyderlib/widgets/dicteditor.py:702 spyderlib/widgets/dicteditor.py:989
-#: spyderlib/widgets/dicteditor.py:997
-msgid "Insert"
-msgstr "Insérer"
+#: spyder/widgets/ipythonconsole/client.py:266
+msgid "Clear line or block"
+msgstr "Effacer la ligne ou le bloc"
 
-#: spyderlib/widgets/dicteditor.py:705 spyderlib/widgets/dicteditor.py:939
-msgid "Remove"
-msgstr "Supprimer"
+#: spyder/widgets/ipythonconsole/client.py:270
+msgid "Reset namespace"
+msgstr ""
 
-#: spyderlib/widgets/dicteditor.py:716 spyderlib/widgets/dicteditor.py:956
-#: spyderlib/widgets/explorer.py:532 spyderlib/widgets/explorer.py:540
-#: spyderlib/widgets/explorer.py:551
-msgid "Rename"
-msgstr "Renommer"
+#: spyder/widgets/ipythonconsole/client.py:273
+msgid "Clear console"
+msgstr "Effacer la console"
 
-#: spyderlib/widgets/dicteditor.py:719
-msgid "Duplicate"
-msgstr "Dupliquer"
+#: spyder/widgets/ipythonconsole/client.py:314
+msgid "Are you sure you want to restart the kernel?"
+msgstr "Souhaitez-vous vraiment redémarrer le noyau ?"
 
-#: spyderlib/widgets/dicteditor.py:937
-msgid "Do you want to remove selected item?"
-msgstr "Souhaitez-vous supprimer l'élément sélectionné ?"
+#: spyder/widgets/ipythonconsole/client.py:316
+msgid "Restart kernel?"
+msgstr "Redémarrer le noyau"
 
-#: spyderlib/widgets/dicteditor.py:938
-msgid "Do you want to remove all selected items?"
-msgstr "Souhaitez-vous supprimer les éléments sélectionnés ?"
+#: spyder/widgets/ipythonconsole/client.py:325
+#, fuzzy
+msgid "Error restarting kernel: %s\n"
+msgstr "Une erreur est survenue lors du démarrage du noyau."
 
-#: spyderlib/widgets/dicteditor.py:956 spyderlib/widgets/dicteditor.py:989
-msgid "Key:"
-msgstr "Clé :"
+#: spyder/widgets/ipythonconsole/client.py:329
+msgid ""
+"<br>Restarting kernel...\n"
+"<hr><br>"
+msgstr ""
 
-#: spyderlib/widgets/dicteditor.py:997
-msgid "Value:"
-msgstr "Valeur :"
+#: spyder/widgets/ipythonconsole/client.py:334
+msgid "Cannot restart a kernel not started by Spyder\n"
+msgstr ""
 
-#: spyderlib/widgets/dicteditor.py:1013
-msgid "Import error"
-msgstr "Erreur d'import"
+#: spyder/widgets/ipythonconsole/client.py:374
+msgid "Changing backend to Qt for Mayavi"
+msgstr "Utilisation du backend Qt pour Mayavi"
 
-#: spyderlib/widgets/dicteditor.py:1014
-msgid "Please install <b>matplotlib</b> or <b>guiqwt</b>."
-msgstr "Merci d'installer <b>matplotlib</b> ou <b>guiqwt</b>."
+#: spyder/widgets/ipythonconsole/client.py:385
+msgid "Connecting to kernel..."
+msgstr "Connexion au noyau..."
 
-#: spyderlib/widgets/dicteditor.py:1026
-msgid "<b>Unable to plot data.</b><br><br>Error message:<br>%s"
+#: spyder/widgets/ipythonconsole/namespacebrowser.py:76
+msgid ""
+"Inspecting and setting values while debugging in IPython consoles is not "
+"supported yet by Spyder."
 msgstr ""
-"<b>Impossible d'afficher les données</b><br><br>Message d'erreur :<br>%s"
 
-#: spyderlib/widgets/dicteditor.py:1043
-msgid "<b>Unable to show image.</b><br><br>Error message:<br>%s"
-msgstr "<b>Impossible d'afficher l'image</b><br><br>Message d'erreur :<br>%s"
+#: spyder/widgets/ipythonconsole/shell.py:135
+#, fuzzy
+msgid "Reset IPython namespace"
+msgstr "Console IPython"
 
-#: spyderlib/widgets/dicteditor.py:1066
-msgid "<b>Unable to save array</b><br><br>Error message:<br>%s"
+#: spyder/widgets/ipythonconsole/shell.py:136
+msgid ""
+"All user-defined variables will be removed.<br>Are you sure you want to "
+"reset the namespace?"
 msgstr ""
-"<b>Impossible d'enregistrer le tableau</b><br><br>Message d'erreur :<br>%s"
 
-#: spyderlib/widgets/dicteditor.py:1085
-msgid "Clipboard contents"
-msgstr "Contenu du presse-papiers"
-
-#: spyderlib/widgets/dicteditor.py:1100
-msgid "Import from clipboard"
-msgstr "Importer depuis le presse-papiers"
-
-#: spyderlib/widgets/dicteditor.py:1102
-msgid "Empty clipboard"
-msgstr "Presse-papiers vide"
-
-#: spyderlib/widgets/dicteditor.py:1103
-msgid "Nothing to be imported from clipboard."
-msgstr "Aucune donnée ne peut être importée depuis le presse-papiers."
+#: spyder/widgets/onecolumntree.py:52
+msgid "Collapse all"
+msgstr "Replier tout"
 
-#: spyderlib/widgets/dicteditorutils.py:60
-msgid "View and edit DataFrames and Series in the Variable Explorer"
-msgstr ""
-"Voir et éditer les Dataframes et les Series dans l'explorateur de variables"
+#: spyder/widgets/onecolumntree.py:56
+msgid "Expand all"
+msgstr "Déplier tout"
 
-#: spyderlib/widgets/editor.py:342
-msgid "Copy path to clipboard"
-msgstr "Copier le chemin d'accès dans le presse-papier"
+#: spyder/widgets/onecolumntree.py:60
+msgid "Restore"
+msgstr "Restaurer"
 
-#: spyderlib/widgets/editor.py:906
-msgid "Temporary file"
-msgstr "Fichier temporaire"
+#: spyder/widgets/onecolumntree.py:61
+msgid "Restore original tree layout"
+msgstr "Restaurer l'organisation initiale de l'arbre"
 
-#: spyderlib/widgets/editor.py:1003
-msgid "New window"
-msgstr "Nouvelle fenêtre"
+#: spyder/widgets/onecolumntree.py:65
+msgid "Collapse selection"
+msgstr "Replier la sélection"
 
-#: spyderlib/widgets/editor.py:1004
-msgid "Create a new editor window"
-msgstr "Créer une nouvelle fenêtre d'édition"
+#: spyder/widgets/onecolumntree.py:69
+msgid "Expand selection"
+msgstr "Déplier la sélection"
 
-#: spyderlib/widgets/editor.py:1007
-msgid "Split vertically"
-msgstr "Séparation verticale"
+#: spyder/widgets/pathmanager.py:87
+msgid "Move to top"
+msgstr "Placer en premier"
 
-#: spyderlib/widgets/editor.py:1009
-msgid "Split vertically this editor window"
-msgstr "Séparer en deux verticalement cette fenêtre d'édition"
+#: spyder/widgets/pathmanager.py:93
+msgid "Move up"
+msgstr "Monter"
 
-#: spyderlib/widgets/editor.py:1011
-msgid "Split horizontally"
-msgstr "Séparation horizontale"
+#: spyder/widgets/pathmanager.py:99
+msgid "Move down"
+msgstr "Descendre"
 
-#: spyderlib/widgets/editor.py:1013
-msgid "Split horizontally this editor window"
-msgstr "Séparer en deux horizontalement cette fenêtre d'édition"
+#: spyder/widgets/pathmanager.py:105
+msgid "Move to bottom"
+msgstr "Placer en dernier"
 
-#: spyderlib/widgets/editor.py:1015
-msgid "Close this panel"
-msgstr "Fermer ce panneau"
+#: spyder/widgets/pathmanager.py:116 spyder/widgets/pathmanager.py:231
+msgid "Add path"
+msgstr "Ajouter un chemin"
 
-#: spyderlib/widgets/editor.py:1153
-msgid "<b>%s</b> has been modified.<br>Do you want to save changes?"
-msgstr ""
-"<b>%s</b> a été modifié.<br>Souhaitez-vous enregistrer ces changements ?"
+#: spyder/widgets/pathmanager.py:121 spyder/widgets/pathmanager.py:214
+msgid "Remove path"
+msgstr "Supprimer"
 
-#: spyderlib/widgets/editor.py:1215
-msgid "Save"
-msgstr "Enregistrer"
+#: spyder/widgets/pathmanager.py:131
+msgid "Synchronize..."
+msgstr "Synchroniser..."
 
-#: spyderlib/widgets/editor.py:1216
-msgid "<b>Unable to save script '%s'</b><br><br>Error message:<br>%s"
+#: spyder/widgets/pathmanager.py:133
+msgid "Synchronize Spyder's path list with PYTHONPATH environment variable"
 msgstr ""
-"<b>Impossible d'enregistrer le script '%s'</b><br><br>Message d'erreur :<br>"
-"%s"
+"Synchronise la liste des chemins d'accès de Spyder avec celle de la variable "
+"d'environnement PYTHONPATH"
 
-#: spyderlib/widgets/editor.py:1238
-msgid "Save Python script"
-msgstr "Enregistrer le script Python"
+#: spyder/widgets/pathmanager.py:145
+msgid "Synchronize"
+msgstr "Synchroniser"
 
-#: spyderlib/widgets/editor.py:1452
+#: spyder/widgets/pathmanager.py:146
 msgid ""
-"<b>%s</b> is unavailable (this file may have been removed, moved or renamed "
-"outside Spyder).<br>Do you want to close it?"
+"This will synchronize Spyder's path list with <b>PYTHONPATH</b> environment "
+"variable for current user, allowing you to run your Python modules outside "
+"Spyder without having to configure sys.path. <br>Do you want to clear "
+"contents of PYTHONPATH before adding Spyder's path list?"
 msgstr ""
-"<b>%s</b> n'est pas accessible (ce fichier a peut-être été supprimé, déplacé "
-"ou renommé en dehors de Spyder).<br>Souhaitez-vous le fermer ?"
+"Ceci synchronisera la liste des chemins d'accès de Spyder avec celle de la "
+"variable d'environnement <b>PYTHONPATH</b> pour l'utilisateur courant, vous "
+"permettant ainsi d'exécuter vos modules Python en dehors de Spyder sans "
+"avoir besoin de configurer sys.path. <br>Souhaitez-vous effacer le contenu "
+"de PYTHONPATH avant d'y ajouter la liste des chemins d'accès de Spyder ?"
 
-#: spyderlib/widgets/editor.py:1472
-msgid ""
-"<b>%s</b> has been modified outside Spyder.<br>Do you want to reload it and "
-"lose all your changes?"
-msgstr ""
-"<b>%s</b> a été modifié en dehors de Spyder.<br>Souhaitez-vous le recharger "
-"et perdre ainsi vos modifications ?"
+#: spyder/widgets/pathmanager.py:215
+msgid "Do you really want to remove selected path?"
+msgstr "Souhaitez-vous vraiment supprimer le chemin sélectionné ?"
 
-#: spyderlib/widgets/editor.py:1568
+#: spyder/widgets/pathmanager.py:232
 msgid ""
-"All changes to <b>%s</b> will be lost.<br>Do you want to revert file from "
-"disk?"
+"This directory is already included in Spyder path list.<br>Do you want to "
+"move it to the top of the list?"
 msgstr ""
-"Toutes les modifications effectuées sur <b>%s</b> seront perdues."
-"<br>Souhaitez-vous revenir à la version du fichier enregistrée sur le "
-"disque ?"
+"Ce répertoire est déjà inclus dans la liste des chemins d'accès de Spyder."
+"<br>Souhaitez-vous le placer en début de liste ?"
 
-#: spyderlib/widgets/editor.py:1708
-msgid "Loading %s..."
-msgstr "Chargement de \"%s\" en cours..."
+#: spyder/widgets/projects/configdialog.py:30
+#, fuzzy
+msgid "Project preferences"
+msgstr "Préférences"
 
-#: spyderlib/widgets/editor.py:1718
-msgid ""
-"<b>%s</b> contains mixed end-of-line characters.<br>Spyder will fix this "
-"automatically."
+#: spyder/widgets/projects/configdialog.py:82
+#: spyder/widgets/projects/configdialog.py:119
+msgid "Restore data on startup"
 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:2083
-msgid "Close window"
-msgstr "Fermer la fenêtre"
+#: spyder/widgets/projects/configdialog.py:84
+#: spyder/widgets/projects/configdialog.py:121
+#, fuzzy
+msgid "Save data on exit"
+msgstr "Enregistrer les données"
 
-#: spyderlib/widgets/editor.py:2085
-msgid "Close this window"
-msgstr "Fermer cette fenêtre d'édition"
+#: spyder/widgets/projects/configdialog.py:86
+#: spyder/widgets/projects/configdialog.py:123
+#, fuzzy
+msgid "Save history"
+msgstr "Enregistrer l'historique"
 
-#: spyderlib/widgets/editortools.py:94 spyderlib/widgets/editortools.py:130
-msgid "Line %s"
-msgstr "Ligne %s"
+#: spyder/widgets/projects/configdialog.py:88
+#: spyder/widgets/projects/configdialog.py:125
+msgid "Save non project files opened"
+msgstr ""
 
-#: spyderlib/widgets/editortools.py:99
-msgid "Class defined at line %s"
-msgstr "Classe déclarée ligne %s"
+#: spyder/widgets/projects/configdialog.py:111
+msgid "Code"
+msgstr ""
 
-#: spyderlib/widgets/editortools.py:107
-msgid "Method defined at line %s"
-msgstr "Méthode déclarée ligne %s"
+#: spyder/widgets/projects/configdialog.py:118
+msgid "Workspace"
+msgstr "Espace de travail"
 
-#: spyderlib/widgets/editortools.py:117
-msgid "Function defined at line %s"
-msgstr "Fonction déclarée ligne %s"
+#: spyder/widgets/projects/configdialog.py:148
+#: spyder/widgets/projects/configdialog.py:155
+#, fuzzy
+msgid "Version control"
+msgstr "Contrôle du débogage"
 
-#: spyderlib/widgets/editortools.py:149
-msgid "Cell starts at line %s"
-msgstr "Cellule commençant ligne %s"
+#: spyder/widgets/projects/configdialog.py:156
+#, fuzzy
+msgid "Use version control"
+msgstr "Contrôle du débogage"
 
-#: spyderlib/widgets/editortools.py:202 spyderlib/widgets/editortools.py:539
-msgid "Go to cursor position"
-msgstr "Aller à la position du curseur"
+#: spyder/widgets/projects/configdialog.py:161
+msgid "Version control system"
+msgstr ""
 
-#: spyderlib/widgets/editortools.py:205
-msgid "Show absolute path"
-msgstr "Afficher les chemins complets"
+#: spyder/widgets/projects/explorer.py:50
+msgid "Show horizontal scrollbar"
+msgstr "Barre de défilement horizontal"
 
-#: spyderlib/widgets/editortools.py:208 spyderlib/widgets/explorer.py:179
-msgid "Show all files"
-msgstr "Afficher tous les fichiers"
+#: spyder/widgets/projects/explorer.py:112
+msgid "File <b>%s</b> already exists.<br>Do you want to overwrite it?"
+msgstr "Le fichier <b>%s</b> existe déjà.<br>Souhaitez-vous le remplacer ?"
 
-#: spyderlib/widgets/editortools.py:211
-msgid "Show special comments"
-msgstr "Afficher les commentaires spéciaux"
+#: spyder/widgets/projects/explorer.py:126
+msgid "Folder <b>%s</b> already exists."
+msgstr "Le dossier <b>%s</b> existe déjà."
 
-#: spyderlib/widgets/explorer.py:175
-msgid "Edit filename filters..."
-msgstr "Modifier les filtres..."
+#: spyder/widgets/projects/explorer.py:144
+msgid "copy"
+msgstr "copier"
 
-#: spyderlib/widgets/explorer.py:189
-msgid "Edit filename filters"
-msgstr "Modifier les filtres"
+#: spyder/widgets/projects/explorer.py:146
+msgid "move"
+msgstr "déplacer"
 
-#: spyderlib/widgets/explorer.py:190
-msgid "Name filters:"
-msgstr "Filtres sur les noms de fichiers :"
+#: spyder/widgets/projects/projectdialog.py:69
+#, fuzzy
+msgid "New directory"
+msgstr "Sélectionner un répertoire"
 
-#: spyderlib/widgets/explorer.py:209
-msgid "File..."
-msgstr "Fichier..."
+#: spyder/widgets/projects/projectdialog.py:70
+msgid "Existing directory"
+msgstr "Répertoire existant"
 
-#: spyderlib/widgets/explorer.py:213
-msgid "Module..."
-msgstr "Module..."
+#: spyder/widgets/projects/projectdialog.py:72
+#, fuzzy
+msgid "Project name"
+msgstr "Nom du projet :"
 
-#: spyderlib/widgets/explorer.py:217
-msgid "Folder..."
-msgstr "Dossier..."
+#: spyder/widgets/projects/projectdialog.py:73
+#, fuzzy
+msgid "Location"
+msgstr "Documentation"
 
-#: spyderlib/widgets/explorer.py:221
-msgid "Package..."
-msgstr "Paquet..."
+#: spyder/widgets/projects/projectdialog.py:74
+#, fuzzy
+msgid "Project type"
+msgstr "Nom du projet :"
 
-#: spyderlib/widgets/explorer.py:244
-msgid "Move..."
-msgstr "Déplacer..."
+#: spyder/widgets/projects/projectdialog.py:75
+#, fuzzy
+msgid "Python version"
+msgstr "Fichiers Python"
 
-#: spyderlib/widgets/explorer.py:247
-msgid "Delete..."
-msgstr "Supprimer..."
+#: spyder/widgets/projects/projectdialog.py:83
+#: spyder/widgets/variableexplorer/importwizard.py:519
+msgid "Cancel"
+msgstr "Annuler"
 
-#: spyderlib/widgets/explorer.py:250
-msgid "Rename..."
-msgstr "Renommer..."
+#: spyder/widgets/projects/projectdialog.py:84
+msgid "Create"
+msgstr ""
 
-#: spyderlib/widgets/explorer.py:253
-msgid "Open"
-msgstr "Ouvrir"
+#: spyder/widgets/projects/projectdialog.py:102
+#, fuzzy
+msgid "Create new project"
+msgstr "Projets associés"
 
-#: spyderlib/widgets/explorer.py:254
-#: spyderlib/widgets/sourcecode/codeeditor.py:2456
-msgid "Convert to Python script"
-msgstr "Convertir en fichier Python"
+#: spyder/widgets/projects/type/__init__.py:215
+#, fuzzy
+msgid "Empty project"
+msgstr "Ouvrir le projet"
 
-#: spyderlib/widgets/explorer.py:277
-msgid "Commit"
-msgstr "Commiter"
+#: spyder/widgets/projects/type/python.py:20
+#, fuzzy
+msgid "Python project"
+msgstr "Ouvrir le projet"
 
-#: spyderlib/widgets/explorer.py:281
-msgid "Browse repository"
-msgstr "Explorer le dépôt"
+#: spyder/widgets/projects/type/python.py:76
+#, fuzzy
+msgid "Python package"
+msgstr "Gestionnaire de chemins d'accès Python"
 
-#: spyderlib/widgets/explorer.py:293
-msgid "Open command prompt here"
-msgstr "Ouvrir un invite de commandes ici"
+#: spyder/widgets/pydocgui.py:110
+msgid "Module or package:"
+msgstr "Module ou paquet :"
 
-#: spyderlib/widgets/explorer.py:295
-msgid "Open terminal here"
-msgstr "Ouvrir un terminal ici"
+#: spyder/widgets/shell.py:129
+msgid "Save history log..."
+msgstr "Enregistrer l'historique..."
 
-#: spyderlib/widgets/explorer.py:300
-msgid "Open Python console here"
-msgstr "Ouvrir une console &Python ici"
+#: spyder/widgets/shell.py:131
+msgid "Save current history log (i.e. all inputs and outputs) in a text file"
+msgstr ""
+"Enregistrer l'historique complet (toutes les entrées et sorties) dans un "
+"fichier texte"
 
-#: spyderlib/widgets/explorer.py:314
-msgid "New"
-msgstr "Nouveau"
+#: spyder/widgets/shell.py:257
+msgid "Save history log"
+msgstr "Enregistrer l'historique"
 
-#: spyderlib/widgets/explorer.py:322
-msgid "Import"
-msgstr "Import"
+#: spyder/widgets/shell.py:260
+msgid "History logs"
+msgstr "Fichiers d'historique"
 
-#: spyderlib/widgets/explorer.py:471
-msgid "Do you really want to delete <b>%s</b>?"
-msgstr "Souhaitez-vous réellement supprimer <b>%s</b> ?"
+#: spyder/widgets/shell.py:271
+msgid "<b>Unable to save file '%s'</b><br><br>Error message:<br>%s"
+msgstr ""
+"<b>Impossible d'enregistrer le fichier '%s'</b><br><br>Message d'erreur :<br>"
+"%s"
 
-#: spyderlib/widgets/explorer.py:489
-msgid "delete"
-msgstr "supprimer"
+#: spyder/widgets/shell.py:713
+msgid "Copy without prompts"
+msgstr "Copier sans les préfixes"
 
-#: spyderlib/widgets/explorer.py:490 spyderlib/widgets/projectexplorer.py:823
-#: spyderlib/widgets/projectexplorer.py:830
-#: spyderlib/widgets/projectexplorer.py:1101
-#: spyderlib/widgets/projectexplorer.py:1186
-msgid "Project Explorer"
-msgstr "Explorateur de projets"
+#: spyder/widgets/shell.py:716 spyder/widgets/shell.py:720
+msgid "Clear line"
+msgstr "Effacer la ligne"
 
-#: spyderlib/widgets/explorer.py:491 spyderlib/widgets/projectexplorer.py:770
-#: spyderlib/widgets/projectexplorer.py:1187
-msgid "<b>Unable to %s <i>%s</i></b><br><br>Error message:<br>%s"
-msgstr "<b>Impossible de %s <i>%s</i></b><br><br>Message d'erreur :<br>%s"
+#: spyder/widgets/shell.py:722
+msgid "Clear shell"
+msgstr "Effacer la console"
 
-#: spyderlib/widgets/explorer.py:514
-#: spyderlib/widgets/sourcecode/codeeditor.py:1987
-msgid "Conversion error"
-msgstr "Erreur de conversion"
+#: spyder/widgets/shell.py:726
+msgid "Clear shell contents ('cls' command)"
+msgstr "Effacer le contenu de la console"
 
-#: spyderlib/widgets/explorer.py:515
-#: spyderlib/widgets/sourcecode/codeeditor.py:1988
-msgid ""
-"It was not possible to convert this notebook. The error is:\n"
-"\n"
-msgstr ""
-"Impossible de convertir ce notebook. Message d'erreur:\n"
-"\n"
+#: spyder/widgets/sourcecode/codeeditor.py:100
+msgid "Go to line:"
+msgstr "Aller à la ligne :"
 
-#: spyderlib/widgets/explorer.py:533
-msgid "New name:"
-msgstr "Nouveau nom :"
+#: spyder/widgets/sourcecode/codeeditor.py:108
+msgid "Line count:"
+msgstr "Nombre de lignes :"
 
-#: spyderlib/widgets/explorer.py:541
-msgid ""
-"Do you really want to rename <b>%s</b> and overwrite the existing file <b>"
-"%s</b>?"
-msgstr ""
-"Souhaitez-vous réellement renommer <b>%s</b> et remplacer le ficher existant "
-"<b>%s</b> ?"
+#: spyder/widgets/sourcecode/codeeditor.py:1296
+msgid "Breakpoint"
+msgstr "Point d'arrêt"
+
+#: spyder/widgets/sourcecode/codeeditor.py:1297
+msgid "Condition:"
+msgstr "Condition :"
 
-#: spyderlib/widgets/explorer.py:552
-msgid "<b>Unable to rename file <i>%s</i></b><br><br>Error message:<br>%s"
-msgstr ""
-"<b>Impossible de renommer l'élément <i>%s</i></b><br><br>Message d'erreur :"
-"<br>%s"
+#: spyder/widgets/sourcecode/codeeditor.py:1703
+msgid "Code analysis"
+msgstr "Analyse de code"
 
-#: spyderlib/widgets/explorer.py:588
-msgid "<b>Unable to move <i>%s</i></b><br><br>Error message:<br>%s"
-msgstr ""
-"<b>Impossible de déplacer <i>%s</i></b><br><br>Message d'erreur :<br>%s"
+#: spyder/widgets/sourcecode/codeeditor.py:1757
+msgid "To do"
+msgstr "À faire"
 
-#: spyderlib/widgets/explorer.py:606
-msgid "<b>Unable to create folder <i>%s</i></b><br><br>Error message:<br>%s"
-msgstr ""
-"<b>Impossible de créer le répertoire <i>%s</i></b><br><br>Message d'erreur :"
-"<br>%s"
+#: spyder/widgets/sourcecode/codeeditor.py:1994
+msgid "Removal error"
+msgstr "Erreur de suppression"
 
-#: spyderlib/widgets/explorer.py:619 spyderlib/widgets/explorer.py:653
-msgid "<b>Unable to create file <i>%s</i></b><br><br>Error message:<br>%s"
+#: spyder/widgets/sourcecode/codeeditor.py:1995
+msgid ""
+"It was not possible to remove outputs from this notebook. The error is:\n"
+"\n"
 msgstr ""
-"<b>Impossible de créer le fichier <i>%s</i></b><br><br>Message d'erreur :<br>"
-"%s"
+"Impossible d'effacer les résultats de ce notebook:\n"
+"\n"
 
-#: spyderlib/widgets/explorer.py:627
-msgid "New folder"
-msgstr "Nouveau répertoire"
+#: spyder/widgets/sourcecode/codeeditor.py:2487
+msgid "Clear all ouput"
+msgstr "Effacer tous les résultats"
 
-#: spyderlib/widgets/explorer.py:628
-msgid "Folder name:"
-msgstr "Nom du dossier :"
+#: spyder/widgets/sourcecode/codeeditor.py:2493
+msgid "Go to definition"
+msgstr "Aller à la définition de l'objet"
 
-#: spyderlib/widgets/explorer.py:633
-msgid "New package"
-msgstr "Nouveau paquet"
+#: spyder/widgets/sourcecode/codeeditor.py:2522
+msgid "Zoom reset"
+msgstr "Réinitialisation du zoom"
 
-#: spyderlib/widgets/explorer.py:634
-msgid "Package name:"
-msgstr "Nom du paquet :"
+#: spyder/widgets/status.py:25
+msgid "CPU and memory usage info in the status bar"
+msgstr ""
+"Informations sur l'utilisation processeur et mémoire dans la barre d'état"
 
-#: spyderlib/widgets/explorer.py:674
-msgid "New module"
-msgstr "Nouveau module"
+#: spyder/widgets/status.py:94
+msgid "Memory:"
+msgstr "Mémoire :"
 
-#: spyderlib/widgets/explorer.py:686
+#: spyder/widgets/status.py:95
 msgid ""
-"For %s support, please install one of the<br/> following tools:<br/><br/>  %s"
+"Memory usage status: requires the `psutil` (>=v0.3) library on non-Windows "
+"platforms"
 msgstr ""
-"Pour ajouter la prise en charge de %s, merci d'installer <br/>l'un des "
-"outils suivants :<br/><br/>  %s"
+"Occupation mémoire : requiert la bibliothèque `psutil` (>=v0.3) sur les "
+"plateformes autres que Windows"
 
-#: spyderlib/widgets/explorer.py:690
-msgid "<b>Unable to find external program.</b><br><br>%s"
-msgstr "<b>Impossible de trouver un programme externe.</b><br><br>%s"
+#: spyder/widgets/status.py:107
+msgid "CPU:"
+msgstr "CPU :"
 
-#: spyderlib/widgets/explorer.py:893
-msgid "Show current directory only"
-msgstr "Afficher uniquement le répertoire courant"
+#: spyder/widgets/status.py:108
+msgid "CPU usage status: requires the `psutil` (>=v0.3) library"
+msgstr "Occupation CPU : requiert la bibliothèque `psutil` (>=v0.3)"
 
-#: spyderlib/widgets/explorer.py:989
-msgid "You don't have the right permissions to open this directory"
-msgstr ""
+#: spyder/widgets/status.py:130
+msgid "Permissions:"
+msgstr "Droits d'accès :"
 
-#: spyderlib/widgets/explorer.py:1018 spyderlib/widgets/importwizard.py:525
-msgid "Previous"
-msgstr "Précédent"
+#: spyder/widgets/status.py:144
+msgid "End-of-lines:"
+msgstr "Fins de ligne :"
 
-#: spyderlib/widgets/explorer.py:1024
-msgid "Parent"
-msgstr "Parent"
+#: spyder/widgets/status.py:158
+msgid "Encoding:"
+msgstr "Encodage :"
 
-#: spyderlib/widgets/externalshell/baseshell.py:142
-msgid "Run again this program"
-msgstr "Exécuter de nouveau ce programme"
+#: spyder/widgets/status.py:171
+msgid "Line:"
+msgstr "Ligne :"
 
-#: spyderlib/widgets/externalshell/baseshell.py:145
-msgid "Kill"
-msgstr "Terminer"
+#: spyder/widgets/status.py:175
+msgid "Column:"
+msgstr "Colonne :"
 
-#: spyderlib/widgets/externalshell/baseshell.py:147
-msgid "Kills the current process, causing it to exit immediately"
-msgstr ""
-"Tue le processus, entraînant une sortie brutale et immédiate du programme"
+#: spyder/widgets/tabs.py:146
+msgid "Browse tabs"
+msgstr "Naviguer dans les onglets"
 
-#: spyderlib/widgets/externalshell/baseshell.py:219
-msgid "<span style='color: #44AA44'><b>Running...</b></span>"
-msgstr "<span style='color: #44AA44'><b>En cours d'exécution...</b></span>"
+#: spyder/widgets/tabs.py:275
+msgid "Close current tab"
+msgstr "Fermer l'onglet"
 
-#: spyderlib/widgets/externalshell/baseshell.py:226
-msgid "Terminated."
-msgstr "Terminé."
+#: spyder/widgets/variableexplorer/arrayeditor.py:497
+#, fuzzy
+msgid "It was not possible to copy values for this array"
+msgstr ""
+"Impossible de convertir ce notebook. Message d'erreur:\n"
+"\n"
 
-#: spyderlib/widgets/externalshell/baseshell.py:251
-#: spyderlib/widgets/ipython.py:351 spyderlib/widgets/ipython.py:368
-#: spyderlib/widgets/mixins.py:656
-msgid "Arguments"
-msgstr "Arguments"
+#: spyder/widgets/variableexplorer/arrayeditor.py:532
+#: spyder/widgets/variableexplorer/arrayeditor.py:565
+#: spyder/widgets/variableexplorer/dataframeeditor.py:544
+#: spyder/widgets/variableexplorer/dataframeeditor.py:584
+msgid "Format"
+msgstr "Format"
 
-#: spyderlib/widgets/externalshell/baseshell.py:252
-msgid "Command line arguments:"
-msgstr "Arguments en ligne de commande :"
+#: spyder/widgets/variableexplorer/arrayeditor.py:537
+#: spyder/widgets/variableexplorer/dataframeeditor.py:548
+msgid "Resize"
+msgstr "Ajuster"
 
-#: spyderlib/widgets/externalshell/namespacebrowser.py:191
-msgid "Refresh"
-msgstr "Rafraîchir"
+#: spyder/widgets/variableexplorer/arrayeditor.py:566
+#: spyder/widgets/variableexplorer/dataframeeditor.py:585
+msgid "Float formatting"
+msgstr "Format de flottant"
 
-#: spyderlib/widgets/externalshell/namespacebrowser.py:195
-msgid "Refresh periodically"
-msgstr "Rafraîchir périodiquement"
+#: spyder/widgets/variableexplorer/arrayeditor.py:574
+#: spyder/widgets/variableexplorer/dataframeeditor.py:594
+msgid "Format (%s) is incorrect"
+msgstr "Le format (%s) n'est pas valide"
 
-#: spyderlib/widgets/externalshell/namespacebrowser.py:199
-#: spyderlib/widgets/externalshell/namespacebrowser.py:453
-msgid "Import data"
-msgstr "Importer des données"
+#: spyder/widgets/variableexplorer/arrayeditor.py:609
+msgid "Array is empty"
+msgstr "Ce tableau est vide"
 
-#: spyderlib/widgets/externalshell/namespacebrowser.py:202
-#: spyderlib/widgets/externalshell/namespacebrowser.py:541
-#: spyderlib/widgets/externalshell/namespacebrowser.py:562
-msgid "Save data"
-msgstr "Enregistrer les données"
+#: spyder/widgets/variableexplorer/arrayeditor.py:612
+msgid "Arrays with more than 3 dimensions are not supported"
+msgstr "Les tableaux de plus de trois dimensions ne sont pas pris en charge"
 
-#: spyderlib/widgets/externalshell/namespacebrowser.py:207
-msgid "Save data as..."
-msgstr "Enregistrer les données sous..."
+#: spyder/widgets/variableexplorer/arrayeditor.py:615
+msgid "The 'xlabels' argument length do no match array column number"
+msgstr ""
+"La taille de 'xlabels' ne correspond pas au nombre de colonnes du tableau"
 
-#: spyderlib/widgets/externalshell/namespacebrowser.py:215
-msgid "Exclude references which name starts with an underscore"
-msgstr "Exclure les références dont le nom commence par un tiret bas"
+#: spyder/widgets/variableexplorer/arrayeditor.py:619
+msgid "The 'ylabels' argument length do no match array row number"
+msgstr ""
+"La taille de 'ylabels' ne correspond pas au nombre de lignes du tableau"
 
-#: spyderlib/widgets/externalshell/namespacebrowser.py:223
-msgid "Exclude references which name is uppercase"
-msgstr "Exclure les références dont le nom s'écrit en lettres capitales"
+#: spyder/widgets/variableexplorer/arrayeditor.py:626
+msgid "%s arrays"
+msgstr "Les tableaux %s"
 
-#: spyderlib/widgets/externalshell/namespacebrowser.py:230
-msgid "Exclude references which name starts with an uppercase character"
-msgstr "Exclure les références dont le nom commence par une lettre majuscule"
+#: spyder/widgets/variableexplorer/arrayeditor.py:627
+msgid "%s are currently not supported"
+msgstr "%s ne sont actuellement pas pris en charge"
 
-#: spyderlib/widgets/externalshell/namespacebrowser.py:238
-msgid ""
-"Exclude references to unsupported data types (i.e. which won't be handled/"
-"saved correctly)"
-msgstr ""
-"Exclure les références dont le type n'est pas supporté par l'espace de "
-"travail (en particulier, l'enregistrement ne fonctionnera pas)"
+#: spyder/widgets/variableexplorer/arrayeditor.py:634
+#, fuzzy
+msgid "NumPy array"
+msgstr "Tableaux NumPy"
 
-#: spyderlib/widgets/externalshell/namespacebrowser.py:347
-msgid "Object <b>%s</b> is not picklable"
-msgstr ""
-"L'objet <b>%s</b> n'est pas pris en charge par le protocole de sérialisation "
-"de <i>Pickle</i>"
+#: spyder/widgets/variableexplorer/arrayeditor.py:636
+#: spyder/widgets/variableexplorer/arrayeditor.py:790
+msgid "Array editor"
+msgstr "Éditeur de tableaux"
 
-#: spyderlib/widgets/externalshell/namespacebrowser.py:473
-msgid ""
-"<b>Unsupported file extension '%s'</b><br><br>Would you like to import it "
-"anyway (by selecting a known file format)?"
-msgstr ""
-"<b>Extension de fichier non pris en charge '%s'</b><br><br>Souhaitez-vous "
-"néanmoins ouvrir ce fichier (en choisissant un format de fichier connu) ?"
+#: spyder/widgets/variableexplorer/arrayeditor.py:638
+msgid "read only"
+msgstr "lecture seule"
 
-#: spyderlib/widgets/externalshell/namespacebrowser.py:481
-msgid "Open file as:"
-msgstr "Ouvrir le fichier en tant que :"
+#: spyder/widgets/variableexplorer/arrayeditor.py:668
+msgid "Record array fields:"
+msgstr "Champs du tableau : "
 
-#: spyderlib/widgets/externalshell/namespacebrowser.py:529
-msgid "<b>Unable to load '%s'</b><br><br>Error message:<br>%s"
-msgstr "<b>Impossible d'ouvrir '%s'</b><br><br>Message d'erreur :<br>%s"
+#: spyder/widgets/variableexplorer/arrayeditor.py:680
+msgid "Data"
+msgstr "Données"
 
-#: spyderlib/widgets/externalshell/namespacebrowser.py:563
-msgid "<b>Unable to save current workspace</b><br><br>Error message:<br>%s"
-msgstr ""
-"<b>Impossible d'enregistrer l'espace de travail</b><br><br>Message d'erreur :"
-"<br>%s"
+#: spyder/widgets/variableexplorer/arrayeditor.py:680
+msgid "Mask"
+msgstr "Masque"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:284
-msgid "Variables"
-msgstr "Variables"
+#: spyder/widgets/variableexplorer/arrayeditor.py:680
+msgid "Masked data"
+msgstr "Données masquées"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:285
-msgid "Show/hide global variables explorer"
-msgstr "Afficher/masquer l'explorateur de variables globales"
+#: spyder/widgets/variableexplorer/arrayeditor.py:691
+msgid "Axis:"
+msgstr "Axe :"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:289
-msgid "Terminate"
-msgstr "Quitter"
+#: spyder/widgets/variableexplorer/arrayeditor.py:696
+msgid "Index:"
+msgstr "Indice :"
+
+#: spyder/widgets/variableexplorer/arrayeditor.py:709
+msgid "<u>Warning</u>: changes are applied separately"
+msgstr "<u>Attention</u>: les changements seront pris en compte séparément"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:290
+#: spyder/widgets/variableexplorer/arrayeditor.py:710
 msgid ""
-"Attempts to stop the process. The process\n"
-"may not exit as a result of clicking this\n"
-"button (it is given the chance to prompt\n"
-"the user for any unsaved files, etc)."
+"For performance reasons, changes applied to masked array won't be reflected "
+"in array's data (and vice-versa)."
 msgstr ""
-"Tentative de fermeture du processus. Il est possible que\n"
-"le processus ne s'arrête pas suite à cette tentative,\n"
-"et propose à l'utilisateur de sauvegarder\n"
-"les fichiers non-enregistrés, etc..."
+"Pour des questions de performance, les changements effectués sur les données "
+"masquées ne seront pas reflétées sur les données du tableau (et "
+"réciproquement)."
 
-#: spyderlib/widgets/externalshell/pythonshell.py:303
-msgid "Interact"
-msgstr "Interagir"
+#: spyder/widgets/variableexplorer/collectionseditor.py:116
+msgid "Index"
+msgstr "Indice"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:305
-msgid "Debug"
-msgstr "Déboguer"
+#: spyder/widgets/variableexplorer/collectionseditor.py:121
+msgid "Tuple"
+msgstr "Tuple"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:307
-#: spyderlib/widgets/externalshell/pythonshell.py:373
-msgid "Arguments..."
-msgstr "Arguments..."
+#: spyder/widgets/variableexplorer/collectionseditor.py:124
+msgid "List"
+msgstr "Liste"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:309
-msgid "Post Mortem Debug"
-msgstr ""
+#: spyder/widgets/variableexplorer/collectionseditor.py:127
+msgid "Dictionary"
+msgstr "Dictionnaire"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:315
-msgid "Working directory"
-msgstr "Répertoire de travail"
+#: spyder/widgets/variableexplorer/collectionseditor.py:129
+msgid "Key"
+msgstr "Clé"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:317
-msgid "Set current working directory"
-msgstr "Changer le répertoire de travail"
+#: spyder/widgets/variableexplorer/collectionseditor.py:135
+msgid "Attribute"
+msgstr "Attribut"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:319
-msgid "Environment variables"
-msgstr "Variables d'environnement"
+#: spyder/widgets/variableexplorer/collectionseditor.py:137
+msgid "elements"
+msgstr "éléments"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:323
-msgid "Show sys.path contents"
-msgstr "Afficher le contenu de sys.path"
+#: spyder/widgets/variableexplorer/collectionseditor.py:313
+msgid "Size"
+msgstr "Taille"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:369
-msgid "Arguments: %s"
-msgstr "Arguments : %s"
+#: spyder/widgets/variableexplorer/collectionseditor.py:313
+msgid "Type"
+msgstr "Type"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:371
-msgid "No argument"
-msgstr "Aucun argument"
+#: spyder/widgets/variableexplorer/collectionseditor.py:313
+msgid "Value"
+msgstr "Valeur"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:550
+#: spyder/widgets/variableexplorer/collectionseditor.py:411
 msgid ""
-"The kernel failed to start!! That's all we know... Please close this console "
-"and open a new one."
+"Opening this variable can be slow\n"
+"\n"
+"Do you want to continue anyway?"
 msgstr ""
-"Le démarrage du noyau a échoué ! C'est malheureusement tout ce que nous "
-"savons... Merci de fermer cette console et d'en ouvrir une nouvelle."
-
-#: spyderlib/widgets/externalshell/pythonshell.py:554
-msgid "A Python console failed to start!"
-msgstr "Le démarrage d'une console Python a échoué !"
-
-#: spyderlib/widgets/externalshell/systemshell.py:100
-msgid "Process failed to start"
-msgstr "Le processus n'a pas pu démarrer"
-
-#: spyderlib/widgets/file_switcher.py:109
-#, fuzzy
-msgid "unsaved file"
-msgstr "Enregitrer un fichier"
+"Afficher cette variable peut prendre du temps.\n"
+"\n"
+"Souhaitez-vous néanmoins continuer ?"
 
-#: spyderlib/widgets/file_switcher.py:229
+#: spyder/widgets/variableexplorer/collectionseditor.py:420
 msgid ""
-"Press <b>Enter</b> to switch files or <b>Esc</b> to cancel.<br><br>Type to "
-"filter filenames.<br><br>Use <b>:number</b> to go to a line, e.g. "
-"<b><code>main:42</code></b><br>Use <b>@symbol_text</b> to go to a symbol, e."
-"g. <b><code>@init</code></b><br><br> Press <b>Ctrl+W</b> to close current "
-"tab.<br>"
+"Spyder was unable to retrieve the value of this variable from the console."
+"<br><br>The error mesage was:<br><i>%s</i>"
 msgstr ""
 
-#: spyderlib/widgets/file_switcher.py:481
-#, fuzzy
-msgid "lines"
-msgstr " lignes"
-
-#: spyderlib/widgets/findinfiles.py:158
-msgid "Unexpected error: see internal console"
-msgstr "Erreur inattendue : voir console interne"
-
-#: spyderlib/widgets/findinfiles.py:210 spyderlib/widgets/findinfiles.py:234
-#: spyderlib/widgets/findinfiles.py:281
-msgid "invalid regular expression"
-msgstr "expression régulière incorrecte"
-
-#: spyderlib/widgets/findinfiles.py:279
-msgid "permission denied errors were encountered"
-msgstr "des erreurs d'autorisation d'accès ont été rencontrées"
+#: spyder/widgets/variableexplorer/collectionseditor.py:579
+msgid "Edit item"
+msgstr "Modifier"
 
-#: spyderlib/widgets/findinfiles.py:316
-msgid "Search pattern"
-msgstr "Expression recherchée"
+#: spyder/widgets/variableexplorer/collectionseditor.py:580
+msgid "<b>Unable to assign data to item.</b><br><br>Error message:<br>%s"
+msgstr ""
+"<b>Impossible d'assigner la valeur de l'objet.</b><br><br>Message d'erreur :"
+"<br>%s"
 
-#: spyderlib/widgets/findinfiles.py:319 spyderlib/widgets/findinfiles.py:353
-#: spyderlib/widgets/findinfiles.py:365 spyderlib/widgets/findreplace.py:77
-msgid "Regular expression"
-msgstr "Expression régulière"
+#: spyder/widgets/variableexplorer/collectionseditor.py:642
+msgid "Resize rows to contents"
+msgstr "Ajuster la hauteur des lignes"
 
-#: spyderlib/widgets/findinfiles.py:328
-msgid "Search"
-msgstr "Rechercher"
+#: spyder/widgets/variableexplorer/collectionseditor.py:653
+#: spyder/widgets/variableexplorer/collectionseditor.py:998
+#: spyder/widgets/variableexplorer/collectionseditor.py:1015
+msgid "Plot"
+msgstr "Tracer"
 
-#: spyderlib/widgets/findinfiles.py:331
-msgid "Start search"
-msgstr "Démarrer la recherche"
+#: spyder/widgets/variableexplorer/collectionseditor.py:657
+msgid "Histogram"
+msgstr "Histogramme"
 
-#: spyderlib/widgets/findinfiles.py:334 spyderlib/widgets/ipython.py:555
-msgid "Stop"
-msgstr "Arrêter"
+#: spyder/widgets/variableexplorer/collectionseditor.py:661
+msgid "Show image"
+msgstr "Afficher l'image"
 
-#: spyderlib/widgets/findinfiles.py:337
-msgid "Stop search"
-msgstr "Arrêter la recherche"
+#: spyder/widgets/variableexplorer/collectionseditor.py:665
+#: spyder/widgets/variableexplorer/collectionseditor.py:1023
+msgid "Save array"
+msgstr "Enregistrer le tableau"
 
-#: spyderlib/widgets/findinfiles.py:347
-msgid "Included filenames pattern"
-msgstr "Expression des noms de fichier à inclure"
+#: spyder/widgets/variableexplorer/collectionseditor.py:669
+#: spyder/widgets/variableexplorer/collectionseditor.py:962
+#: spyder/widgets/variableexplorer/collectionseditor.py:970
+msgid "Insert"
+msgstr "Insérer"
 
-#: spyderlib/widgets/findinfiles.py:356
-msgid "Include:"
-msgstr "Inclure :"
+#: spyder/widgets/variableexplorer/collectionseditor.py:672
+#: spyder/widgets/variableexplorer/collectionseditor.py:906
+msgid "Remove"
+msgstr "Supprimer"
 
-#: spyderlib/widgets/findinfiles.py:359
-msgid "Excluded filenames pattern"
-msgstr "Expression des noms de fichier à exclure"
+#: spyder/widgets/variableexplorer/collectionseditor.py:686
+#: spyder/widgets/variableexplorer/collectionseditor.py:927
+msgid "Duplicate"
+msgstr "Dupliquer"
 
-#: spyderlib/widgets/findinfiles.py:368
-msgid "Exclude:"
-msgstr "Exclure :"
+#: spyder/widgets/variableexplorer/collectionseditor.py:904
+#, fuzzy
+msgid "Do you want to remove the selected item?"
+msgstr "Souhaitez-vous supprimer l'élément sélectionné ?"
 
-#: spyderlib/widgets/findinfiles.py:378
-msgid "PYTHONPATH"
-msgstr "PYTHONPATH"
+#: spyder/widgets/variableexplorer/collectionseditor.py:905
+msgid "Do you want to remove all selected items?"
+msgstr "Souhaitez-vous supprimer les éléments sélectionnés ?"
 
-#: spyderlib/widgets/findinfiles.py:380
-msgid ""
-"Search in all directories listed in sys.path which are outside the Python "
-"installation directory"
-msgstr ""
-"Rechercher dans tous les répertoires listés dans sys.path qui sont situés en "
-"dehors du répertoire d'installation de Python"
+#: spyder/widgets/variableexplorer/collectionseditor.py:925
+#, fuzzy
+msgid "New variable name:"
+msgstr "nom_de_variable"
 
-#: spyderlib/widgets/findinfiles.py:383
-msgid "Hg repository"
-msgstr "Dépôt Mercurial"
+#: spyder/widgets/variableexplorer/collectionseditor.py:928
+#, fuzzy
+msgid "Variable name:"
+msgstr "Nom de variable"
 
-#: spyderlib/widgets/findinfiles.py:386
-msgid "Search in current directory hg repository"
-msgstr "Rechercher dans le dépôt Mercurial du répertoire courant"
+#: spyder/widgets/variableexplorer/collectionseditor.py:962
+msgid "Key:"
+msgstr "Clé :"
 
-#: spyderlib/widgets/findinfiles.py:387
-msgid "Here:"
-msgstr "Ici :"
+#: spyder/widgets/variableexplorer/collectionseditor.py:970
+msgid "Value:"
+msgstr "Valeur :"
 
-#: spyderlib/widgets/findinfiles.py:391
-msgid "Search recursively in this directory"
-msgstr "Rechercher de manière récursive dans ce répertoire"
+#: spyder/widgets/variableexplorer/collectionseditor.py:986
+msgid "Import error"
+msgstr "Erreur d'import"
 
-#: spyderlib/widgets/findinfiles.py:396
-msgid "Browse a search directory"
-msgstr "Sélectionner un répertoire de recherche"
+#: spyder/widgets/variableexplorer/collectionseditor.py:987
+msgid "Please install <b>matplotlib</b> or <b>guiqwt</b>."
+msgstr "Merci d'installer <b>matplotlib</b> ou <b>guiqwt</b>."
 
-#: spyderlib/widgets/findinfiles.py:426
-msgid "Hide advanced options"
-msgstr "Masquer les options avancées"
+#: spyder/widgets/variableexplorer/collectionseditor.py:999
+msgid "<b>Unable to plot data.</b><br><br>Error message:<br>%s"
+msgstr ""
+"<b>Impossible d'afficher les données</b><br><br>Message d'erreur :<br>%s"
 
-#: spyderlib/widgets/findinfiles.py:429
-msgid "Show advanced options"
-msgstr "Afficher les options avancées"
+#: spyder/widgets/variableexplorer/collectionseditor.py:1016
+msgid "<b>Unable to show image.</b><br><br>Error message:<br>%s"
+msgstr "<b>Impossible d'afficher l'image</b><br><br>Message d'erreur :<br>%s"
 
-#: spyderlib/widgets/findinfiles.py:570
-msgid "Search canceled"
-msgstr "Recherche annulée"
+#: spyder/widgets/variableexplorer/collectionseditor.py:1039
+msgid "<b>Unable to save array</b><br><br>Error message:<br>%s"
+msgstr ""
+"<b>Impossible d'enregistrer le tableau</b><br><br>Message d'erreur :<br>%s"
 
-#: spyderlib/widgets/findinfiles.py:574
-msgid "String not found"
-msgstr "Chaîne de caractères non trouvée"
+#: spyder/widgets/variableexplorer/collectionseditor.py:1064
+#, fuzzy
+msgid "It was not possible to copy this array"
+msgstr "Impossible d'exécuter ce fichier dans un terminal externe"
 
-#: spyderlib/widgets/findinfiles.py:576
-msgid "matches in"
-msgstr "correspondances trouvées dans"
+#: spyder/widgets/variableexplorer/collectionseditor.py:1089
+msgid "Clipboard contents"
+msgstr "Contenu du presse-papiers"
 
-#: spyderlib/widgets/findinfiles.py:577
-msgid "file"
-msgstr "fichier"
+#: spyder/widgets/variableexplorer/collectionseditor.py:1104
+msgid "Import from clipboard"
+msgstr "Importer depuis le presse-papiers"
 
-#: spyderlib/widgets/findinfiles.py:585
-msgid "interrupted"
-msgstr "interrompu"
+#: spyder/widgets/variableexplorer/collectionseditor.py:1106
+msgid "Empty clipboard"
+msgstr "Presse-papiers vide"
 
-#: spyderlib/widgets/findreplace.py:59
-msgid "Search string"
-msgstr "Chaîne de caractères à rechercher"
+#: spyder/widgets/variableexplorer/collectionseditor.py:1107
+msgid "Nothing to be imported from clipboard."
+msgstr "Aucune donnée ne peut être importée depuis le presse-papiers."
 
-#: spyderlib/widgets/findreplace.py:83
-msgid "Case Sensitive"
-msgstr "Respecter la casse"
+#: spyder/widgets/variableexplorer/dataframeeditor.py:450
+msgid "To bool"
+msgstr "Booléen"
 
-#: spyderlib/widgets/findreplace.py:89
-msgid "Whole words"
-msgstr "Mots entiers"
+#: spyder/widgets/variableexplorer/dataframeeditor.py:450
+msgid "To complex"
+msgstr "Complexe"
 
-#: spyderlib/widgets/findreplace.py:95
-msgid "Highlight matches"
-msgstr "Surligner les résultats"
+#: spyder/widgets/variableexplorer/dataframeeditor.py:451
+msgid "To float"
+msgstr "Flottant"
 
-#: spyderlib/widgets/findreplace.py:109
-msgid "Replace with:"
-msgstr "Remplacer par :"
+#: spyder/widgets/variableexplorer/dataframeeditor.py:451
+msgid "To int"
+msgstr "Entier"
 
-#: spyderlib/widgets/findreplace.py:111
-msgid "Replace string"
-msgstr "Chaîne de caractères de remplacement"
+#: spyder/widgets/variableexplorer/dataframeeditor.py:452
+msgid "To str"
+msgstr "Caractères"
 
-#: spyderlib/widgets/findreplace.py:114
-msgid "Replace/find"
-msgstr "Remplacer/rechercher"
+#: spyder/widgets/variableexplorer/dataframeeditor.py:526
+msgid "%s editor"
+msgstr "Éditeur de %s"
 
-#: spyderlib/widgets/findreplace.py:121
-msgid "Replace all"
-msgstr "Remplacer tout"
+#: spyder/widgets/variableexplorer/dataframeeditor.py:558
+msgid "Column min/max"
+msgstr "Colonne min/max"
 
-#: spyderlib/widgets/importwizard.py:116 spyderlib/widgets/importwizard.py:431
+#: spyder/widgets/variableexplorer/importwizard.py:116
+#: spyder/widgets/variableexplorer/importwizard.py:431
 msgid "Import as"
 msgstr "Importer en tant que"
 
-#: spyderlib/widgets/importwizard.py:118
+#: spyder/widgets/variableexplorer/importwizard.py:118
 msgid "data"
 msgstr "données"
 
-#: spyderlib/widgets/importwizard.py:122
+#: spyder/widgets/variableexplorer/importwizard.py:122
 msgid "code"
 msgstr "code"
 
-#: spyderlib/widgets/importwizard.py:125 spyderlib/widgets/importwizard.py:504
+#: spyder/widgets/variableexplorer/importwizard.py:125
+#: spyder/widgets/variableexplorer/importwizard.py:504
 msgid "text"
 msgstr "texte"
 
-#: spyderlib/widgets/importwizard.py:138
+#: spyder/widgets/variableexplorer/importwizard.py:138
 msgid "Column separator:"
 msgstr "Séparateur de colonne :"
 
-#: spyderlib/widgets/importwizard.py:142
+#: spyder/widgets/variableexplorer/importwizard.py:142
 msgid "Tab"
 msgstr "Tab"
 
-#: spyderlib/widgets/importwizard.py:145 spyderlib/widgets/importwizard.py:163
+#: spyder/widgets/variableexplorer/importwizard.py:145
+#: spyder/widgets/variableexplorer/importwizard.py:163
 msgid "other"
 msgstr "autre"
 
-#: spyderlib/widgets/importwizard.py:156
+#: spyder/widgets/variableexplorer/importwizard.py:156
 msgid "Row separator:"
 msgstr "Séparateur de ligne :"
 
-#: spyderlib/widgets/importwizard.py:160
+#: spyder/widgets/variableexplorer/importwizard.py:160
 msgid "EOL"
 msgstr "EOL"
 
-#: spyderlib/widgets/importwizard.py:175
+#: spyder/widgets/variableexplorer/importwizard.py:175
 msgid "Additional options"
 msgstr "Options supplémentaires"
 
-#: spyderlib/widgets/importwizard.py:179
+#: spyder/widgets/variableexplorer/importwizard.py:179
 msgid "Skip rows:"
 msgstr "Sauter des lignes :"
 
-#: spyderlib/widgets/importwizard.py:190
+#: spyder/widgets/variableexplorer/importwizard.py:190
 msgid "Comments:"
 msgstr "Commentaires :"
 
-#: spyderlib/widgets/importwizard.py:196
+#: spyder/widgets/variableexplorer/importwizard.py:196
 msgid "Transpose"
 msgstr "Transposer"
 
-#: spyderlib/widgets/importwizard.py:434
+#: spyder/widgets/variableexplorer/importwizard.py:434
 msgid "array"
 msgstr "tableau"
 
-#: spyderlib/widgets/importwizard.py:439
+#: spyder/widgets/variableexplorer/importwizard.py:439
 msgid "list"
 msgstr "liste"
 
-#: spyderlib/widgets/importwizard.py:444
+#: spyder/widgets/variableexplorer/importwizard.py:444
 msgid "DataFrame"
 msgstr "DataFrame"
 
-#: spyderlib/widgets/importwizard.py:487 spyderlib/widgets/importwizard.py:569
+#: spyder/widgets/variableexplorer/importwizard.py:487
+#: spyder/widgets/variableexplorer/importwizard.py:571
 msgid "Import wizard"
 msgstr "Assistant d'importation"
 
-#: spyderlib/widgets/importwizard.py:492
+#: spyder/widgets/variableexplorer/importwizard.py:492
 msgid "Raw text"
 msgstr "Text brut"
 
-#: spyderlib/widgets/importwizard.py:495
+#: spyder/widgets/variableexplorer/importwizard.py:495
 msgid "variable_name"
 msgstr "nom_de_variable"
 
-#: spyderlib/widgets/importwizard.py:506
+#: spyder/widgets/variableexplorer/importwizard.py:506
 msgid "table"
 msgstr "tableau"
 
-#: spyderlib/widgets/importwizard.py:507
+#: spyder/widgets/variableexplorer/importwizard.py:507
 msgid "Preview"
 msgstr "Aperçu"
 
-#: spyderlib/widgets/importwizard.py:511
+#: spyder/widgets/variableexplorer/importwizard.py:511
 msgid "Variable Name"
 msgstr "Nom de variable"
 
-#: spyderlib/widgets/importwizard.py:519
-msgid "Cancel"
-msgstr "Annuler"
-
-#: spyderlib/widgets/importwizard.py:532
+#: spyder/widgets/variableexplorer/importwizard.py:534
 msgid "Done"
 msgstr "Terminer"
 
-#: spyderlib/widgets/importwizard.py:570
+#: spyder/widgets/variableexplorer/importwizard.py:572
 msgid ""
 "<b>Unable to proceed to next step</b><br><br>Please check your entries."
 "<br><br>Error message:<br>%s"
@@ -4733,586 +5170,455 @@ msgstr ""
 "<b>Impossible de passer à l'étape suivante</b><br><br>Merci de vérifier "
 "votre saisie.<br><br>Message d'erreur :<br>%s"
 
-#: spyderlib/widgets/internalshell.py:258
-msgid "Help..."
-msgstr "Aide..."
-
-#: spyderlib/widgets/internalshell.py:266
-msgid "Help"
-msgstr "Aide"
-
-#: spyderlib/widgets/internalshell.py:275
-msgid "Shell special commands:"
-msgstr "Commandes spéciales de la console :"
-
-#: spyderlib/widgets/internalshell.py:276
-msgid "Internal editor:"
-msgstr "Éditeur interne :"
-
-#: spyderlib/widgets/internalshell.py:277
-msgid "External editor:"
-msgstr "Éditeur externe :"
-
-#: spyderlib/widgets/internalshell.py:278
-msgid "Run script:"
-msgstr "Exécuter un script :"
-
-#: spyderlib/widgets/internalshell.py:279
-msgid "Remove references:"
-msgstr "Supprimer des références :"
-
-#: spyderlib/widgets/internalshell.py:280
-msgid "System commands:"
-msgstr "Commandes systèmes :"
-
-#: spyderlib/widgets/internalshell.py:281
-msgid "Python help:"
-msgstr "Aide Python :"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:199
+msgid "Refresh"
+msgstr "Rafraîchir"
 
-#: spyderlib/widgets/internalshell.py:282
-msgid "GUI-based editor:"
-msgstr "Éditeur graphique :"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:203
+msgid "Refresh periodically"
+msgstr "Rafraîchir périodiquement"
 
-#: spyderlib/widgets/ipython.py:506
-msgid "An error ocurred while starting the kernel"
-msgstr "Une erreur est survenue lors du démarrage du noyau."
+#: spyder/widgets/variableexplorer/namespacebrowser.py:210
+#: spyder/widgets/variableexplorer/namespacebrowser.py:490
+msgid "Import data"
+msgstr "Importer des données"
 
-#: spyderlib/widgets/ipython.py:535
-msgid "Restart kernel"
-msgstr "Redémarrer le noyau"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:213
+#: spyder/widgets/variableexplorer/namespacebrowser.py:568
+#: spyder/widgets/variableexplorer/namespacebrowser.py:587
+msgid "Save data"
+msgstr "Enregistrer les données"
 
-#: spyderlib/widgets/ipython.py:557
-msgid "Stop the current command"
-msgstr "Interrompre la commande en cours"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:218
+msgid "Save data as..."
+msgstr "Enregistrer les données sous..."
 
-#: spyderlib/widgets/ipython.py:581
-msgid "Inspect current object"
-msgstr "Inspecter l'onglet courant"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:230
+msgid "Exclude references which name starts with an underscore"
+msgstr "Exclure les références dont le nom commence par un tiret bas"
 
-#: spyderlib/widgets/ipython.py:586
-msgid "Clear line or block"
-msgstr "Effacer la ligne ou le bloc"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:238
+msgid "Exclude references which name is uppercase"
+msgstr "Exclure les références dont le nom s'écrit en lettres capitales"
 
-#: spyderlib/widgets/ipython.py:590
-msgid "Clear console"
-msgstr "Effacer la console"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:245
+msgid "Exclude references which name starts with an uppercase character"
+msgstr "Exclure les références dont le nom commence par une lettre majuscule"
 
-#: spyderlib/widgets/ipython.py:640
+#: spyder/widgets/variableexplorer/namespacebrowser.py:253
 msgid ""
-"It seems the kernel died unexpectedly. Use 'Restart kernel' to continue "
-"using this console."
-msgstr ""
-"Le noyau a été arrêté de façon inattendue. Redémarrez le noyau pour "
-"continuer d'utiliser cette console."
-
-#: spyderlib/widgets/ipython.py:660
-msgid "Changing backend to Qt for Mayavi"
-msgstr "Utilisation du backend Qt pour Mayavi"
-
-#: spyderlib/widgets/ipython.py:669
-msgid "Kernel process is either remote or unspecified. Cannot interrupt"
+"Exclude references to unsupported data types (i.e. which won't be handled/"
+"saved correctly)"
 msgstr ""
-"Le processus du noyau est soit distant, soit non spécifié : impossible "
-"d'arrêter le noyau."
+"Exclure les références dont le type n'est pas supporté par l'espace de "
+"travail (en particulier, l'enregistrement ne fonctionnera pas)"
 
-#: spyderlib/widgets/ipython.py:678
-msgid "Kernel process is either remote or unspecified. Cannot restart."
+#: spyder/widgets/variableexplorer/namespacebrowser.py:348
+msgid "Object <b>%s</b> is not picklable"
 msgstr ""
-"Le processus du noyau est soit distant, soit non spécifié : impossible de "
-"redémarrer le noyau."
-
-#: spyderlib/widgets/ipython.py:757
-msgid "Connecting to kernel..."
-msgstr "Connexion au noyau..."
-
-#: spyderlib/widgets/onecolumntree.py:60
-msgid "Collapse all"
-msgstr "Replier tout"
-
-#: spyderlib/widgets/onecolumntree.py:64
-msgid "Expand all"
-msgstr "Déplier tout"
-
-#: spyderlib/widgets/onecolumntree.py:68
-msgid "Restore"
-msgstr "Restaurer"
-
-#: spyderlib/widgets/onecolumntree.py:69
-msgid "Restore original tree layout"
-msgstr "Restaurer l'organisation initiale de l'arbre"
-
-#: spyderlib/widgets/onecolumntree.py:73
-msgid "Collapse selection"
-msgstr "Replier la sélection"
-
-#: spyderlib/widgets/onecolumntree.py:77
-msgid "Expand selection"
-msgstr "Déplier la sélection"
-
-#: spyderlib/widgets/pathmanager.py:86
-msgid "Move to top"
-msgstr "Placer en premier"
-
-#: spyderlib/widgets/pathmanager.py:92
-msgid "Move up"
-msgstr "Monter"
+"L'objet <b>%s</b> n'est pas pris en charge par le protocole de sérialisation "
+"de <i>Pickle</i>"
 
-#: spyderlib/widgets/pathmanager.py:98
-msgid "Move down"
-msgstr "Descendre"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:510
+msgid ""
+"<b>Unsupported file extension '%s'</b><br><br>Would you like to import it "
+"anyway (by selecting a known file format)?"
+msgstr ""
+"<b>Extension de fichier non pris en charge '%s'</b><br><br>Souhaitez-vous "
+"néanmoins ouvrir ce fichier (en choisissant un format de fichier connu) ?"
 
-#: spyderlib/widgets/pathmanager.py:104
-msgid "Move to bottom"
-msgstr "Placer en dernier"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:518
+msgid "Open file as:"
+msgstr "Ouvrir le fichier en tant que :"
 
-#: spyderlib/widgets/pathmanager.py:115 spyderlib/widgets/pathmanager.py:230
-msgid "Add path"
-msgstr "Ajouter un chemin"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:556
+msgid "<b>Unable to load '%s'</b><br><br>Error message:<br>%s"
+msgstr "<b>Impossible d'ouvrir '%s'</b><br><br>Message d'erreur :<br>%s"
 
-#: spyderlib/widgets/pathmanager.py:120 spyderlib/widgets/pathmanager.py:213
-msgid "Remove path"
-msgstr "Supprimer"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:588
+msgid "<b>Unable to save current workspace</b><br><br>Error message:<br>%s"
+msgstr ""
+"<b>Impossible d'enregistrer l'espace de travail</b><br><br>Message d'erreur :"
+"<br>%s"
 
-#: spyderlib/widgets/pathmanager.py:130
-msgid "Synchronize..."
-msgstr "Synchroniser..."
+#: spyder/widgets/variableexplorer/texteditor.py:74
+msgid "Text editor"
+msgstr "Éditeur de texte"
 
-#: spyderlib/widgets/pathmanager.py:132
-msgid "Synchronize Spyder's path list with PYTHONPATH environment variable"
+#: spyder/widgets/variableexplorer/utils.py:29
+msgid "View and edit DataFrames and Series in the Variable Explorer"
 msgstr ""
-"Synchronise la liste des chemins d'accès de Spyder avec celle de la variable "
-"d'environnement PYTHONPATH"
-
-#: spyderlib/widgets/pathmanager.py:144
-msgid "Synchronize"
-msgstr "Synchroniser"
+"Voir et éditer les Dataframes et les Series dans l'explorateur de variables"
 
-#: spyderlib/widgets/pathmanager.py:145
-msgid ""
-"This will synchronize Spyder's path list with <b>PYTHONPATH</b> environment "
-"variable for current user, allowing you to run your Python modules outside "
-"Spyder without having to configure sys.path. <br>Do you want to clear "
-"contents of PYTHONPATH before adding Spyder's path list?"
+#: spyder/widgets/variableexplorer/utils.py:34
+#, fuzzy
+msgid "View and edit two and three dimensional arrays in the Variable Explorer"
 msgstr ""
-"Ceci synchronisera la liste des chemins d'accès de Spyder avec celle de la "
-"variable d'environnement <b>PYTHONPATH</b> pour l'utilisateur courant, vous "
-"permettant ainsi d'exécuter vos modules Python en dehors de Spyder sans "
-"avoir besoin de configurer sys.path. <br>Souhaitez-vous effacer le contenu "
-"de PYTHONPATH avant d'y ajouter la liste des chemins d'accès de Spyder ?"
+"Voir et éditer les Dataframes et les Series dans l'explorateur de variables"
 
-#: spyderlib/widgets/pathmanager.py:214
-msgid "Do you really want to remove selected path?"
-msgstr "Souhaitez-vous vraiment supprimer le chemin sélectionné ?"
+#: spyder/workers/updates.py:89 spyder/workers/updates.py:91
+msgid "Unable to retrieve information."
+msgstr ""
 
-#: spyderlib/widgets/pathmanager.py:231
+#: spyder/workers/updates.py:93
 msgid ""
-"This directory is already included in Spyder path list.<br>Do you want to "
-"move it to the top of the list?"
+"Unable to connect to the internet. <br><br>Make sure the connection is "
+"working properly."
 msgstr ""
-"Ce répertoire est déjà inclus dans la liste des chemins d'accès de Spyder."
-"<br>Souhaitez-vous le placer en début de liste ?"
 
-#: spyderlib/widgets/projectexplorer.py:335
-msgid "its own configuration file"
-msgstr "son propre fichier de configuration"
+#: spyder/workers/updates.py:96
+#, fuzzy
+msgid "Unable to check for updates."
+msgstr "Impossible de charger la page"
 
-#: spyderlib/widgets/projectexplorer.py:337
-msgid " and "
-msgstr " et "
+#~ msgid "Reload last session"
+#~ msgstr "Recharger la session précédente"
 
-#: spyderlib/widgets/projectexplorer.py:341
-msgid "the following projects:<br>%s"
-msgstr "les projets suivants :<br>%s"
+#~ msgid "Load session..."
+#~ msgstr "Charger une session..."
 
-#: spyderlib/widgets/projectexplorer.py:545
-msgid "Project..."
-msgstr "Projet..."
+#~ msgid "Load Spyder session"
+#~ msgstr "Charger une session Spyder"
 
-#: spyderlib/widgets/projectexplorer.py:558
-msgid "Existing directory"
-msgstr "Répertoire existant"
+#, fuzzy
+#~ msgid "Save session..."
+#~ msgstr "Enregistrer la session"
 
-#: spyderlib/widgets/projectexplorer.py:562
-msgid "Existing Spyder project"
-msgstr "Projet Spyder existant"
+#~ msgid "Save current session and quit application"
+#~ msgstr "Enregistrer la session en cours et quitter l'application"
 
-#: spyderlib/widgets/projectexplorer.py:566
-msgid "Existing Pydev project"
-msgstr "Projet Pydev existant"
+#~ msgid "Open session"
+#~ msgstr "Ouvrir une session"
 
-#: spyderlib/widgets/projectexplorer.py:583
-msgid "Open project"
-msgstr "Ouvrir le projet"
+#~ msgid "Spyder sessions"
+#~ msgstr "Sessions Spyder"
 
-#: spyderlib/widgets/projectexplorer.py:588
-msgid "Close project"
-msgstr "Fermer le projet"
+#~ msgid "Save session"
+#~ msgstr "Enregistrer la session"
 
-#: spyderlib/widgets/projectexplorer.py:593
-msgid "Close unrelated projects"
-msgstr "Fermer les projets non associés"
+#, fuzzy
+#~ msgid "Jupyter Qtconsole integration"
+#~ msgstr "Intégration de la console IPython"
 
-#: spyderlib/widgets/projectexplorer.py:602
-msgid "Edit related projects"
-msgstr "Modifier les projets associés"
+#~ msgid "Python executable"
+#~ msgstr "Exécutable Python"
 
-#: spyderlib/widgets/projectexplorer.py:610
-msgid "Add to PYTHONPATH"
-msgstr "Ajouter à PYTHONPATH"
+#~ msgid "Trying to kill a kernel?"
+#~ msgstr "Tentative d'arrêt d'un noyau"
 
-#: spyderlib/widgets/projectexplorer.py:615
-msgid "Remove from PYTHONPATH"
-msgstr "Retirer de PYTHONPATH"
+#~ 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 the second button from right to left."
+#~ msgstr ""
+#~ "Le noyau ne peut pas être fermé car au moins une console y est connectée. "
+#~ "<br><br> Veuillez soit fermer toutes les consoles connectées ou appuyer "
+#~ "sur le second bouton en partant de la droite pour tuer le processus du "
+#~ "noyau."
 
-#: spyderlib/widgets/projectexplorer.py:620
-msgid "Properties"
-msgstr "Propriétés"
+#~ msgid "Kernel"
+#~ msgstr "Noyau"
 
-#: spyderlib/widgets/projectexplorer.py:655
-msgid "Show horizontal scrollbar"
-msgstr "Barre de défilement horizontal"
+#~ msgid ""
+#~ "Either:<ol><li>Your IPython frontend and kernel versions are "
+#~ "<b>incompatible</b> or</li><li>You <b>don't have</b> IPython installed in "
+#~ "your external interpreter.</li></ol>In any case, we're sorry but we can't "
+#~ "create a console for you."
+#~ msgstr ""
+#~ "<ol><li>Soit les versions de votre interface IPython et du noyau sont "
+#~ "<b>incompatibles</b>,</li><li>soit IPython <b>n'est pas</b> installé pour "
+#~ "votre interpréteur externe.</li></ol>Dans tous les cas nous sommes "
+#~ "désolés mais nous ne pouvons ouvrir une console pour vous."
 
-#: spyderlib/widgets/projectexplorer.py:692
-msgid "Workspace"
-msgstr "Espace de travail"
+#~ msgid "Kernel %s"
+#~ msgstr "Noyau %s"
 
-#: spyderlib/widgets/projectexplorer.py:693
-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."
-msgstr ""
-"L'espace de travail n'est pas parvenu à ouvrir ou enregistrer "
-"%s<br><br>Veuillez vérifier que vous disposez bien des droits d'écriture sur "
-"les fichiers de configuration associés."
+#~ msgid "Open an IPython console"
+#~ msgstr "Ouvrir une console IPython"
 
-#: spyderlib/widgets/projectexplorer.py:752
-msgid "Import directory"
-msgstr "Importer un répertoire"
+#~ 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 ""
+#~ "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/widgets/projectexplorer.py:754
-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)?"
-msgstr ""
-"Le répertoire suivant n'est pas dans l'espace de travail :<br><b>%s</"
-"b><br><br>Souhaitez-vous continuer (et copier ce répertoire dans l'espace de "
-"travail) ?"
+#~ msgid ""
+#~ "UMR excluded modules:\n"
+#~ "(example: guidata, guiqwt)"
+#~ msgstr ""
+#~ "Modules non rechargés par l'UMR :\n"
+#~ "(exemple: guidata, guiqwt)"
 
-#: spyderlib/widgets/projectexplorer.py:772
-#: spyderlib/widgets/projectexplorer.py:1183
-msgid "copy"
-msgstr "copier"
+#~ msgid ""
+#~ "This feature requires the Matplotlib library.\n"
+#~ "It seems you don't have it installed."
+#~ msgstr ""
+#~ "Cette fonctionnalité nécessite l'installation du module Matplotlib.\n"
+#~ "Ce dernier n'est apparemment pas installé."
 
-#: spyderlib/widgets/projectexplorer.py:824
-msgid "The project <b>%s</b> is already opened!"
-msgstr "Le projet <b>%s</b> est déjà ouvert !"
+#~ msgid ""
+#~ "This feature requires the Sympy library.\n"
+#~ "It seems you don't have it installed."
+#~ msgstr ""
+#~ "Cette fonctionnalité nécessite l'installation du module Sympy.\n"
+#~ "Ce dernier n'est apparemment pas installé."
 
-#: spyderlib/widgets/projectexplorer.py:831
-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>"
-msgstr ""
-"Le répertoire racine du projet est bien à l'intérieur de l'espace de travail "
-"mais pas au niveau d'arborescence attendu. Ce n'est pas un répertoire de "
-"l'espace de travail :<br><b>%s</b>"
+#~ msgid "&Font..."
+#~ msgstr "&Police..."
 
-#: spyderlib/widgets/projectexplorer.py:842
-msgid "Project name:"
-msgstr "Nom du projet :"
+#~ msgid "Set font style"
+#~ msgstr "Changer la police d'écriture"
 
-#: spyderlib/widgets/projectexplorer.py:851
-msgid "A project named <b>%s</b> already exists"
-msgstr "Un projet nommé <b>%s</b> existe déjà"
+#~ msgid "Select a new font"
+#~ msgstr "Sélectionner une police d'écriture"
 
-#: spyderlib/widgets/projectexplorer.py:856
-msgid ""
-"Invalid project name.<br><br>Name must match the following regular "
-"expression:<br><b>%s</b>"
-msgstr ""
-"Nom de projet incorrect.<br><br>Le nom doit respecter l'expression régulière "
-"suivante :<br><b>%s</b>"
+#~ msgid ""
+#~ "The kernel failed to start!! That's all we know... Please close this "
+#~ "console and open a new one."
+#~ msgstr ""
+#~ "Le démarrage du noyau a échoué ! C'est malheureusement tout ce que nous "
+#~ "savons... Merci de fermer cette console et d'en ouvrir une nouvelle."
 
-#: spyderlib/widgets/projectexplorer.py:863
-msgid ""
-"The following directory is not empty:<br><b>%s</b><br><br>Do you want to "
-"continue?"
-msgstr ""
-"Le répertoire suivant n'est pas vide :<br><b>%s</b><br><br>Souhaitez-vous "
-"néanmoins continuer ?"
+#~ msgid ""
+#~ "It seems the kernel died unexpectedly. Use 'Restart kernel' to continue "
+#~ "using this console."
+#~ msgstr ""
+#~ "Le noyau a été arrêté de façon inattendue. Redémarrez le noyau pour "
+#~ "continuer d'utiliser cette console."
 
-#: spyderlib/widgets/projectexplorer.py:876
-msgid "New project"
-msgstr "Nouveau projet"
+#~ 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/widgets/projectexplorer.py:884
-msgid ""
-"The current workspace has not been configured yet.\n"
-"Do you want to do this now?"
-msgstr ""
-"L'espace de travail n'a pas encore été défini.\n"
-"Souhaitez-vous le faire maintenant ?"
+#~ 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/widgets/projectexplorer.py:922
-msgid "Import existing project"
-msgstr "Importer un projet existant"
+#~ msgid "its own configuration file"
+#~ msgstr "son propre fichier de configuration"
 
-#: spyderlib/widgets/projectexplorer.py:935
-msgid "Select projects to import"
-msgstr "Sélectionner les projets à importer"
+#~ msgid " and "
+#~ msgstr " et "
 
-#: spyderlib/widgets/projectexplorer.py:947
-msgid "The folder <i>%s</i> does not contain a valid %s project"
-msgstr "Le dossier <i>%s</i> ne contient pas de projet %s valide"
+#~ msgid "the following projects:<br>%s"
+#~ msgstr "les projets suivants :<br>%s"
 
-#: spyderlib/widgets/projectexplorer.py:977
-msgid "Import existing Pydev project"
-msgstr "Importer un projet Pydev"
+#~ msgid "Project..."
+#~ msgstr "Projet..."
 
-#: spyderlib/widgets/projectexplorer.py:978
-msgid ""
-"<b>Unable to read Pydev project <i>%s</i></b><br><br>Error message:<br>%s"
-msgstr ""
-"<b>Impossible d'ouvrir le projet Pydev <i>%s</i></b><br><br>Message "
-"d'erreur :<br>%s"
+#~ msgid "Existing Spyder project"
+#~ msgstr "Projet Spyder existant"
 
-#: spyderlib/widgets/projectexplorer.py:1016
-msgid ""
-"Do you really want to delete project <b>%s</b>?<br><br>Note: project files "
-"won't be deleted from disk."
-msgstr ""
-"Souhaitez-vous réellement supprimer le projet <b>%s</b> ?<br><br>Notez que "
-"les fichiers et répertoires du projet ne seront pas supprimés du disque."
+#~ msgid "Existing Pydev project"
+#~ msgstr "Projet Pydev existant"
 
-#: spyderlib/widgets/projectexplorer.py:1069
-msgid "Related projects"
-msgstr "Projets associés"
+#~ msgid "Close unrelated projects"
+#~ msgstr "Fermer les projets non associés"
 
-#: spyderlib/widgets/projectexplorer.py:1077
-msgid "Select projects which are related to <b>%s</b>"
-msgstr "Sélectionner les projets à associer à <b>%s</b>"
+#~ msgid "Edit related projects"
+#~ msgstr "Modifier les projets associés"
 
-#: spyderlib/widgets/projectexplorer.py:1102
-#, fuzzy
-msgid ""
-"Statistics on source files only:<br>(Python, Cython, IPython, Enaml,C/C++, "
-"Fortran)<br><br><b>%s</b> files.<br><b>%s</b> lines of code."
-msgstr ""
-"Statistique sur les fichiers source uniquement:<br>(Python, C/C++, "
-"Fortran)<br><br><b>%s</b> fichiers.<br><b>%s</b> lignes de code."
+#~ msgid "Add to PYTHONPATH"
+#~ msgstr "Ajouter à PYTHONPATH"
 
-#: spyderlib/widgets/projectexplorer.py:1151
-msgid "File <b>%s</b> already exists.<br>Do you want to overwrite it?"
-msgstr "Le fichier <b>%s</b> existe déjà.<br>Souhaitez-vous le remplacer ?"
+#~ msgid "Remove from PYTHONPATH"
+#~ msgstr "Retirer de PYTHONPATH"
 
-#: spyderlib/widgets/projectexplorer.py:1165
-msgid "Folder <b>%s</b> already exists."
-msgstr "Le dossier <b>%s</b> existe déjà."
+#~ msgid "Properties"
+#~ msgstr "Propriétés"
 
-#: spyderlib/widgets/projectexplorer.py:1185
-msgid "move"
-msgstr "déplacer"
+#~ 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."
+#~ msgstr ""
+#~ "L'espace de travail n'est pas parvenu à ouvrir ou enregistrer "
+#~ "%s<br><br>Veuillez vérifier que vous disposez bien des droits d'écriture "
+#~ "sur les fichiers de configuration associés."
 
-#: spyderlib/widgets/projectexplorer.py:1195
-msgid "Select an existing workspace directory, or create a new one"
-msgstr "Sélectionner un espace de travail existant, ou en créer un nouveau"
+#~ msgid "Import directory"
+#~ msgstr "Importer un répertoire"
 
-#: spyderlib/widgets/projectexplorer.py:1196
-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>."
-"spyderworkspace</b> configuration file.<br><br>A <b>Spyder project</b> is a "
-"directory with source code (and other related files) and a configuration "
-"file (named <b>.spyderproject</b>) with project settings (PYTHONPATH, linked "
-"projects, ...).<br>"
-msgstr ""
-"<u><b>Qu'est-ce que l'espace de travail ?</b></u><br><br>L'<b>espace de "
-"travail Spyder</b> est un répertoire de votre système de fichiers qui "
-"contient les projets Spyder et le fichier de configuration <b>."
-"spyderworkspace</b>.<br><br>Un <b>projet Spyder</b> est un répertoire "
-"contenant du code source (et d'autres fichiers) ainsi qu'un fichier de "
-"configuration (nommé <b>.spyderproject</b>) dans lequel sont stockés les "
-"réglages du projet (PYTHONPATH, projets liés, ...).<br>"
-
-#: spyderlib/widgets/projectexplorer.py:1225
-msgid "This is the current workspace directory"
-msgstr "Ceci est l'espace de travail actif"
-
-#: spyderlib/widgets/projectexplorer.py:1255
-msgid ""
-"The following directory is not a Spyder workspace:<br>%s<br><br>Do you want "
-"to create a new workspace in this directory?"
-msgstr ""
-"Le répertoire suivant n'est pas un espace de travail Spyder :<br><b>%s</"
-"b><br><br>Souhaitez-vous créer un nouvel espace de travail dans ce "
-"répertoire ?"
+#~ 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)?"
+#~ msgstr ""
+#~ "Le répertoire suivant n'est pas dans l'espace de travail :<br><b>%s</"
+#~ "b><br><br>Souhaitez-vous continuer (et copier ce répertoire dans l'espace "
+#~ "de travail) ?"
 
-#: spyderlib/widgets/pydocgui.py:107
-msgid "Module or package:"
-msgstr "Module ou paquet :"
+#~ msgid "The project <b>%s</b> is already opened!"
+#~ msgstr "Le projet <b>%s</b> est déjà ouvert !"
 
-#: spyderlib/widgets/shell.py:134
-msgid "Save history log..."
-msgstr "Enregistrer l'historique..."
+#~ 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>"
+#~ msgstr ""
+#~ "Le répertoire racine du projet est bien à l'intérieur de l'espace de "
+#~ "travail mais pas au niveau d'arborescence attendu. Ce n'est pas un "
+#~ "répertoire de l'espace de travail :<br><b>%s</b>"
 
-#: spyderlib/widgets/shell.py:136
-msgid "Save current history log (i.e. all inputs and outputs) in a text file"
-msgstr ""
-"Enregistrer l'historique complet (toutes les entrées et sorties) dans un "
-"fichier texte"
+#~ msgid "A project named <b>%s</b> already exists"
+#~ msgstr "Un projet nommé <b>%s</b> existe déjà"
 
-#: spyderlib/widgets/shell.py:262
-msgid "Save history log"
-msgstr "Enregistrer l'historique"
+#~ msgid ""
+#~ "Invalid project name.<br><br>Name must match the following regular "
+#~ "expression:<br><b>%s</b>"
+#~ msgstr ""
+#~ "Nom de projet incorrect.<br><br>Le nom doit respecter l'expression "
+#~ "régulière suivante :<br><b>%s</b>"
 
-#: spyderlib/widgets/shell.py:265
-msgid "History logs"
-msgstr "Fichiers d'historique"
+#~ msgid ""
+#~ "The following directory is not empty:<br><b>%s</b><br><br>Do you want to "
+#~ "continue?"
+#~ msgstr ""
+#~ "Le répertoire suivant n'est pas vide :<br><b>%s</b><br><br>Souhaitez-vous "
+#~ "néanmoins continuer ?"
 
-#: spyderlib/widgets/shell.py:276
-msgid "<b>Unable to save file '%s'</b><br><br>Error message:<br>%s"
-msgstr ""
-"<b>Impossible d'enregistrer le fichier '%s'</b><br><br>Message d'erreur :<br>"
-"%s"
+#~ msgid "New project"
+#~ msgstr "Nouveau projet"
 
-#: spyderlib/widgets/shell.py:718
-msgid "Copy without prompts"
-msgstr "Copier sans les préfixes"
+#~ msgid ""
+#~ "The current workspace has not been configured yet.\n"
+#~ "Do you want to do this now?"
+#~ msgstr ""
+#~ "L'espace de travail n'a pas encore été défini.\n"
+#~ "Souhaitez-vous le faire maintenant ?"
 
-#: spyderlib/widgets/shell.py:721 spyderlib/widgets/shell.py:725
-msgid "Clear line"
-msgstr "Effacer la ligne"
+#~ msgid "Import existing project"
+#~ msgstr "Importer un projet existant"
 
-#: spyderlib/widgets/shell.py:727
-msgid "Clear shell"
-msgstr "Effacer la console"
+#~ msgid "Select projects to import"
+#~ msgstr "Sélectionner les projets à importer"
 
-#: spyderlib/widgets/shell.py:731
-msgid "Clear shell contents ('cls' command)"
-msgstr "Effacer le contenu de la console"
+#~ msgid "The folder <i>%s</i> does not contain a valid %s project"
+#~ msgstr "Le dossier <i>%s</i> ne contient pas de projet %s valide"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:98
-msgid "Go to line:"
-msgstr "Aller à la ligne :"
+#~ msgid "Import existing Pydev project"
+#~ msgstr "Importer un projet Pydev"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:106
-msgid "Line count:"
-msgstr "Nombre de lignes :"
+#~ msgid ""
+#~ "<b>Unable to read Pydev project <i>%s</i></b><br><br>Error message:<br>%s"
+#~ msgstr ""
+#~ "<b>Impossible d'ouvrir le projet Pydev <i>%s</i></b><br><br>Message "
+#~ "d'erreur :<br>%s"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:1270
-msgid "Breakpoint"
-msgstr "Point d'arrêt"
+#~ msgid ""
+#~ "Do you really want to delete project <b>%s</b>?<br><br>Note: project "
+#~ "files won't be deleted from disk."
+#~ msgstr ""
+#~ "Souhaitez-vous réellement supprimer le projet <b>%s</b> ?<br><br>Notez "
+#~ "que les fichiers et répertoires du projet ne seront pas supprimés du "
+#~ "disque."
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:1271
-msgid "Condition:"
-msgstr "Condition :"
+#~ msgid "Select projects which are related to <b>%s</b>"
+#~ msgstr "Sélectionner les projets à associer à <b>%s</b>"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:1679
-msgid "Code analysis"
-msgstr "Analyse de code"
+#, fuzzy
+#~ msgid ""
+#~ "Statistics on source files only:<br>(Python, Cython, IPython, Enaml,C/C+"
+#~ "+, Fortran)<br><br><b>%s</b> files.<br><b>%s</b> lines of code."
+#~ msgstr ""
+#~ "Statistique sur les fichiers source uniquement:<br>(Python, C/C++, "
+#~ "Fortran)<br><br><b>%s</b> fichiers.<br><b>%s</b> lignes de code."
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:1733
-msgid "To do"
-msgstr "À faire"
+#~ msgid "Select an existing workspace directory, or create a new one"
+#~ msgstr "Sélectionner un espace de travail existant, ou en créer un nouveau"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:1974
-msgid "Removal error"
-msgstr "Erreur de suppression"
+#~ 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>."
+#~ "spyderworkspace</b> configuration file.<br><br>A <b>Spyder project</b> is "
+#~ "a directory with source code (and other related files) and a "
+#~ "configuration file (named <b>.spyderproject</b>) with project settings "
+#~ "(PYTHONPATH, linked projects, ...).<br>"
+#~ msgstr ""
+#~ "<u><b>Qu'est-ce que l'espace de travail ?</b></u><br><br>L'<b>espace de "
+#~ "travail Spyder</b> est un répertoire de votre système de fichiers qui "
+#~ "contient les projets Spyder et le fichier de configuration <b>."
+#~ "spyderworkspace</b>.<br><br>Un <b>projet Spyder</b> est un répertoire "
+#~ "contenant du code source (et d'autres fichiers) ainsi qu'un fichier de "
+#~ "configuration (nommé <b>.spyderproject</b>) dans lequel sont stockés les "
+#~ "réglages du projet (PYTHONPATH, projets liés, ...).<br>"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:1975
-msgid ""
-"It was not possible to remove outputs from this notebook. The error is:\n"
-"\n"
-msgstr ""
-"Impossible d'effacer les résultats de ce notebook:\n"
-"\n"
+#~ msgid "This is the current workspace directory"
+#~ msgstr "Ceci est l'espace de travail actif"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:2453
-msgid "Clear all ouput"
-msgstr "Effacer tous les résultats"
+#~ msgid ""
+#~ "The following directory is not a Spyder workspace:<br>%s<br><br>Do you "
+#~ "want to create a new workspace in this directory?"
+#~ msgstr ""
+#~ "Le répertoire suivant n'est pas un espace de travail Spyder :<br><b>%s</"
+#~ "b><br><br>Souhaitez-vous créer un nouvel espace de travail dans ce "
+#~ "répertoire ?"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:2459
-msgid "Go to definition"
-msgstr "Aller à la définition de l'objet"
+#~ msgid "<b>Unable to retrieve data.</b><br><br>Error message:<br>%s"
+#~ msgstr ""
+#~ "<b>Impossible d'accéder aux données</b><br><br>Message d'erreur :<br>%s"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:2471
-msgid "Zoom reset"
-msgstr "Réinitialisation du zoom"
+#~ msgid "Matched parentheses:"
+#~ msgstr "Parenthèse fermée :"
 
-#: spyderlib/widgets/sourcecode/syntaxhighlighters.py:32
-msgid "Syntax highlighting for Matlab, Julia and other file types"
-msgstr "Coloration syntaxique pour Matlab, Julia et d'autres types de fichier"
+#~ msgid "Unmatched parentheses:"
+#~ msgstr "Parenthèse non fermée :"
 
-#: spyderlib/widgets/status.py:23
-msgid "CPU and memory usage info in the status bar"
-msgstr ""
-"Informations sur l'utilisation processeur et mémoire dans la barre d'état"
+#~ msgid "Set shell font style"
+#~ msgstr "Changer la police d'écriture de la console"
 
-#: spyderlib/widgets/status.py:92
-msgid "Memory:"
-msgstr "Mémoire :"
+#~ msgid "Text and margin font style"
+#~ msgstr "Police d'écriture du texte et de la marge"
 
-#: spyderlib/widgets/status.py:93
-msgid ""
-"Memory usage status: requires the `psutil` (>=v0.3) library on non-Windows "
-"platforms"
-msgstr ""
-"Occupation mémoire : requiert la bibliothèque `psutil` (>=v0.3) sur les "
-"plateformes autres que Windows"
+#~ msgid "tab"
+#~ msgstr "tabulation"
 
-#: spyderlib/widgets/status.py:105
-msgid "CPU:"
-msgstr "CPU :"
+#~ msgid "Breakpoints"
+#~ msgstr "Points d'arrêt"
 
-#: spyderlib/widgets/status.py:106
-msgid "CPU usage status: requires the `psutil` (>=v0.3) library"
-msgstr "Occupation CPU : requiert la bibliothèque `psutil` (>=v0.3)"
+#~ msgid "Exit"
+#~ msgstr "Sortir"
 
-#: spyderlib/widgets/status.py:128
-msgid "Permissions:"
-msgstr "Droits d'accès :"
+#~ msgid "Exit Debug"
+#~ msgstr "Quitter le débogage"
 
-#: spyderlib/widgets/status.py:142
-msgid "End-of-lines:"
-msgstr "Fins de ligne :"
+#~ msgid "Rich text help on the Object Inspector"
+#~ msgstr "Texte enrichi dans l'inspecteur d'objets"
 
-#: spyderlib/widgets/status.py:156
-msgid "Encoding:"
-msgstr "Encodage :"
+#~ msgid "Object inspector"
+#~ msgstr "Inspecteur d'objets"
 
-#: spyderlib/widgets/status.py:169
-msgid "Line:"
-msgstr "Ligne :"
+#~ msgid "Preferences > Object Inspector"
+#~ msgstr "Préférences > Inspecteur d'objets"
 
-#: spyderlib/widgets/status.py:173
-msgid "Column:"
-msgstr "Colonne :"
+#~ msgid "Set as current console's working directory"
+#~ msgstr "Changer le répertoire de travail de la console actuelle"
 
-#: spyderlib/widgets/tabs.py:142
-msgid "Browse tabs"
-msgstr "Naviguer dans les onglets"
+#~ msgid "Save session and quit..."
+#~ msgstr "Enregistrer la session et quitter..."
 
-#: spyderlib/widgets/tabs.py:270
-msgid "Close current tab"
-msgstr "Fermer l'onglet"
+#~ msgid "Loading object inspector..."
+#~ msgstr "Chargement de l'inspecteur d'objet..."
 
-#: spyderlib/widgets/texteditor.py:72
-msgid "Text editor"
-msgstr "Éditeur de texte"
+#, fuzzy
+#~ msgid "The Object Inspector"
+#~ msgstr "Inspecteur d'objets"
 
-#: spyderlib/workers/updates.py:79 spyderlib/workers/updates.py:81
-msgid "Unable to retrieve information."
-msgstr ""
+#~ msgid "(Experimental) Editor's code completion, go-to-definition and help"
+#~ msgstr "(Expérimental) : autocomplétion, aller à la définition, aide."
 
-#: spyderlib/workers/updates.py:83
-msgid ""
-"Unable to connect to the internet. <br><br>Make sure the connection is "
-"working properly."
-msgstr ""
+#~ msgid ""
+#~ "This path is incorrect.\n"
+#~ "Enter a correct directory path,\n"
+#~ "then press enter to validate"
+#~ msgstr ""
+#~ "Ce chemin d'accès n'est pas valide :\n"
+#~ "veuillez entrer un chemin d'accès correct,\n"
+#~ "puis appuyer sur Entrée pour le valider"
 
-#: spyderlib/workers/updates.py:86
-#, fuzzy
-msgid "Unable to check for updates."
-msgstr "Impossible de charger la page"
+#~ msgid "Save Python script"
+#~ msgstr "Enregistrer le script Python"
 
 #~ msgid "PyQt"
 #~ msgstr "PyQt"
@@ -5564,9 +5870,6 @@ msgstr "Impossible de charger la page"
 #~ msgid "Windows and toolbars"
 #~ msgstr "Fenêtres et barres d'outils"
 
-#~ msgid "Documentation"
-#~ msgstr "Documentation"
-
 #~ msgid "Automatic notification to object inspector"
 #~ msgstr "Notification automatique à l'inspecteur d'objets"
 
@@ -5802,9 +6105,6 @@ msgstr "Impossible de charger la page"
 #~ msgid "IPython interpreter command line options"
 #~ msgstr "IPython : options en ligne de commande"
 
-#~ msgid "Open IPython interpreter"
-#~ msgstr "Ouvrir un interpréteur IPython"
-
 #~ msgid "Open an IPython interpreter"
 #~ msgstr "Ouvrir un interpréteur IPython"
 
@@ -5868,9 +6168,6 @@ msgstr "Impossible de charger la page"
 #~ msgid "Create a new workspace directory"
 #~ msgstr "Créer un nouvel espace de travail"
 
-#~ msgid "The directory <b>%s</b> is not a Spyder workspace."
-#~ msgstr "Le répertoire <b>%s</b> n'est pas un espace de travail Spyder."
-
 #~ msgid "New folder..."
 #~ msgstr "Nouveau répertoire..."
 
@@ -5890,9 +6187,6 @@ msgstr "Impossible de charger la page"
 #~ msgid "Folder name"
 #~ msgstr "Nom du répertoire"
 
-#~ msgid "project"
-#~ msgstr "projet"
-
 #~ msgid "Select project root path"
 #~ msgstr "Sélectionner la racine du projet"
 
@@ -5911,9 +6205,6 @@ msgstr "Impossible de charger la page"
 #~ msgid "Exclude"
 #~ msgstr "Exclure"
 
-#~ msgid "Edit filter"
-#~ msgstr "Modifier le filtre"
-
 #~ msgid "Warning:"
 #~ msgstr "Attention :"
 
@@ -5953,12 +6244,6 @@ msgstr "Impossible de charger la page"
 #~ msgid "Uncomment current line or selection"
 #~ msgstr "Décommenter la sélection ou la ligne en cours d'édition"
 
-#~ msgid "Matched braces:"
-#~ msgstr "Parenthèses correspondantes:"
-
-#~ msgid "Unmatched braces:"
-#~ msgstr "Parenthèse isolée:"
-
 #~ msgid "Please install <b>matplotlib</b>."
 #~ msgstr "Merci d'installer <b>matplotlib</b>."
 
@@ -5985,9 +6270,6 @@ msgstr "Impossible de charger la page"
 #~ msgid "Close"
 #~ msgstr "Fermer"
 
-#~ msgid "Close all"
-#~ msgstr "Fermer tout"
-
 #~ msgid "Add block comment"
 #~ msgstr "Ajouter un bloc de commentaires"
 
diff --git a/spyder/locale/ja/LC_MESSAGES/spyder.mo b/spyder/locale/ja/LC_MESSAGES/spyder.mo
new file mode 100644
index 0000000..c17f318
Binary files /dev/null and b/spyder/locale/ja/LC_MESSAGES/spyder.mo differ
diff --git a/spyderlib/locale/ja/LC_MESSAGES/spyderlib.po b/spyder/locale/ja/LC_MESSAGES/spyder.po
similarity index 61%
rename from spyderlib/locale/ja/LC_MESSAGES/spyderlib.po
rename to spyder/locale/ja/LC_MESSAGES/spyder.po
index 5fd5279..3f3b583 100644
--- a/spyderlib/locale/ja/LC_MESSAGES/spyderlib.po
+++ b/spyder/locale/ja/LC_MESSAGES/spyder.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Spyder3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-19 17:55+0300\n"
+"POT-Creation-Date: 2016-09-24 04:45+COT\n"
 "PO-Revision-Date: 2016-07-12 09:04+0900\n"
 "Last-Translator: \n"
 "Language-Team: Japanese <s.ohnishi77+github at gmail.com>\n"
@@ -20,331 +20,239 @@ msgstr ""
 "X-Generator: Poedit 1.6.10\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: spyderlib/app/restart.py:129
-msgid ""
-"It was not possible to close the previous Spyder instance.\n"
-"Restart aborted."
-msgstr ""
-"前回実行したSpyderを終了できませんでした。\n"
-"再起動を終了します。"
-
-#: spyderlib/app/restart.py:131
-msgid ""
-"Spyder could not reset to factory defaults.\n"
-"Restart aborted."
-msgstr ""
-"デフォルト設定を適用できませんでした。\n"
-"再起動を終了します。"
-
-#: spyderlib/app/restart.py:133
-msgid ""
-"It was not possible to restart Spyder.\n"
-"Operation aborted."
-msgstr ""
-"再起動できませんでした。\n"
-"オペレーションを終了します。"
-
-#: spyderlib/app/restart.py:135
-msgid "Spyder exit error"
-msgstr "Spyder実行エラー"
-
-#: spyderlib/app/restart.py:136
-msgid "Spyder reset error"
-msgstr "Spyderリセットエラー"
-
-#: spyderlib/app/restart.py:137
-msgid "Spyder restart error"
-msgstr "Spyder再起動エラー"
-
-#: spyderlib/app/restart.py:141
-msgid ""
-"\n"
-"\n"
-"{0}"
-msgstr ""
-"\n"
-"\n"
-"{0}"
-
-#: spyderlib/app/restart.py:161
-msgid "Closing Spyder"
-msgstr "Spyderを閉じる"
-
-#: spyderlib/app/restart.py:235
-msgid "Resetting Spyder to defaults"
-msgstr "Spyderをデフォルト状態に戻しています"
-
-#: spyderlib/app/restart.py:267
-msgid "Restarting"
-msgstr "再起動中。"
-
-#: spyderlib/app/spyder.py:112
+#: spyder/app/mainwindow.py:120
 msgid "Initializing..."
 msgstr "初期化中..."
 
-#: spyderlib/app/spyder.py:237
+#: spyder/app/mainwindow.py:236
 msgid "Numpy and Scipy documentation"
 msgstr "NumpyとScipyのドキュメント"
 
-#: spyderlib/app/spyder.py:239 spyderlib/app/spyder.py:1073
+#: spyder/app/mainwindow.py:238 spyder/app/mainwindow.py:1022
 msgid "Matplotlib documentation"
 msgstr "Matplotlibドキュメント"
 
-#: spyderlib/app/spyder.py:242
+#: spyder/app/mainwindow.py:241
 msgid "PyQt4 Reference Guide"
 msgstr "PyQt4リファレンスガイド"
 
-#: spyderlib/app/spyder.py:245
+#: spyder/app/mainwindow.py:244
 msgid "PyQt4 API Reference"
 msgstr "PyQt4 APIリファレンス"
 
-#: spyderlib/app/spyder.py:247
+#: spyder/app/mainwindow.py:246
 msgid "Python(x,y)"
 msgstr "Python(x,y)"
 
-#: spyderlib/app/spyder.py:249
+#: spyder/app/mainwindow.py:248
 msgid "WinPython"
 msgstr "WinPython"
 
-#: spyderlib/app/spyder.py:311
-msgid "Reload last session"
-msgstr "前回のセッションをリロードする"
-
-#: spyderlib/app/spyder.py:315
-msgid "Load session..."
-msgstr "セッションをロード..."
-
-#: spyderlib/app/spyder.py:318
-msgid "Load Spyder session"
-msgstr "Spyderのセッションをロード"
-
-#: spyderlib/app/spyder.py:320
-msgid "Save session and quit..."
-msgstr "セッションを保存して終了"
-
-#: spyderlib/app/spyder.py:323
-msgid "Save current session and quit application"
-msgstr "現在のセッションを保存しアプリケーションを終了"
-
-#: spyderlib/app/spyder.py:533
+#: spyder/app/mainwindow.py:519
 msgid "Close current pane"
 msgstr "現在のペインを閉じる"
 
-#: spyderlib/app/spyder.py:538
+#: spyder/app/mainwindow.py:524
 msgid "Lock panes"
 msgstr "ペインをロック"
 
-#: spyderlib/app/spyder.py:545
+#: spyder/app/mainwindow.py:531
 msgid "Use next layout"
 msgstr "次のレイアウトを使用"
 
-#: spyderlib/app/spyder.py:549
+#: spyder/app/mainwindow.py:535
 msgid "Use previous layout"
 msgstr "前のレイアウトを使用"
 
-#: spyderlib/app/spyder.py:558
-msgid "&Find text"
-msgstr "テキストを検索(&F)"
-
-#: spyderlib/app/spyder.py:563
-msgid "Find &next"
-msgstr "次を検索(&N)"
-
-#: spyderlib/app/spyder.py:570
-msgid "Find &previous"
-msgstr "前を検索(&F)"
-
-#: spyderlib/app/spyder.py:576
-msgid "&Replace text"
-msgstr "テキストを置換(&R)"
-
-#: spyderlib/app/spyder.py:596 spyderlib/widgets/sourcecode/codeeditor.py:2418
+#: spyder/app/mainwindow.py:554 spyder/widgets/sourcecode/codeeditor.py:2464
 msgid "Undo"
 msgstr "元に戻す"
 
-#: spyderlib/app/spyder.py:598 spyderlib/widgets/sourcecode/codeeditor.py:2421
+#: spyder/app/mainwindow.py:556 spyder/widgets/sourcecode/codeeditor.py:2467
 msgid "Redo"
 msgstr "やり直す"
 
-#: spyderlib/app/spyder.py:600
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:638
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:452
-#: spyderlib/widgets/variableexplorer/dataframeeditor.py:425
-#: spyderlib/widgets/shell.py:120
-#: spyderlib/widgets/sourcecode/codeeditor.py:2427
+#: spyder/app/mainwindow.py:558 spyder/widgets/shell.py:121
+#: spyder/widgets/sourcecode/codeeditor.py:2473
+#: spyder/widgets/variableexplorer/arrayeditor.py:453
+#: spyder/widgets/variableexplorer/collectionseditor.py:647
+#: spyder/widgets/variableexplorer/dataframeeditor.py:445
 msgid "Copy"
 msgstr "コピー"
 
-#: spyderlib/app/spyder.py:602 spyderlib/widgets/shell.py:116
-#: spyderlib/widgets/sourcecode/codeeditor.py:2424
+#: spyder/app/mainwindow.py:560 spyder/widgets/shell.py:117
+#: spyder/widgets/sourcecode/codeeditor.py:2470
 msgid "Cut"
 msgstr "切り取り"
 
-#: spyderlib/app/spyder.py:604
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:635
-#: spyderlib/widgets/shell.py:124
-#: spyderlib/widgets/sourcecode/codeeditor.py:2430
+#: spyder/app/mainwindow.py:562 spyder/widgets/shell.py:125
+#: spyder/widgets/sourcecode/codeeditor.py:2476
+#: spyder/widgets/variableexplorer/collectionseditor.py:644
 msgid "Paste"
 msgstr "貼り付け"
 
-#: spyderlib/app/spyder.py:607 spyderlib/widgets/shell.py:137
-#: spyderlib/widgets/sourcecode/codeeditor.py:2433
+#: spyder/app/mainwindow.py:565 spyder/widgets/shell.py:138
+#: spyder/widgets/sourcecode/codeeditor.py:2479
 msgid "Select All"
 msgstr "全て選択"
 
-#: spyderlib/app/spyder.py:624 spyderlib/plugins/editor.py:1257
+#: spyder/app/mainwindow.py:575 spyder/plugins/editor.py:1342
 msgid "&File"
 msgstr "ファイル(&A)"
 
-#: spyderlib/app/spyder.py:626 spyderlib/plugins/editor.py:1249
+#: spyder/app/mainwindow.py:576 spyder/plugins/editor.py:1334
 msgid "File toolbar"
 msgstr "ファイルツールバー"
 
-#: spyderlib/app/spyder.py:630 spyderlib/plugins/editor.py:1258
+#: spyder/app/mainwindow.py:580 spyder/plugins/editor.py:1343
 msgid "&Edit"
 msgstr "編集(&E)"
 
-#: spyderlib/app/spyder.py:631 spyderlib/plugins/editor.py:1254
+#: spyder/app/mainwindow.py:581 spyder/plugins/editor.py:1339
 msgid "Edit toolbar"
 msgstr "編集ツールバー"
 
-#: spyderlib/app/spyder.py:635 spyderlib/plugins/editor.py:1259
+#: spyder/app/mainwindow.py:585 spyder/plugins/editor.py:1344
 msgid "&Search"
 msgstr "検索(&S)"
 
-#: spyderlib/app/spyder.py:636 spyderlib/plugins/editor.py:1250
+#: spyder/app/mainwindow.py:586 spyder/plugins/editor.py:1335
 msgid "Search toolbar"
 msgstr "検索ツールバー"
 
-#: spyderlib/app/spyder.py:640 spyderlib/plugins/editor.py:1260
+#: spyder/app/mainwindow.py:590 spyder/plugins/editor.py:1345
 msgid "Sour&ce"
 msgstr "ソース(&C)"
 
-#: spyderlib/app/spyder.py:641 spyderlib/plugins/editor.py:1251
+#: spyder/app/mainwindow.py:591 spyder/plugins/editor.py:1336
 msgid "Source toolbar"
 msgstr "ソースツールバー"
 
-#: spyderlib/app/spyder.py:645 spyderlib/plugins/editor.py:775
-#: spyderlib/plugins/editor.py:1261
+#: spyder/app/mainwindow.py:595 spyder/plugins/editor.py:780
+#: spyder/plugins/editor.py:1346
 msgid "&Run"
 msgstr "実行(&R)"
 
-#: spyderlib/app/spyder.py:646 spyderlib/plugins/editor.py:1252
+#: spyder/app/mainwindow.py:596 spyder/plugins/editor.py:1337
 msgid "Run toolbar"
 msgstr "実行ツールバー"
 
-#: spyderlib/app/spyder.py:650 spyderlib/plugins/editor.py:723
+#: spyder/app/mainwindow.py:600 spyder/plugins/editor.py:739
 msgid "&Debug"
 msgstr "デバッグ(&D)"
 
-#: spyderlib/app/spyder.py:651 spyderlib/plugins/editor.py:1253
+#: spyder/app/mainwindow.py:601 spyder/plugins/editor.py:1338
 msgid "Debug toolbar"
 msgstr "デバッグツールバー"
 
-#: spyderlib/app/spyder.py:655
+#: spyder/app/mainwindow.py:605
 msgid "C&onsoles"
 msgstr "コンソール(&O)"
 
-#: spyderlib/app/spyder.py:658 spyderlib/plugins/editor.py:1262
+#: spyder/app/mainwindow.py:608
+#, fuzzy
+msgid "&Projects"
+msgstr "プロジェクト..."
+
+#: spyder/app/mainwindow.py:611 spyder/plugins/editor.py:1347
 msgid "&Tools"
 msgstr "ツール(&T)"
 
-#: spyderlib/app/spyder.py:661
+#: spyder/app/mainwindow.py:614
 msgid "&View"
 msgstr "表示(&V)"
 
-#: spyderlib/app/spyder.py:664
+#: spyder/app/mainwindow.py:617
 msgid "&Help"
 msgstr "ヘルプ(&H)"
 
-#: spyderlib/app/spyder.py:669
+#: spyder/app/mainwindow.py:622
 msgid "Welcome to Spyder!"
 msgstr "Spyderへようこそ!"
 
-#: spyderlib/app/spyder.py:674
+#: spyder/app/mainwindow.py:627
 msgid "Pre&ferences"
 msgstr "設定(&F)"
 
-#: spyderlib/app/spyder.py:681 spyderlib/widgets/pathmanager.py:48
-#: spyderlib/widgets/projectexplorer.py:598
+#: spyder/app/mainwindow.py:634 spyder/widgets/pathmanager.py:49
 msgid "PYTHONPATH manager"
 msgstr "PYTHONPATHマネージャ"
 
-#: spyderlib/app/spyder.py:684
+#: spyder/app/mainwindow.py:637
 msgid "Python Path Manager"
 msgstr "Pythonパスマネージャ"
 
-#: spyderlib/app/spyder.py:687
+#: spyder/app/mainwindow.py:640
 msgid "Update module names list"
 msgstr "モジュール名リストの更新"
 
-#: spyderlib/app/spyder.py:690
+#: spyder/app/mainwindow.py:643
 msgid "Refresh list of module names available in PYTHONPATH"
 msgstr "PYTHONPATH上で利用可能なモジュールリストの更新"
 
-#: spyderlib/app/spyder.py:693
+#: spyder/app/mainwindow.py:646
 msgid "Reset Spyder to factory defaults"
 msgstr "Spyderをデフォルト設定へ戻す"
 
-#: spyderlib/app/spyder.py:698
+#: spyder/app/mainwindow.py:651
 msgid "Current user environment variables..."
 msgstr "現在のユーザー環境変数..."
 
-#: spyderlib/app/spyder.py:700
+#: spyder/app/mainwindow.py:653
 msgid ""
 "Show and edit current user environment variables in Windows registry (i.e. "
 "for all sessions)"
 msgstr "レジストリ内のユーザー環境変数を表示・編集する"
 
-#: spyderlib/app/spyder.py:709 spyderlib/app/spyder.py:1167
+#: spyder/app/mainwindow.py:662 spyder/app/mainwindow.py:1118
 msgid "External Tools"
 msgstr "外部ツール"
 
-#: spyderlib/app/spyder.py:713
+#: spyder/app/mainwindow.py:666
 msgid "Python(x,y) launcher"
 msgstr "Python(x,y)ランチャー"
 
-#: spyderlib/app/spyder.py:720
+#: spyder/app/mainwindow.py:673
 msgid "WinPython control panel"
 msgstr "WinPythonコントロールパネル"
 
-#: spyderlib/app/spyder.py:729
+#: spyder/app/mainwindow.py:682
 msgid "Qt Designer"
 msgstr "Qt Designer"
 
-#: spyderlib/app/spyder.py:734
+#: spyder/app/mainwindow.py:687
 msgid "Qt Linguist"
 msgstr "Qt Linguist"
 
-#: spyderlib/app/spyder.py:740
+#: spyder/app/mainwindow.py:693
 msgid "Qt examples"
 msgstr "Qt examples"
 
-#: spyderlib/app/spyder.py:761
+#: spyder/app/mainwindow.py:714
 msgid "guidata examples"
 msgstr "guidata examples"
 
-#: spyderlib/app/spyder.py:772
+#: spyder/app/mainwindow.py:725
 msgid "guiqwt examples"
 msgstr "guiqwt examples"
 
-#: spyderlib/app/spyder.py:777
+#: spyder/app/mainwindow.py:730
 msgid "Sift"
 msgstr "選別する"
 
-#: spyderlib/app/spyder.py:787
+#: spyder/app/mainwindow.py:740
 msgid "ViTables"
 msgstr "Viテーブル"
 
-#: spyderlib/app/spyder.py:801
+#: spyder/app/mainwindow.py:754
 msgid "Fullscreen mode"
 msgstr "フルスクリーンモード"
 
-#: spyderlib/app/spyder.py:813
+#: spyder/app/mainwindow.py:766
 msgid "Main toolbar"
 msgstr "メインツールバー"
 
-#: spyderlib/app/spyder.py:822
+#: spyder/app/mainwindow.py:775
 msgid ""
 "Spyder Internal Console\n"
 "\n"
@@ -366,192 +274,191 @@ msgstr ""
 "ユーザーのpythonコードを実行するために使わないでください。\n"
 "\n"
 
-#: spyderlib/app/spyder.py:839
+#: spyder/app/mainwindow.py:792
 msgid "Loading help..."
 msgstr "ヘルプをロードしています..."
 
-#: spyderlib/app/spyder.py:846
+#: spyder/app/mainwindow.py:799
 msgid "Loading outline explorer..."
 msgstr "アウトラインエクスプローラーをロードしています..."
 
-#: spyderlib/app/spyder.py:854
+#: spyder/app/mainwindow.py:807
 msgid "Loading editor..."
 msgstr "エディタをロードしています..."
 
-#: spyderlib/app/spyder.py:860 spyderlib/widgets/ipython.py:610
-#: spyderlib/plugins/console.py:133
+#: spyder/app/mainwindow.py:813 spyder/plugins/console.py:134
+#: spyder/widgets/ipythonconsole/client.py:278
 msgid "&Quit"
 msgstr "終了(&Q)"
 
-#: spyderlib/app/spyder.py:862 spyderlib/plugins/console.py:135
+#: spyder/app/mainwindow.py:815 spyder/plugins/console.py:136
 msgid "Quit"
 msgstr "終了"
 
-#: spyderlib/app/spyder.py:865
+#: spyder/app/mainwindow.py:819
 msgid "&Restart"
 msgstr "再起動(&R)"
 
-#: spyderlib/app/spyder.py:867
+#: spyder/app/mainwindow.py:821
 msgid "Restart"
 msgstr "再起動"
 
-#: spyderlib/app/spyder.py:886
+#: spyder/app/mainwindow.py:838
 msgid "Loading file explorer..."
 msgstr "ファイルエクスプローラーをロードしています..."
 
-#: spyderlib/app/spyder.py:893
+#: spyder/app/mainwindow.py:845
 msgid "Loading history plugin..."
 msgstr "ヒストリプラグインをロードしています..."
 
-#: spyderlib/app/spyder.py:904
+#: spyder/app/mainwindow.py:856
 msgid "Loading online help..."
 msgstr "オンラインヘルプをロードしています..."
 
-#: spyderlib/app/spyder.py:910
+#: spyder/app/mainwindow.py:862
 msgid "Loading project explorer..."
 msgstr "プロジェクトエクスプローラーをロード中..."
 
-#: spyderlib/app/spyder.py:916
+#: spyder/app/mainwindow.py:869
 msgid "Loading external console..."
 msgstr "外部コンソールをロード中..."
 
-#: spyderlib/app/spyder.py:922
+#: spyder/app/mainwindow.py:875
 msgid "Loading namespace browser..."
 msgstr "名前空間ブラウザをロード中..."
 
-#: spyderlib/app/spyder.py:929
+#: spyder/app/mainwindow.py:882
 msgid "Loading IPython console..."
 msgstr "IPythonコンソールをロード中..."
 
-#: spyderlib/app/spyder.py:938
+#: spyder/app/mainwindow.py:887
 msgid "Setting up main window..."
 msgstr "メインウインドウを設定中..."
 
-#: spyderlib/app/spyder.py:941
+#: spyder/app/mainwindow.py:890
 msgid "Dependencies..."
 msgstr "依存性..."
 
-#: spyderlib/app/spyder.py:945
+#: spyder/app/mainwindow.py:894
 msgid "Report issue..."
 msgstr "問題をレポート..."
 
-#: spyderlib/app/spyder.py:949
+#: spyder/app/mainwindow.py:898
 msgid "Spyder support..."
 msgstr "Spyderサポート..."
 
-#: spyderlib/app/spyder.py:952
+#: spyder/app/mainwindow.py:901
 msgid "Check for updates..."
 msgstr "更新をチェック..."
 
-#: spyderlib/app/spyder.py:975
+#: spyder/app/mainwindow.py:924
 msgid "Spyder documentation"
 msgstr "spyderドキュメント"
 
-#: spyderlib/app/spyder.py:980
+#: spyder/app/mainwindow.py:929
 msgid "Spyder tutorial"
 msgstr "Spyderチュートリアル"
 
-#: spyderlib/app/spyder.py:987
+#: spyder/app/mainwindow.py:936
 msgid "Interactive tours"
 msgstr "インタラクティブツアー"
 
-#: spyderlib/app/spyder.py:1015
+#: spyder/app/mainwindow.py:964
 msgid "Python documentation"
 msgstr "Pythonドキュメント"
 
-#: spyderlib/app/spyder.py:1021 spyderlib/app/spyder.py:1065
+#: spyder/app/mainwindow.py:970 spyder/app/mainwindow.py:1014
 msgid "IPython documentation"
 msgstr "IPythonドキュメント"
 
-#: spyderlib/app/spyder.py:1022
+#: spyder/app/mainwindow.py:971
 msgid "Intro to IPython"
 msgstr "IPythonの紹介"
 
-#: spyderlib/app/spyder.py:1024
+#: spyder/app/mainwindow.py:973
 msgid "Quick reference"
 msgstr "クイックリファレンス"
 
-#: spyderlib/app/spyder.py:1026
+#: spyder/app/mainwindow.py:975
 msgid "Console help"
 msgstr "コンソールヘルプ"
 
-#: spyderlib/app/spyder.py:1063
+#: spyder/app/mainwindow.py:1012
 msgid "Python(x,y) documentation folder"
 msgstr "Python(x,y) ドキュメントフォルダ"
 
-#: spyderlib/app/spyder.py:1067
+#: spyder/app/mainwindow.py:1016
 msgid "guidata documentation"
 msgstr "guidataドキュメント"
 
-#: spyderlib/app/spyder.py:1070
+#: spyder/app/mainwindow.py:1019
 msgid "guiqwt documentation"
 msgstr "guiqwtドキュメント"
 
-#: spyderlib/app/spyder.py:1076
+#: spyder/app/mainwindow.py:1025
 msgid "NumPy documentation"
 msgstr "NumPyドキュメント"
 
-#: spyderlib/app/spyder.py:1078
+#: spyder/app/mainwindow.py:1027
 msgid "NumPy reference guide"
 msgstr "NumPyリファレンスガイド"
 
-#: spyderlib/app/spyder.py:1080
+#: spyder/app/mainwindow.py:1029
 msgid "NumPy user guide"
 msgstr "NumPyユーザーガイド"
 
-#: spyderlib/app/spyder.py:1082
+#: spyder/app/mainwindow.py:1031
 msgid "SciPy documentation"
 msgstr "SciPyドキュメント"
 
-#: spyderlib/app/spyder.py:1089
+#: spyder/app/mainwindow.py:1038
 msgid "Installed Python modules"
 msgstr "インストールされたPythonモジュール"
 
-#: spyderlib/app/spyder.py:1093
+#: spyder/app/mainwindow.py:1042
 msgid "Online documentation"
 msgstr "オンラインドキュメント"
 
-#: spyderlib/app/spyder.py:1105
+#: spyder/app/mainwindow.py:1054
 msgid "Qt documentation"
 msgstr "Qtドキュメント"
 
-#: spyderlib/app/spyder.py:1111
-#, python-format
+#: spyder/app/mainwindow.py:1060
 msgid "About %s..."
 msgstr "%s について..."
 
-#: spyderlib/app/spyder.py:1135
+#: spyder/app/mainwindow.py:1084
 msgid "Panes"
 msgstr "ペイン"
 
-#: spyderlib/app/spyder.py:1136
+#: spyder/app/mainwindow.py:1086
 msgid "Toolbars"
 msgstr "ツールバー"
 
-#: spyderlib/app/spyder.py:1137
+#: spyder/app/mainwindow.py:1087
 msgid "Window layouts"
 msgstr "ウインドウレイアウト"
 
-#: spyderlib/app/spyder.py:1146 spyderlib/app/spyder.py:1919
-#: spyderlib/app/spyder.py:1920
+#: spyder/app/mainwindow.py:1096 spyder/app/mainwindow.py:1893
+#: spyder/app/mainwindow.py:1894
 msgid "Show toolbars"
 msgstr "ツールバーを表示"
 
-#: spyderlib/app/spyder.py:1160
+#: spyder/app/mainwindow.py:1111
 msgid "Attached console window (debugging)"
 msgstr "接続されたコンソールウインドウ(デバッグ)"
 
-#: spyderlib/app/spyder.py:1324
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:572
-#: spyderlib/widgets/variableexplorer/dataframeeditor.py:573
-#: spyderlib/widgets/externalshell/pythonshell.py:553
-#: spyderlib/widgets/externalshell/systemshell.py:104
-#: spyderlib/widgets/explorer.py:597 spyderlib/widgets/explorer.py:699
+#: spyder/app/mainwindow.py:1294 spyder/plugins/projects.py:238
+#: spyder/widgets/explorer.py:627 spyder/widgets/explorer.py:732
+#: spyder/widgets/externalshell/pythonshell.py:533
+#: spyder/widgets/externalshell/systemshell.py:105
+#: spyder/widgets/variableexplorer/arrayeditor.py:573
+#: spyder/widgets/variableexplorer/collectionseditor.py:419
+#: spyder/widgets/variableexplorer/dataframeeditor.py:593
 msgid "Error"
 msgstr "エラー"
 
-#: spyderlib/app/spyder.py:1325
-#, python-format
+#: spyder/app/mainwindow.py:1295
 msgid ""
 "<b>You have missing dependencies!</b><br><br><tt>%s</tt><br><br><b>Please "
 "install them to avoid this message.</b><br><br><i>Note</i>: Spyder could "
@@ -569,37 +476,35 @@ msgstr ""
 "可能性があります。新しい問題を報告する前には、 発生した不具合が依存性欠如の直"
 "接の結果ではないことを確認してください。"
 
-#: spyderlib/app/spyder.py:1766
+#: spyder/app/mainwindow.py:1740
 msgid "Spyder Default Layout"
 msgstr "Spyderデフォルトレイアウト"
 
-#: spyderlib/app/spyder.py:1784
+#: spyder/app/mainwindow.py:1758
 msgid "Save current layout"
 msgstr "現在のレイアウトを保存"
 
-#: spyderlib/app/spyder.py:1788
+#: spyder/app/mainwindow.py:1762
 msgid "Layout preferences"
 msgstr "レイアウト設定"
 
-#: spyderlib/app/spyder.py:1792
+#: spyder/app/mainwindow.py:1766
 msgid "Reset to spyder default"
 msgstr "Spyderのデフォルト値に戻す"
 
-#: spyderlib/app/spyder.py:1812 spyderlib/app/spyder.py:1834
-#: spyderlib/app/spyder.py:1897 spyderlib/app/spyder.py:2775
-#: spyderlib/utils/environ.py:97 spyderlib/utils/environ.py:110
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:407
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:1048
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:495
-#: spyderlib/plugins/configdialog.py:1229
-#: spyderlib/plugins/ipythonconsole.py:114
-#: spyderlib/plugins/ipythonconsole.py:834
-#: spyderlib/plugins/externalconsole.py:368
-#: spyderlib/plugins/externalconsole.py:611
+#: spyder/app/mainwindow.py:1786 spyder/app/mainwindow.py:1808
+#: spyder/app/mainwindow.py:1871 spyder/app/mainwindow.py:2655
+#: spyder/plugins/configdialog.py:1250 spyder/plugins/externalconsole.py:446
+#: spyder/plugins/ipythonconsole.py:119 spyder/plugins/ipythonconsole.py:835
+#: spyder/plugins/maininterpreter.py:167 spyder/utils/environ.py:100
+#: spyder/utils/environ.py:113
+#: spyder/widgets/variableexplorer/arrayeditor.py:496
+#: spyder/widgets/variableexplorer/collectionseditor.py:410
+#: spyder/widgets/variableexplorer/collectionseditor.py:1063
 msgid "Warning"
 msgstr "警告"
 
-#: spyderlib/app/spyder.py:1813
+#: spyder/app/mainwindow.py:1787
 msgid ""
 "Window layout will be reset to default settings: this affects window "
 "position, size and dockwidgets.\n"
@@ -609,8 +514,7 @@ msgstr ""
 "ズ及びドックウィジェットが影響されます。\n"
 "続行しますか?"
 
-#: spyderlib/app/spyder.py:1835
-#, python-format
+#: spyder/app/mainwindow.py:1809
 msgid ""
 "Layout <b>%s</b> will be                                                "
 "overwritten. Do you want to                                                "
@@ -619,75 +523,58 @@ msgstr ""
 "レイアウト <b>%s</b>は                                                上書き"
 "されます。                                                続行しますか?"
 
-#: spyderlib/app/spyder.py:1898
-#, python-format
+#: spyder/app/mainwindow.py:1872
 msgid "Quick switch layout #%s has not yet been defined."
 msgstr "クイックスイッチレイアウト #%s は未定義です。"
 
-#: spyderlib/app/spyder.py:1916 spyderlib/app/spyder.py:1917
+#: spyder/app/mainwindow.py:1890 spyder/app/mainwindow.py:1891
 msgid "Hide toolbars"
 msgstr "ツールバーを隠す"
 
-#: spyderlib/app/spyder.py:2231 spyderlib/app/spyder.py:2232
+#: spyder/app/mainwindow.py:2184 spyder/app/mainwindow.py:2185
 msgid "Maximize current pane"
 msgstr "現在のペインを最大化"
 
-#: spyderlib/app/spyder.py:2235
+#: spyder/app/mainwindow.py:2188
 msgid "Restore current pane"
 msgstr "現在のペインを復元"
 
-#: spyderlib/app/spyder.py:2236
+#: spyder/app/mainwindow.py:2189
 msgid "Restore pane to its original size"
 msgstr "ペインをオリジナルサイズに復元"
 
-#: spyderlib/app/spyder.py:2320
-#, python-format
+#: spyder/app/mainwindow.py:2273
 msgid "About %s"
 msgstr "%s について"
 
-#: spyderlib/app/spyder.py:2496 spyderlib/utils/programs.py:281
-#: spyderlib/widgets/externalshell/baseshell.py:139
-#: spyderlib/widgets/explorer.py:239 spyderlib/plugins/editor.py:156
-#: spyderlib/plugins/runconfig.py:321 spyderlib/plugins/runconfig.py:443
-#: spyderlib/plugins/runconfig.py:448
+#: spyder/app/mainwindow.py:2400 spyder/plugins/editor.py:158
+#: spyder/plugins/runconfig.py:322 spyder/plugins/runconfig.py:444
+#: spyder/plugins/runconfig.py:449 spyder/utils/programs.py:285
+#: spyder/widgets/explorer.py:269 spyder/widgets/externalshell/baseshell.py:127
 msgid "Run"
 msgstr "実行"
 
-#: spyderlib/app/spyder.py:2497
-#, python-format
+#: spyder/app/mainwindow.py:2401
 msgid "Running an external system terminal is not supported on platform %s."
 msgstr ""
 "プラットフォーム %s では外部システムターミナルの実行はサポートされていませ"
 "ん。"
 
-#: spyderlib/app/spyder.py:2722
-msgid "Open session"
-msgstr "セッションを開く"
-
-#: spyderlib/app/spyder.py:2723 spyderlib/app/spyder.py:2735
-msgid "Spyder sessions"
-msgstr "Spyderセッション"
-
-#: spyderlib/app/spyder.py:2734
-msgid "Save session"
-msgstr "セッションを保存"
-
-#: spyderlib/app/spyder.py:2776
+#: spyder/app/mainwindow.py:2656
 msgid ""
 "Spyder will restart and reset to default settings: <br><br>Do you want to "
 "continue?"
 msgstr "Spyderを再起動して設定をデフォルトに戻します: <br><br>続行しますか?"
 
-#: spyderlib/app/spyder.py:2873 spyderlib/widgets/helperwidgets.py:243
+#: spyder/app/mainwindow.py:2753 spyder/widgets/helperwidgets.py:250
 msgid "Spyder updates"
 msgstr "Spyderアップデート"
 
-#: spyderlib/app/spyder.py:2874 spyderlib/plugins/configdialog.py:799
+#: spyder/app/mainwindow.py:2754 spyder/plugins/configdialog.py:819
 msgid "Check for updates on startup"
 msgstr "起動時に更新をチェック"
 
-#: spyderlib/app/spyder.py:2892
-#, python-format
+#: spyder/app/mainwindow.py:2772
 msgid ""
 "<b>Spyder %s is available!</b> <br><br>Please use your package manager to "
 "update Spyder or go to our <a href=\"%s\">Releases</a> page to download this "
@@ -699,15 +586,63 @@ msgstr ""
 "new version. <br><br>If you are not sure how to proceed to update Spyder "
 "please refer to our  <a href=\"%s\">Installation</a> instructions."
 
-#: spyderlib/app/spyder.py:2904
+#: spyder/app/mainwindow.py:2784
 msgid "Spyder is up to date."
 msgstr "Spyderは最新の状態です。"
 
-#: spyderlib/app/tour.py:121
+#: spyder/app/restart.py:133
+msgid ""
+"It was not possible to close the previous Spyder instance.\n"
+"Restart aborted."
+msgstr ""
+"前回実行したSpyderを終了できませんでした。\n"
+"再起動を終了します。"
+
+#: spyder/app/restart.py:135
+msgid ""
+"Spyder could not reset to factory defaults.\n"
+"Restart aborted."
+msgstr ""
+"デフォルト設定を適用できませんでした。\n"
+"再起動を終了します。"
+
+#: spyder/app/restart.py:137
+msgid ""
+"It was not possible to restart Spyder.\n"
+"Operation aborted."
+msgstr ""
+"再起動できませんでした。\n"
+"オペレーションを終了します。"
+
+#: spyder/app/restart.py:139
+msgid "Spyder exit error"
+msgstr "Spyder実行エラー"
+
+#: spyder/app/restart.py:140
+msgid "Spyder reset error"
+msgstr "Spyderリセットエラー"
+
+#: spyder/app/restart.py:141
+msgid "Spyder restart error"
+msgstr "Spyder再起動エラー"
+
+#: spyder/app/restart.py:165
+msgid "Closing Spyder"
+msgstr "Spyderを閉じる"
+
+#: spyder/app/restart.py:239
+msgid "Resetting Spyder to defaults"
+msgstr "Spyderをデフォルト状態に戻しています"
+
+#: spyder/app/restart.py:271
+msgid "Restarting"
+msgstr "再起動中。"
+
+#: spyder/app/tour.py:124
 msgid "Welcome to the Introduction tour"
 msgstr "紹介ツアーへようこそ"
 
-#: spyderlib/app/tour.py:122
+#: spyder/app/tour.py:125
 msgid ""
 "<b>Spyder</b> is a powerful Interactive Development Environment (or IDE) for "
 "the Python programming language.<br><br>Here we are going to guide you "
@@ -719,11 +654,11 @@ msgstr ""
 "な機能の紹介です。<br><br>ツアーにそって進むには矢印キーを押すか下のボタンを"
 "クリックしてください。"
 
-#: spyderlib/app/tour.py:131
+#: spyder/app/tour.py:134
 msgid "The Editor"
 msgstr "エディタ"
 
-#: spyderlib/app/tour.py:132
+#: spyder/app/tour.py:135
 msgid ""
 "This is the pane where you write Python code before evaluating it. You can "
 "get automatic suggestions and completions while writing, by pressing the "
@@ -740,11 +675,11 @@ msgstr ""
 "ります。<br><br> また行番号エリアの空行以外の場所でダブルクリックすることによ"
 "り、デバッグのためのブレークポイントを設置することができます。"
 
-#: spyderlib/app/tour.py:147
+#: spyder/app/tour.py:150
 msgid "The IPython console"
 msgstr "IPythonコンソール"
 
-#: spyderlib/app/tour.py:148
+#: spyder/app/tour.py:151
 msgid ""
 "This is one of panes where you can run or execute the code you wrote on the "
 "Editor. To do it you need to press the <b>F5</b> key.<br><br>This console "
@@ -761,11 +696,11 @@ msgstr ""
 "い。<br><br> このコンソール内の単純なコードを動かすために下のボタンをクリック"
 "してください。 他の重要な機能を見るために役立ちます。"
 
-#: spyderlib/app/tour.py:164
+#: spyder/app/tour.py:167
 msgid "The Variable Explorer"
 msgstr "変数エクスプローラー"
 
-#: spyderlib/app/tour.py:165
+#: spyder/app/tour.py:168
 msgid ""
 "In this pane you can view and edit the variables generated during the "
 "execution of a program, or those entered directly in one of Spyder consoles."
@@ -780,11 +715,11 @@ msgstr ""
 "ブルクリックすると新しいウィンドウが開き、変数の中身を調査したり変更したりす"
 "ることができます。"
 
-#: spyderlib/app/tour.py:177
+#: spyder/app/tour.py:180
 msgid "The Python console"
 msgstr "Pythonコンソール"
 
-#: spyderlib/app/tour.py:178
+#: spyder/app/tour.py:181
 msgid ""
 "You can also run your code on a Python console. These consoles are useful "
 "because they let you run a file in a console dedicated only to it.To select "
@@ -800,12 +735,12 @@ msgstr ""
 "変数エクスプローラーは現在フォーカスされているコンソールの変数のみを表示する"
 "ということがわかります。"
 
-#: spyderlib/app/tour.py:192 spyderlib/widgets/internalshell.py:266
-#: spyderlib/plugins/help.py:490 spyderlib/plugins/help.py:940
+#: spyder/app/tour.py:195 spyder/plugins/help.py:485 spyder/plugins/help.py:929
+#: spyder/widgets/internalshell.py:270
 msgid "Help"
 msgstr "ヘルプ"
 
-#: spyderlib/app/tour.py:193
+#: spyder/app/tour.py:196
 msgid ""
 "This pane displays documentation of the functions, classes, methods or "
 "modules you are currently using in the Editor or the Consoles.<br><br>To use "
@@ -817,11 +752,11 @@ msgstr ""
 "<b>Ctrl+I</b> を押す必要があります。もしオブジェクトに関連付けられたドキュメ"
 "ントがある場合ここに表示されます。"
 
-#: spyderlib/app/tour.py:203
+#: spyder/app/tour.py:206
 msgid "The File Explorer"
 msgstr "ファイルエクスプローラー"
 
-#: spyderlib/app/tour.py:204
+#: spyder/app/tour.py:207
 msgid ""
 "This pane lets you navigate through the directories and files present in "
 "your computer.<br><br>You can also open any of these files with its "
@@ -834,4628 +769,4709 @@ msgstr ""
 "リケーションで開くことができます。<br><br> 但しプレーンテキストは常にSpyder "
 "Editorで開かれるという例外はあります。"
 
-#: spyderlib/app/tour.py:214
+#: spyder/app/tour.py:217
 msgid "The History Log"
 msgstr "履歴ログ"
 
-#: spyderlib/app/tour.py:215
+#: spyder/app/tour.py:218
 msgid ""
 "This pane records all commands introduced in the Python and IPython consoles."
 msgstr ""
 "このペインはPython及びIPythonコンソール内で入力された全てののコマンドを記録し"
 "ます。"
 
-#: spyderlib/app/tour.py:263
+#: spyder/app/tour.py:266
 msgid "<b>Spyder</b> is an interactive development environment based on bla"
 msgstr ""
 "<b>Spyder</b> はなにか(bla)に基づいた対話型開発環境(Interactive development "
 "environment)です。"
 
-#: spyderlib/app/tour.py:267
+#: spyder/app/tour.py:270
 msgid "Welcome to Spyder introduction tour"
 msgstr "Spyder紹介ツアーへようこそ"
 
-#: spyderlib/app/tour.py:268
+#: spyder/app/tour.py:271
 msgid "Spyder is an interactive development environment based on bla"
 msgstr ""
 "Spyderはなにか(bla)に基づいた対話型開発環境(Interactive development "
 "environment)です。"
 
-#: spyderlib/app/tour.py:273
+#: spyder/app/tour.py:276
 msgid "Introduction tour"
 msgstr "紹介ツアー"
 
-#: spyderlib/app/tour.py:274
+#: spyder/app/tour.py:277
 msgid "New features in version 3.0"
 msgstr "バージョン3.0の新機能"
 
-#: spyderlib/app/tour.py:552 spyderlib/plugins/ipythonconsole.py:324
+#: spyder/app/tour.py:555 spyder/plugins/ipythonconsole.py:431
 msgid "Run code"
 msgstr "コードを実行"
 
-#: spyderlib/app/tour.py:821
+#: spyder/app/tour.py:824
 msgid "Go to step: "
 msgstr "ステップへ移動"
 
-#: spyderlib/config/ipython.py:23
-msgid "Jupyter Qtconsole integration"
-msgstr "Jupyter Qtconsole 統合"
-
-#: spyderlib/config/ipython.py:25
-msgid "Manipulate Jupyter notebooks on the Editor"
-msgstr "エディタ上でJupyter notebookを操作"
-
-#: spyderlib/config/base.py:241
+#: spyder/config/base.py:249
 msgid ""
 "Update LANGUAGE_CODES (inside config/base.py) if a new translation has been "
 "added to Spyder"
 msgstr ""
 "新しい翻訳がSpyderに追加された場合LANGUAGE_CODES (config/base.py内)を更新"
 
-#: spyderlib/config/utils.py:24
+#: spyder/config/ipython.py:23
+#, fuzzy
+msgid "Integrate the IPython console"
+msgstr "IPythonコンソール"
+
+#: spyder/config/ipython.py:25
+msgid "Manipulate Jupyter notebooks on the Editor"
+msgstr "エディタ上でJupyter notebookを操作"
+
+#: spyder/config/utils.py:24
 msgid "Python files"
 msgstr "Pythonファイル"
 
-#: spyderlib/config/utils.py:25
+#: spyder/config/utils.py:25
 msgid "Cython/Pyrex files"
 msgstr "Cython/Pyrexファイル"
 
-#: spyderlib/config/utils.py:26
+#: spyder/config/utils.py:26
 msgid "C files"
 msgstr "Cファイル"
 
-#: spyderlib/config/utils.py:27
+#: spyder/config/utils.py:27
 msgid "C++ files"
 msgstr "C++ファイル"
 
-#: spyderlib/config/utils.py:28
+#: spyder/config/utils.py:28
 msgid "OpenCL files"
 msgstr "OpenCLファイル"
 
-#: spyderlib/config/utils.py:29
+#: spyder/config/utils.py:29
 msgid "Fortran files"
 msgstr "Fortranファイル"
 
-#: spyderlib/config/utils.py:30
+#: spyder/config/utils.py:30
 msgid "IDL files"
 msgstr "IDLファイル"
 
-#: spyderlib/config/utils.py:31
+#: spyder/config/utils.py:31
 msgid "MATLAB files"
 msgstr "MATLABファイル"
 
-#: spyderlib/config/utils.py:32
+#: spyder/config/utils.py:32
 msgid "Julia files"
 msgstr "Juliaファイル"
 
-#: spyderlib/config/utils.py:33
+#: spyder/config/utils.py:33
 msgid "Yaml files"
 msgstr "Yamlファイル"
 
-#: spyderlib/config/utils.py:34
+#: spyder/config/utils.py:34
 msgid "Patch and diff files"
 msgstr "Patch and diffファイル"
 
-#: spyderlib/config/utils.py:35
+#: spyder/config/utils.py:35
 msgid "Batch files"
 msgstr "Batchファイル"
 
-#: spyderlib/config/utils.py:36 spyderlib/utils/iofuncs.py:515
+#: spyder/config/utils.py:36 spyder/utils/iofuncs.py:426
 msgid "Text files"
 msgstr "テキストファイル"
 
-#: spyderlib/config/utils.py:37
+#: spyder/config/utils.py:37
 msgid "reStructuredText files"
 msgstr "reStructuredTextファイル"
 
-#: spyderlib/config/utils.py:38
+#: spyder/config/utils.py:38
 msgid "gettext files"
 msgstr "gettextファイル"
 
-#: spyderlib/config/utils.py:39
+#: spyder/config/utils.py:39
 msgid "NSIS files"
 msgstr "NSISファイル"
 
-#: spyderlib/config/utils.py:40
+#: spyder/config/utils.py:40
 msgid "Web page files"
 msgstr "Webページファイル"
 
-#: spyderlib/config/utils.py:41
+#: spyder/config/utils.py:41
 msgid "XML files"
 msgstr "XMLファイル"
 
-#: spyderlib/config/utils.py:42
+#: spyder/config/utils.py:42
 msgid "Javascript files"
 msgstr "Javascriptファイル"
 
-#: spyderlib/config/utils.py:43
+#: spyder/config/utils.py:43
 msgid "Json files"
 msgstr "Jsonファイル"
 
-#: spyderlib/config/utils.py:44
+#: spyder/config/utils.py:44
 msgid "IPython notebooks"
 msgstr "IPython notebooks"
 
-#: spyderlib/config/utils.py:45
+#: spyder/config/utils.py:45
 msgid "Enaml files"
 msgstr "Enamlファイル"
 
-#: spyderlib/config/utils.py:46
+#: spyder/config/utils.py:46
 msgid "Configuration files"
 msgstr "Configurationファイル"
 
-#: spyderlib/config/utils.py:51 spyderlib/widgets/explorer.py:670
+#: spyder/config/utils.py:51 spyder/widgets/explorer.py:700
 msgid "All files"
 msgstr "すべてのファイル"
 
-#: spyderlib/config/utils.py:113
+#: spyder/config/utils.py:121
 msgid "Supported text files"
 msgstr "サポートされたテキストファイル"
 
-#: spyderlib/utils/environ.py:98
-msgid ""
-"Module <b>pywin32 was not found</b>.<br>Please restart this Windows "
-"<i>session</i> (not the computer) for changes to take effect."
-msgstr ""
-"モジュール <b>pywin32 は見つかりませんでした</b>。<br>変更を反映させるには(コ"
-"ンピュータではなく)このWindows<i>セッション</i> を再起動して。"
+#: spyder/plugins/__init__.py:508 spyder/plugins/editor.py:98
+#: spyder/plugins/editor.py:545 spyder/plugins/editor.py:1718
+#: spyder/plugins/help.py:118 spyder/plugins/help.py:385
+#: spyder/widgets/editor.py:369 spyder/widgets/sourcecode/codeeditor.py:97
+#: spyder/widgets/sourcecode/codeeditor.py:2960
+msgid "Editor"
+msgstr "エディタ"
 
-#: spyderlib/utils/environ.py:111
-msgid ""
-"If you accept changes, this will modify the current user environment "
-"variables directly <b>in Windows registry</b>. Use it with precautions, at "
-"your own risks.<br><br>Note that for changes to take effect, you will need "
-"to restart the parent process of this application (simply restart Spyder if "
-"you have executed it from a Windows shortcut, otherwise restart any "
-"application from which you may have executed it, like <i>Python(x,y) Home</"
-"i> for example)"
-msgstr ""
-"変更を受諾すると <b>Windowsレジストリ内の</b>現在のユーザー環境変数が直接修正"
-"されます。 各自のリスクで注意深く使用すること。<br><br>変更が効果を及ぼすには"
-"このアプリケーションの親プロセスを再起動する必要があります。(Windowsショート"
-"カットから実行している場合単にspyderを再起動すれば良い。そうでなければ例えば"
-"<i>Python(x,y) Home</i>のようにSpyderを実行しているアプリケーションを全て再起"
-"動する)"
+#: spyder/plugins/configdialog.py:139
+msgid "Reset to defaults"
+msgstr "デフォルト設定へ戻す"
 
-#: spyderlib/utils/codeanalysis.py:91
-msgid "Real-time code analysis on the Editor"
-msgstr "エディタ上でのリアルタイムコード分析"
+#: spyder/plugins/configdialog.py:151
+msgid "Preferences"
+msgstr "設定"
 
-#: spyderlib/utils/codeanalysis.py:95
-msgid "Real-time code style analysis on the Editor"
-msgstr "エディタ上でのリアルタイムコードスタイル分析"
+#: spyder/plugins/configdialog.py:491
+msgid "Invalid directory path"
+msgstr "不正なディレクトリパス"
 
-#: spyderlib/utils/iofuncs.py:497
-msgid "Supported files"
-msgstr "サポートされているファイル"
+#: spyder/plugins/configdialog.py:494 spyder/plugins/configdialog.py:509
+#: spyder/plugins/runconfig.py:177 spyder/plugins/runconfig.py:241
+#: spyder/plugins/workingdirectory.py:291 spyder/widgets/explorer.py:614
+#: spyder/widgets/externalshell/pythonshell.py:616
+#: spyder/widgets/findinfiles.py:504 spyder/widgets/pathmanager.py:224
+#: spyder/widgets/projects/projectdialog.py:155
+msgid "Select directory"
+msgstr "ディレクトリを選択"
 
-#: spyderlib/utils/iofuncs.py:499
-msgid "All files (*.*)"
-msgstr "すべてのファイル (*.*)"
+#: spyder/plugins/configdialog.py:521
+msgid "Invalid file path"
+msgstr "不正なファイルパス"
 
-#: spyderlib/utils/iofuncs.py:509
-msgid "Spyder data files"
-msgstr "Spyderデータファイル"
+#: spyder/plugins/configdialog.py:524 spyder/plugins/configdialog.py:541
+msgid "Select file"
+msgstr "ファイル選択"
 
-#: spyderlib/utils/iofuncs.py:511
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:1014
-msgid "NumPy arrays"
-msgstr "NumPy配列"
+#: spyder/plugins/configdialog.py:540
+msgid "All files (*)"
+msgstr "全てのファイル (*)"
 
-#: spyderlib/utils/iofuncs.py:512
-msgid "NumPy zip arrays"
-msgstr "NumPy zip配列"
+#: spyder/plugins/configdialog.py:613 spyder/widgets/formlayout.py:215
+msgid "Bold"
+msgstr "ボールド"
 
-#: spyderlib/utils/iofuncs.py:513
-msgid "Matlab files"
-msgstr "Matlabファイル"
+#: spyder/plugins/configdialog.py:616 spyder/widgets/formlayout.py:210
+msgid "Italic"
+msgstr "イタリック"
 
-#: spyderlib/utils/iofuncs.py:514
-msgid "CSV text files"
-msgstr "CSVテキストファイル"
+#: spyder/plugins/configdialog.py:670
+msgid "Font: "
+msgstr "フォント:"
 
-#: spyderlib/utils/iofuncs.py:516
-msgid "JPEG images"
-msgstr "JPEG画像"
+#: spyder/plugins/configdialog.py:676
+msgid "Size: "
+msgstr "サイズ:"
 
-#: spyderlib/utils/iofuncs.py:517
-msgid "PNG images"
-msgstr "PNG画像"
+#: spyder/plugins/configdialog.py:695
+msgid "Font style"
+msgstr "フォントスタイル"
 
-#: spyderlib/utils/iofuncs.py:518
-msgid "GIF images"
-msgstr "GIF画像"
+#: spyder/plugins/configdialog.py:772
+msgid "Spyder needs to restart to change the following setting:"
+msgstr "Spyderは以下の設定を適用するために再起動が必要となります:"
 
-#: spyderlib/utils/iofuncs.py:519
-msgid "TIFF images"
-msgstr "TIFF画像"
+#: spyder/plugins/configdialog.py:775
+msgid "Spyder needs to restart to change the following settings:"
+msgstr "Spyderは以下の設定を適用するために再起動が必要となります:"
 
-#: spyderlib/utils/iofuncs.py:520 spyderlib/utils/iofuncs.py:521
-msgid "Pickle files"
-msgstr "Pickleファイル"
+#: spyder/plugins/configdialog.py:777
+msgid "Do you wish to restart now?"
+msgstr "直ちに再起動しますか?"
 
-#: spyderlib/utils/iofuncs.py:522
-msgid "JSON files"
-msgstr "JSONファイル"
+#: spyder/plugins/configdialog.py:783
+msgid "Information"
+msgstr "情報"
 
-#: spyderlib/utils/iofuncs.py:541 spyderlib/utils/iofuncs.py:548
-#, python-format
-msgid "<b>Unsupported file type '%s'</b>"
-msgstr "<b>非サポートファイルタイプ '%s'</b>"
+#: spyder/plugins/configdialog.py:797 spyder/plugins/configdialog.py:804
+#: spyder/widgets/projects/configdialog.py:74
+msgid "General"
+msgstr "一般"
 
-#: spyderlib/utils/programs.py:282
-msgid "It was not possible to run this file in an external terminal"
-msgstr "このファイルを外部ターミナルで実行できませんでした"
+#: spyder/plugins/configdialog.py:807
+msgid "Language"
+msgstr "言語"
+
+#: spyder/plugins/configdialog.py:810
+msgid "Use a single instance"
+msgstr "単一インスタンスを使用"
 
-#: spyderlib/utils/help/sphinxify.py:212 spyderlib/utils/help/sphinxify.py:222
+#: spyder/plugins/configdialog.py:812
 msgid ""
-"It was not possible to generate rich text help for this object.</br>Please "
-"see it in plain text."
+"Set this to open external<br> Python files in an already running instance "
+"(Requires a restart)"
 msgstr ""
-"このオブジェクトに対してリッチテキストのヘルプを生成できませんでした。</br>プ"
-"レーンテキストを参照してください。"
+"外部Pythonファイルを実行中の<br> インスタンスで開くためにこれをセット (再起動"
+"が必要)"
 
-#: spyderlib/utils/introspection/manager.py:31
-#: spyderlib/utils/introspection/manager.py:36
-msgid "Editor's code completion, go-to-definition and help"
-msgstr "エディタのコード補完、go-to-definition及びヘルプ"
+#: spyder/plugins/configdialog.py:815
+msgid "Prompt when exiting"
+msgstr "終了時に確認する"
 
-#: spyderlib/utils/syntaxhighlighters.py:32
-msgid "Syntax highlighting for Matlab, Julia and other file types"
-msgstr "Matbal、Julia及びたのファイルタイプの構文強調"
+#: spyder/plugins/configdialog.py:816
+msgid "Pop up internal console when internal errors appear"
+msgstr "内部エラー発生時に内部コンソールをポップアップさせる"
 
-#: spyderlib/utils/syntaxhighlighters.py:41
-msgid "Background:"
-msgstr "バックグラウンド:"
+#: spyder/plugins/configdialog.py:836 spyder/plugins/editor.py:107
+#: spyder/plugins/externalconsole.py:57 spyder/plugins/ipythonconsole.py:273
+#: spyder/widgets/projects/configdialog.py:81
+msgid "Interface"
+msgstr "インターフェイス"
 
-#: spyderlib/utils/syntaxhighlighters.py:42
-#: spyderlib/widgets/sourcecode/codeeditor.py:103
-msgid "Current line:"
-msgstr "現在行:"
+#: spyder/plugins/configdialog.py:844
+msgid "Qt windows style"
+msgstr "Qt windowスタイル"
 
-#: spyderlib/utils/syntaxhighlighters.py:43
-msgid "Current cell:"
-msgstr "現在セル:"
+#: spyder/plugins/configdialog.py:850
+msgid "Icon theme"
+msgstr "アイコンテーマ"
 
-#: spyderlib/utils/syntaxhighlighters.py:44
-msgid "Occurrence:"
-msgstr "事象:"
+#: spyder/plugins/configdialog.py:854
+msgid "Vertical title bars in panes"
+msgstr "ペインのタイトルバーを縦にする"
 
-#: spyderlib/utils/syntaxhighlighters.py:45
-msgid "Link:"
-msgstr "リンク:"
+#: spyder/plugins/configdialog.py:856
+msgid "Vertical tabs in panes"
+msgstr "ペインのタブを縦にする"
 
-#: spyderlib/utils/syntaxhighlighters.py:46
-msgid "Side areas:"
-msgstr "サイドエリア:"
+#: spyder/plugins/configdialog.py:858
+msgid "Animated toolbars and panes"
+msgstr "ツールバーとペインをアニメーションさせる"
 
-#: spyderlib/utils/syntaxhighlighters.py:47
-msgid "Matched <br>parens:"
-msgstr "閉じた<br>括弧:"
+#: spyder/plugins/configdialog.py:860
+msgid "Tear off menus"
+msgstr "メニューを切り離す"
 
-#: spyderlib/utils/syntaxhighlighters.py:48
-msgid "Unmatched <br>parens:"
-msgstr "閉じていない <br>括弧:"
+#: spyder/plugins/configdialog.py:861
+msgid "Set this to detach any<br> menu from the main window"
+msgstr "メインウインドウから<br>メニューを切り離すために設定する"
 
-#: spyderlib/utils/syntaxhighlighters.py:49
-msgid "Normal text:"
-msgstr "通常テキスト:"
+#: spyder/plugins/configdialog.py:863
+msgid "Custom margin for panes:"
+msgstr "ペインのマージン調整"
 
-#: spyderlib/utils/syntaxhighlighters.py:50
-msgid "Keyword:"
-msgstr "キーワード:"
+#: spyder/plugins/configdialog.py:865 spyder/plugins/editor.py:209
+msgid "pixels"
+msgstr "ピクセル"
 
-#: spyderlib/utils/syntaxhighlighters.py:51
-msgid "Builtin:"
-msgstr "組み込み:"
+#: spyder/plugins/configdialog.py:893
+msgid "Status bar"
+msgstr "ステータスバー"
 
-#: spyderlib/utils/syntaxhighlighters.py:52
-msgid "Definition:"
-msgstr "定義:"
+#: spyder/plugins/configdialog.py:894
+msgid "Show status bar"
+msgstr "ステータスバーを表示"
 
-#: spyderlib/utils/syntaxhighlighters.py:53
-msgid "Comment:"
-msgstr "コメント:"
+#: spyder/plugins/configdialog.py:896
+msgid "Show memory usage every"
+msgstr "メモリ使用状況を以下の間隔で更新"
 
-#: spyderlib/utils/syntaxhighlighters.py:54
-msgid "String:"
-msgstr "文字列:"
+#: spyder/plugins/configdialog.py:898 spyder/plugins/configdialog.py:907
+#: spyder/plugins/editor.py:133 spyder/plugins/editor.py:261
+#: spyder/plugins/variableexplorer.py:30
+msgid " ms"
+msgstr "ms"
 
-#: spyderlib/utils/syntaxhighlighters.py:55
-msgid "Number:"
-msgstr "数字:"
+#: spyder/plugins/configdialog.py:905
+msgid "Show CPU usage every"
+msgstr "CPU使用状況を以下の間隔で更新"
 
-#: spyderlib/utils/syntaxhighlighters.py:56
-msgid "Instance:"
-msgstr "インスタンス:"
+#: spyder/plugins/configdialog.py:940
+msgid "Plain text font"
+msgstr "プレーンテキスト"
 
-#: spyderlib/workers/updates.py:86 spyderlib/workers/updates.py:88
-msgid "Unable to retrieve information."
-msgstr "情報が取得できません"
+#: spyder/plugins/configdialog.py:946
+msgid "Rich text font"
+msgstr "リッチテキスト"
 
-#: spyderlib/workers/updates.py:90
-msgid ""
-"Unable to connect to the internet. <br><br>Make sure the connection is "
-"working properly."
-msgstr ""
-"インターネットに接続できません。 <br><br>接続が正しく動作しているか確認してく"
-"ださい。"
+#: spyder/plugins/configdialog.py:949
+msgid "Fonts"
+msgstr "フォント"
 
-#: spyderlib/workers/updates.py:93
-msgid "Unable to check for updates."
-msgstr "更新をチェックできません"
+#: spyder/plugins/configdialog.py:963
+msgid "Appearance"
+msgstr "外見"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:113
-msgid "Index"
-msgstr "インデックス"
+#: spyder/plugins/configdialog.py:965 spyder/plugins/ipythonconsole.py:564
+msgid "Advanced Settings"
+msgstr "詳細設定"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:115
-#: spyderlib/plugins/shortcuts.py:517
-msgid "Name"
-msgstr "名前"
+#: spyder/plugins/configdialog.py:1001
+msgid "Syntax coloring"
+msgstr "構文強調の配色"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:118
-msgid "Tuple"
-msgstr "タプル"
+#: spyder/plugins/configdialog.py:1014
+msgid ""
+"Here you can select the color scheme used in the Editor and all other Spyder "
+"plugins.<br><br>You can also edit the color schemes provided by Spyder or "
+"create your own ones by using the options provided below.<br>"
+msgstr ""
+"エディタ及びその他全Spyderプラグインで利用する色スキームを選択できます。"
+"<br><br>以下のオプションにより定義済みの色スキームの編集及び独自色スキーム作"
+"成が実行できます。<br>"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:121
-msgid "List"
-msgstr "リスト"
+#: spyder/plugins/configdialog.py:1019
+msgid "Edit selected"
+msgstr "選択を編集"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:124
-msgid "Dictionary"
-msgstr "辞書"
+#: spyder/plugins/configdialog.py:1020
+msgid "Create new scheme"
+msgstr "新しいスキームを作成"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:126
-msgid "Key"
-msgstr "キー"
+#: spyder/plugins/configdialog.py:1021 spyder/widgets/explorer.py:510
+#: spyder/widgets/shell.py:134
+msgid "Delete"
+msgstr "削除"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:130
-#: spyderlib/plugins/help.py:399
-msgid "Object"
-msgstr "オブジェクト"
+#: spyder/plugins/configdialog.py:1024
+msgid "Reset"
+msgstr "リセット"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:132
-msgid "Attribute"
-msgstr "属性"
+#: spyder/plugins/configdialog.py:1031
+msgid "Scheme:"
+msgstr "スキーム:"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:134
-msgid "elements"
-msgstr "要素"
+#: spyder/plugins/configdialog.py:1062
+msgid "Manage color schemes"
+msgstr "色スキームのマネージ"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:310
-msgid "Type"
-msgstr "型"
+#: spyder/plugins/configdialog.py:1251
+msgid "Are you sure you want to delete this scheme?"
+msgstr "本当にこのスキームを削除しますか?"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:310
-msgid "Size"
-msgstr "サイズ"
+#: spyder/plugins/configdialog.py:1368
+msgid "Text"
+msgstr "テキスト"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:310
-msgid "Value"
-msgstr "値"
+#: spyder/plugins/configdialog.py:1370
+msgid "Highlight"
+msgstr "強調"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:408
-msgid ""
-"Opening this variable can be slow\n"
-"\n"
-"Do you want to continue anyway?"
-msgstr ""
-"この変数を開くには時間がかかる場合があります\n"
-"\n"
-"続行しますか?"
+#: spyder/plugins/configdialog.py:1372
+msgid "Background"
+msgstr "背景"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:416
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:570
-msgid "Edit item"
-msgstr "アイテムを編集"
+#: spyder/plugins/configdialog.py:1376
+msgid "Scheme name:"
+msgstr "スキーム名:"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:417
-#, python-format
-msgid "<b>Unable to retrieve data.</b><br><br>Error message:<br>%s"
-msgstr "<b>データを取得できません。</b><br><br>エラーメッセージ:<br>%s"
+#: spyder/plugins/configdialog.py:1383
+msgid "Color scheme editor"
+msgstr "色スキームエディタ"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:571
-#, python-format
-msgid "<b>Unable to assign data to item.</b><br><br>Error message:<br>%s"
-msgstr ""
-"<b>アイテムにデータを割り当てられません。</b><br><br>エラーメッセージ:<br>%s"
+#: spyder/plugins/console.py:109
+msgid "Internal console"
+msgstr "内部コンソール"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:633
-msgid "Resize rows to contents"
-msgstr "行数を中身に応じて変更"
+#: spyder/plugins/console.py:139 spyder/plugins/externalconsole.py:743
+msgid "&Run..."
+msgstr "実行(&R)"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:641
-#: spyderlib/widgets/explorer.py:241
-msgid "Edit"
-msgstr "編集"
+#: spyder/plugins/console.py:141 spyder/plugins/externalconsole.py:744
+msgid "Run a Python script"
+msgstr "Pythonスクリプトを実行"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:644
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:983
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:1000
-msgid "Plot"
-msgstr "プロット"
+#: spyder/plugins/console.py:144
+msgid "Environment variables..."
+msgstr "環境変数.."
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:648
-msgid "Histogram"
-msgstr "ヒストグラム"
+#: spyder/plugins/console.py:146
+msgid "Show and edit environment variables (for current session)"
+msgstr "(現在のセッションのため)環境変数を表示・編集する"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:652
-msgid "Show image"
-msgstr "画像を表示"
+#: spyder/plugins/console.py:150
+msgid "Show sys.path contents..."
+msgstr "sys.pathの中身を表示..."
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:656
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:1008
-msgid "Save array"
-msgstr "配列を保存"
+#: spyder/plugins/console.py:152
+msgid "Show (read-only) sys.path"
+msgstr "sys.pathを読み取り専用で表示"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:660
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:947
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:955
-msgid "Insert"
-msgstr "挿入"
+#: spyder/plugins/console.py:155
+msgid "Buffer..."
+msgstr "バッファー..."
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:663
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:897
-msgid "Remove"
-msgstr "除去"
+#: spyder/plugins/console.py:156 spyder/plugins/externalconsole.py:75
+#: spyder/plugins/history.py:43
+msgid "Set maximum line count"
+msgstr "最大行数を設定"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:666
-#: spyderlib/plugins/variableexplorer.py:42
-msgid "Truncate values"
-msgstr "値を切り捨て"
+#: spyder/plugins/console.py:159
+msgid "External editor path..."
+msgstr "外部エディタのパス..."
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:670
-#: spyderlib/plugins/variableexplorer.py:44
-msgid "Show arrays min/max"
-msgstr "配列の最小/最大を表示"
+#: spyder/plugins/console.py:160
+msgid "Set external editor executable path"
+msgstr "外部エディタ実行パスを設定"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:674
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:914
-#: spyderlib/widgets/explorer.py:542 spyderlib/widgets/explorer.py:550
-#: spyderlib/widgets/explorer.py:561
-msgid "Rename"
-msgstr "リネーム"
+#: spyder/plugins/console.py:163 spyder/plugins/editor.py:139
+#: spyder/plugins/externalconsole.py:76 spyder/plugins/help.py:157
+#: spyder/plugins/help.py:360 spyder/plugins/history.py:46
+#: spyder/plugins/history.py:157
+msgid "Wrap lines"
+msgstr "行の折り返し"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:677
-msgid "Duplicate"
-msgstr "複製"
+#: spyder/plugins/console.py:166 spyder/plugins/editor.py:175
+#: spyder/plugins/externalconsole.py:121 spyder/plugins/ipythonconsole.py:283
+msgid "Display balloon tips"
+msgstr "バルーンチップを表示"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:895
-msgid "Do you want to remove selected item?"
-msgstr "選択されたアイテムを除去しますか?"
+#: spyder/plugins/console.py:170 spyder/plugins/editor.py:169
+#: spyder/plugins/externalconsole.py:115
+msgid "Automatic code completion"
+msgstr "自動コード補完"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:896
-msgid "Do you want to remove all selected items?"
-msgstr "選択された全てのアイテムを除去しますか?"
+#: spyder/plugins/console.py:174 spyder/plugins/editor.py:173
+#: spyder/plugins/externalconsole.py:119
+msgid "Enter key selects completion"
+msgstr "Enterキーで補完候補を選択"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:914
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:947
-msgid "Key:"
-msgstr "キー:"
+#: spyder/plugins/console.py:179
+msgid "Internal console settings"
+msgstr "内部コンソール設定"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:955
-msgid "Value:"
-msgstr "値:"
+#: spyder/plugins/console.py:232 spyder/plugins/externalconsole.py:918
+msgid "Run Python script"
+msgstr "Pythonスクリプトを実行"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:971
-msgid "Import error"
-msgstr "インポートエラー"
+#: spyder/plugins/console.py:233 spyder/plugins/externalconsole.py:146
+#: spyder/plugins/externalconsole.py:919 spyder/widgets/explorer.py:715
+msgid "Python scripts"
+msgstr "Pythonスクリプト"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:972
-msgid "Please install <b>matplotlib</b> or <b>guiqwt</b>."
-msgstr "<b>matplotlib</b> か <b>guiqwt</b> をインストールしてください。"
+#: spyder/plugins/console.py:278
+msgid "Buffer"
+msgstr "バッファー"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:984
-#, python-format
-msgid "<b>Unable to plot data.</b><br><br>Error message:<br>%s"
-msgstr "<b>データをプロットできません。</b><br><br>エラーメッセージ:<br>%s"
+#: spyder/plugins/console.py:279
+msgid "Maximum line count"
+msgstr "最大行数"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:1001
-#, python-format
-msgid "<b>Unable to show image.</b><br><br>Error message:<br>%s"
-msgstr "<b>画像を表示できません。</b><br><br>エラーメッセージ:<br>%s"
+#: spyder/plugins/console.py:289
+msgid "External editor"
+msgstr "外部エディタ"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:1024
-#, python-format
-msgid "<b>Unable to save array</b><br><br>Error message:<br>%s"
-msgstr "<b>配列を保存できません</b><br><br>エラーメッセージ:<br>%s"
+#: spyder/plugins/console.py:290
+msgid "External editor executable path:"
+msgstr "外部エディタ実行パス:"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:1049
-msgid "It was not possible to copy this array"
-msgstr "配列をコピーできませんでした"
+#: spyder/plugins/editor.py:104
+msgid "Edit template for new modules"
+msgstr "新規モジュール用テンプレートの編集"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:1074
-msgid "Clipboard contents"
-msgstr "クリップボードの内容"
+#: spyder/plugins/editor.py:109
+msgid "Sort files according to full path"
+msgstr "フルパスでファイルをソート"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:1089
-msgid "Import from clipboard"
-msgstr "クリップボードからインポート"
+#: spyder/plugins/editor.py:111
+msgid "Show tab bar"
+msgstr "タブバーを表示"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:1091
-msgid "Empty clipboard"
-msgstr "クリップボードを空にする"
+#: spyder/plugins/editor.py:118 spyder/plugins/editor.py:189
+#: spyder/plugins/externalconsole.py:71 spyder/plugins/externalconsole.py:114
+#: spyder/plugins/help.py:156 spyder/plugins/history.py:45
+#: spyder/plugins/ipythonconsole.py:317
+msgid "Source code"
+msgstr "ソースコード"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:1092
-msgid "Nothing to be imported from clipboard."
-msgstr "クリップボードからインポートするものはありません。"
+#: spyder/plugins/editor.py:119
+msgid "Show line numbers"
+msgstr "行番号を表示"
 
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:496
-msgid "It was not possible to copy values for this array"
-msgstr "配列の値をコピーできませんでした"
+#: spyder/plugins/editor.py:120 spyder/plugins/editor.py:937
+msgid "Show blank spaces"
+msgstr "空白スペースを表示"
 
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:531
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:564
-#: spyderlib/widgets/variableexplorer/dataframeeditor.py:524
-#: spyderlib/widgets/variableexplorer/dataframeeditor.py:564
-msgid "Format"
-msgstr "フォーマット"
+#: spyder/plugins/editor.py:121
+msgid "Show vertical line after"
+msgstr "縦線を以下の後に表示"
 
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:536
-#: spyderlib/widgets/variableexplorer/dataframeeditor.py:528
-msgid "Resize"
-msgstr "リサイズ"
+#: spyder/plugins/editor.py:122
+msgid "characters"
+msgstr "文字"
 
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:539
-#: spyderlib/widgets/variableexplorer/dataframeeditor.py:532
-#: spyderlib/plugins/ipythonconsole.py:191
-#: spyderlib/plugins/externalconsole.py:111
-msgid "Background color"
-msgstr "背景色"
+#: spyder/plugins/editor.py:127
+msgid "Highlight current line"
+msgstr "現在行を強調"
 
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:565
-#: spyderlib/widgets/variableexplorer/dataframeeditor.py:565
-msgid "Float formatting"
-msgstr "浮動小数点フォーマット"
+#: spyder/plugins/editor.py:129
+msgid "Highlight current cell"
+msgstr "現在セルを強調"
 
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:573
-#: spyderlib/widgets/variableexplorer/dataframeeditor.py:574
-#, python-format
-msgid "Format (%s) is incorrect"
-msgstr "フォーマット (%s) が不正です"
+#: spyder/plugins/editor.py:131
+msgid "Highlight occurrences after"
+msgstr "以下の事象を強調"
 
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:607
-msgid "Array is empty"
-msgstr "配列が空です"
-
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:610
-msgid "Arrays with more than 3 dimensions are not supported"
-msgstr "3次元以上の配列はサポートされていません"
-
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:613
-msgid "The 'xlabels' argument length do no match array column number"
-msgstr "'xlabels'引数の長さが配列の列数に一致していません"
-
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:617
-msgid "The 'ylabels' argument length do no match array row number"
-msgstr "'ylabels'引数の長さが配列の行数に一致していません"
-
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:624
-#, python-format
-msgid "%s arrays"
-msgstr "%s 配列"
+#: spyder/plugins/editor.py:159
+msgid "Save all files before running script"
+msgstr "スクリプトを実行前に保存"
 
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:625
-#, python-format
-msgid "%s are currently not supported"
-msgstr "%s は現在サポートされていません"
+#: spyder/plugins/editor.py:162
+msgid "Run selection"
+msgstr "選択を実行"
 
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:632
-msgid "NumPy array"
-msgstr "NumPy配列"
+#: spyder/plugins/editor.py:163
+msgid "Maintain focus in the Editor after running cells or selections"
+msgstr "エディタ内で実行後、選択後もセルのフォーカスを維持する"
 
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:634
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:788
-msgid "Array editor"
-msgstr "配列エディタ"
+#: spyder/plugins/editor.py:166 spyder/plugins/externalconsole.py:252
+msgid "Introspection"
+msgstr "イントロスペクション"
 
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:636
-msgid "read only"
-msgstr "読み取り専用"
+#: spyder/plugins/editor.py:171 spyder/plugins/externalconsole.py:117
+msgid "Case sensitive code completion"
+msgstr "コード補完で大文字/小文字を区別"
 
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:666
-msgid "Record array fields:"
-msgstr "配列のフィールドを記録:"
+#: spyder/plugins/editor.py:176
+msgid "Link to object definition"
+msgstr "オブジェクトの定義にリンク"
 
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:678
-msgid "Masked data"
-msgstr "Maskedデータ"
+#: spyder/plugins/editor.py:178
+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 ""
+"このオプションを有効にした場合、オブジェクト名の上で\n"
+"クリック(left-click + Ctrl key) するとオブジェクトの定義へ\n"
+"(定義位置が解決できていれば)移動する。"
 
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:678
-msgid "Data"
-msgstr "データ"
+#: spyder/plugins/editor.py:182
+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 ""
+"<b>警告:</b><br>パイソンモジュール <i>rope</i> がこのコンピューターにインス"
+"トールされていません: 呼び出し情報の表示、コード補完及びgo-to-definition機能"
+"は利用できません。"
 
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:678
-msgid "Mask"
-msgstr "マスク"
+#: spyder/plugins/editor.py:190
+msgid "Automatic insertion of parentheses, braces and brackets"
+msgstr "括弧、中括弧、大かっこを自動的に挿入"
 
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:689
-msgid "Axis:"
-msgstr "軸:"
+#: spyder/plugins/editor.py:193
+msgid "Automatic insertion of closing quotes"
+msgstr "引用符を自動的に閉じる"
 
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:694
-msgid "Index:"
-msgstr "インデックス:"
+#: spyder/plugins/editor.py:195
+msgid "Automatic insertion of colons after 'for', 'if', 'def', etc"
+msgstr "'for', 'if', 'def'等の後にコロンを自動挿入する"
 
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:707
-msgid "<u>Warning</u>: changes are applied separately"
-msgstr "<u>警告</u>: 変更は別々に適用されます"
+#: spyder/plugins/editor.py:198
+msgid "Automatic indentation after 'else', 'elif', etc."
+msgstr "'else'や'elif'の後を自動的にインデントする"
 
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:708
-msgid ""
-"For performance reasons, changes applied to masked array won't be reflected "
-"in array's data (and vice-versa)."
-msgstr ""
-"実行性能に関する理由により、masked配列に適用された変更は配列内のデータには反"
-"映されません(逆もまた同様)。"
+#: spyder/plugins/editor.py:200
+msgid "Indentation characters: "
+msgstr "インデント文字:"
 
-#: spyderlib/widgets/variableexplorer/dataframeeditor.py:430
-msgid "To bool"
-msgstr "真偽値へ"
+#: spyder/plugins/editor.py:201
+msgid "2 spaces"
+msgstr "空白2個"
 
-#: spyderlib/widgets/variableexplorer/dataframeeditor.py:430
-msgid "To complex"
-msgstr "複素数へ"
+#: spyder/plugins/editor.py:202
+msgid "3 spaces"
+msgstr "空白3個"
 
-#: spyderlib/widgets/variableexplorer/dataframeeditor.py:431
-msgid "To int"
-msgstr "整数へ"
+#: spyder/plugins/editor.py:203
+msgid "4 spaces"
+msgstr "空白4個"
 
-#: spyderlib/widgets/variableexplorer/dataframeeditor.py:431
-msgid "To float"
-msgstr "浮動小数点数へ"
+#: spyder/plugins/editor.py:204
+msgid "5 spaces"
+msgstr "空白5個"
 
-#: spyderlib/widgets/variableexplorer/dataframeeditor.py:432
-msgid "To str"
-msgstr "文字列へ"
+#: spyder/plugins/editor.py:205
+msgid "6 spaces"
+msgstr "空白6個"
 
-#: spyderlib/widgets/variableexplorer/dataframeeditor.py:506
-#, python-format
-msgid "%s editor"
-msgstr "%s エディタ"
+#: spyder/plugins/editor.py:206
+msgid "7 spaces"
+msgstr "空白7個"
 
-#: spyderlib/widgets/variableexplorer/dataframeeditor.py:538
-msgid "Column min/max"
-msgstr "列の 最小/最大"
+#: spyder/plugins/editor.py:207
+msgid "8 spaces"
+msgstr "空白8個"
 
-#: spyderlib/widgets/variableexplorer/utils.py:28
-msgid "View and edit DataFrames and Series in the Variable Explorer"
-msgstr "変数エクスプローラーでのDataFrameとSeriesの表示・編集"
+#: spyder/plugins/editor.py:208
+msgid "Tabulations"
+msgstr "一覧表"
 
-#: spyderlib/widgets/variableexplorer/utils.py:33
-msgid "View and edit two and three dimensional arrays in the Variable Explorer"
-msgstr "変数エクスプローラーでの2, 3次元配列の表示・編集"
+#: spyder/plugins/editor.py:209
+msgid "Tab stop width:"
+msgstr "タブ幅:"
 
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:151
-#: spyderlib/widgets/editor.py:468 spyderlib/widgets/ipython.py:580
-#: spyderlib/widgets/externalshell/baseshell.py:152
-#: spyderlib/widgets/explorer.py:1040 spyderlib/plugins/help.py:443
-#: spyderlib/plugins/history.py:103
-msgid "Options"
-msgstr "オプション"
+#: spyder/plugins/editor.py:211
+msgid "Tab always indent"
+msgstr "常にインデントにタブを使う"
 
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:195
-msgid "Refresh"
-msgstr "リフレッシュ"
+#: spyder/plugins/editor.py:213
+msgid ""
+"If enabled, pressing Tab will always indent,\n"
+"even when the cursor is not at the beginning\n"
+"of a line (when this option is enabled, code\n"
+"completion may be triggered using the alternate\n"
+"shortcut: Ctrl+Space)"
+msgstr ""
+"これを有効にすると、タブキーを押すとカーソルが\n"
+"行頭になくても常にインデントされる。\n"
+"(このオプションを有効化した場合、コード補完\n"
+"のトリガーは別のショートカット\n"
+"Ctrl+Spaceに変更される)"
 
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:199
-msgid "Refresh periodically"
-msgstr "定期的にリフレッシュ"
+#: spyder/plugins/editor.py:218
+msgid "Intelligent backspace"
+msgstr "インテリジェントなバックスペース"
 
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:203
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:456
-msgid "Import data"
-msgstr "データをインポート"
+#: spyder/plugins/editor.py:220
+msgid "Automatically remove trailing spaces when saving files"
+msgstr "ファイル保存時に後続スペースを削除する"
 
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:206
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:544
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:565
-msgid "Save data"
-msgstr "データを保存"
+#: spyder/plugins/editor.py:224
+msgid "Analysis"
+msgstr "分析"
 
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:211
-msgid "Save data as..."
-msgstr "形式を指定してデータ保存"
+#: spyder/plugins/editor.py:226
+msgid "<i>(Refer to the {} page)</i>"
+msgstr "<i>( {} ページ参照)</i>"
 
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:218
-#: spyderlib/plugins/variableexplorer.py:33
-msgid "Exclude private references"
-msgstr "privateな参照を除外"
+#: spyder/plugins/editor.py:230
+msgid "Real-time code analysis"
+msgstr "リアルタイムコード分析"
 
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:219
-msgid "Exclude references which name starts with an underscore"
-msgstr "アンダースコアで始まる参照を除外"
+#: spyder/plugins/editor.py:232
+msgid ""
+"<p>If enabled, Python source code will be analyzed using pyflakes, lines "
+"containing errors or warnings will be highlighted.</p><p><u>Note</u>: add "
+"<b>analysis:ignore</b> in a comment to ignore code analysis warnings.</p>"
+msgstr ""
+"<p>有効にした場合Pythonソースコードはpyflakesで分析され、エラーや警告のある行"
+"は強調表示されます。</p><p><u>注</u>: <b>analysis:ignore</b> をコメントで追加"
+"すると警告は無視されます。</p>"
 
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:226
-#: spyderlib/plugins/variableexplorer.py:35
-msgid "Exclude all-uppercase references"
-msgstr "名前が全て大文字の参照を除外"
+#: spyder/plugins/editor.py:240
+msgid "Code analysis requires pyflakes %s+"
+msgstr "コード分析にはpyflakes %s+ が必要です"
 
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:227
-msgid "Exclude references which name is uppercase"
-msgstr "名前が大文字の参照を除外"
+#: spyder/plugins/editor.py:242
+msgid "Real-time code style analysis"
+msgstr "リアルタイムコードスタイル分析"
 
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:233
-#: spyderlib/plugins/variableexplorer.py:34
-msgid "Exclude capitalized references"
-msgstr "大文字で始まる参照を除外"
+#: spyder/plugins/editor.py:244
+msgid ""
+"<p>If enabled, Python source code will be analyzedusing pep8, lines that are "
+"not following PEP8 style guide will be highlighted.</p><p><u>Note</u>: add "
+"<b>analysis:ignore</b> in a comment to ignore style analysis warnings.</p>"
+msgstr ""
+"<p>有効にした場合、Pythonソースコードはpep8を使って分析されます。PEP8スタイル"
+"ガイドに適合していない行は強調表示されます。</p><p><u>中</u>: 警告を抑制する"
+"には、<b>analysis:ignore</b> をコメント内に追加してください。</p>"
 
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:234
-msgid "Exclude references which name starts with an uppercase character"
-msgstr "大文字で始まる参照を除外"
+#: spyder/plugins/editor.py:251
+msgid "Code annotations (TODO, FIXME, XXX, HINT, TIP, @todo)"
+msgstr "コード注釈(TODO, FIXME, XXX, HINT, TIP, @todo)"
 
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:241
-#: spyderlib/plugins/variableexplorer.py:36
-msgid "Exclude unsupported data types"
-msgstr "非サポートのデータ型を除外"
+#: spyder/plugins/editor.py:254
+msgid "Perform analysis when saving file and every"
+msgstr "コード分析をファイル保存時と以下の間隔で実施"
 
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:242
-msgid ""
-"Exclude references to unsupported data types (i.e. which won't be handled/"
-"saved correctly)"
-msgstr "非サポートデータ型(例:正しくhandle/saveがができない型)への参照を除外 "
+#: spyder/plugins/editor.py:258
+msgid "Perform analysis only when saving file"
+msgstr "コード分析をファイル保存時のみ実施"
 
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:351
-#, python-format
-msgid "Object <b>%s</b> is not picklable"
-msgstr "オブジェクト <b>%s</b> はpickle化できません"
+#: spyder/plugins/editor.py:317
+msgid "End-of-line characters"
+msgstr "改行コード"
 
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:476
-#, python-format
+#: spyder/plugins/editor.py:318
 msgid ""
-"<b>Unsupported file extension '%s'</b><br><br>Would you like to import it "
-"anyway (by selecting a known file format)?"
+"When opening a text file containing mixed end-of-line characters (this may "
+"raise syntax errors in the consoles on Windows platforms), Spyder may fix "
+"the file automatically."
 msgstr ""
-"<b>サポートされていないファイル拡張 '%s'</b><br><br>(既知のファイルフォーマッ"
-"トを選択して)とにかくインポートしますか ?"
+"複数種の改行コードを含むテキストファイル(Windows環境ではコンソールで文法エ"
+"ラーを起こす可能性があります)を開く場合、Spyderは自動的にこれを修正します。"
 
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:484
-msgid "Open file as:"
-msgstr "形式を指定して開く:"
+#: spyder/plugins/editor.py:324
+msgid "Fix automatically and show warning message box"
+msgstr "自動的に修正し、警告をメッセージボックスで表示する"
 
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:532
-#, python-format
-msgid "<b>Unable to load '%s'</b><br><br>Error message:<br>%s"
-msgstr "<b> '%s' をロードできません</b><br><br>エラーメッセージ:<br>%s"
+#: spyder/plugins/editor.py:335 spyder/plugins/externalconsole.py:250
+#: spyder/plugins/ipythonconsole.py:558 spyder/plugins/variableexplorer.py:43
+msgid "Display"
+msgstr "表示"
 
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:566
-#, python-format
-msgid "<b>Unable to save current workspace</b><br><br>Error message:<br>%s"
-msgstr ""
-"<b>現在のワークスペースを保存できません</b><br><br>エラーメッセージ:<br>%s"
+#: spyder/plugins/editor.py:337
+msgid "Code Introspection/Analysis"
+msgstr "コード イントロスペクション/分析"
 
-#: spyderlib/widgets/variableexplorer/importwizard.py:116
-#: spyderlib/widgets/variableexplorer/importwizard.py:431
-msgid "Import as"
-msgstr "形式を指定してインポート"
+#: spyder/plugins/editor.py:340 spyder/plugins/externalconsole.py:253
+msgid "Advanced settings"
+msgstr "詳細設定"
 
-#: spyderlib/widgets/variableexplorer/importwizard.py:118
-msgid "data"
-msgstr "データ"
+#: spyder/plugins/editor.py:613 spyder/widgets/editortools.py:510
+msgid "Show/hide outline explorer"
+msgstr "アウトラインエクスプローラーの表示/隠す"
 
-#: spyderlib/widgets/variableexplorer/importwizard.py:122
-msgid "code"
-msgstr "コード"
+#: spyder/plugins/editor.py:619
+msgid "Show/hide project explorer"
+msgstr "プロジェクトエクスプローラーの表示/隠す"
 
-#: spyderlib/widgets/variableexplorer/importwizard.py:125
-#: spyderlib/widgets/variableexplorer/importwizard.py:504
-msgid "text"
-msgstr "テキスト"
+#: spyder/plugins/editor.py:627
+msgid "&New file..."
+msgstr "新規ファイル(&N)..."
 
-#: spyderlib/widgets/variableexplorer/importwizard.py:138
-msgid "Column separator:"
-msgstr "列セパレータ"
+#: spyder/plugins/editor.py:628 spyder/plugins/workingdirectory.py:83
+#: spyder/widgets/explorer.py:692 spyder/widgets/explorer.py:699
+msgid "New file"
+msgstr "新規ファイル"
 
-#: spyderlib/widgets/variableexplorer/importwizard.py:142
-msgid "Tab"
-msgstr "タブ"
+#: spyder/plugins/editor.py:634
+msgid "&Open..."
+msgstr "開く(&O)..."
 
-#: spyderlib/widgets/variableexplorer/importwizard.py:145
-#: spyderlib/widgets/variableexplorer/importwizard.py:163
-msgid "other"
-msgstr "その他"
+#: spyder/plugins/editor.py:635 spyder/plugins/editor.py:1767
+#: spyder/plugins/workingdirectory.py:70
+msgid "Open file"
+msgstr "ファイルを開く"
 
-#: spyderlib/widgets/variableexplorer/importwizard.py:156
-msgid "Row separator:"
-msgstr "行セパレーター"
+#: spyder/plugins/editor.py:641 spyder/widgets/editor.py:345
+msgid "File switcher..."
+msgstr "ファイル切り替え..."
 
-#: spyderlib/widgets/variableexplorer/importwizard.py:160
-msgid "EOL"
-msgstr "EOL"
+#: spyder/plugins/editor.py:643
+msgid "Fast switch between files"
+msgstr "フィルを高速で切り替え"
 
-#: spyderlib/widgets/variableexplorer/importwizard.py:175
-msgid "Additional options"
-msgstr "追加オプション"
-
-#: spyderlib/widgets/variableexplorer/importwizard.py:179
-msgid "Skip rows:"
-msgstr "行を飛ばす:"
-
-#: spyderlib/widgets/variableexplorer/importwizard.py:190
-msgid "Comments:"
-msgstr "コメント:"
-
-#: spyderlib/widgets/variableexplorer/importwizard.py:196
-msgid "Transpose"
-msgstr "転置"
+#: spyder/plugins/editor.py:649
+msgid "&Revert"
+msgstr "復帰(&R)"
 
-#: spyderlib/widgets/variableexplorer/importwizard.py:434
-msgid "array"
-msgstr "配列"
+#: spyder/plugins/editor.py:650
+msgid "Revert file from disk"
+msgstr "ディスクからファイルを復帰"
 
-#: spyderlib/widgets/variableexplorer/importwizard.py:439
-msgid "list"
-msgstr "リスト"
+#: spyder/plugins/editor.py:653
+msgid "&Save"
+msgstr "保存(&S)"
 
-#: spyderlib/widgets/variableexplorer/importwizard.py:444
-msgid "DataFrame"
-msgstr "DataFrame"
+#: spyder/plugins/editor.py:654 spyder/widgets/editor.py:1304
+msgid "Save file"
+msgstr "ファイルを保存"
 
-#: spyderlib/widgets/variableexplorer/importwizard.py:487
-#: spyderlib/widgets/variableexplorer/importwizard.py:569
-msgid "Import wizard"
-msgstr "インポートウィザード"
+#: spyder/plugins/editor.py:660
+msgid "Sav&e all"
+msgstr "全て保存(&E)"
 
-#: spyderlib/widgets/variableexplorer/importwizard.py:492
-msgid "Raw text"
-msgstr "Rawテキスト"
+#: spyder/plugins/editor.py:661
+msgid "Save all files"
+msgstr "すべてのファイルを保存"
 
-#: spyderlib/widgets/variableexplorer/importwizard.py:495
-msgid "variable_name"
-msgstr "variable_name"
+#: spyder/plugins/editor.py:667
+msgid "Save &as..."
+msgstr "形式を指定して保存(&A)"
 
-#: spyderlib/widgets/variableexplorer/importwizard.py:506
-msgid "table"
-msgstr "テーブル"
+#: spyder/plugins/editor.py:668
+msgid "Save current file as..."
+msgstr "現在のファイルを形式を指定して保存..."
 
-#: spyderlib/widgets/variableexplorer/importwizard.py:507
-msgid "Preview"
-msgstr "プレビュー"
+#: spyder/plugins/editor.py:673 spyder/plugins/editor.py:674
+msgid "Print preview..."
+msgstr "プレビューを表示..."
 
-#: spyderlib/widgets/variableexplorer/importwizard.py:511
-msgid "Variable Name"
-msgstr "変数名"
+#: spyder/plugins/editor.py:675
+msgid "&Print..."
+msgstr "印刷(&P)"
 
-#: spyderlib/widgets/variableexplorer/importwizard.py:519
-msgid "Cancel"
-msgstr "キャンセル"
+#: spyder/plugins/editor.py:676
+msgid "Print current file..."
+msgstr "現在のファイルを印刷..."
 
-#: spyderlib/widgets/variableexplorer/importwizard.py:525
-#: spyderlib/widgets/explorer.py:1031
-msgid "Previous"
-msgstr "前"
+#: spyder/plugins/editor.py:679
+msgid "&Close"
+msgstr "閉じる(&C)"
 
-#: spyderlib/widgets/variableexplorer/importwizard.py:529
-#: spyderlib/widgets/explorer.py:1034
-#: spyderlib/plugins/workingdirectory.py:179
-msgid "Next"
-msgstr "次"
+#: spyder/plugins/editor.py:680
+msgid "Close current file"
+msgstr "現在のファイルを閉じる"
 
-#: spyderlib/widgets/variableexplorer/importwizard.py:532
-msgid "Done"
-msgstr "完了"
+#: spyder/plugins/editor.py:683
+msgid "C&lose all"
+msgstr "すべて閉じる(&C)"
 
-#: spyderlib/widgets/variableexplorer/importwizard.py:570
-#, python-format
-msgid ""
-"<b>Unable to proceed to next step</b><br><br>Please check your entries."
-"<br><br>Error message:<br>%s"
-msgstr ""
-"<b>次のステップを実行できません</b><br><br>入力をチェックしてください。"
-"<br><br>エラーメッセージ:<br>%s"
+#: spyder/plugins/editor.py:684
+msgid "Close all opened files"
+msgstr "開いているファイルを全て閉じる"
 
-#: spyderlib/widgets/variableexplorer/texteditor.py:72
-msgid "Text editor"
-msgstr "テキストエディタ"
+#: spyder/plugins/editor.py:691
+msgid "&Find text"
+msgstr "テキストを検索(&F)"
 
-#: spyderlib/widgets/comboboxes.py:165
-msgid "Press enter to validate this entry"
-msgstr "入力を検証するにはエンターキーを押してください"
+#: spyder/plugins/editor.py:697
+msgid "Find &next"
+msgstr "次を検索(&N)"
 
-#: spyderlib/widgets/comboboxes.py:166
-msgid "This entry is incorrect"
-msgstr "この入力は不正です"
+#: spyder/plugins/editor.py:703
+msgid "Find &previous"
+msgstr "前を検索(&F)"
 
-#: spyderlib/widgets/comboboxes.py:209
-msgid "Press enter to validate this path"
-msgstr "パスを検証するにはエンターキーを押してください"
+#: spyder/plugins/editor.py:709
+msgid "&Replace text"
+msgstr "テキストを置換(&R)"
 
-#: spyderlib/widgets/onecolumntree.py:50
-msgid "Collapse all"
-msgstr "全て折りたたむ"
+#: spyder/plugins/editor.py:718
+msgid "Set/Clear breakpoint"
+msgstr "ブレークポイントのセット/クリア"
 
-#: spyderlib/widgets/onecolumntree.py:54
-msgid "Expand all"
-msgstr "すべて展開"
+#: spyder/plugins/editor.py:725
+msgid "Set/Edit conditional breakpoint"
+msgstr "条件付きブレークポイントをセット/編集"
 
-#: spyderlib/widgets/onecolumntree.py:58
-msgid "Restore"
-msgstr "復元"
+#: spyder/plugins/editor.py:732
+msgid "Clear breakpoints in all files"
+msgstr "全てのファイルのブレークポイントをクリア"
 
-#: spyderlib/widgets/onecolumntree.py:59
-msgid "Restore original tree layout"
-msgstr "元のツリーレイアウトを復元"
+#: spyder/plugins/editor.py:734
+msgid "Debug with winpdb"
+msgstr "winpdbでデバッグ"
 
-#: spyderlib/widgets/onecolumntree.py:63
-msgid "Collapse selection"
-msgstr "現在の選択を折りたたむ"
+#: spyder/plugins/editor.py:741
+msgid "Debug file"
+msgstr "ファイルをデバッグ開始"
 
-#: spyderlib/widgets/onecolumntree.py:67
-msgid "Expand selection"
-msgstr "現在の選択を展開する"
+#: spyder/plugins/editor.py:746
+msgid "Step"
+msgstr "Step"
 
-#: spyderlib/widgets/editor.py:341 spyderlib/plugins/editor.py:645
-msgid "File switcher..."
-msgstr "ファイル切り替え..."
+#: spyder/plugins/editor.py:747
+msgid "Run current line"
+msgstr "現在行を実行"
 
-#: spyderlib/widgets/editor.py:344
-msgid "Copy path to clipboard"
-msgstr "パスをクリップボードにコピー"
+#: spyder/plugins/editor.py:752
+msgid "Continue"
+msgstr "Continue"
 
-#: spyderlib/widgets/editor.py:348
-msgid "Close all to the right"
-msgstr "全体を右側へ閉じる"
+#: spyder/plugins/editor.py:754
+msgid "Continue execution until next breakpoint"
+msgstr "次のブレークポイントまで実行を続ける"
 
-#: spyderlib/widgets/editor.py:350
-msgid "Close all but this"
-msgstr "他を閉じる"
+#: spyder/plugins/editor.py:759
+msgid "Step Into"
+msgstr "Step Into"
 
-#: spyderlib/widgets/editor.py:365
-#: spyderlib/widgets/sourcecode/codeeditor.py:94
-#: spyderlib/widgets/sourcecode/codeeditor.py:2901
-#: spyderlib/plugins/editor.py:96 spyderlib/plugins/editor.py:556
-#: spyderlib/plugins/editor.py:1636 spyderlib/plugins/help.py:123
-#: spyderlib/plugins/help.py:391 spyderlib/plugins/__init__.py:523
-msgid "Editor"
-msgstr "エディタ"
+#: spyder/plugins/editor.py:761
+msgid "Step into function or method of current line"
+msgstr "現在行のメソッド/関数までStep inする"
 
-#: spyderlib/widgets/editor.py:914
-msgid "Temporary file"
-msgstr "一時ファイル"
+#: spyder/plugins/editor.py:766
+msgid "Step Return"
+msgstr "Step Return"
 
-#: spyderlib/widgets/editor.py:1011
-msgid "New window"
-msgstr "新しいウインドウ"
+#: spyder/plugins/editor.py:768
+msgid "Run until current function or method returns"
+msgstr "現在行のメソッド/関数までRunする"
 
-#: spyderlib/widgets/editor.py:1012
-msgid "Create a new editor window"
-msgstr "新しいエディタウインドウを作成する"
+#: spyder/plugins/editor.py:773 spyder/widgets/findinfiles.py:333
+#: spyder/widgets/ipythonconsole/client.py:236
+msgid "Stop"
+msgstr "停止"
 
-#: spyderlib/widgets/editor.py:1015
-msgid "Split vertically"
-msgstr "縦に分割する"
+#: spyder/plugins/editor.py:774
+msgid "Stop debugging"
+msgstr ""
 
-#: spyderlib/widgets/editor.py:1017
-msgid "Split vertically this editor window"
-msgstr "このエディタウインドウを縦に分割する"
+#: spyder/plugins/editor.py:781
+msgid "Run file"
+msgstr "ファイルを実行"
 
-#: spyderlib/widgets/editor.py:1019
-msgid "Split horizontally"
-msgstr "横に分割"
+#: spyder/plugins/editor.py:786
+msgid "&Configure..."
+msgstr "設定(&C)..."
 
-#: spyderlib/widgets/editor.py:1021
-msgid "Split horizontally this editor window"
-msgstr "このエディタウインドウを横に分割"
+#: spyder/plugins/editor.py:788 spyder/widgets/externalshell/pythonshell.py:304
+msgid "Run settings"
+msgstr "設定の実行"
 
-#: spyderlib/widgets/editor.py:1023
-msgid "Close this panel"
-msgstr "このパネルを閉じる"
+#: spyder/plugins/editor.py:794
+msgid "Re-run &last script"
+msgstr "最後のスクリプトを再度実行する(&L)"
 
-#: spyderlib/widgets/editor.py:1180
-#, python-format
-msgid "<b>%s</b> has been modified.<br>Do you want to save changes?"
-msgstr "<b>%s</b> は変更されています。<br>変更を保存しますか?"
+#: spyder/plugins/editor.py:796
+msgid "Run again last file"
+msgstr "最後のファイルを再度実行する"
 
-#: spyderlib/widgets/editor.py:1242
-msgid "Save"
-msgstr "保存"
+#: spyder/plugins/editor.py:802 spyder/widgets/sourcecode/codeeditor.py:2507
+msgid "Run &selection or current line"
+msgstr "選択範囲あるいは現在のカーソル行を実行(&S)"
 
-#: spyderlib/widgets/editor.py:1243
-#, python-format
-msgid "<b>Unable to save script '%s'</b><br><br>Error message:<br>%s"
-msgstr "<b>スクリプト '%s' を保存できません</b><br><br>エラーメッセージ:<br>%s"
+#: spyder/plugins/editor.py:805
+msgid "Run selection or current line"
+msgstr "選択範囲あるいは現在行を実行"
 
-#: spyderlib/widgets/editor.py:1263 spyderlib/plugins/editor.py:657
-msgid "Save file"
-msgstr "ファイルを保存"
+#: spyder/plugins/editor.py:813 spyder/widgets/sourcecode/codeeditor.py:2499
+msgid "Run cell"
+msgstr "cellを実行"
 
-#: spyderlib/widgets/editor.py:1477
-#, python-format
+#: spyder/plugins/editor.py:816
 msgid ""
-"<b>%s</b> is unavailable (this file may have been removed, moved or renamed "
-"outside Spyder).<br>Do you want to close it?"
+"Run current cell (Ctrl+Enter)\n"
+"[Use #%% to create cells]"
 msgstr ""
-"<b>%s</b> は利用できません (このファイルはSpypder外で削除、移動あるいは名前変"
-"更されています)。<br>閉じますか?"
+"現在のセルを実行する (Ctrl+Enter)\n"
+"[Use #%% to create cells]"
 
-#: spyderlib/widgets/editor.py:1497
-#, python-format
-msgid ""
-"<b>%s</b> has been modified outside Spyder.<br>Do you want to reload it and "
-"lose all your changes?"
-msgstr ""
-"<b>%s</b> はSpyderの外で変更されています。<br>変更を破棄して再読込しますか?"
+#: spyder/plugins/editor.py:822 spyder/widgets/sourcecode/codeeditor.py:2503
+msgid "Run cell and advance"
+msgstr "cellを実行し進む"
 
-#: spyderlib/widgets/editor.py:1593
-#, python-format
-msgid ""
-"All changes to <b>%s</b> will be lost.<br>Do you want to revert file from "
-"disk?"
-msgstr ""
-"<b>%s</b> へのすべての変更は失われます。<br>ファイルをディスクから復帰させま"
-"すか?"
+#: spyder/plugins/editor.py:825
+msgid "Run current cell and go to the next one (Shift+Enter)"
+msgstr "現在のセルを実行し次のセルへ(Shift+Enter)"
 
-#: spyderlib/widgets/editor.py:1733
-#, python-format
-msgid "Loading %s..."
-msgstr "%s をロードしています..."
+#: spyder/plugins/editor.py:832
+msgid "Show todo list"
+msgstr "TODOリストを表示"
 
-#: spyderlib/widgets/editor.py:1743
-#, python-format
-msgid ""
-"<b>%s</b> contains mixed end-of-line characters.<br>Spyder will fix this "
-"automatically."
-msgstr ""
-"<b>%s</b> は複数種の改行コードを含んでいます。<br>Spyderは自動的に修正しま"
-"す。"
+#: spyder/plugins/editor.py:833
+msgid "Show TODO/FIXME/XXX/HINT/TIP/@todo comments list"
+msgstr "TODO/FIXME/XXX/HINT/TIP/@todo リストを表示"
 
-#: spyderlib/widgets/editor.py:2108
-msgid "Close window"
-msgstr "ウインドウを閉じる"
+#: spyder/plugins/editor.py:840
+msgid "Show warning/error list"
+msgstr "警告/エラー リストを表示"
 
-#: spyderlib/widgets/editor.py:2110
-msgid "Close this window"
-msgstr "このウインドウを閉じる"
+#: spyder/plugins/editor.py:841
+msgid "Show code analysis warnings/errors"
+msgstr "コード分析の 警告/エラー を表示"
 
-#: spyderlib/widgets/shell.py:128
-msgid "Save history log..."
-msgstr "ヒストリログを保存..."
+#: spyder/plugins/editor.py:847
+msgid "Previous warning/error"
+msgstr "前の 警告/表示"
 
-#: spyderlib/widgets/shell.py:130
-msgid "Save current history log (i.e. all inputs and outputs) in a text file"
-msgstr "現在のヒストリログ(全ての入出力)をテキストファイルに保存"
+#: spyder/plugins/editor.py:848
+msgid "Go to previous code analysis warning/error"
+msgstr "前のコード分析 警告/エラー へ移動"
 
-#: spyderlib/widgets/shell.py:133 spyderlib/widgets/projectexplorer.py:1015
-#: spyderlib/widgets/explorer.py:480 spyderlib/plugins/configdialog.py:1000
-msgid "Delete"
-msgstr "削除"
+#: spyder/plugins/editor.py:851
+msgid "Next warning/error"
+msgstr "次の 警告/エラー"
 
-#: spyderlib/widgets/shell.py:256
-msgid "Save history log"
-msgstr "ヒストリログを保存"
+#: spyder/plugins/editor.py:852
+msgid "Go to next code analysis warning/error"
+msgstr "次のコード分析 警告/エラー へ移動"
 
-#: spyderlib/widgets/shell.py:259
-msgid "History logs"
-msgstr "ヒストリログ"
+#: spyder/plugins/editor.py:856
+msgid "Last edit location"
+msgstr "最後に編集した箇所"
 
-#: spyderlib/widgets/shell.py:270
-#, python-format
-msgid "<b>Unable to save file '%s'</b><br><br>Error message:<br>%s"
-msgstr "<b>ファイル '%s' を保存できません</b><br><br>エラーメッセージ:<br>%s"
+#: spyder/plugins/editor.py:857
+msgid "Go to last edit location"
+msgstr "最後に編集した箇所へ移動"
 
-#: spyderlib/widgets/shell.py:712
-msgid "Copy without prompts"
-msgstr "プロンプトなしでコピー"
+#: spyder/plugins/editor.py:865
+msgid "Previous cursor position"
+msgstr "前のカーソル位置"
 
-#: spyderlib/widgets/shell.py:715 spyderlib/widgets/shell.py:719
-msgid "Clear line"
-msgstr "行をクリア"
+#: spyder/plugins/editor.py:866
+msgid "Go to previous cursor position"
+msgstr "前のカーソル位置へ移動"
 
-#: spyderlib/widgets/shell.py:721
-msgid "Clear shell"
-msgstr "シェルをクリア"
-
-#: spyderlib/widgets/shell.py:725
-msgid "Clear shell contents ('cls' command)"
-msgstr "シェルの中身をクリア(clsコマンド)"
+#: spyder/plugins/editor.py:874
+msgid "Next cursor position"
+msgstr "次のカーソル位置"
 
-#: spyderlib/widgets/ipython.py:246
-msgid "Reset IPython namespace"
-msgstr "IPythonの名前空間をリセット"
+#: spyder/plugins/editor.py:875
+msgid "Go to next cursor position"
+msgstr "次のカーソル位置へ移動"
 
-#: spyderlib/widgets/ipython.py:247
-msgid ""
-"All user-defined variables will be removed.<br>Are you sure you want to "
-"reset the namespace?"
-msgstr ""
-"全てのユーザー定義変数は削除されます。<br>本当に名前空間をリセットしますか?"
+#: spyder/plugins/editor.py:885 spyder/widgets/sourcecode/codeeditor.py:2483
+msgid "Comment"
+msgstr "コメント"
 
-#: spyderlib/widgets/ipython.py:363 spyderlib/widgets/ipython.py:380
-#: spyderlib/widgets/externalshell/baseshell.py:250
-#: spyderlib/widgets/mixins.py:656
-msgid "Arguments"
-msgstr "引数"
+#: spyder/plugins/editor.py:885 spyder/widgets/sourcecode/codeeditor.py:2483
+msgid "Uncomment"
+msgstr "コメント解除"
 
-#: spyderlib/widgets/ipython.py:518
-msgid "An error ocurred while starting the kernel"
-msgstr "カーネルを開始中にエラーが発生しました"
+#: spyder/plugins/editor.py:886
+msgid "Comment current line or selection"
+msgstr "現在行あるいは選択範囲をコメントアウト"
 
-#: spyderlib/widgets/ipython.py:533
-#: spyderlib/widgets/externalshell/baseshell.py:106
-#: spyderlib/plugins/help.py:391 spyderlib/plugins/runconfig.py:185
-#: spyderlib/plugins/runconfig.py:455 spyderlib/plugins/externalconsole.py:56
-#: spyderlib/plugins/externalconsole.py:999
-msgid "Console"
-msgstr "コンソール"
+#: spyder/plugins/editor.py:890
+msgid "Add &block comment"
+msgstr "ブロックコメントを追加(&B)"
 
-#: spyderlib/widgets/ipython.py:547
-msgid "Restart kernel"
-msgstr "カーネルの再起動"
+#: spyder/plugins/editor.py:891
+msgid "Add block comment around current line or selection"
+msgstr "ブロックコメントを現在行あるいは選択範囲の周りに追加"
 
-#: spyderlib/widgets/ipython.py:567 spyderlib/widgets/findinfiles.py:333
-msgid "Stop"
-msgstr "停止"
+#: spyder/plugins/editor.py:897
+msgid "R&emove block comment"
+msgstr "ブロックコメントを削除(&R)"
 
-#: spyderlib/widgets/ipython.py:569
-msgid "Stop the current command"
-msgstr "現在のコマンドを停止する"
+#: spyder/plugins/editor.py:898
+msgid "Remove comment block around current line or selection"
+msgstr "現在行あるいは選択範囲の周りのブロックコメントを削除"
 
-#: spyderlib/widgets/ipython.py:593
-msgid "Inspect current object"
-msgstr "現在のオブジェクトを調査する"
+#: spyder/plugins/editor.py:909
+msgid "Indent"
+msgstr "インデント"
 
-#: spyderlib/widgets/ipython.py:598
-msgid "Clear line or block"
-msgstr "ラインやブロックをクリアする"
+#: spyder/plugins/editor.py:910
+msgid "Indent current line or selection"
+msgstr "現在行あるいは選択範囲をインデント"
 
-#: spyderlib/widgets/ipython.py:602
-msgid "Reset namespace"
-msgstr "名前空間をリセットする"
+#: spyder/plugins/editor.py:913
+msgid "Unindent"
+msgstr "インデント解除"
 
-#: spyderlib/widgets/ipython.py:605
-msgid "Clear console"
-msgstr "コンソールをクリアする"
+#: spyder/plugins/editor.py:914
+msgid "Unindent current line or selection"
+msgstr "現在行あるいは選択範囲をインデント解除"
 
-#: spyderlib/widgets/ipython.py:661
-msgid ""
-"It seems the kernel died unexpectedly. Use 'Restart kernel' to continue "
-"using this console."
-msgstr ""
-"カーネルが予期せず停止したようです。このコンソールを続行するには\"カーネルの"
-"再起動\"を利用してください。"
+#: spyder/plugins/editor.py:919
+msgid "Carriage return and line feed (Windows)"
+msgstr "CR+LF (Windows)"
 
-#: spyderlib/widgets/ipython.py:681
-msgid "Changing backend to Qt for Mayavi"
-msgstr "MayaviのバックエンドをQtに変更中"
+#: spyder/plugins/editor.py:922
+msgid "Line feed (UNIX)"
+msgstr "LF (UNIX)"
 
-#: spyderlib/widgets/ipython.py:690
-msgid "Kernel process is either remote or unspecified. Cannot interrupt"
-msgstr "カーネルプロセスはリモートあるいは詳細不明です。中断できません"
+#: spyder/plugins/editor.py:925
+msgid "Carriage return (Mac)"
+msgstr "CR (Mac)"
 
-#: spyderlib/widgets/ipython.py:699
-msgid "Kernel process is either remote or unspecified. Cannot restart."
-msgstr "カーネルプロセスはリモートあるいは詳細不明です。再起動できません。"
+#: spyder/plugins/editor.py:931
+msgid "Convert end-of-line characters"
+msgstr "改行コードを変換する"
 
-#: spyderlib/widgets/ipython.py:778
-msgid "Connecting to kernel..."
-msgstr "カーネルへ接続中..."
+#: spyder/plugins/editor.py:935
+msgid "Remove trailing spaces"
+msgstr "無駄な後続スペースを削除"
 
-#: spyderlib/widgets/pathmanager.py:86
-msgid "Move to top"
-msgstr "一番上へ移動"
+#: spyder/plugins/editor.py:939
+msgid "Fix indentation"
+msgstr "インデントを修正"
 
-#: spyderlib/widgets/pathmanager.py:92
-msgid "Move up"
-msgstr "上へ移動"
+#: spyder/plugins/editor.py:940
+msgid "Replace tab characters by space characters"
+msgstr "タブ文字を空白に置換"
 
-#: spyderlib/widgets/pathmanager.py:98
-msgid "Move down"
-msgstr "下へ移動"
+#: spyder/plugins/editor.py:943
+msgid "Go to line..."
+msgstr "行へ移動..."
 
-#: spyderlib/widgets/pathmanager.py:104
-msgid "Move to bottom"
-msgstr "一番下へ移動"
+#: spyder/plugins/editor.py:951
+msgid "Set console working directory"
+msgstr "コンソールの作業ディレクトリをセット"
 
-#: spyderlib/widgets/pathmanager.py:115 spyderlib/widgets/pathmanager.py:230
-msgid "Add path"
-msgstr "パスを追加"
+#: spyder/plugins/editor.py:953
+msgid ""
+"Set current console (and file explorer) working directory to current script "
+"directory"
+msgstr ""
+"コンソール(とファイルエクスプローラー)の作業ディレクトリを現在のスクリプトの"
+"ディレクトリにセット"
 
-#: spyderlib/widgets/pathmanager.py:120 spyderlib/widgets/pathmanager.py:213
-msgid "Remove path"
-msgstr "パスを削除"
+#: spyder/plugins/editor.py:958
+msgid "Maximum number of recent files..."
+msgstr "「最近使用したファイル」の最大履歴数..."
 
-#: spyderlib/widgets/pathmanager.py:130
-msgid "Synchronize..."
-msgstr "同期..."
+#: spyder/plugins/editor.py:961
+msgid "Clear recent files list"
+msgstr "最近使用したファイルのリストをクリア"
 
-#: spyderlib/widgets/pathmanager.py:132
-msgid "Synchronize Spyder's path list with PYTHONPATH environment variable"
-msgstr "SpyderのパスリストをPYTHONPATH環境変数に同期させる"
+#: spyder/plugins/editor.py:961 spyder/plugins/projects.py:97
+msgid "Clear this list"
+msgstr "このリストをクリア"
 
-#: spyderlib/widgets/pathmanager.py:144
-msgid "Synchronize"
-msgstr "同期"
+#: spyder/plugins/editor.py:965
+msgid "Open &recent"
+msgstr "最近使用したファイル(&R)"
 
-#: spyderlib/widgets/pathmanager.py:145
-msgid ""
-"This will synchronize Spyder's path list with <b>PYTHONPATH</b> environment "
-"variable for current user, allowing you to run your Python modules outside "
-"Spyder without having to configure sys.path. <br>Do you want to clear "
-"contents of PYTHONPATH before adding Spyder's path list?"
-msgstr ""
-"sys.pathを変更することなくSpypder外でPythonモジュールを実行できるように、"
-"Spyderのパスはユーザーの <b>PYTHONPATH</b> 環境変数に同期されます。 "
-"<br>Spyderのパスリストを追加する前にPYTHONPATHの値をクリアしますか?"
+#: spyder/plugins/editor.py:1348
+msgid "?"
+msgstr "?"
 
-#: spyderlib/widgets/pathmanager.py:214
-msgid "Do you really want to remove selected path?"
-msgstr "本当に選択したパスを削除しますか?"
+#: spyder/plugins/editor.py:1575
+msgid "Spyder Editor"
+msgstr "Spyderエディタ"
 
-#: spyderlib/widgets/pathmanager.py:223 spyderlib/widgets/findinfiles.py:504
-#: spyderlib/widgets/projectexplorer.py:899
-#: spyderlib/widgets/externalshell/pythonshell.py:638
-#: spyderlib/widgets/explorer.py:584 spyderlib/plugins/configdialog.py:490
-#: spyderlib/plugins/configdialog.py:505
-#: spyderlib/plugins/workingdirectory.py:290
-#: spyderlib/plugins/runconfig.py:176 spyderlib/plugins/runconfig.py:240
-msgid "Select directory"
-msgstr "ディレクトリを選択"
+#: spyder/plugins/editor.py:1576
+msgid "This is a temporary script file."
+msgstr "これは一時的なスクリプトファイルです"
 
-#: spyderlib/widgets/pathmanager.py:231
-msgid ""
-"This directory is already included in Spyder path list.<br>Do you want to "
-"move it to the top of the list?"
-msgstr ""
-"このディレクトリは既にSpyderのパスリストに含まれています。<br>リストの一番上"
-"にパスを移動させますか?"
+#: spyder/plugins/editor.py:1645
+msgid "untitled"
+msgstr "タイトル無し"
 
-#: spyderlib/widgets/findinfiles.py:158
-msgid "Unexpected error: see internal console"
-msgstr "予期しないエラー: 内部コンソールを参照してください"
+#: spyder/plugins/editor.py:1719
+msgid "Maximum number of recent files"
+msgstr "「最近使用したファイル」の最大履歴数"
 
-#: spyderlib/widgets/findinfiles.py:209 spyderlib/widgets/findinfiles.py:233
-#: spyderlib/widgets/findinfiles.py:280
-msgid "invalid regular expression"
-msgstr "無効な正規表現"
+#: spyder/plugins/editor.py:1852
+msgid "Printing..."
+msgstr "印刷中..."
 
-#: spyderlib/widgets/findinfiles.py:278
-msgid "permission denied errors were encountered"
-msgstr "エラーが発生しました(権限がありません)"
+#: spyder/plugins/explorer.py:53
+msgid "File explorer"
+msgstr "ファイルエクスプローラー"
 
-#: spyderlib/widgets/findinfiles.py:315
-msgid "Search pattern"
-msgstr "パターンを検索"
+#: spyder/plugins/externalconsole.py:46
+msgid "Interactive data plotting in the consoles"
+msgstr "コンソールでの対話的データプロット"
 
-#: spyderlib/widgets/findinfiles.py:318 spyderlib/widgets/findinfiles.py:352
-#: spyderlib/widgets/findinfiles.py:364 spyderlib/widgets/findreplace.py:77
-msgid "Regular expression"
-msgstr "正規表現"
+#: spyder/plugins/externalconsole.py:54 spyder/plugins/externalconsole.py:709
+#, fuzzy
+msgid "Python console"
+msgstr "IPythonコンソール"
 
-#: spyderlib/widgets/findinfiles.py:327
-msgid "Search"
-msgstr "検索"
+#: spyder/plugins/externalconsole.py:59
+msgid "One tab per script"
+msgstr "スクリプトあたりのタブを1つ"
 
-#: spyderlib/widgets/findinfiles.py:330
-msgid "Start search"
-msgstr "検索開始"
+#: spyder/plugins/externalconsole.py:60
+#: spyder/widgets/externalshell/baseshell.py:160
+msgid "Show elapsed time"
+msgstr "実行時間を表示"
 
-#: spyderlib/widgets/findinfiles.py:336
-msgid "Stop search"
-msgstr "検索終了"
+#: spyder/plugins/externalconsole.py:61 spyder/widgets/explorer.py:1074
+msgid "Show icons and text"
+msgstr "アイコンとテキストを表示"
 
-#: spyderlib/widgets/findinfiles.py:346
-msgid "Included filenames pattern"
-msgstr "含まれるファイル名パターン"
+#: spyder/plugins/externalconsole.py:73
+msgid "Buffer: "
+msgstr "バッファー:"
 
-#: spyderlib/widgets/findinfiles.py:355
-msgid "Include:"
-msgstr "含む:"
+#: spyder/plugins/externalconsole.py:73 spyder/plugins/ipythonconsole.py:319
+msgid " lines"
+msgstr "行"
 
-#: spyderlib/widgets/findinfiles.py:358
-msgid "Excluded filenames pattern"
-msgstr "除外されるファイル名パターン"
+#: spyder/plugins/externalconsole.py:78
+msgid "Merge process standard output/error channels"
+msgstr "プロセス標準出力/エラーチャンネルをマージ"
 
-#: spyderlib/widgets/findinfiles.py:367
-msgid "Exclude:"
-msgstr "除外:"
+#: spyder/plugins/externalconsole.py:80
+msgid ""
+"Merging the output channels of the process means that\n"
+"the standard error won't be written in red anymore,\n"
+"but this has the effect of speeding up display."
+msgstr ""
+"プロセスの出力チャンネルをマージした場合\n"
+"標準エラーは赤色で表示されなくなりますが、\n"
+"表示は高速化されます。"
 
-#: spyderlib/widgets/findinfiles.py:377
-msgid "PYTHONPATH"
-msgstr "PYTHONPATH"
+#: spyder/plugins/externalconsole.py:84
+msgid "Colorize standard error channel using ANSI escape codes"
+msgstr "標準エラーチャンネルをANSIエスケープコードで色分け"
 
-#: spyderlib/widgets/findinfiles.py:380
+#: spyder/plugins/externalconsole.py:86
 msgid ""
-"Search in all directories listed in sys.path which are outside the Python "
-"installation directory"
+"This method is the only way to have colorized standard\n"
+"error channel when the output channels have been merged."
 msgstr ""
-"Pythonインストールディレクトリ外のsys.pathにリストアップされたディレクトリ内"
-"を検索"
+"出力チャンネルがマージされた場合、これは標準エラーチャンネルを\n"
+"色分けする唯一の方法となります。"
 
-#: spyderlib/widgets/findinfiles.py:382
-msgid "Hg repository"
-msgstr "Hgレポジトリ"
+#: spyder/plugins/externalconsole.py:102 spyder/plugins/ipythonconsole.py:306
+#: spyder/widgets/variableexplorer/arrayeditor.py:540
+#: spyder/widgets/variableexplorer/dataframeeditor.py:552
+msgid "Background color"
+msgstr "背景色"
 
-#: spyderlib/widgets/findinfiles.py:385
-msgid "Search in current directory hg repository"
-msgstr "カレントディレクトリのHgレポジトリを検索"
+#: spyder/plugins/externalconsole.py:103
+msgid ""
+"This option will be applied the next time a Python console or a terminal is "
+"opened."
+msgstr ""
+"このオプションは次回Pythonコンソールかターミナルが開かれた時適用されます。"
 
-#: spyderlib/widgets/findinfiles.py:386
-msgid "Here:"
-msgstr "ここ:"
+#: spyder/plugins/externalconsole.py:106
+msgid "Light background (white color)"
+msgstr "明るい背景(白色)"
 
-#: spyderlib/widgets/findinfiles.py:390
-msgid "Search recursively in this directory"
-msgstr "ディレクトリ内を再帰的に検索"
+#: spyder/plugins/externalconsole.py:131
+msgid "PYTHONSTARTUP replacement"
+msgstr "PYTHONSTARTUP代替物"
 
-#: spyderlib/widgets/findinfiles.py:395
-msgid "Browse a search directory"
-msgstr "検索ディレクトリを表示"
+#: spyder/plugins/externalconsole.py:133
+msgid ""
+"This option will override the PYTHONSTARTUP environment variable which\n"
+"defines the script to be executed during the Python console startup."
+msgstr ""
+"このオプションはPYTHONSTARTUP環境変数(Pythonコンソール起動時に実行する\n"
+"スクリプトを指定する)を上書きします。"
 
-#: spyderlib/widgets/findinfiles.py:425
-msgid "Hide advanced options"
-msgstr "詳細オプションを隠す"
+#: spyder/plugins/externalconsole.py:138
+msgid "Default PYTHONSTARTUP script"
+msgstr "デフォルトPYTHONSTARTUPスクリプト"
 
-#: spyderlib/widgets/findinfiles.py:428
-msgid "Show advanced options"
-msgstr "詳細オプションを表示"
+#: spyder/plugins/externalconsole.py:142
+msgid "Use the following startup script:"
+msgstr "以下のスタートアップスクリプトを実行:"
 
-#: spyderlib/widgets/findinfiles.py:569
-msgid "Search canceled"
-msgstr "検索をキャンセル"
+#: spyder/plugins/externalconsole.py:159
+msgid "Monitor"
+msgstr "モニター"
 
-#: spyderlib/widgets/findinfiles.py:573
-msgid "String not found"
-msgstr "文字列が見つかりませんでした"
+#: spyder/plugins/externalconsole.py:160
+msgid ""
+"The monitor provides introspection features to console: code completion, "
+"calltips and variable explorer. Because it relies on several modules, "
+"disabling the monitor may be useful to accelerate console startup."
+msgstr ""
+"モニターによりコンソールでコード補完、 コールティップス及び変数エクスプロー"
+"ラー等のintrospection機能が利用できます。モニターは複数のモジュールに依存する"
+"ため、無効化した場合コンソールのスタートアップを高速化できます。"
 
-#: spyderlib/widgets/findinfiles.py:575
-msgid "matches in"
-msgstr "一致"
+#: spyder/plugins/externalconsole.py:167
+msgid "Enable monitor"
+msgstr "モニターを有効化"
 
-#: spyderlib/widgets/findinfiles.py:576
-msgid "file"
-msgstr "ファイル"
+#: spyder/plugins/externalconsole.py:180
+msgid "Default library"
+msgstr "デフォルトライブラリ"
 
-#: spyderlib/widgets/findinfiles.py:584
-msgid "interrupted"
-msgstr "中断"
+#: spyder/plugins/externalconsole.py:185
+msgid "Qt-Python Bindings"
+msgstr "Qt-Pythonバインディング"
 
-#: spyderlib/widgets/findinfiles.py:689 spyderlib/plugins/findinfiles.py:114
-msgid "Find in files"
-msgstr "ファイルの検索"
+#: spyder/plugins/externalconsole.py:187
+msgid "Library:"
+msgstr "ライブラリ:"
 
-#: spyderlib/widgets/tabs.py:142
-msgid "Browse tabs"
-msgstr "tabを表示"
+#: spyder/plugins/externalconsole.py:189
+msgid ""
+"This option will act on<br> libraries such as Matplotlib, guidata or ETS"
+msgstr "このオプションは<br>Matplotlib、guidata、ETS等のライブラリで機能します"
 
-#: spyderlib/widgets/tabs.py:271
-msgid "Close current tab"
-msgstr "現在のタブを閉じる"
+#: spyder/plugins/externalconsole.py:198 spyder/plugins/ipythonconsole.py:560
+msgid "Graphics"
+msgstr "グラフィックス"
 
-#: spyderlib/widgets/pydocgui.py:107
-msgid "Module or package:"
-msgstr "モジュールあるいはパッケージ:"
+#: spyder/plugins/externalconsole.py:199
+msgid ""
+"Decide which backend to use to display graphics. If unsure, please select "
+"the <b>Automatic</b> backend.<br><br><b>Note:</b> We support a very limited "
+"number of backends in our Python consoles. If you prefer to work with a "
+"different one, please use an IPython console."
+msgstr ""
+"画像を表示するためにどのバックエンドを使うか選択してください。よくわからない"
+"場合<b>Automatic</b> バックエンドを選んでください。<br><br><b>注:</b> Python"
+"コンソールでサポートされるバックエンドは非常に限られています。もし別のバック"
+"エンドを使いたい場合IPythonコンソールを使ってください。"
 
-#: spyderlib/widgets/editortools.py:94 spyderlib/widgets/editortools.py:130
-#, python-format
-msgid "Line %s"
-msgstr " %s 行"
+#: spyder/plugins/externalconsole.py:208
+msgid "None"
+msgstr ""
 
-#: spyderlib/widgets/editortools.py:99
-#, python-format
-msgid "Class defined at line %s"
-msgstr "%s 行で定義されているクラス"
+#: spyder/plugins/externalconsole.py:208 spyder/plugins/ipythonconsole.py:351
+msgid "Automatic"
+msgstr "自動"
 
-#: spyderlib/widgets/editortools.py:107
-#, python-format
-msgid "Method defined at line %s"
-msgstr "%s 行で定義されているメソッド"
+#: spyder/plugins/externalconsole.py:213 spyder/plugins/ipythonconsole.py:373
+msgid "Backend:"
+msgstr "バックエンド:"
 
-#: spyderlib/widgets/editortools.py:117
-#, python-format
-msgid "Function defined at line %s"
-msgstr "%s 行で定義されている関数"
+#: spyder/plugins/externalconsole.py:215 spyder/plugins/ipythonconsole.py:375
+msgid "This option will be applied the next time a console is opened."
+msgstr "このオプションは次にコンソールを開いた時に適用されます"
 
-#: spyderlib/widgets/editortools.py:149
-#, python-format
-msgid "Cell starts at line %s"
-msgstr "%s 行から始まるセル"
+#: spyder/plugins/externalconsole.py:226
+msgid "Enthought Tool Suite"
+msgstr "Enthoughtツールスイート"
 
-#: spyderlib/widgets/editortools.py:195
-#: spyderlib/plugins/outlineexplorer.py:48
-msgid "Outline"
-msgstr "アウトライン"
+#: spyder/plugins/externalconsole.py:227
+msgid ""
+"Enthought Tool Suite (ETS) supports PyQt4 (qt4) and wxPython (wx) graphical "
+"user interfaces."
+msgstr ""
+"Enthoughtツールスイート(ETS)はPyQt4(qt4)とwxPython(wx)GUIをサポートします。"
 
-#: spyderlib/widgets/editortools.py:202 spyderlib/widgets/editortools.py:539
-msgid "Go to cursor position"
-msgstr "カーソル位置へ移動"
+#: spyder/plugins/externalconsole.py:231
+msgid "ETS_TOOLKIT:"
+msgstr "ETS_TOOLKIT:"
 
-#: spyderlib/widgets/editortools.py:205
-msgid "Show absolute path"
-msgstr "絶対パスを表示"
+#: spyder/plugins/externalconsole.py:255
+msgid "External modules"
+msgstr "外部モジュール"
 
-#: spyderlib/widgets/editortools.py:208 spyderlib/widgets/explorer.py:178
-msgid "Show all files"
-msgstr "全てのファイルを表示"
+#: spyder/plugins/externalconsole.py:447
+msgid ""
+"No Python console is currently selected to run <b>%s</b>.<br><br>Please "
+"select or open a new Python console and try again."
+msgstr ""
+"実行対象として選ばれているPythonコンソールがありません: <b>%s</b>。<br><br>選"
+"択するか新規Pythonコンソールを開いて再試行してください。"
 
-#: spyderlib/widgets/editortools.py:211
-msgid "Show special comments"
-msgstr "特別なコメントを表示"
+#: spyder/plugins/externalconsole.py:518
+msgid ""
+"%s is already running in a separate process.\n"
+"Do you want to kill the process before starting a new one?"
+msgstr ""
+"%s は既に別プロセスで実行されています。\n"
+"新しいプロセスを開始する前にそのプロセスを殺しますか?"
 
-#: spyderlib/widgets/editortools.py:510 spyderlib/plugins/editor.py:615
-msgid "Show/hide outline explorer"
-msgstr "アウトラインエクスプローラーの表示/隠す"
+#: spyder/plugins/externalconsole.py:647
+msgid "Command Window"
+msgstr "コマンドウインドウ"
 
-#: spyderlib/widgets/fileswitcher.py:108
-msgid "unsaved file"
-msgstr "保存されていないファイル"
+#: spyder/plugins/externalconsole.py:649 spyder/plugins/ipythonconsole.py:297
+msgid "Terminal"
+msgstr "ターミナル"
 
-#: spyderlib/widgets/fileswitcher.py:228
-msgid ""
-"Press <b>Enter</b> to switch files or <b>Esc</b> to cancel.<br><br>Type to "
-"filter filenames.<br><br>Use <b>:number</b> to go to a line, e.g. "
-"<b><code>main:42</code></b><br>Use <b>@symbol_text</b> to go to a symbol, e."
-"g. <b><code>@init</code></b><br><br> Press <b>Ctrl+W</b> to close current "
-"tab.<br>"
-msgstr ""
-"ファイルを切り替えるために <b>Enter</b> を押すか <b>Esc</b> でキャンセルして"
-"ください。.<br><br>ファイルをフィルターするために入力してください。<br><br>行"
-"移動には<b>:数字</b> を使ってください。例: <b><code>main:42</code></b><br>シ"
-"ンボルへの移動は<b>@symbol_text</b> を使ってください。例: <b><code>@init</"
-"code></b><br><br> 現在のタブを閉じるには <b>Ctrl+W</b> を押してください。<br>"
+#: spyder/plugins/externalconsole.py:731
+msgid "Open a &Python console"
+msgstr "Pythonコンソールを開く(&O)"
 
-#: spyderlib/widgets/fileswitcher.py:485
-msgid "lines"
-msgstr "行"
+#: spyder/plugins/externalconsole.py:735
+msgid "Open &command prompt"
+msgstr "コマンドプロンプトを開く(&C)"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:97
-msgid "Go to line:"
-msgstr "行へ移動:"
+#: spyder/plugins/externalconsole.py:736
+msgid "Open a Windows command prompt"
+msgstr "Windowsコマンドプロンプトを開く"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:105
-msgid "Line count:"
-msgstr "行数:"
+#: spyder/plugins/externalconsole.py:738
+msgid "Open a &terminal"
+msgstr "ターミナルを開く(&T)"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:1269
-msgid "Breakpoint"
-msgstr "ブレークポイント"
+#: spyder/plugins/externalconsole.py:739
+msgid "Open a terminal window"
+msgstr "ターミナルウインドウを開く"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:1270
-msgid "Condition:"
-msgstr "条件:"
+#: spyder/plugins/findinfiles.py:127 spyder/widgets/findinfiles.py:689
+msgid "Find in files"
+msgstr "ファイルの検索"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:1672
-msgid "Code analysis"
-msgstr "コード分析"
+#: spyder/plugins/findinfiles.py:148
+msgid "&Find in files"
+msgstr "ファイル内を検索(&F)"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:1726
-msgid "To do"
-msgstr "To do"
+#: spyder/plugins/findinfiles.py:151
+msgid "Search text in multiple files"
+msgstr "複数のファイルからテキストを検索"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:1967
-msgid "Removal error"
-msgstr "削除エラー"
+#: spyder/plugins/help.py:44
+msgid "Show help for objects in the Editor and Consoles in a dedicated pane"
+msgstr "専用ペインでエディタ・コンソール中のオブジェクトのヘルプを表示する"
+
+#: spyder/plugins/help.py:110
+msgid "Automatic connections"
+msgstr "自動接続"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:1968
+#: spyder/plugins/help.py:111
 msgid ""
-"It was not possible to remove outputs from this notebook. The error is:\n"
-"\n"
+"This pane can automatically show an object's help information after a left "
+"parenthesis is written next to it. Below you can decide to which plugin you "
+"want to connect it to turn on this feature."
 msgstr ""
-"notebookからoutputを削除できませんでした。エラー:\n"
-"\n"
-
-#: spyderlib/widgets/sourcecode/codeeditor.py:1980
-#: spyderlib/widgets/explorer.py:524
-msgid "Conversion error"
-msgstr "変換エラー"
+"このペインは括弧の左側が入力されるとそのオブジェクトのヘルプ情報を自動的に表"
+"示します。この機能を有効にするために接続したいプラグインを選べます。"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:1981
-#: spyderlib/widgets/explorer.py:525
+#: spyder/plugins/help.py:123
 msgid ""
-"It was not possible to convert this notebook. The error is:\n"
-"\n"
+"This feature requires the Rope or Jedi libraries.\n"
+"It seems you don't have either installed."
 msgstr ""
-"notebookが変換できませんでした。エラー:\n"
-"\n"
-
-#: spyderlib/widgets/sourcecode/codeeditor.py:2438
-#: spyderlib/plugins/editor.py:879
-msgid "Comment"
-msgstr "コメント"
+"この機能はRopeあるいはJediライブラリを必要とします。\n"
+"どちらもインストールされていないようです。"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:2438
-#: spyderlib/plugins/editor.py:879
-msgid "Uncomment"
-msgstr "コメント解除"
+#: spyder/plugins/help.py:126
+msgid "Python Console"
+msgstr "Pythonコンソール"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:2442
-msgid "Clear all ouput"
-msgstr "全ての出力をクリア"
+#: spyder/plugins/help.py:128
+msgid "IPython Console"
+msgstr "IPythonコンソール"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:2445
-#: spyderlib/widgets/explorer.py:253
-msgid "Convert to Python script"
-msgstr "Pythonスクリプトへ変換"
+#: spyder/plugins/help.py:140
+msgid "Additional features"
+msgstr "追加機能"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:2448
-msgid "Go to definition"
-msgstr "定義へ移動"
+#: spyder/plugins/help.py:141
+msgid "Render mathematical equations"
+msgstr "数式を描画"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:2451
-#: spyderlib/plugins/editor.py:816
-msgid "Run cell"
-msgstr "cellを実行"
+#: spyder/plugins/help.py:147
+msgid "This feature requires Sphinx 1.1 or superior."
+msgstr "この機能はSphinx 1.1以上を必要とします。"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:2455
-#: spyderlib/plugins/editor.py:824
-msgid "Run cell and advance"
-msgstr "cellを実行し進む"
+#: spyder/plugins/help.py:148
+msgid "Sphinx %s is currently installed."
+msgstr "Sphinx %s が現在インストールされています。"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:2459
-#: spyderlib/plugins/editor.py:800
-msgid "Run &selection or current line"
-msgstr "選択範囲あるいは現在のカーソル行を実行(&S)"
+#: spyder/plugins/help.py:309
+msgid "No further documentation available"
+msgstr "これ以上のドキュメントはありません"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:2462
-#: spyderlib/widgets/browser.py:34
-msgid "Zoom in"
-msgstr "ズームイン"
+#: spyder/plugins/help.py:347
+#, fuzzy
+msgid "No documentation available"
+msgstr "これ以上のドキュメントはありません"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:2465
-#: spyderlib/widgets/browser.py:31
-msgid "Zoom out"
-msgstr "ズームアウト"
+#: spyder/plugins/help.py:378
+msgid "Source"
+msgstr "ソース"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:2468
-msgid "Zoom reset"
-msgstr "ズームリセット"
+#: spyder/plugins/help.py:385 spyder/plugins/runconfig.py:186
+#: spyder/plugins/runconfig.py:456 spyder/widgets/externalshell/baseshell.py:94
+#: spyder/widgets/ipythonconsole/client.py:200
+msgid "Console"
+msgstr "コンソール"
 
-#: spyderlib/widgets/internalshell.py:258
-msgid "Help..."
-msgstr "ヘルプ..."
+#: spyder/plugins/help.py:393
+#: spyder/widgets/variableexplorer/collectionseditor.py:133
+msgid "Object"
+msgstr "オブジェクト"
 
-#: spyderlib/widgets/internalshell.py:275
-msgid "Shell special commands:"
-msgstr "特別なシェルコマンド:"
+#: spyder/plugins/help.py:407
+msgid "Plain Text"
+msgstr "プレーンテキスト"
 
-#: spyderlib/widgets/internalshell.py:276
-msgid "Internal editor:"
-msgstr "内部エディタ"
+#: spyder/plugins/help.py:411
+msgid "Show Source"
+msgstr "ソースを表示"
 
-#: spyderlib/widgets/internalshell.py:277
-msgid "External editor:"
-msgstr "外部エディタ"
+#: spyder/plugins/help.py:415
+msgid "Rich Text"
+msgstr "リッチテキスト"
 
-#: spyderlib/widgets/internalshell.py:278
-msgid "Run script:"
-msgstr "スクリプトを実行:"
+#: spyder/plugins/help.py:425
+msgid "Automatic import"
+msgstr "自動インポート"
 
-#: spyderlib/widgets/internalshell.py:279
-msgid "Remove references:"
-msgstr "参照を削除"
+#: spyder/plugins/help.py:437 spyder/plugins/history.py:106
+#: spyder/widgets/editor.py:502 spyder/widgets/explorer.py:1085
+#: spyder/widgets/externalshell/baseshell.py:140
+#: spyder/widgets/ipythonconsole/client.py:249
+#: spyder/widgets/variableexplorer/namespacebrowser.py:162
+msgid "Options"
+msgstr "オプション"
 
-#: spyderlib/widgets/internalshell.py:280
-msgid "System commands:"
-msgstr "システムコマンド:"
+#: spyder/plugins/help.py:695
+msgid ""
+"Here you can get help of any object by pressing %s in front of it, either on "
+"the Editor or the Console.%sHelp can also be shown automatically after "
+"writing a left parenthesis next to an object. You can activate this behavior "
+"in %s."
+msgstr ""
+"エディタあるいはコンソールでは %s を直前で押すことで直後のオブジェクトのヘル"
+"プが得られます。%s ヘルプはオブジェクトの隣で左括弧を入力することでも自動的に"
+"表示されます。%sでこの機能を有効化できます。"
 
-#: spyderlib/widgets/internalshell.py:281
-msgid "Python help:"
-msgstr "Pythonヘルプ:"
+#: spyder/plugins/help.py:701
+msgid "Preferences > Help"
+msgstr "設定 > ヘルプ"
 
-#: spyderlib/widgets/internalshell.py:282
-msgid "GUI-based editor:"
-msgstr "GUIエディタ:"
+#: spyder/plugins/help.py:708
+msgid "Usage"
+msgstr "使用法"
 
-#: spyderlib/widgets/projectexplorer.py:335
-msgid "its own configuration file"
-msgstr "独自の設定ファイル"
+#: spyder/plugins/help.py:709
+msgid "New to Spyder? Read our"
+msgstr "Spypderは初めてですか? 読んでください。"
 
-#: spyderlib/widgets/projectexplorer.py:337
-msgid " and "
-msgstr "及び"
+#: spyder/plugins/help.py:710
+msgid "tutorial"
+msgstr "チュートリアル"
 
-#: spyderlib/widgets/projectexplorer.py:341
-#, python-format
-msgid "the following projects:<br>%s"
-msgstr "以下のプロジェクト:<br>%s"
+#: spyder/plugins/help.py:717
+msgid ""
+"Please consider installing Sphinx to get documentation rendered in rich text."
+msgstr ""
+"ドキュメントをリッチテキストで表示するためにSphinxをインストールした方が良い"
+"でしょう。"
 
-#: spyderlib/widgets/projectexplorer.py:545
-msgid "Project..."
-msgstr "プロジェクト..."
+#: spyder/plugins/help.py:886
+msgid "Lock"
+msgstr "ロック"
 
-#: spyderlib/widgets/projectexplorer.py:549
-#: spyderlib/plugins/projectexplorer.py:64
-msgid "New project..."
-msgstr "新規プロジェクト..."
+#: spyder/plugins/help.py:886
+msgid "Unlock"
+msgstr "アンロック"
 
-#: spyderlib/widgets/projectexplorer.py:558
-msgid "Existing directory"
-msgstr "存在するディレクトリ"
+#: spyder/plugins/help.py:930
+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 ""
+"以下のエラーは <b>Sphinx %s</b> を呼んだ時に発生しました。 <br>Sphinxのバー"
+"ジョンが合っていないか文字列のデコードに失敗しました。<br><br>エラーメッセー"
+"ジ:<br>%s"
 
-#: spyderlib/widgets/projectexplorer.py:562
-msgid "Existing Spyder project"
-msgstr "存在するSpyderプロジェクト"
+#: spyder/plugins/help.py:974
+msgid "No source code available."
+msgstr "ソースコードが利用できません"
 
-#: spyderlib/widgets/projectexplorer.py:566
-msgid "Existing Pydev project"
-msgstr "存在するPydevプロジェクト"
+#: spyder/plugins/history.py:39
+msgid "Settings"
+msgstr "設定"
 
-#: spyderlib/widgets/projectexplorer.py:583
-msgid "Open project"
-msgstr "プロジェクトを開く"
+#: spyder/plugins/history.py:41
+msgid " entries"
+msgstr " エントリ"
 
-#: spyderlib/widgets/projectexplorer.py:588
-msgid "Close project"
-msgstr "プロジェクトを閉じる"
+#: spyder/plugins/history.py:41
+msgid "History depth: "
+msgstr "ヒストリー階層:"
 
-#: spyderlib/widgets/projectexplorer.py:593
-msgid "Close unrelated projects"
-msgstr "関係のないプロジェクトを閉じる"
+#: spyder/plugins/history.py:48
+msgid "Scroll automatically to last entry"
+msgstr "最後のエントリーまで自動的にスクロール"
 
-#: spyderlib/widgets/projectexplorer.py:602
-msgid "Edit related projects"
-msgstr "関係するプロジェクトを編集"
+#: spyder/plugins/history.py:126
+msgid "History log"
+msgstr "ヒストリログ"
 
-#: spyderlib/widgets/projectexplorer.py:610
-msgid "Add to PYTHONPATH"
-msgstr "PYTHONPATHに追加"
+#: spyder/plugins/history.py:153
+msgid "History..."
+msgstr "ヒストリ..."
 
-#: spyderlib/widgets/projectexplorer.py:615
-msgid "Remove from PYTHONPATH"
-msgstr "PYTHONPATHから削除"
+#: spyder/plugins/history.py:155
+msgid "Set history maximum entries"
+msgstr "ヒストリの最大エントリ数"
 
-#: spyderlib/widgets/projectexplorer.py:620
-msgid "Properties"
-msgstr "プロパティ"
+#: spyder/plugins/history.py:260
+msgid "History"
+msgstr "ヒストリ"
 
-#: spyderlib/widgets/projectexplorer.py:655
-msgid "Show horizontal scrollbar"
-msgstr "水平スクロールバーを表示"
+#: spyder/plugins/history.py:261
+msgid "Maximum entries"
+msgstr "最大エントリ数"
 
-#: spyderlib/widgets/projectexplorer.py:692
-msgid "Workspace"
-msgstr "ワークスペース"
+#: spyder/plugins/ipythonconsole.py:64
+msgid "Symbolic mathematics in the IPython Console"
+msgstr "IPythonコンソールでの記号数学"
 
-#: spyderlib/widgets/projectexplorer.py:693
-#, python-format
+#: spyder/plugins/ipythonconsole.py:116
 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."
-msgstr ""
-"ワークスペースは保存あるいは復元できませんでした。 %s<br><br>関係づけられてい"
-"る設定ファイルへの書き込み権限があるかチェックしてください。"
+"The authenticity of host <b>%s</b> can't be established. Are you sure you "
+"want to continue connecting?"
+msgstr "ホスト <b>%s</b> の信頼性が確立できません。本当に接続を続けますか?"
 
-#: spyderlib/widgets/projectexplorer.py:752
-msgid "Import directory"
-msgstr "ディレクトリのインポート"
+#: spyder/plugins/ipythonconsole.py:128
+msgid "The authenticity of the host can't be established"
+msgstr "ホストの信頼性が確立できません"
 
-#: spyderlib/widgets/projectexplorer.py:754
-#, python-format
-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)?"
-msgstr ""
-"以下のディレクトリがワークスーペース内にありません。<br><b>%s</"
-"b><br><br>(ディレクトリをワークスペースにコピーして)続行しますか?"
+#: spyder/plugins/ipythonconsole.py:135
+msgid "Tunnel '%s' failed to start"
+msgstr "Tunnel '%s' は開始できませんでした"
 
-#: spyderlib/widgets/projectexplorer.py:770
-#: spyderlib/widgets/projectexplorer.py:1187 spyderlib/widgets/explorer.py:501
-#, python-format
-msgid "<b>Unable to %s <i>%s</i></b><br><br>Error message:<br>%s"
+#: spyder/plugins/ipythonconsole.py:140
+msgid "Could not connect to remote host"
+msgstr "リモートホストへ接続できませんでした"
+
+#: spyder/plugins/ipythonconsole.py:157 spyder/plugins/ipythonconsole.py:747
+msgid "Connect to an existing kernel"
+msgstr "既存のカーネルに接続"
+
+#: spyder/plugins/ipythonconsole.py:159
+msgid ""
+"Please enter the connection info of the kernel you want to connect to. For "
+"that you can either select its JSON connection file using the <tt>Browse</"
+"tt> button, or write directly its id, in case it's a local kernel (for "
+"example <tt>kernel-3764.json</tt> or just <tt>3764</tt>)."
 msgstr ""
-"<b>%s が <i>%s</i> に実行できませんでした。</b><br><br>エラーメッセージ:<br>"
-"%s"
+"接続したいカーネルの接続情報を入力してください。 <tt>表示</tt> ボタンを押し、"
+"JSON接続ファイルを選ぶか、ローカルカーネルの場合IDを入力してください (例: "
+"<tt>kernel-3764.json</tt> あるいは <tt>3764</tt>)。"
 
-#: spyderlib/widgets/projectexplorer.py:772
-#: spyderlib/widgets/projectexplorer.py:1183
-msgid "copy"
-msgstr "コピー"
+#: spyder/plugins/ipythonconsole.py:170
+msgid "Connection info:"
+msgstr "接続情報:"
 
-#: spyderlib/widgets/projectexplorer.py:823
-#: spyderlib/widgets/projectexplorer.py:830
-#: spyderlib/widgets/projectexplorer.py:1101
-#: spyderlib/widgets/projectexplorer.py:1186 spyderlib/widgets/explorer.py:500
-msgid "Project Explorer"
-msgstr "プロジェクトエクスプローラー"
+#: spyder/plugins/ipythonconsole.py:172
+msgid "Path to connection file or kernel id"
+msgstr "接続ファイルへのパスあるいはカーネルID"
 
-#: spyderlib/widgets/projectexplorer.py:824
-#, python-format
-msgid "The project <b>%s</b> is already opened!"
-msgstr "プロジェクト<b>%s</b>は既に開いています!"
+#: spyder/plugins/ipythonconsole.py:174 spyder/plugins/ipythonconsole.py:191
+msgid "Browse"
+msgstr "表示"
 
-#: spyderlib/widgets/projectexplorer.py:831
-#, python-format
-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>"
-msgstr ""
-"プロジェクトのルートディレクトリはワークスペース内に有りますが想定された階層"
-"にありません。 ワークスペース:<br><b>%s</b>のディレクトリではありません"
+#: spyder/plugins/ipythonconsole.py:183
+msgid "This is a remote kernel"
+msgstr "これはリモートカーネルです"
 
-#: spyderlib/widgets/projectexplorer.py:842
-msgid "Project name:"
-msgstr "プロジェクト名:"
+#: spyder/plugins/ipythonconsole.py:187
+msgid "username at hostname:port"
+msgstr "username at hostname:port"
 
-#: spyderlib/widgets/projectexplorer.py:851
-#, python-format
-msgid "A project named <b>%s</b> already exists"
-msgstr "<b>%s</b>という名前のプロジェクトは既に存在します"
+#: spyder/plugins/ipythonconsole.py:190
+msgid "Path to ssh key file"
+msgstr "sshキーファイルへのパス"
 
-#: spyderlib/widgets/projectexplorer.py:856
-#, python-format
-msgid ""
-"Invalid project name.<br><br>Name must match the following regular "
-"expression:<br><b>%s</b>"
-msgstr ""
-"無効なプロジェクト名。<br><br>プロジェクト名は以下の正規表現に従ってください:"
-"<br><b>%s</b>"
+#: spyder/plugins/ipythonconsole.py:199
+msgid "Password or ssh key passphrase"
+msgstr "パスワードあるいはsshキーのパスフレーズ"
 
-#: spyderlib/widgets/projectexplorer.py:863
-#, python-format
-msgid ""
-"The following directory is not empty:<br><b>%s</b><br><br>Do you want to "
-"continue?"
-msgstr ""
-"以下のディレクトリは空ではありません:<br><b>%s</b><br><br> 続行しますか?"
+#: spyder/plugins/ipythonconsole.py:203
+msgid "Host name"
+msgstr "ホスト名"
 
-#: spyderlib/widgets/projectexplorer.py:876
-msgid "New project"
-msgstr "New project_"
+#: spyder/plugins/ipythonconsole.py:204
+msgid "Ssh key"
+msgstr "sshキー"
 
-#: spyderlib/widgets/projectexplorer.py:884
-msgid ""
-"The current workspace has not been configured yet.\n"
-"Do you want to do this now?"
-msgstr ""
-"現在のワークスペースはまだ設定がされていません。\n"
-"すぐに設定しますか?"
+#: spyder/plugins/ipythonconsole.py:205
+msgid "Password"
+msgstr "パスワード"
 
-#: spyderlib/widgets/projectexplorer.py:922
-msgid "Import existing project"
-msgstr "既存のプロジェクトをインポート"
+#: spyder/plugins/ipythonconsole.py:234
+#, fuzzy
+msgid "Open connection file"
+msgstr "IPython接続ファイルを開く"
 
-#: spyderlib/widgets/projectexplorer.py:935
-msgid "Select projects to import"
-msgstr "インポートするプロジェクトを選択"
+#: spyder/plugins/ipythonconsole.py:239
+msgid "Select ssh key"
+msgstr "sshキーを選択"
 
-#: spyderlib/widgets/projectexplorer.py:947
-#, python-format
-msgid "The folder <i>%s</i> does not contain a valid %s project"
-msgstr "フォルダー <i>%s</i>  は有効な %s プロジェクトを含んでいません"
+#: spyder/plugins/ipythonconsole.py:267 spyder/plugins/ipythonconsole.py:686
+msgid "IPython console"
+msgstr "IPythonコンソール"
 
-#: spyderlib/widgets/projectexplorer.py:977
-msgid "Import existing Pydev project"
-msgstr "既存のPydevプロジェクトをインポート"
+#: spyder/plugins/ipythonconsole.py:274
+msgid "Display initial banner"
+msgstr "初期バナーの表示"
 
-#: spyderlib/widgets/projectexplorer.py:978
-#, python-format
+#: spyder/plugins/ipythonconsole.py:275
 msgid ""
-"<b>Unable to read Pydev project <i>%s</i></b><br><br>Error message:<br>%s"
+"This option lets you hide the message shown at\n"
+"the top of the console when it's opened."
 msgstr ""
-"<b>Pydevプロジェクト<i>%s</i>を読み取れません</b><br><br>エラーメッセージ:"
-"<br>%s"
+"このオプションによりコンソールを開いた時に表示される\n"
+"一番上のメッセージを隠すことができます。"
+
+#: spyder/plugins/ipythonconsole.py:277
+msgid "Use a pager to display additional text inside the console"
+msgstr "コンソール内で追加テキストを表示するためにページャーを使用"
 
-#: spyderlib/widgets/projectexplorer.py:1016
-#, python-format
+#: spyder/plugins/ipythonconsole.py:279
 msgid ""
-"Do you really want to delete project <b>%s</b>?<br><br>Note: project files "
-"won't be deleted from disk."
+"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 ""
-"本当にプロジェクト<b>%s</b>を削除しますか?<br><br>注: プロジェクトファイルは"
-"ディスク上からは削除されません。"
+"補完テキストや長いヘルプでコンソールを埋めたくない場合有効です。\n"
+"注: このページャーから出るには Qキーを押してください。"
 
-#: spyderlib/widgets/projectexplorer.py:1069
-msgid "Related projects"
-msgstr "関係するプロジェクト"
+#: spyder/plugins/ipythonconsole.py:284
+msgid "Ask for confirmation before closing"
+msgstr "閉じる前に確認するようにする"
 
-#: spyderlib/widgets/projectexplorer.py:1077
-#, python-format
-msgid "Select projects which are related to <b>%s</b>"
-msgstr "<b>%s</b>に関連するプロジェクトを選択"
+#: spyder/plugins/ipythonconsole.py:294
+msgid "Completion Type"
+msgstr "補完タイプ"
 
-#: spyderlib/widgets/projectexplorer.py:1102
-#, python-format
-msgid ""
-"Statistics on source files only:<br>(Python, Cython, IPython, Enaml,C/C++, "
-"Fortran)<br><br><b>%s</b> files.<br><b>%s</b> lines of code."
-msgstr ""
-"ソースファイルのみの統計:<br>(Python, Cython, IPython, Enaml,C/C++, "
-"Fortran)<br><br><b>%s</b> ファイル。<br><b>%s</b> 行のコード。"
+#: spyder/plugins/ipythonconsole.py:295
+msgid "Decide what type of completion to use"
+msgstr "どのタイプの補完を使うか選択"
 
-#: spyderlib/widgets/projectexplorer.py:1150
-#: spyderlib/widgets/projectexplorer.py:1164
-#: spyderlib/plugins/projectexplorer.py:53
-msgid "Project explorer"
-msgstr "プロジェクトエクスプローラー"
+#: spyder/plugins/ipythonconsole.py:297
+#, fuzzy
+msgid "Graphical"
+msgstr "グラフィックス"
 
-#: spyderlib/widgets/projectexplorer.py:1151
-#, python-format
-msgid "File <b>%s</b> already exists.<br>Do you want to overwrite it?"
-msgstr "ファイル <b>%s</b> は既に存在します。<br>上書きしますか?"
+#: spyder/plugins/ipythonconsole.py:297
+#, fuzzy
+msgid "Plain"
+msgstr "プレーンテキスト"
 
-#: spyderlib/widgets/projectexplorer.py:1165
-#, python-format
-msgid "Folder <b>%s</b> already exists."
-msgstr "フォルダ <b>%s</b> は既に存在します。"
+#: spyder/plugins/ipythonconsole.py:298
+msgid "Completion:"
+msgstr "補完:"
 
-#: spyderlib/widgets/projectexplorer.py:1185
-msgid "move"
-msgstr "移動"
+#: spyder/plugins/ipythonconsole.py:307
+msgid "Light background"
+msgstr "明るい背景"
 
-#: spyderlib/widgets/projectexplorer.py:1195
-msgid "Select an existing workspace directory, or create a new one"
-msgstr "既存のワークスペースを選択するか新規に作成する"
+#: spyder/plugins/ipythonconsole.py:309
+msgid "Dark background"
+msgstr "暗い背景"
+
+#: spyder/plugins/ipythonconsole.py:319
+msgid "Buffer:  "
+msgstr "バッファー:"
 
-#: spyderlib/widgets/projectexplorer.py:1196
+#: spyder/plugins/ipythonconsole.py:321
 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>."
-"spyderworkspace</b> configuration file.<br><br>A <b>Spyder project</b> is a "
-"directory with source code (and other related files) and a configuration "
-"file (named <b>.spyderproject</b>) with project settings (PYTHONPATH, linked "
-"projects, ...).<br>"
+"Set the maximum number of lines of text shown in the\n"
+"console before truncation. Specifying -1 disables it\n"
+"(not recommended!)"
 msgstr ""
-"<u><b>ワークスペースとは何か?</b></u><br><br><b>Spyderワークスペース</b> とは"
-"ファイルシステム上のSpyderプロジェクトと<b>.spyderworkspace</b>設定ファイルを"
-"含むディレクトリである。<br><br> <b>Spyderプロジェクト</b> はソースコード(と"
-"その他関連ファイル)や(PYTHONPATHや関連プロジェクト.等の)設定ファイル(<b>."
-"spyderproject</b>)を保存しているディレクトリである。<br>"
-
-#: spyderlib/widgets/projectexplorer.py:1225
-msgid "This is the current workspace directory"
-msgstr "これは現在のワークスペースディレクトリです"
-
-#: spyderlib/widgets/projectexplorer.py:1255
-#, python-format
+"コンソール内で表示するテキストの最大行数を設定。\n"
+"-1 を設定すると無効になります\n"
+"(非推奨です!)"
+
+#: spyder/plugins/ipythonconsole.py:330
+msgid "Support for graphics (Matplotlib)"
+msgstr "画像のサポート(Matplotlib)"
+
+#: spyder/plugins/ipythonconsole.py:331
+msgid "Activate support"
+msgstr "サポートを有効化"
+
+#: spyder/plugins/ipythonconsole.py:332
+msgid "Automatically load Pylab and NumPy modules"
+msgstr "Pylab, NumPyモジュールを自動的にロード"
+
+#: spyder/plugins/ipythonconsole.py:335
 msgid ""
-"The following directory is not a Spyder workspace:<br>%s<br><br>Do you want "
-"to create a new workspace in this directory?"
+"This lets you load graphics support without importing \n"
+"the commands to do plots. Useful to work with other\n"
+"plotting libraries different to Matplotlib or to develop \n"
+"GUIs with Spyder."
 msgstr ""
-"以下のディレクトリはSpyderワークスペースではありません:<br>%s<br><br>このディ"
-"レクトリに新規ワークスペースを作成しますか?"
-
-#: spyderlib/widgets/externalshell/pythonshell.py:284
-msgid "Variables"
-msgstr "変数"
+"プロットコマンドをインポートすることなしに画像サポートを\n"
+"有効にします。Matplotlib以外のプロットライブラリを利用\n"
+"している場合や、SpyderでGUIを開発している場合、\n"
+"有用です。"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:285
-msgid "Show/hide global variables explorer"
-msgstr "変数エクスプローラの表示/隠す"
+#: spyder/plugins/ipythonconsole.py:350
+msgid "Inline"
+msgstr "インライン"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:289
-msgid "Terminate"
-msgstr "終了"
+#: spyder/plugins/ipythonconsole.py:352
+msgid "Graphics backend"
+msgstr "グラフィックスのバックエンド"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:290
+#: spyder/plugins/ipythonconsole.py:353
 msgid ""
-"Attempts to stop the process. The process\n"
-"may not exit as a result of clicking this\n"
-"button (it is given the chance to prompt\n"
-"the user for any unsaved files, etc)."
+"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 ""
-"プロセスを停止させる。 このボタンを\n"
-"押しただけではプロセスはまだ停止\n"
-"しません。(未保存のファイルの扱いを\n"
-"尋ねる,etc)"
+"コンソール内でどのように画像を表示するか選んでください。よくわからなければ、"
+"コンソール内で画像を表示したい場合 <b>%s</b> を選び、別ウィンドウで(ズーム、"
+"パン等)操作したい場合は <b>%s</b> を選んでください。"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:303
-msgid "Interact"
-msgstr "相互作用"
+#: spyder/plugins/ipythonconsole.py:386
+msgid "Inline backend"
+msgstr "インラインのバックエンド"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:305
-msgid "Debug"
-msgstr "デバッグ"
+#: spyder/plugins/ipythonconsole.py:387
+msgid "Decide how to render the figures created by this backend"
+msgstr "このバックエンドで生成された画像をどのように描画するか選択"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:307
-#: spyderlib/widgets/externalshell/pythonshell.py:373
-msgid "Arguments..."
-msgstr "引数..."
+#: spyder/plugins/ipythonconsole.py:391
+msgid "Format:"
+msgstr "フォーマット:"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:309
-msgid "Post Mortem Debug"
-msgstr "事後デバッグ"
+#: spyder/plugins/ipythonconsole.py:394
+msgid "Resolution:"
+msgstr "解像度:"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:311
-#: spyderlib/plugins/editor.py:783
-msgid "Run settings"
-msgstr "設定の実行"
+#: spyder/plugins/ipythonconsole.py:394
+msgid "dpi"
+msgstr "dpi"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:315
-msgid "Working directory"
-msgstr "作業ディレクトリ"
+#: spyder/plugins/ipythonconsole.py:396
+msgid "Only used when the format is PNG. Default is 72"
+msgstr "PNGフォーマットの場合のみ使われます。デフォルトは72"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:317
-msgid "Set current working directory"
-msgstr "現在のワーキングディレクトリを設定"
+#: spyder/plugins/ipythonconsole.py:399
+msgid "Width:"
+msgstr "幅:"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:319
-msgid "Environment variables"
-msgstr "環境変数"
+#: spyder/plugins/ipythonconsole.py:399 spyder/plugins/ipythonconsole.py:403
+msgid "inches"
+msgstr "インチ"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:323
-msgid "Show sys.path contents"
-msgstr "sys.pathの中身を表示"
+#: spyder/plugins/ipythonconsole.py:401
+msgid "Default is 6"
+msgstr "デフォルトは6です"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:369
-#, python-format
-msgid "Arguments: %s"
-msgstr "引数: %s"
+#: spyder/plugins/ipythonconsole.py:403
+msgid "Height:"
+msgstr "高さ:"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:371
-msgid "No argument"
-msgstr "引数なし"
+#: spyder/plugins/ipythonconsole.py:405
+msgid "Default is 4"
+msgstr "デフォルトは4です"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:550
+#: spyder/plugins/ipythonconsole.py:432
 msgid ""
-"The kernel failed to start!! That's all we know... Please close this console "
-"and open a new one."
+"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 ""
-"カーネルは開始できませんでした!!これがわかっていることの全てです...このコン"
-"ソールを閉じて再度新しく開いてください。"
+"コンソールを開始した時にコードを実行できます。それぞれをコンマで区切ってくだ"
+"さい。例:<br><i>import os, import sys</i>"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:554
-msgid "A Python console failed to start!"
-msgstr "Pythonコンソールを開始できませんでした!"
+#: spyder/plugins/ipythonconsole.py:438
+msgid "Lines:"
+msgstr "行:"
 
-#: spyderlib/widgets/externalshell/systemshell.py:105
-msgid "Process failed to start"
-msgstr "プロセスを開始できませんでした"
-
-#: spyderlib/widgets/externalshell/baseshell.py:141
-msgid "Run again this program"
-msgstr "プログラムを再度実行する"
-
-#: spyderlib/widgets/externalshell/baseshell.py:144
-msgid "Kill"
-msgstr "殺す"
-
-#: spyderlib/widgets/externalshell/baseshell.py:146
-msgid "Kills the current process, causing it to exit immediately"
-msgstr "現在のプロセスを殺し、直ちにexit"
-
-#: spyderlib/widgets/externalshell/baseshell.py:172
-#: spyderlib/plugins/externalconsole.py:69
-msgid "Show elapsed time"
-msgstr "実行時間を表示"
-
-#: spyderlib/widgets/externalshell/baseshell.py:219
-msgid "<span style='color: #44AA44'><b>Running...</b></span>"
-msgstr "<span style='color: #44AA44'><b>実行中...</b></span>"
-
-#: spyderlib/widgets/externalshell/baseshell.py:225
-msgid "Terminated."
-msgstr "終了。"
-
-#: spyderlib/widgets/externalshell/baseshell.py:251
-msgid "Command line arguments:"
-msgstr "コマンドライン引数:"
-
-#: spyderlib/widgets/arraybuilder.py:162
-msgid ""
-"\n"
-"           <b>Numpy Array/Matrix Helper</b><br>\n"
-"           Type an array in Matlab    : <code>[1 2;3 4]</code><br>\n"
-"           or Spyder simplified syntax : <code>1 2;3 4</code>\n"
-"           <br><br>\n"
-"           Hit 'Enter' for array or 'Ctrl+Enter' for matrix.\n"
-"           <br><br>\n"
-"           <b>Hint:</b><br>\n"
-"           Use two spaces or two tabs to generate a ';'.\n"
-"           "
-msgstr ""
-"\n"
-"           <b>Numpy 配列/行列 ヘルパー        </b><br>\n"
-"           以下の形式で入力 Matlab形式  : <code>[1 2;3 4]</code><br>\n"
-"                             あるいはSpyder構文 : <code>1 2;3 4</code>\n"
-"           <br><br>\n"
-"           配列入力には'Enter'を、行列入力には 'Ctrl+Enter'を使う。\n"
-"           <br><br>\n"
-"           <b>ヒント:</b><br>\n"
-"           空白2つあるいはタブ2つは';'入力になる。\n"
-"           "
+#: spyder/plugins/ipythonconsole.py:447
+msgid "Run a file"
+msgstr "ファイルを実行"
 
-#: spyderlib/widgets/arraybuilder.py:173
+#: spyder/plugins/ipythonconsole.py:448
 msgid ""
-"\n"
-"           <b>Numpy Array/Matrix Helper</b><br>\n"
-"           Enter an array in the table. <br>\n"
-"           Use Tab to move between cells.\n"
-"           <br><br>\n"
-"           Hit 'Enter' for array or 'Ctrl+Enter' for matrix.\n"
-"           <br><br>\n"
-"           <b>Hint:</b><br>\n"
-"           Use two tabs at the end of a row to move to the next row.\n"
-"           "
+"You can also run a whole file at startup instead of just some lines (This is "
+"similar to have a PYTHONSTARTUP file)."
 msgstr ""
-"\n"
-"           <b>Numpy 配列/行列 ヘルパー</b><br>\n"
-"           テーブルに配列を入力してください。 <br>\n"
-"           セル間の移動にはタブを使います。\n"
-"           <br><br>\n"
-"           配列入力には'Enter'を、行列入力には 'Ctrl+Enter'を。\n"
-"           <br><br>\n"
-"           <b>ヒント:</b><br>\n"
-"           行末で次の行へ移動するにはタブを2回入力すれば良い。\n"
-"           "
-
-#: spyderlib/widgets/arraybuilder.py:337
-msgid "Array dimensions not valid"
-msgstr "配列の次元が不正"
+"行の一部だけではなくファイル全体をスタート時に実行できます(PYTHONSTARTUPファ"
+"イルと類似)"
 
-#: spyderlib/widgets/dependencies.py:59
-msgid "Module"
-msgstr "モジュール"
+#: spyder/plugins/ipythonconsole.py:452
+msgid "Use the following file:"
+msgstr "以下のファイルを使う:"
 
-#: spyderlib/widgets/dependencies.py:59
-msgid " Required "
-msgstr "必須"
+#: spyder/plugins/ipythonconsole.py:466
+msgid "Greedy completion"
+msgstr "Greedy completion"
 
-#: spyderlib/widgets/dependencies.py:60
-msgid " Installed "
-msgstr "インストール済み"
+#: spyder/plugins/ipythonconsole.py:467
+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 ""
+"リスト要素、関数呼び出し結果等を変数に<i>割り当てずに</i>に<tt>Tab</tt> 補完"
+"を有効にする。<br>例えば <tt>li[0].<Tab></tt> や <tt>ins.meth().<"
+"Tab></tt> のように補完できる"
 
-#: spyderlib/widgets/dependencies.py:60
-msgid "Provided features"
-msgstr "利用できる機能"
+#: spyder/plugins/ipythonconsole.py:475
+msgid "Use the greedy completer"
+msgstr "greedy completerを利用する"
 
-#: spyderlib/widgets/dependencies.py:130
-msgid "Dependencies"
-msgstr "依存性"
+#: spyder/plugins/ipythonconsole.py:486
+msgid "Autocall"
+msgstr "Autocall"
 
-#: spyderlib/widgets/dependencies.py:137
-#, python-format
+#: spyder/plugins/ipythonconsole.py:487
 msgid ""
-"Spyder depends on several Python modules to provide the right functionality "
-"for all its panes. The table below shows the required and installed versions "
-"(if any) of all of them.<br><br><b>Note</b>: You can safely use Spyder "
-"without the following modules installed: <b>%s</b> and <b>%s</b>"
+"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 ""
-"全てのペインが正しく機能するために、SpyderはいくつかのPythonモジュールに依存"
-"しています。 下記のテーブルには必要なモジュールとインストール済みモジュールの"
-"バージョンを示します。<br><br><b>注</b>: 以下のモジュールはインストールしなく"
-"てもSpyderを安全に使用できます。: <b>%s</b> and <b>%s</b>"
-
-#: spyderlib/widgets/dependencies.py:150
-msgid "Copy to clipboard"
-msgstr "クリップボードにコピー"
-
-#: spyderlib/widgets/explorer.py:174
-msgid "Edit filename filters..."
-msgstr "ファイル名フィルターを編集..."
+"明示的に括弧を省略している場合でも、IPythonで呼び出し可能なオブジェクトを"
+"Autocallによって自動的に呼ぶ。 <br>例えば、<i>str 43</i> と入力すると自動的"
+"に <i>str(43)</i> となる。"
 
-#: spyderlib/widgets/explorer.py:188
-msgid "Edit filename filters"
-msgstr "ファイル名フィルターを編集"
+#: spyder/plugins/ipythonconsole.py:494
+msgid "Smart"
+msgstr "Smart"
 
-#: spyderlib/widgets/explorer.py:189
-msgid "Name filters:"
-msgstr "フィルター:"
+#: spyder/plugins/ipythonconsole.py:495
+msgid "Full"
+msgstr "Full"
 
-#: spyderlib/widgets/explorer.py:208
-msgid "File..."
-msgstr "ファイル..."
+#: spyder/plugins/ipythonconsole.py:496
+msgid "Off"
+msgstr "オフPff"
 
-#: spyderlib/widgets/explorer.py:212
-msgid "Module..."
-msgstr "モジュール..."
+#: spyder/plugins/ipythonconsole.py:498
+msgid "Autocall:  "
+msgstr "Autocall:"
 
-#: spyderlib/widgets/explorer.py:216
-msgid "Folder..."
-msgstr "フォルダー..."
+#: spyder/plugins/ipythonconsole.py:499
+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 ""
+"<b>%s</b> モードでは、 呼び出し可能オブジェクトに引数がない場合Autocallは適用"
+"されません。 <b>%s</b> モードでは、(引数がない場合でも)全ての呼び出し可能オブ"
+"ジェクトが自動的に呼ばれます。"
 
-#: spyderlib/widgets/explorer.py:220
-msgid "Package..."
-msgstr "パッケージ..."
+#: spyder/plugins/ipythonconsole.py:511
+msgid "Symbolic Mathematics"
+msgstr "記号数学"
 
-#: spyderlib/widgets/explorer.py:243
-msgid "Move..."
-msgstr "移動..."
+#: spyder/plugins/ipythonconsole.py:512
+#, fuzzy
+msgid ""
+"Perfom symbolic operations in the console (e.g. integrals, derivatives, "
+"vector calculus, etc) and get the outputs in a beautifully printed style (it "
+"requires the Sympy module)."
+msgstr ""
+"記号演算をコンソール内で実行し(例:積分、微分、ベクトル演算等)、整えられた印刷"
+"可能スタイルで出力する。"
 
-#: spyderlib/widgets/explorer.py:246
-msgid "Delete..."
-msgstr "削除..."
+#: spyder/plugins/ipythonconsole.py:517
+msgid "Use symbolic math"
+msgstr "記号演算を使う"
 
-#: spyderlib/widgets/explorer.py:249
-msgid "Rename..."
-msgstr "リネーム..."
+#: spyder/plugins/ipythonconsole.py:518
+msgid ""
+"This option loads the Sympy library to work with.<br>Please refer to its "
+"documentation to learn how to use it."
+msgstr ""
+"このオプションはSympyライブラリをロードします。<br>Sympyドキュメントを参照"
+"し、使用方法を学んでください。"
 
-#: spyderlib/widgets/explorer.py:252
-msgid "Open"
-msgstr "開く"
+#: spyder/plugins/ipythonconsole.py:528
+msgid "Prompts"
+msgstr "プロンプト"
 
-#: spyderlib/widgets/explorer.py:287
-msgid "Commit"
-msgstr "コミット"
+#: spyder/plugins/ipythonconsole.py:529
+msgid "Modify how Input and Output prompts are shown in the console."
+msgstr "プロンプトの入力と出力のコンソール内での表示を変更する。"
 
-#: spyderlib/widgets/explorer.py:290
-msgid "Browse repository"
-msgstr "レポジトリを表示"
+#: spyder/plugins/ipythonconsole.py:532
+msgid "Input prompt:"
+msgstr "入力プロンプト:"
 
-#: spyderlib/widgets/explorer.py:301
-msgid "Open command prompt here"
-msgstr "コマンドプロンプトをここで開く"
+#: spyder/plugins/ipythonconsole.py:534
+msgid ""
+"Default is<br>In [<span class=\"in-prompt-number\">%i</span>]:"
+msgstr ""
+"デフォルトは<br>In [<span class=\"in-prompt-number\">%i</span>]:"
 
-#: spyderlib/widgets/explorer.py:303
-msgid "Open terminal here"
-msgstr "ターミナルをここで開く"
+#: spyder/plugins/ipythonconsole.py:538
+msgid "Output prompt:"
+msgstr "出力プロンプト:"
 
-#: spyderlib/widgets/explorer.py:308
-msgid "Open Python console here"
-msgstr "Pythonコンソールをここで開く"
+#: spyder/plugins/ipythonconsole.py:540
+msgid ""
+"Default is<br>Out[<span class=\"out-prompt-number\">%i</span>]:"
+msgstr ""
+"デフォルトは<br>Out[<span class=\"out-prompt-number\">%i</span>]:"
 
-#: spyderlib/widgets/explorer.py:322
-msgid "New"
-msgstr "新規"
+#: spyder/plugins/ipythonconsole.py:562 spyder/plugins/workingdirectory.py:45
+msgid "Startup"
+msgstr "スタートアップ"
 
-#: spyderlib/widgets/explorer.py:330
-msgid "Import"
-msgstr "インポート"
+#: spyder/plugins/ipythonconsole.py:734
+msgid "Open an &IPython console"
+msgstr "IPythonコンソールを開く(&I)"
 
-#: spyderlib/widgets/explorer.py:481
-#, python-format
-msgid "Do you really want to delete <b>%s</b>?"
-msgstr "本当に <b>%s</b> を削除しますか?"
+#: spyder/plugins/ipythonconsole.py:737
+msgid "Use %s+T when the console is selected to open a new one"
+msgstr "コンソールを新しく開く場合 %s+T を使う"
 
-#: spyderlib/widgets/explorer.py:499
-msgid "delete"
-msgstr "削除"
+#: spyder/plugins/ipythonconsole.py:740
+msgid "Open a new console"
+msgstr "新規コンソールを開く"
 
-#: spyderlib/widgets/explorer.py:543
-msgid "New name:"
-msgstr "新しい名前:"
+#: spyder/plugins/ipythonconsole.py:748
+msgid "Open a new IPython console connected to an existing kernel"
+msgstr "既存カーネルに接続された新規IPythonコンソールを開く"
 
-#: spyderlib/widgets/explorer.py:551
-#, python-format
+#: spyder/plugins/ipythonconsole.py:836
 msgid ""
-"Do you really want to rename <b>%s</b> and overwrite the existing file <b>"
-"%s</b>?"
-msgstr ""
-"本当に <b>%s</b> をリネームし、既存ファイル <b>%s</b> を上書きしますか?"
-
-#: spyderlib/widgets/explorer.py:562
-#, python-format
-msgid "<b>Unable to rename file <i>%s</i></b><br><br>Error message:<br>%s"
-msgstr ""
-"<b>ファイル <i>%s</i> をリネームできません</b><br><br>エラーメッセージ:<br>%s"
-
-#: spyderlib/widgets/explorer.py:598
-#, python-format
-msgid "<b>Unable to move <i>%s</i></b><br><br>Error message:<br>%s"
-msgstr "<b> <i>%s</i> を移動できません </b><br><br>エラーメッセージ:<br>%s"
-
-#: spyderlib/widgets/explorer.py:616
-#, python-format
-msgid "<b>Unable to create folder <i>%s</i></b><br><br>Error message:<br>%s"
+"No IPython console is currently available to run <b>%s</b>.<br><br>Please "
+"open a new one and try again."
 msgstr ""
-"<b>フォルダ <i>%s</i> を作成できません</b><br><br>エラーメッセージ:<br>%s"
+"現在<b>%s</b>実行可能なIPythonコンソールがありません。.<br><br>新規に開いて再"
+"試行してください。"
 
-#: spyderlib/widgets/explorer.py:629 spyderlib/widgets/explorer.py:663
-#, python-format
-msgid "<b>Unable to create file <i>%s</i></b><br><br>Error message:<br>%s"
+#: spyder/plugins/ipythonconsole.py:873
+msgid ""
+"Your Python environment or installation doesn't have the <tt>ipykernel</tt> "
+"module installed on it. Without this module is not possible for Spyder to "
+"create a console for you.<br><br>You can install <tt>ipykernel</tt> by "
+"running in a terminal:<br><br><tt>pip install ipykernel</"
+"tt><br><br>or<br><br><tt>conda install ipykernel</tt>"
 msgstr ""
-"<b>ファイル <i>%s</i> を作成できません</b><br><br>エラーメッセージ:<br>%s"
-
-#: spyderlib/widgets/explorer.py:637
-msgid "New folder"
-msgstr "新規フォルダー"
-
-#: spyderlib/widgets/explorer.py:638
-msgid "Folder name:"
-msgstr "フォルダ名:"
 
-#: spyderlib/widgets/explorer.py:643
-msgid "New package"
-msgstr "新規パッケージ"
+#: spyder/plugins/ipythonconsole.py:1098
+#, fuzzy
+msgid "Do you want to close this console?"
+msgstr "本当にこのスキームを削除しますか?"
 
-#: spyderlib/widgets/explorer.py:644
-msgid "Package name:"
-msgstr "パッケージ名:"
+#: spyder/plugins/ipythonconsole.py:1104
+msgid ""
+"Do you want to close all other consoles connected to the same kernel as this "
+"one?"
+msgstr "同じカーネルに接続している他の全てのコンソールを閉じますか?"
 
-#: spyderlib/widgets/explorer.py:662 spyderlib/widgets/explorer.py:669
-#: spyderlib/plugins/editor.py:630 spyderlib/plugins/workingdirectory.py:82
-msgid "New file"
-msgstr "新規ファイル"
+#: spyder/plugins/ipythonconsole.py:1364
+msgid "IPython"
+msgstr "IPython"
 
-#: spyderlib/widgets/explorer.py:684
-msgid "New module"
-msgstr "新規モジュール"
+#: spyder/plugins/ipythonconsole.py:1365
+#, fuzzy
+msgid "Unable to connect to <b>%s</b>"
+msgstr "IPythonに接続できませんでした。 <b>%s"
 
-#: spyderlib/widgets/explorer.py:685 spyderlib/plugins/console.py:232
-#: spyderlib/plugins/externalconsole.py:223
-#: spyderlib/plugins/externalconsole.py:1211
-msgid "Python scripts"
-msgstr "Pythonスクリプト"
+#: spyder/plugins/ipythonconsole.py:1422
+msgid "Connection error"
+msgstr "接続エラー"
 
-#: spyderlib/widgets/explorer.py:696
-#, python-format
+#: spyder/plugins/ipythonconsole.py:1423
 msgid ""
-"For %s support, please install one of the<br/> following tools:<br/><br/>  %s"
+"Could not open ssh tunnel. The error was:\n"
+"\n"
 msgstr ""
-" %s をサポートするためには以下のツールをインストールしてください。<br/> ツー"
-"ル:<br/><br/>  %s"
-
-#: spyderlib/widgets/explorer.py:700
-#, python-format
-msgid "<b>Unable to find external program.</b><br><br>%s"
-msgstr "<b>外部プログラムが見つかりません。</b><br><br>%s"
+"sshトンネルを開けませんでした。エラー:\n"
+"\n"
 
-#: spyderlib/widgets/explorer.py:903
-msgid "Show current directory only"
-msgstr "現在のディレクトリのみを表示"
+#: spyder/plugins/layoutdialog.py:177
+msgid "Move Up"
+msgstr "上へ移動"
 
-#: spyderlib/widgets/explorer.py:1001
-msgid "You don't have the right permissions to open this directory"
-msgstr "このディレクトリを開く権限がありません"
+#: spyder/plugins/layoutdialog.py:178
+msgid "Move Down"
+msgstr "下へ移動"
 
-#: spyderlib/widgets/explorer.py:1029 spyderlib/plugins/externalconsole.py:70
-msgid "Show icons and text"
-msgstr "アイコンとテキストを表示"
+#: spyder/plugins/layoutdialog.py:179
+msgid "Delete Layout"
+msgstr "レイアウトの削除"
 
-#: spyderlib/widgets/explorer.py:1037
-msgid "Parent"
-msgstr "親"
+#: spyder/plugins/layoutdialog.py:183
+msgid "Layout Display and Order"
+msgstr "レイアウトの表示と順序"
 
-#: spyderlib/widgets/findreplace.py:59
-msgid "Search string"
-msgstr "検索文字列"
+#: spyder/plugins/maininterpreter.py:31 spyder/plugins/maininterpreter.py:66
+#, fuzzy
+msgid "Python interpreter"
+msgstr "以下のPythonインタープリターを使う"
 
-#: spyderlib/widgets/findreplace.py:83
-msgid "Case Sensitive"
-msgstr "大文字/小文字を区別"
+#: spyder/plugins/maininterpreter.py:68
+#, fuzzy
+msgid "Select the Python interpreter for all Spyder consoles"
+msgstr ""
+"Spyderにスクリプトを実行させる(Pythonインタープリター)実行可能ファイルを選ぶ:"
 
-#: spyderlib/widgets/findreplace.py:89
-msgid "Whole words"
-msgstr "単語全体"
+#: spyder/plugins/maininterpreter.py:71
+msgid "Default (i.e. the same as Spyder's)"
+msgstr "デフォルト(=Spyderと同じ)"
 
-#: spyderlib/widgets/findreplace.py:95
-msgid "Highlight matches"
-msgstr "一致箇所を強調"
+#: spyder/plugins/maininterpreter.py:74
+msgid "Use the following Python interpreter:"
+msgstr "以下のPythonインタープリターを使う"
 
-#: spyderlib/widgets/findreplace.py:109
-msgid "Replace with:"
-msgstr "以下で置換:"
+#: spyder/plugins/maininterpreter.py:77
+msgid "Executables"
+msgstr "実行可能ファイル"
 
-#: spyderlib/widgets/findreplace.py:111
-msgid "Replace string"
-msgstr "置換文字列"
+#: spyder/plugins/maininterpreter.py:94
+msgid "User Module Reloader (UMR)"
+msgstr "モジュールリローダーを使用(UMR)"
 
-#: spyderlib/widgets/findreplace.py:114
-msgid "Replace/find"
-msgstr "置換/検索"
+#: spyder/plugins/maininterpreter.py:95
+#, fuzzy
+msgid ""
+"UMR forces Python to reload modules which were imported when executing a "
+"file in a Python or IPython console with the <i>runfile</i> function."
+msgstr ""
+"外部コンソールで'runfile'機能を使うスクリプトを実行する時、\n"
+"UMRはモジュール再読み込みを強制します。"
 
-#: spyderlib/widgets/findreplace.py:121
-msgid "Replace all"
-msgstr "全て置換"
+#: spyder/plugins/maininterpreter.py:100
+msgid "Enable UMR"
+msgstr "UMRを有効化"
 
-#: spyderlib/widgets/formlayout.py:209 spyderlib/plugins/configdialog.py:612
-msgid "Italic"
-msgstr "イタリック"
+#: spyder/plugins/maininterpreter.py:101
+#, fuzzy
+msgid ""
+"This option will enable the User Module Reloader (UMR) in Python/IPython "
+"consoles. UMR forces Python to reload deeply modules during import when "
+"running a Python script using the Spyder's builtin function <b>runfile</b>."
+"<br><br><b>1.</b> UMR may require to restart the console in which it will be "
+"called (otherwise only newly imported modules will be reloaded when "
+"executing files).<br><br><b>2.</b> If errors occur when re-running a PyQt-"
+"based program, please check that the Qt objects are properly destroyed (e.g. "
+"you may have to use the attribute <b>Qt.WA_DeleteOnClose</b> on your main "
+"window, using the <b>setAttribute</b> method)"
+msgstr ""
+"このオプションはPython/IPython コンソールでユーザーモジュールリローダー (UMR)"
+"を有効化します。UMRはSpyderの組み込み関数<b>runfile</b>を使うPythonスクリプト"
+"を実行する場合インポート時にモジュールの再読み込みを強制します。<br><br><b>1."
+"</b> UMRは実行するコンソールの再起動を必要とする場合が有ります(あるいはスクリ"
+"プト実行時に新しくインポートされたモジュールのみが再読み込みされます)。"
+"<br><br><b>2.</b> PyQtを使ったプログラムの再実行時にエラーが発生した場合、Qt"
+"オブジェクトが適切に破棄されているか確認してください。(例: <b>setAttribute</"
+"b>メソッドを使ってアトリビュート<b>Qt.WA_DeleteOnClose</b> をメインウインドウ"
+"に適用するなど)"
 
-#: spyderlib/widgets/formlayout.py:214 spyderlib/plugins/configdialog.py:609
-msgid "Bold"
-msgstr "ボールド"
+#: spyder/plugins/maininterpreter.py:117
+msgid "Show reloaded modules list"
+msgstr "再読込されたモジュールのリストを表示"
 
-#: spyderlib/widgets/status.py:23
-msgid "CPU and memory usage info in the status bar"
-msgstr "CPUとメモリの使用状況をステータスバーに表示"
+#: spyder/plugins/maininterpreter.py:118
+msgid "Please note that these changes will be applied only to new consoles"
+msgstr "これらの変更は新規コンソールのみに適用されることに注意してください"
 
-#: spyderlib/widgets/status.py:92
-msgid "Memory:"
-msgstr "メモリ:"
+#: spyder/plugins/maininterpreter.py:122
+msgid "Set UMR excluded (not reloaded) modules"
+msgstr "UMRから排除される(=再読込されない)モジュールを設定"
 
-#: spyderlib/widgets/status.py:93
+#: spyder/plugins/maininterpreter.py:168
 msgid ""
-"Memory usage status: requires the `psutil` (>=v0.3) library on non-Windows "
-"platforms"
+"You selected a <b>Python %d</b> interpreter for the console but Spyder is "
+"running on <b>Python %d</b>!.<br><br>Although this is possible, we recommend "
+"you to install and run Spyder directly with your selected interpreter, to "
+"avoid seeing false warnings and errors due to the incompatible syntax "
+"between these two Python versions."
 msgstr ""
-"メモリ使用状況の表示には非Windows環境では`psutil` (>=v0.3) が必要になります"
+"コンソール用に<b>Python %d</b>インタープリターが選択されましたがSpyder上では"
+"<b>Python %d</b>が実行されています!<br><br>この選択は可能ですが、Pythonバー"
+"ジョン間での構文非互換性による偽の警告/エラーを避けるため、Spyder上でも選択し"
+"たバージョンのインタープリターをインストール・実行することが推奨されます。"
 
-#: spyderlib/widgets/status.py:105
-msgid "CPU:"
-msgstr "CPU:"
+#: spyder/plugins/maininterpreter.py:178 spyder/plugins/maininterpreter.py:191
+#: spyder/plugins/maininterpreter.py:195
+msgid "UMR"
+msgstr "UMR"
 
-#: spyderlib/widgets/status.py:106
-msgid "CPU usage status: requires the `psutil` (>=v0.3) library"
+#: spyder/plugins/maininterpreter.py:179
+msgid "Set the list of excluded modules as this: <i>numpy, scipy</i>"
 msgstr ""
-"CPU使用状況の表示には非Windows環境では`psutil` (>=v0.3) が必要になります"
-
-#: spyderlib/widgets/status.py:128
-msgid "Permissions:"
-msgstr "権限:"
 
-#: spyderlib/widgets/status.py:142
-msgid "End-of-lines:"
-msgstr "改行:"
-
-#: spyderlib/widgets/status.py:156
-msgid "Encoding:"
-msgstr "エンコード"
+#: spyder/plugins/maininterpreter.py:192
+msgid ""
+"The following modules are not installed on your machine:\n"
+"%s"
+msgstr ""
+"以下のモジュールがコンピュータにインストールされていません:\n"
+"%s"
 
-#: spyderlib/widgets/status.py:169
-msgid "Line:"
-msgstr "行:"
+#: spyder/plugins/maininterpreter.py:196
+msgid ""
+"Please note that these changes will be applied only to new Python/IPython "
+"consoles"
+msgstr ""
+"これらの変更は新規Python/IPythonコンソールにのみ適用されることに注意してくだ"
+"さい"
 
-#: spyderlib/widgets/status.py:173
-msgid "Column:"
-msgstr "列:"
+#: spyder/plugins/onlinehelp.py:70
+msgid "Online help"
+msgstr "オンラインヘルプ"
 
-#: spyderlib/widgets/browser.py:131
-msgid "Home"
-msgstr "ホーム"
+#: spyder/plugins/outlineexplorer.py:49 spyder/widgets/editortools.py:195
+msgid "Outline"
+msgstr "アウトライン"
 
-#: spyderlib/widgets/browser.py:166
-msgid "Find text"
-msgstr "テキスト検索"
+#: spyder/plugins/projects.py:76 spyder/widgets/projects/explorer.py:111
+#: spyder/widgets/projects/explorer.py:125
+msgid "Project explorer"
+msgstr "プロジェクトエクスプローラー"
 
-#: spyderlib/widgets/browser.py:184
-msgid "Address:"
-msgstr "アドレス:"
+#: spyder/plugins/projects.py:88
+#, fuzzy
+msgid "New Project..."
+msgstr "新規プロジェクト..."
 
-#: spyderlib/widgets/browser.py:220
-msgid "Unable to load page"
-msgstr "ページをロードできません"
+#: spyder/plugins/projects.py:91
+#, fuzzy
+msgid "Open Project..."
+msgstr "プロジェクトを開く"
 
-#: spyderlib/plugins/configdialog.py:139
-msgid "Reset to defaults"
-msgstr "デフォルト設定へ戻す"
+#: spyder/plugins/projects.py:94
+#, fuzzy
+msgid "Close Project"
+msgstr "プロジェクトを閉じる"
 
-#: spyderlib/plugins/configdialog.py:151
-msgid "Preferences"
+#: spyder/plugins/projects.py:100
+#, fuzzy
+msgid "Project Preferences"
 msgstr "設定"
 
-#: spyderlib/plugins/configdialog.py:487
-msgid "Invalid directory path"
-msgstr "不正なディレクトリパス"
+#: spyder/plugins/projects.py:102
+#, fuzzy
+msgid "Recent Projects"
+msgstr "関係するプロジェクト"
 
-#: spyderlib/plugins/configdialog.py:517
-msgid "Invalid file path"
-msgstr "不正なファイルパス"
+#: spyder/plugins/projects.py:234
+msgid "Open project"
+msgstr "プロジェクトを開く"
 
-#: spyderlib/plugins/configdialog.py:520 spyderlib/plugins/configdialog.py:537
-msgid "Select file"
-msgstr "ファイル選択"
+#: spyder/plugins/projects.py:239
+#, fuzzy
+msgid "<b>%s</b> is not a Spyder project!"
+msgstr "存在するSpyderプロジェクト"
+
+#: spyder/plugins/runconfig.py:29
+msgid "Execute in current Python or IPython console"
+msgstr "現在のPython/IPythonコンソールで実行"
 
-#: spyderlib/plugins/configdialog.py:536
-msgid "All files (*)"
-msgstr "全てのファイル (*)"
+#: spyder/plugins/runconfig.py:30
+msgid "Execute in a new dedicated Python console"
+msgstr "Pythonに特化した新規コンソールで実行"
 
-#: spyderlib/plugins/configdialog.py:666
-msgid "Font: "
-msgstr "フォント:"
+#: spyder/plugins/runconfig.py:31
+msgid "Execute in an external System terminal"
+msgstr "外部システムターミナルで実行"
 
-#: spyderlib/plugins/configdialog.py:672
-msgid "Size: "
-msgstr "サイズ:"
+#: spyder/plugins/runconfig.py:41
+msgid "Always show %s on a first file run"
+msgstr "ファイルの先頭に %s を常に表示"
 
-#: spyderlib/plugins/configdialog.py:691
-msgid "Font style"
-msgstr "フォントスタイル"
+#: spyder/plugins/runconfig.py:160 spyder/plugins/runconfig.py:474
+msgid "General settings"
+msgstr "一般設定"
 
-#: spyderlib/plugins/configdialog.py:751
-msgid "Spyder needs to restart to change the following setting:"
-msgstr "Spyderは以下の設定を適用するために再起動が必要となります:"
+#: spyder/plugins/runconfig.py:163 spyder/plugins/runconfig.py:209
+msgid "Command line options:"
+msgstr "コマンドラインオプション:"
 
-#: spyderlib/plugins/configdialog.py:754
-msgid "Spyder needs to restart to change the following settings:"
-msgstr "Spyderは以下の設定を適用するために再起動が必要となります:"
+#: spyder/plugins/runconfig.py:169
+msgid "Working directory:"
+msgstr "作業ディレクトリ:"
 
-#: spyderlib/plugins/configdialog.py:756
-msgid "Do you wish to restart now?"
-msgstr "直ちに再起動しますか?"
+#: spyder/plugins/runconfig.py:181 spyder/plugins/runconfig.py:492
+msgid "Enter debugging mode when errors appear during execution"
+msgstr "実行中にエラーが発生した場合デバッグモードに入る"
 
-#: spyderlib/plugins/configdialog.py:762
-msgid "Information"
-msgstr "情報"
+#: spyder/plugins/runconfig.py:197 spyder/plugins/runconfig.py:502
+msgid "Dedicated Python console"
+msgstr "Dedicated Pythonコンソール"
 
-#: spyderlib/plugins/configdialog.py:777 spyderlib/plugins/configdialog.py:784
-msgid "General"
-msgstr "一般"
+#: spyder/plugins/runconfig.py:201 spyder/plugins/runconfig.py:504
+msgid "Interact with the Python console after execution"
+msgstr "実行後Pythonコンソールと相互作用する"
 
-#: spyderlib/plugins/configdialog.py:787
-msgid "Language"
-msgstr "言語"
+#: spyder/plugins/runconfig.py:205
+msgid "Show warning when killing running process"
+msgstr "実行中プロセスが殺された場合には警告を表示"
 
-#: spyderlib/plugins/configdialog.py:790
-msgid "Use a single instance"
-msgstr "単一インスタンスを使用"
+#: spyder/plugins/runconfig.py:214
+msgid "<b>-u</b> is added to the other options you set here"
+msgstr "ここで設定した以外に、<b>-u</b> がオプションに追加されました。"
 
-#: spyderlib/plugins/configdialog.py:792
-msgid ""
-"Set this to open external<br> Python files in an already running instance "
-"(Requires a restart)"
-msgstr ""
-"外部Pythonファイルを実行中の<br> インスタンスで開くためにこれをセット (再起動"
-"が必要)"
+#: spyder/plugins/runconfig.py:224
+msgid "this dialog"
+msgstr "このダイアログ"
 
-#: spyderlib/plugins/configdialog.py:795
-msgid "Prompt when exiting"
-msgstr "終了時に確認する"
+#: spyder/plugins/runconfig.py:283
+msgid "Run configuration"
+msgstr "設定を実行"
 
-#: spyderlib/plugins/configdialog.py:796
-msgid "Pop up internal console when internal errors appear"
-msgstr "内部エラー発生時に内部コンソールをポップアップさせる"
+#: spyder/plugins/runconfig.py:284
+msgid "The following working directory is not valid:<br><b>%s</b>"
+msgstr "以下の作業ディレクトリは不正です:<br><b>%s</b>"
 
-#: spyderlib/plugins/configdialog.py:816 spyderlib/plugins/editor.py:105
-#: spyderlib/plugins/ipythonconsole.py:158
-#: spyderlib/plugins/externalconsole.py:66
-msgid "Interface"
-msgstr "インターフェイス"
+#: spyder/plugins/runconfig.py:362
+msgid "Run settings for %s"
+msgstr "%s の設定を実行"
 
-#: spyderlib/plugins/configdialog.py:824
-msgid "Qt windows style"
-msgstr "Qt windowスタイル"
+#: spyder/plugins/runconfig.py:394
+msgid "Select a run configuration:"
+msgstr "実行する設定を選択"
 
-#: spyderlib/plugins/configdialog.py:830
-msgid "Icon theme"
-msgstr "アイコンテーマ"
+#: spyder/plugins/runconfig.py:423 spyder/plugins/runconfig.py:448
+msgid "Run Settings"
+msgstr "設定を実行"
 
-#: spyderlib/plugins/configdialog.py:834
-msgid "Vertical title bars in panes"
-msgstr "ペインのタイトルバーを縦にする"
+#: spyder/plugins/runconfig.py:450
+msgid ""
+"The following are the default <i>%s</i>. These options may be overriden "
+"using the <b>%s</b> dialog box (see the <b>%s</b> menu)"
+msgstr ""
+"以下はデフォルトです <i>%s</i>。 これらのオプションは <b>%s</b> ダイアログ"
+"ボックスで上書き可能です (see the <b>%s</b> メニュー)"
 
-#: spyderlib/plugins/configdialog.py:836
-msgid "Vertical tabs in panes"
-msgstr "ペインのタブを縦にする"
+#: spyder/plugins/runconfig.py:476
+msgid "Default working directory is:"
+msgstr "デフォルト作業ディレクトリは:"
 
-#: spyderlib/plugins/configdialog.py:838
-msgid "Animated toolbars and panes"
-msgstr "ツールバーとペインをアニメーションさせる"
+#: spyder/plugins/runconfig.py:478
+msgid "the script directory"
+msgstr "スクリプトディレクトリ"
 
-#: spyderlib/plugins/configdialog.py:840
-msgid "Tear off menus"
-msgstr "メニューを切り離す"
+#: spyder/plugins/runconfig.py:481 spyder/plugins/workingdirectory.py:57
+msgid "the following directory:"
+msgstr "以下のディレクトリ:"
 
-#: spyderlib/plugins/configdialog.py:841
-msgid "Set this to detach any<br> menu from the main window"
-msgstr "メインウインドウから<br>メニューを切り離すために設定する"
+#: spyder/plugins/runconfig.py:507
+msgid "Show warning when killing running processes"
+msgstr "実行中のプロセスが殺された場合警告を表示"
 
-#: spyderlib/plugins/configdialog.py:843
-msgid "Custom margin for panes:"
-msgstr "ペインのマージン調整"
+#: spyder/plugins/runconfig.py:516
+msgid "Run Settings dialog"
+msgstr "設定ダイアログを実行"
 
-#: spyderlib/plugins/configdialog.py:873
-msgid "Status bar"
-msgstr "ステータスバー"
+#: spyder/plugins/shortcuts.py:137
+msgid ""
+"Press the new shortcut and select 'Ok': \n"
+"(Press 'Tab' once to switch focus between the shortcut entry \n"
+"and the buttons below it)"
+msgstr ""
+"新しショートカットを押し、 'Ok'を選択してください: \n"
+"(ショートカットエントリ間やボタン間のフォーカス移動には\n"
+"'Tab'を押してください)"
 
-#: spyderlib/plugins/configdialog.py:874
-msgid "Show status bar"
-msgstr "ステータスバーを表示"
+#: spyder/plugins/shortcuts.py:140
+msgid "Current shortcut:"
+msgstr "現在のショートカット:"
 
-#: spyderlib/plugins/configdialog.py:876
-msgid "Show memory usage every"
-msgstr "メモリ使用状況を以下の間隔で更新"
+#: spyder/plugins/shortcuts.py:142
+msgid "New shortcut:"
+msgstr "新規ショートカット:"
 
-#: spyderlib/plugins/configdialog.py:885
-msgid "Show CPU usage every"
-msgstr "CPU使用状況を以下の間隔で更新"
+#: spyder/plugins/shortcuts.py:155
+msgid "Shortcut: {0}"
+msgstr "ショートカット: {0}"
 
-#: spyderlib/plugins/configdialog.py:920
-msgid "Plain text font"
-msgstr "プレーンテキスト"
+#: spyder/plugins/shortcuts.py:276
+msgid "Please introduce a different shortcut"
+msgstr "異なるショートカットを設定してください"
 
-#: spyderlib/plugins/configdialog.py:926
-msgid "Rich text font"
-msgstr "リッチテキスト"
+#: spyder/plugins/shortcuts.py:313
+msgid "The new shorcut conflicts with:"
+msgstr "新しいショートカットは以下と競合しています:"
 
-#: spyderlib/plugins/configdialog.py:929
-msgid "Fonts"
-msgstr "フォント"
+#: spyder/plugins/shortcuts.py:324
+msgid ""
+"A compound sequence can have {break} a maximum of 4 subsequences.{break}"
+msgstr "複合シーケンスは{break} 最大4個のサブシーケンス{break}を持てます。"
 
-#: spyderlib/plugins/configdialog.py:943
-msgid "Appearance"
-msgstr "外見"
+#: spyder/plugins/shortcuts.py:329
+msgid "Invalid key entered"
+msgstr "不正なキー入力"
 
-#: spyderlib/plugins/configdialog.py:945
-#: spyderlib/plugins/ipythonconsole.py:465
-msgid "Advanced Settings"
-msgstr "詳細設定"
+#: spyder/plugins/shortcuts.py:531
+msgid "Context"
+msgstr "コンテキスト"
 
-#: spyderlib/plugins/configdialog.py:981
-msgid "Syntax coloring"
-msgstr "構文強調の配色"
+#: spyder/plugins/shortcuts.py:533
+#: spyder/widgets/variableexplorer/collectionseditor.py:118
+msgid "Name"
+msgstr "名前"
 
-#: spyderlib/plugins/configdialog.py:993
-msgid ""
-"Here you can select the color scheme used in the Editor and all other Spyder "
-"plugins.<br><br>You can also edit the color schemes provided by Spyder or "
-"create your own ones by using the options provided below.<br>"
-msgstr ""
-"エディタ及びその他全Spyderプラグインで利用する色スキームを選択できます。"
-"<br><br>以下のオプションにより定義済みの色スキームの編集及び独自色スキーム作"
-"成が実行できます。<br>"
+#: spyder/plugins/shortcuts.py:535
+msgid "Shortcut"
+msgstr "ショートカット"
 
-#: spyderlib/plugins/configdialog.py:998
-msgid "Edit selected"
-msgstr "選択を編集"
+#: spyder/plugins/shortcuts.py:537
+msgid "Score"
+msgstr "スコア"
 
-#: spyderlib/plugins/configdialog.py:999
-msgid "Create new scheme"
-msgstr "新しいスキームを作成"
+#: spyder/plugins/shortcuts.py:697
+msgid "Conflicts"
+msgstr "競合"
 
-#: spyderlib/plugins/configdialog.py:1003
-msgid "Reset"
-msgstr "リセット"
+#: spyder/plugins/shortcuts.py:698
+msgid "The following conflicts have been detected:"
+msgstr "以下の競合が検知されました:"
 
-#: spyderlib/plugins/configdialog.py:1010
-msgid "Scheme:"
-msgstr "スキーム:"
+#: spyder/plugins/shortcuts.py:783
+msgid "Keyboard shortcuts"
+msgstr "キーボード・ショートカット"
 
-#: spyderlib/plugins/configdialog.py:1041
-msgid "Manage color schemes"
-msgstr "色スキームのマネージ"
+#: spyder/plugins/shortcuts.py:791
+msgid "Search: "
+msgstr "検索:"
 
-#: spyderlib/plugins/configdialog.py:1230
-msgid "Are you sure you want to delete this scheme?"
-msgstr "本当にこのスキームを削除しますか?"
+#: spyder/plugins/shortcuts.py:792
+msgid "Reset to default values"
+msgstr "デフォルト値に戻す"
 
-#: spyderlib/plugins/configdialog.py:1347
-msgid "Text"
-msgstr "テキスト"
+#: spyder/plugins/variableexplorer.py:26
+msgid "Autorefresh"
+msgstr "自動リフレッシュ"
 
-#: spyderlib/plugins/configdialog.py:1349
-msgid "Highlight"
-msgstr "強調"
+#: spyder/plugins/variableexplorer.py:27
+msgid "Enable autorefresh"
+msgstr "自動リフレッシュを有効化"
 
-#: spyderlib/plugins/configdialog.py:1351
-msgid "Background"
-msgstr "背景"
+#: spyder/plugins/variableexplorer.py:29
+msgid "Refresh interval: "
+msgstr "リフレッシュ間隔:"
 
-#: spyderlib/plugins/configdialog.py:1355
-msgid "Scheme name:"
-msgstr "スキーム名:"
+#: spyder/plugins/variableexplorer.py:33
+msgid "Filter"
+msgstr "フィルター"
 
-#: spyderlib/plugins/configdialog.py:1362
-msgid "Color scheme editor"
-msgstr "色スキームエディタ"
+#: spyder/plugins/variableexplorer.py:35
+#: spyder/widgets/variableexplorer/namespacebrowser.py:229
+msgid "Exclude private references"
+msgstr "privateな参照を除外"
 
-#: spyderlib/plugins/editor.py:102
-msgid "Edit template for new modules"
-msgstr "新規モジュール用テンプレートの編集"
+#: spyder/plugins/variableexplorer.py:36
+#: spyder/widgets/variableexplorer/namespacebrowser.py:244
+msgid "Exclude capitalized references"
+msgstr "大文字で始まる参照を除外"
 
-#: spyderlib/plugins/editor.py:107
-msgid "Sort files according to full path"
-msgstr "フルパスでファイルをソート"
+#: spyder/plugins/variableexplorer.py:37
+#: spyder/widgets/variableexplorer/namespacebrowser.py:237
+msgid "Exclude all-uppercase references"
+msgstr "名前が全て大文字の参照を除外"
 
-#: spyderlib/plugins/editor.py:109
-msgid "Show tab bar"
-msgstr "タブバーを表示"
+#: spyder/plugins/variableexplorer.py:38
+#: spyder/widgets/variableexplorer/namespacebrowser.py:252
+msgid "Exclude unsupported data types"
+msgstr "非サポートのデータ型を除外"
 
-#: spyderlib/plugins/editor.py:116 spyderlib/plugins/editor.py:187
-#: spyderlib/plugins/help.py:161 spyderlib/plugins/ipythonconsole.py:202
-#: spyderlib/plugins/history.py:41 spyderlib/plugins/externalconsole.py:80
-#: spyderlib/plugins/externalconsole.py:123
-msgid "Source code"
-msgstr "ソースコード"
+#: spyder/plugins/variableexplorer.py:44
+#: spyder/widgets/variableexplorer/collectionseditor.py:675
+msgid "Truncate values"
+msgstr "値を切り捨て"
 
-#: spyderlib/plugins/editor.py:117
-msgid "Show line numbers"
-msgstr "行番号を表示"
+#: spyder/plugins/variableexplorer.py:46
+#: spyder/widgets/variableexplorer/collectionseditor.py:679
+msgid "Show arrays min/max"
+msgstr "配列の最小/最大を表示"
 
-#: spyderlib/plugins/editor.py:118 spyderlib/plugins/editor.py:931
-msgid "Show blank spaces"
-msgstr "空白スペースを表示"
+#: spyder/plugins/variableexplorer.py:48
+msgid "Edit data in the remote process"
+msgstr "リモートプロセスのデータを編集する"
 
-#: spyderlib/plugins/editor.py:119
-msgid "Show vertical line after"
-msgstr "縦線を以下の後に表示"
+#: spyder/plugins/variableexplorer.py:49
+msgid ""
+"Editors are opened in the remote process for NumPy arrays, PIL images, "
+"lists, tuples and dictionaries.\n"
+"This avoids transfering large amount of data between the remote process and "
+"Spyder (through the socket)."
+msgstr ""
+"エディタはリモートプロセスで開かれています(NumPy配列、PILイメージ、リストタプ"
+"ル及び辞書型のため)。\n"
+"これによりリモートプロセスとSpyder間のsokectによる膨大なデータ転送を避けるこ"
+"とができます。"
 
-#: spyderlib/plugins/editor.py:120
-msgid "characters"
-msgstr "文字"
+#: spyder/plugins/variableexplorer.py:185
+msgid "Variable explorer"
+msgstr "変数エクスプローラー"
 
-#: spyderlib/plugins/editor.py:125
-msgid "Highlight current line"
-msgstr "現在行を強調"
+#: spyder/plugins/workingdirectory.py:38
+msgid ""
+"The <b>global working directory</b> is the working directory for newly "
+"opened <i>consoles</i> (Python/IPython consoles and terminals), for the "
+"<i>file explorer</i>, for the <i>find in files</i> plugin and for new files "
+"created in the <i>editor</i>."
+msgstr ""
+"<b>グローバル作業ディレクトリ</b> は<i>ファイルエクスプローラー</i>、<i>ファ"
+"イル検索</i>プラグイン、<i>コンソール</i>(Python/IPython コンソールとターミナ"
+"ル) を新しく開いた場合、<i>エディタ</i>で新規ファイルを開いた場合の作業ディレ"
+"クトリです。 "
+
+#: spyder/plugins/workingdirectory.py:47
+msgid "At startup, the global working directory is:"
+msgstr "スタートアップ時のグローバル作業ディレクトリは:"
 
-#: spyderlib/plugins/editor.py:127
-msgid "Highlight current cell"
-msgstr "現在セルを強調"
+#: spyder/plugins/workingdirectory.py:51
+msgid "the same as in last session"
+msgstr "最後のセッションと同じ"
 
-#: spyderlib/plugins/editor.py:129
-msgid "Highlight occurrences after"
-msgstr "以下の事象を強調"
+#: spyder/plugins/workingdirectory.py:53
+msgid "At startup, Spyder will restore the global directory from last session"
+msgstr ""
+"Spyderはスタートアップ時に最後のセッションからグローバル作業ディレクトリを復"
+"元します"
 
-#: spyderlib/plugins/editor.py:137 spyderlib/plugins/help.py:162
-#: spyderlib/plugins/help.py:364 spyderlib/plugins/console.py:162
-#: spyderlib/plugins/history.py:42 spyderlib/plugins/history.py:154
-#: spyderlib/plugins/externalconsole.py:85
-msgid "Wrap lines"
-msgstr "行の折り返し"
+#: spyder/plugins/workingdirectory.py:59
+msgid "At startup, the global working directory will be the specified path"
+msgstr "グローバル作業ディレクトリはスタートアップ時にパスにより決定されます"
 
-#: spyderlib/plugins/editor.py:157
-msgid "Save all files before running script"
-msgstr "スクリプトを実行前に保存"
+#: spyder/plugins/workingdirectory.py:71
+msgid "Files are opened from:"
+msgstr "ファイルは以下から開かれています:"
 
-#: spyderlib/plugins/editor.py:160
-msgid "Run selection"
-msgstr "選択を実行"
+#: spyder/plugins/workingdirectory.py:75 spyder/plugins/workingdirectory.py:88
+msgid "the current file directory"
+msgstr "現在ファイルのディレクトリ"
 
-#: spyderlib/plugins/editor.py:161
-msgid "Maintain focus in the Editor after running cells or selections"
-msgstr "エディタ内で実行後、選択後もセルのフォーカスを維持する"
+#: spyder/plugins/workingdirectory.py:79 spyder/plugins/workingdirectory.py:92
+msgid "the global working directory"
+msgstr "グローバル作業ディレクトリ"
 
-#: spyderlib/plugins/editor.py:164 spyderlib/plugins/externalconsole.py:329
-msgid "Introspection"
-msgstr "イントロスペクション"
+#: spyder/plugins/workingdirectory.py:84
+msgid "Files are created in:"
+msgstr "ファイルは以下で作成されています:"
 
-#: spyderlib/plugins/editor.py:167 spyderlib/plugins/console.py:169
-#: spyderlib/plugins/externalconsole.py:124
-msgid "Automatic code completion"
-msgstr "自動コード補完"
+#: spyder/plugins/workingdirectory.py:98
+msgid "Change to file base directory"
+msgstr "ファイルの基本ディレクトリに変更"
 
-#: spyderlib/plugins/editor.py:169 spyderlib/plugins/externalconsole.py:126
-msgid "Case sensitive code completion"
-msgstr "コード補完で大文字/小文字を区別"
+#: spyder/plugins/workingdirectory.py:100
+msgid "When opening a file"
+msgstr "ファイルを開いた時"
 
-#: spyderlib/plugins/editor.py:171 spyderlib/plugins/console.py:173
-#: spyderlib/plugins/externalconsole.py:128
-msgid "Enter key selects completion"
-msgstr "Enterキーで補完候補を選択"
+#: spyder/plugins/workingdirectory.py:102
+msgid "When saving a file"
+msgstr "ファイルを保存する時"
 
-#: spyderlib/plugins/editor.py:173 spyderlib/plugins/ipythonconsole.py:168
-#: spyderlib/plugins/console.py:165 spyderlib/plugins/externalconsole.py:130
-msgid "Display balloon tips"
-msgstr "バルーンチップを表示"
+#: spyder/plugins/workingdirectory.py:172
+msgid "Back"
+msgstr "戻る"
 
-#: spyderlib/plugins/editor.py:174
-msgid "Link to object definition"
-msgstr "オブジェクトの定義にリンク"
+#: spyder/plugins/workingdirectory.py:180 spyder/widgets/explorer.py:1079
+#: spyder/widgets/variableexplorer/importwizard.py:529
+msgid "Next"
+msgstr "次"
 
-#: spyderlib/plugins/editor.py:176
+#: spyder/plugins/workingdirectory.py:191
 msgid ""
-"If this option is enabled, clicking on an object\n"
-"name (left-click + Ctrl key) will go this object\n"
-"definition (if resolved)."
+"This is the working directory for newly\n"
+"opened consoles (Python/IPython consoles and\n"
+"terminals), for the file explorer, for the\n"
+"find in files plugin and for new files\n"
+"created in the editor"
 msgstr ""
-"このオプションを有効にした場合、オブジェクト名の上で\n"
-"クリック(left-click + Ctrl key) するとオブジェクトの定義へ\n"
-"(定義位置が解決できていれば)移動する。"
+"これは、ファイルエクスプローラー、\n"
+"ファイル検索プラグイン、新規コンソール\n"
+"(Python/IPythonコンソール及びターミナル)\n"
+"及びエディタで作成した新規ファイルの\n"
+"作業ディレクトリです。"
 
-#: spyderlib/plugins/editor.py:180
-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 ""
-"<b>警告:</b><br>パイソンモジュール <i>rope</i> がこのコンピューターにインス"
-"トールされていません: 呼び出し情報の表示、コード補完及びgo-to-definition機能"
-"は利用できません。"
+#: spyder/plugins/workingdirectory.py:219
+msgid "Browse a working directory"
+msgstr "作業ディレクトリを表示"
 
-#: spyderlib/plugins/editor.py:188
-msgid "Automatic insertion of parentheses, braces and brackets"
-msgstr "括弧、中括弧、大かっこを自動的に挿入"
+#: spyder/plugins/workingdirectory.py:226
+msgid "Change to parent directory"
+msgstr "親ディレクトリへ移動"
 
-#: spyderlib/plugins/editor.py:191
-msgid "Automatic insertion of closing quotes"
-msgstr "引用符を自動的に閉じる"
+#: spyder/plugins/workingdirectory.py:233
+msgid "Global working directory"
+msgstr "グローバル作業ディレクトリ"
 
-#: spyderlib/plugins/editor.py:193
-msgid "Automatic insertion of colons after 'for', 'if', 'def', etc"
-msgstr "'for', 'if', 'def'等の後にコロンを自動挿入する"
+#: spyder/utils/codeanalysis.py:91
+msgid "Real-time code analysis on the Editor"
+msgstr "エディタ上でのリアルタイムコード分析"
 
-#: spyderlib/plugins/editor.py:196
-msgid "Automatic indentation after 'else', 'elif', etc."
-msgstr "'else'や'elif'の後を自動的にインデントする"
+#: spyder/utils/codeanalysis.py:95
+msgid "Real-time code style analysis on the Editor"
+msgstr "エディタ上でのリアルタイムコードスタイル分析"
 
-#: spyderlib/plugins/editor.py:198
-msgid "Indentation characters: "
-msgstr "インデント文字:"
+#: spyder/utils/environ.py:101
+msgid ""
+"Module <b>pywin32 was not found</b>.<br>Please restart this Windows "
+"<i>session</i> (not the computer) for changes to take effect."
+msgstr ""
+"モジュール <b>pywin32 は見つかりませんでした</b>。<br>変更を反映させるには(コ"
+"ンピュータではなく)このWindows<i>セッション</i> を再起動して。"
 
-#: spyderlib/plugins/editor.py:199
-msgid "2 spaces"
-msgstr "空白2個"
+#: spyder/utils/environ.py:114
+msgid ""
+"If you accept changes, this will modify the current user environment "
+"variables directly <b>in Windows registry</b>. Use it with precautions, at "
+"your own risks.<br><br>Note that for changes to take effect, you will need "
+"to restart the parent process of this application (simply restart Spyder if "
+"you have executed it from a Windows shortcut, otherwise restart any "
+"application from which you may have executed it, like <i>Python(x,y) Home</"
+"i> for example)"
+msgstr ""
+"変更を受諾すると <b>Windowsレジストリ内の</b>現在のユーザー環境変数が直接修正"
+"されます。 各自のリスクで注意深く使用すること。<br><br>変更が効果を及ぼすには"
+"このアプリケーションの親プロセスを再起動する必要があります。(Windowsショート"
+"カットから実行している場合単にspyderを再起動すれば良い。そうでなければ例えば"
+"<i>Python(x,y) Home</i>のようにSpyderを実行しているアプリケーションを全て再起"
+"動する)"
 
-#: spyderlib/plugins/editor.py:200
-msgid "3 spaces"
-msgstr "空白3個"
+#: spyder/utils/help/sphinxify.py:217 spyder/utils/help/sphinxify.py:227
+msgid ""
+"It was not possible to generate rich text help for this object.</br>Please "
+"see it in plain text."
+msgstr ""
+"このオブジェクトに対してリッチテキストのヘルプを生成できませんでした。</br>プ"
+"レーンテキストを参照してください。"
 
-#: spyderlib/plugins/editor.py:201
-msgid "4 spaces"
-msgstr "空白4個"
+#: spyder/utils/introspection/manager.py:33
+#: spyder/utils/introspection/manager.py:38
+msgid "Editor's code completion, go-to-definition and help"
+msgstr "エディタのコード補完、go-to-definition及びヘルプ"
 
-#: spyderlib/plugins/editor.py:202
-msgid "5 spaces"
-msgstr "空白5個"
+#: spyder/utils/iofuncs.py:408
+msgid "Supported files"
+msgstr "サポートされているファイル"
 
-#: spyderlib/plugins/editor.py:203
-msgid "6 spaces"
-msgstr "空白6個"
+#: spyder/utils/iofuncs.py:410
+msgid "All files (*.*)"
+msgstr "すべてのファイル (*.*)"
 
-#: spyderlib/plugins/editor.py:204
-msgid "7 spaces"
-msgstr "空白7個"
+#: spyder/utils/iofuncs.py:420
+msgid "Spyder data files"
+msgstr "Spyderデータファイル"
 
-#: spyderlib/plugins/editor.py:205
-msgid "8 spaces"
-msgstr "空白8個"
+#: spyder/utils/iofuncs.py:422
+#: spyder/widgets/variableexplorer/collectionseditor.py:1029
+msgid "NumPy arrays"
+msgstr "NumPy配列"
 
-#: spyderlib/plugins/editor.py:206
-msgid "Tabulations"
-msgstr "一覧表"
+#: spyder/utils/iofuncs.py:423
+msgid "NumPy zip arrays"
+msgstr "NumPy zip配列"
 
-#: spyderlib/plugins/editor.py:207
-msgid "Tab stop width:"
-msgstr "タブ幅:"
+#: spyder/utils/iofuncs.py:424
+msgid "Matlab files"
+msgstr "Matlabファイル"
 
-#: spyderlib/plugins/editor.py:207
-msgid "pixels"
-msgstr "ピクセル"
+#: spyder/utils/iofuncs.py:425
+msgid "CSV text files"
+msgstr "CSVテキストファイル"
 
-#: spyderlib/plugins/editor.py:209
-msgid "Tab always indent"
-msgstr "常にインデントにタブを使う"
+#: spyder/utils/iofuncs.py:427
+msgid "JPEG images"
+msgstr "JPEG画像"
 
-#: spyderlib/plugins/editor.py:211
-msgid ""
-"If enabled, pressing Tab will always indent,\n"
-"even when the cursor is not at the beginning\n"
-"of a line (when this option is enabled, code\n"
-"completion may be triggered using the alternate\n"
-"shortcut: Ctrl+Space)"
-msgstr ""
-"これを有効にすると、タブキーを押すとカーソルが\n"
-"行頭になくても常にインデントされる。\n"
-"(このオプションを有効化した場合、コード補完\n"
-"のトリガーは別のショートカット\n"
-"Ctrl+Spaceに変更される)"
+#: spyder/utils/iofuncs.py:428
+msgid "PNG images"
+msgstr "PNG画像"
 
-#: spyderlib/plugins/editor.py:216
-msgid "Intelligent backspace"
-msgstr "インテリジェントなバックスペース"
+#: spyder/utils/iofuncs.py:429
+msgid "GIF images"
+msgstr "GIF画像"
 
-#: spyderlib/plugins/editor.py:218
-msgid "Automatically remove trailing spaces when saving files"
-msgstr "ファイル保存時に後続スペースを削除する"
+#: spyder/utils/iofuncs.py:430
+msgid "TIFF images"
+msgstr "TIFF画像"
 
-#: spyderlib/plugins/editor.py:222
-msgid "Analysis"
-msgstr "分析"
+#: spyder/utils/iofuncs.py:431 spyder/utils/iofuncs.py:432
+msgid "Pickle files"
+msgstr "Pickleファイル"
 
-#: spyderlib/plugins/editor.py:224
-msgid "<i>(Refer to the {} page)</i>"
-msgstr "<i>( {} ページ参照)</i>"
+#: spyder/utils/iofuncs.py:433
+msgid "JSON files"
+msgstr "JSONファイル"
 
-#: spyderlib/plugins/editor.py:228
-msgid "Real-time code analysis"
-msgstr "リアルタイムコード分析"
+#: spyder/utils/iofuncs.py:452 spyder/utils/iofuncs.py:459
+msgid "<b>Unsupported file type '%s'</b>"
+msgstr "<b>非サポートファイルタイプ '%s'</b>"
 
-#: spyderlib/plugins/editor.py:230
-msgid ""
-"<p>If enabled, Python source code will be analyzed using pyflakes, lines "
-"containing errors or warnings will be highlighted.</p><p><u>Note</u>: add "
-"<b>analysis:ignore</b> in a comment to ignore code analysis warnings.</p>"
-msgstr ""
-"<p>有効にした場合Pythonソースコードはpyflakesで分析され、エラーや警告のある行"
-"は強調表示されます。</p><p><u>注</u>: <b>analysis:ignore</b> をコメントで追加"
-"すると警告は無視されます。</p>"
+#: spyder/utils/programs.py:286
+msgid "It was not possible to run this file in an external terminal"
+msgstr "このファイルを外部ターミナルで実行できませんでした"
 
-#: spyderlib/plugins/editor.py:238
-#, python-format
-msgid "Code analysis requires pyflakes %s+"
-msgstr "コード分析にはpyflakes %s+ が必要です"
+#: spyder/utils/syntaxhighlighters.py:33
+msgid "Syntax highlighting for Matlab, Julia and other file types"
+msgstr "Matbal、Julia及びたのファイルタイプの構文強調"
 
-#: spyderlib/plugins/editor.py:240
-msgid "Real-time code style analysis"
-msgstr "リアルタイムコードスタイル分析"
+#: spyder/utils/syntaxhighlighters.py:42
+msgid "Background:"
+msgstr "バックグラウンド:"
 
-#: spyderlib/plugins/editor.py:242
-msgid ""
-"<p>If enabled, Python source code will be analyzedusing pep8, lines that are "
-"not following PEP8 style guide will be highlighted.</p><p><u>Note</u>: add "
-"<b>analysis:ignore</b> in a comment to ignore style analysis warnings.</p>"
-msgstr ""
-"<p>有効にした場合、Pythonソースコードはpep8を使って分析されます。PEP8スタイル"
-"ガイドに適合していない行は強調表示されます。</p><p><u>中</u>: 警告を抑制する"
-"には、<b>analysis:ignore</b> をコメント内に追加してください。</p>"
+#: spyder/utils/syntaxhighlighters.py:43
+#: spyder/widgets/sourcecode/codeeditor.py:106
+msgid "Current line:"
+msgstr "現在行:"
 
-#: spyderlib/plugins/editor.py:249
-msgid "Code annotations (TODO, FIXME, XXX, HINT, TIP, @todo)"
-msgstr "コード注釈(TODO, FIXME, XXX, HINT, TIP, @todo)"
+#: spyder/utils/syntaxhighlighters.py:44
+msgid "Current cell:"
+msgstr "現在セル:"
 
-#: spyderlib/plugins/editor.py:252
-msgid "Perform analysis when saving file and every"
-msgstr "コード分析をファイル保存時と以下の間隔で実施"
+#: spyder/utils/syntaxhighlighters.py:45
+msgid "Occurrence:"
+msgstr "事象:"
 
-#: spyderlib/plugins/editor.py:256
-msgid "Perform analysis only when saving file"
-msgstr "コード分析をファイル保存時のみ実施"
+#: spyder/utils/syntaxhighlighters.py:46
+msgid "Link:"
+msgstr "リンク:"
 
-#: spyderlib/plugins/editor.py:315
-msgid "End-of-line characters"
-msgstr "改行コード"
+#: spyder/utils/syntaxhighlighters.py:47
+msgid "Side areas:"
+msgstr "サイドエリア:"
 
-#: spyderlib/plugins/editor.py:316
-msgid ""
-"When opening a text file containing mixed end-of-line characters (this may "
-"raise syntax errors in the consoles on Windows platforms), Spyder may fix "
-"the file automatically."
-msgstr ""
-"複数種の改行コードを含むテキストファイル(Windows環境ではコンソールで文法エ"
-"ラーを起こす可能性があります)を開く場合、Spyderは自動的にこれを修正します。"
+#: spyder/utils/syntaxhighlighters.py:48
+msgid "Matched <br>parens:"
+msgstr "閉じた<br>括弧:"
 
-#: spyderlib/plugins/editor.py:322
-msgid "Fix automatically and show warning message box"
-msgstr "自動的に修正し、警告をメッセージボックスで表示する"
+#: spyder/utils/syntaxhighlighters.py:49
+msgid "Unmatched <br>parens:"
+msgstr "閉じていない <br>括弧:"
 
-#: spyderlib/plugins/editor.py:333 spyderlib/plugins/ipythonconsole.py:459
-#: spyderlib/plugins/variableexplorer.py:41
-#: spyderlib/plugins/externalconsole.py:327
-msgid "Display"
-msgstr "表示"
+#: spyder/utils/syntaxhighlighters.py:50
+msgid "Normal text:"
+msgstr "通常テキスト:"
 
-#: spyderlib/plugins/editor.py:335
-msgid "Code Introspection/Analysis"
-msgstr "コード イントロスペクション/分析"
+#: spyder/utils/syntaxhighlighters.py:51
+msgid "Keyword:"
+msgstr "キーワード:"
 
-#: spyderlib/plugins/editor.py:338 spyderlib/plugins/externalconsole.py:331
-msgid "Advanced settings"
-msgstr "詳細設定"
+#: spyder/utils/syntaxhighlighters.py:52
+msgid "Builtin:"
+msgstr "組み込み:"
 
-#: spyderlib/plugins/editor.py:621
-msgid "Show/hide project explorer"
-msgstr "プロジェクトエクスプローラーの表示/隠す"
+#: spyder/utils/syntaxhighlighters.py:53
+msgid "Definition:"
+msgstr "定義:"
 
-#: spyderlib/plugins/editor.py:629
-msgid "&New file..."
-msgstr "新規ファイル(&N)..."
+#: spyder/utils/syntaxhighlighters.py:54
+msgid "Comment:"
+msgstr "コメント:"
 
-#: spyderlib/plugins/editor.py:637
-msgid "&Open..."
-msgstr "開く(&O)..."
+#: spyder/utils/syntaxhighlighters.py:55
+msgid "String:"
+msgstr "文字列:"
 
-#: spyderlib/plugins/editor.py:638 spyderlib/plugins/editor.py:1683
-#: spyderlib/plugins/workingdirectory.py:69
-msgid "Open file"
-msgstr "ファイルを開く"
+#: spyder/utils/syntaxhighlighters.py:56
+msgid "Number:"
+msgstr "数字:"
 
-#: spyderlib/plugins/editor.py:647
-msgid "Fast switch between files"
-msgstr "フィルを高速で切り替え"
+#: spyder/utils/syntaxhighlighters.py:57
+msgid "Instance:"
+msgstr "インスタンス:"
 
-#: spyderlib/plugins/editor.py:652
-msgid "&Revert"
-msgstr "復帰(&R)"
+#: spyder/widgets/arraybuilder.py:179
+msgid ""
+"\n"
+"           <b>Numpy Array/Matrix Helper</b><br>\n"
+"           Type an array in Matlab    : <code>[1 2;3 4]</code><br>\n"
+"           or Spyder simplified syntax : <code>1 2;3 4</code>\n"
+"           <br><br>\n"
+"           Hit 'Enter' for array or 'Ctrl+Enter' for matrix.\n"
+"           <br><br>\n"
+"           <b>Hint:</b><br>\n"
+"           Use two spaces or two tabs to generate a ';'.\n"
+"           "
+msgstr ""
+"\n"
+"           <b>Numpy 配列/行列 ヘルパー        </b><br>\n"
+"           以下の形式で入力 Matlab形式  : <code>[1 2;3 4]</code><br>\n"
+"                             あるいはSpyder構文 : <code>1 2;3 4</code>\n"
+"           <br><br>\n"
+"           配列入力には'Enter'を、行列入力には 'Ctrl+Enter'を使う。\n"
+"           <br><br>\n"
+"           <b>ヒント:</b><br>\n"
+"           空白2つあるいはタブ2つは';'入力になる。\n"
+"           "
 
-#: spyderlib/plugins/editor.py:653
-msgid "Revert file from disk"
-msgstr "ディスクからファイルを復帰"
+#: spyder/widgets/arraybuilder.py:190
+msgid ""
+"\n"
+"           <b>Numpy Array/Matrix Helper</b><br>\n"
+"           Enter an array in the table. <br>\n"
+"           Use Tab to move between cells.\n"
+"           <br><br>\n"
+"           Hit 'Enter' for array or 'Ctrl+Enter' for matrix.\n"
+"           <br><br>\n"
+"           <b>Hint:</b><br>\n"
+"           Use two tabs at the end of a row to move to the next row.\n"
+"           "
+msgstr ""
+"\n"
+"           <b>Numpy 配列/行列 ヘルパー</b><br>\n"
+"           テーブルに配列を入力してください。 <br>\n"
+"           セル間の移動にはタブを使います。\n"
+"           <br><br>\n"
+"           配列入力には'Enter'を、行列入力には 'Ctrl+Enter'を。\n"
+"           <br><br>\n"
+"           <b>ヒント:</b><br>\n"
+"           行末で次の行へ移動するにはタブを2回入力すれば良い。\n"
+"           "
 
-#: spyderlib/plugins/editor.py:656
-msgid "&Save"
-msgstr "保存(&S)"
+#: spyder/widgets/arraybuilder.py:365
+msgid "Array dimensions not valid"
+msgstr "配列の次元が不正"
 
-#: spyderlib/plugins/editor.py:664
-msgid "Sav&e all"
-msgstr "全て保存(&E)"
+#: spyder/widgets/browser.py:54 spyder/widgets/sourcecode/codeeditor.py:2518
+msgid "Zoom out"
+msgstr "ズームアウト"
 
-#: spyderlib/plugins/editor.py:665
-msgid "Save all files"
-msgstr "すべてのファイルを保存"
+#: spyder/widgets/browser.py:57 spyder/widgets/sourcecode/codeeditor.py:2514
+msgid "Zoom in"
+msgstr "ズームイン"
 
-#: spyderlib/plugins/editor.py:673
-msgid "Save &as..."
-msgstr "形式を指定して保存(&A)"
+#: spyder/widgets/browser.py:162
+msgid "Home"
+msgstr "ホーム"
 
-#: spyderlib/plugins/editor.py:674
-msgid "Save current file as..."
-msgstr "現在のファイルを形式を指定して保存..."
+#: spyder/widgets/browser.py:198
+msgid "Find text"
+msgstr "テキスト検索"
 
-#: spyderlib/plugins/editor.py:678 spyderlib/plugins/editor.py:679
-msgid "Print preview..."
-msgstr "プレビューを表示..."
+#: spyder/widgets/browser.py:216
+msgid "Address:"
+msgstr "アドレス:"
 
-#: spyderlib/plugins/editor.py:680
-msgid "&Print..."
-msgstr "印刷(&P)"
+#: spyder/widgets/browser.py:252
+msgid "Unable to load page"
+msgstr "ページをロードできません"
 
-#: spyderlib/plugins/editor.py:681
-msgid "Print current file..."
-msgstr "現在のファイルを印刷..."
+#: spyder/widgets/comboboxes.py:165
+msgid "Press enter to validate this entry"
+msgstr "入力を検証するにはエンターキーを押してください"
 
-#: spyderlib/plugins/editor.py:684
-msgid "&Close"
-msgstr "閉じる(&C)"
+#: spyder/widgets/comboboxes.py:166
+msgid "This entry is incorrect"
+msgstr "この入力は不正です"
 
-#: spyderlib/plugins/editor.py:685
-msgid "Close current file"
-msgstr "現在のファイルを閉じる"
+#: spyder/widgets/comboboxes.py:209
+msgid "Press enter to validate this path"
+msgstr "パスを検証するにはエンターキーを押してください"
 
-#: spyderlib/plugins/editor.py:688
-msgid "C&lose all"
-msgstr "すべて閉じる(&C)"
+#: spyder/widgets/dependencies.py:63
+msgid " Required "
+msgstr "必須"
 
-#: spyderlib/plugins/editor.py:689
-msgid "Close all opened files"
-msgstr "開いているファイルを全て閉じる"
+#: spyder/widgets/dependencies.py:63
+msgid "Module"
+msgstr "モジュール"
 
-#: spyderlib/plugins/editor.py:696
-msgid "Set/Clear breakpoint"
-msgstr "ブレークポイントのセット/クリア"
+#: spyder/widgets/dependencies.py:64
+msgid " Installed "
+msgstr "インストール済み"
 
-#: spyderlib/plugins/editor.py:703
-msgid "Set/Edit conditional breakpoint"
-msgstr "条件付きブレークポイントをセット/編集"
+#: spyder/widgets/dependencies.py:64
+msgid "Provided features"
+msgstr "利用できる機能"
 
-#: spyderlib/plugins/editor.py:710
-msgid "Clear breakpoints in all files"
-msgstr "全てのファイルのブレークポイントをクリア"
+#: spyder/widgets/dependencies.py:134
+msgid "Dependencies"
+msgstr "依存性"
 
-#: spyderlib/plugins/editor.py:712
-msgid "Breakpoints"
-msgstr "ブレークポイント"
+#: spyder/widgets/dependencies.py:141
+msgid ""
+"Spyder depends on several Python modules to provide the right functionality "
+"for all its panes. The table below shows the required and installed versions "
+"(if any) of all of them.<br><br><b>Note</b>: You can safely use Spyder "
+"without the following modules installed: <b>%s</b> and <b>%s</b>"
+msgstr ""
+"全てのペインが正しく機能するために、SpyderはいくつかのPythonモジュールに依存"
+"しています。 下記のテーブルには必要なモジュールとインストール済みモジュールの"
+"バージョンを示します。<br><br><b>注</b>: 以下のモジュールはインストールしなく"
+"てもSpyderを安全に使用できます。: <b>%s</b> and <b>%s</b>"
 
-#: spyderlib/plugins/editor.py:716
-msgid "Debug with winpdb"
-msgstr "winpdbでデバッグ"
+#: spyder/widgets/dependencies.py:154
+msgid "Copy to clipboard"
+msgstr "クリップボードにコピー"
 
-#: spyderlib/plugins/editor.py:724
-msgid "Debug file"
-msgstr "ファイルをデバッグ開始"
+#: spyder/widgets/editor.py:348
+msgid "Copy path to clipboard"
+msgstr "パスをクリップボードにコピー"
 
-#: spyderlib/plugins/editor.py:728
-msgid "Step"
-msgstr "Step"
+#: spyder/widgets/editor.py:352
+msgid "Close all to the right"
+msgstr "全体を右側へ閉じる"
 
-#: spyderlib/plugins/editor.py:729
-msgid "Run current line"
-msgstr "現在行を実行"
+#: spyder/widgets/editor.py:354
+msgid "Close all but this"
+msgstr "他を閉じる"
 
-#: spyderlib/plugins/editor.py:735
-msgid "Continue"
-msgstr "Continue"
+#: spyder/widgets/editor.py:957
+msgid "Temporary file"
+msgstr "一時ファイル"
 
-#: spyderlib/plugins/editor.py:736
-msgid "Continue execution until next breakpoint"
-msgstr "次のブレークポイントまで実行を続ける"
+#: spyder/widgets/editor.py:1052
+msgid "New window"
+msgstr "新しいウインドウ"
 
-#: spyderlib/plugins/editor.py:743
-msgid "Step Into"
-msgstr "Step Into"
+#: spyder/widgets/editor.py:1053
+msgid "Create a new editor window"
+msgstr "新しいエディタウインドウを作成する"
 
-#: spyderlib/plugins/editor.py:744
-msgid "Step into function or method of current line"
-msgstr "現在行のメソッド/関数までStep inする"
+#: spyder/widgets/editor.py:1056
+msgid "Split vertically"
+msgstr "縦に分割する"
 
-#: spyderlib/plugins/editor.py:751
-msgid "Step Return"
-msgstr "Step Return"
+#: spyder/widgets/editor.py:1058
+msgid "Split vertically this editor window"
+msgstr "このエディタウインドウを縦に分割する"
 
-#: spyderlib/plugins/editor.py:752
-msgid "Run until current function or method returns"
-msgstr "現在行のメソッド/関数までRunする"
+#: spyder/widgets/editor.py:1060
+msgid "Split horizontally"
+msgstr "横に分割"
 
-#: spyderlib/plugins/editor.py:759
-msgid "Exit"
-msgstr "Exit"
+#: spyder/widgets/editor.py:1062
+msgid "Split horizontally this editor window"
+msgstr "このエディタウインドウを横に分割"
 
-#: spyderlib/plugins/editor.py:760
-msgid "Exit Debug"
-msgstr "デバッグを終了する"
+#: spyder/widgets/editor.py:1064
+msgid "Close this panel"
+msgstr "このパネルを閉じる"
 
-#: spyderlib/plugins/editor.py:771
-msgid "Debugging control"
-msgstr "デバッグコントロール"
+#: spyder/widgets/editor.py:1221
+msgid "<b>%s</b> has been modified.<br>Do you want to save changes?"
+msgstr "<b>%s</b> は変更されています。<br>変更を保存しますか?"
 
-#: spyderlib/plugins/editor.py:776
-msgid "Run file"
-msgstr "ファイルを実行"
+#: spyder/widgets/editor.py:1283
+msgid "Save"
+msgstr "保存"
 
-#: spyderlib/plugins/editor.py:781
-msgid "&Configure..."
-msgstr "設定(&C)..."
+#: spyder/widgets/editor.py:1284
+msgid "<b>Unable to save script '%s'</b><br><br>Error message:<br>%s"
+msgstr "<b>スクリプト '%s' を保存できません</b><br><br>エラーメッセージ:<br>%s"
 
-#: spyderlib/plugins/editor.py:791
-msgid "Re-run &last script"
-msgstr "最後のスクリプトを再度実行する(&L)"
+#: spyder/widgets/editor.py:1518
+msgid ""
+"<b>%s</b> is unavailable (this file may have been removed, moved or renamed "
+"outside Spyder).<br>Do you want to close it?"
+msgstr ""
+"<b>%s</b> は利用できません (このファイルはSpypder外で削除、移動あるいは名前変"
+"更されています)。<br>閉じますか?"
 
-#: spyderlib/plugins/editor.py:793
-msgid "Run again last file"
-msgstr "最後のファイルを再度実行する"
+#: spyder/widgets/editor.py:1538
+msgid ""
+"<b>%s</b> has been modified outside Spyder.<br>Do you want to reload it and "
+"lose all your changes?"
+msgstr ""
+"<b>%s</b> はSpyderの外で変更されています。<br>変更を破棄して再読込しますか?"
 
-#: spyderlib/plugins/editor.py:803
-msgid "Run selection or current line"
-msgstr "選択範囲あるいは現在行を実行"
+#: spyder/widgets/editor.py:1634
+msgid ""
+"All changes to <b>%s</b> will be lost.<br>Do you want to revert file from "
+"disk?"
+msgstr ""
+"<b>%s</b> へのすべての変更は失われます。<br>ファイルをディスクから復帰させま"
+"すか?"
+
+#: spyder/widgets/editor.py:1774
+msgid "Loading %s..."
+msgstr "%s をロードしています..."
 
-#: spyderlib/plugins/editor.py:819
-#, python-format
+#: spyder/widgets/editor.py:1784
 msgid ""
-"Run current cell (Ctrl+Enter)\n"
-"[Use #%% to create cells]"
+"<b>%s</b> contains mixed end-of-line characters.<br>Spyder will fix this "
+"automatically."
 msgstr ""
-"現在のセルを実行する (Ctrl+Enter)\n"
-"[Use #%% to create cells]"
+"<b>%s</b> は複数種の改行コードを含んでいます。<br>Spyderは自動的に修正しま"
+"す。"
 
-#: spyderlib/plugins/editor.py:827
-msgid "Run current cell and go to the next one (Shift+Enter)"
-msgstr "現在のセルを実行し次のセルへ(Shift+Enter)"
+#: spyder/widgets/editor.py:2166
+msgid "Close window"
+msgstr "ウインドウを閉じる"
 
-#: spyderlib/plugins/editor.py:833
-msgid "Show todo list"
-msgstr "TODOリストを表示"
+#: spyder/widgets/editor.py:2168
+msgid "Close this window"
+msgstr "このウインドウを閉じる"
 
-#: spyderlib/plugins/editor.py:834
-msgid "Show TODO/FIXME/XXX/HINT/TIP/@todo comments list"
-msgstr "TODO/FIXME/XXX/HINT/TIP/@todo リストを表示"
+#: spyder/widgets/editortools.py:94 spyder/widgets/editortools.py:130
+msgid "Line %s"
+msgstr " %s 行"
+
+#: spyder/widgets/editortools.py:99
+msgid "Class defined at line %s"
+msgstr "%s 行で定義されているクラス"
+
+#: spyder/widgets/editortools.py:107
+msgid "Method defined at line %s"
+msgstr "%s 行で定義されているメソッド"
+
+#: spyder/widgets/editortools.py:117
+msgid "Function defined at line %s"
+msgstr "%s 行で定義されている関数"
 
-#: spyderlib/plugins/editor.py:841
-msgid "Show warning/error list"
-msgstr "警告/エラー リストを表示"
+#: spyder/widgets/editortools.py:149
+msgid "Cell starts at line %s"
+msgstr "%s 行から始まるセル"
 
-#: spyderlib/plugins/editor.py:842
-msgid "Show code analysis warnings/errors"
-msgstr "コード分析の 警告/エラー を表示"
+#: spyder/widgets/editortools.py:202 spyder/widgets/editortools.py:539
+msgid "Go to cursor position"
+msgstr "カーソル位置へ移動"
 
-#: spyderlib/plugins/editor.py:848
-msgid "Previous warning/error"
-msgstr "前の 警告/表示"
+#: spyder/widgets/editortools.py:205
+msgid "Show absolute path"
+msgstr "絶対パスを表示"
 
-#: spyderlib/plugins/editor.py:849
-msgid "Go to previous code analysis warning/error"
-msgstr "前のコード分析 警告/エラー へ移動"
+#: spyder/widgets/editortools.py:208 spyder/widgets/explorer.py:208
+msgid "Show all files"
+msgstr "全てのファイルを表示"
 
-#: spyderlib/plugins/editor.py:852
-msgid "Next warning/error"
-msgstr "次の 警告/エラー"
+#: spyder/widgets/editortools.py:211
+msgid "Show special comments"
+msgstr "特別なコメントを表示"
 
-#: spyderlib/plugins/editor.py:853
-msgid "Go to next code analysis warning/error"
-msgstr "次のコード分析 警告/エラー へ移動"
+#: spyder/widgets/explorer.py:204
+msgid "Edit filename filters..."
+msgstr "ファイル名フィルターを編集..."
 
-#: spyderlib/plugins/editor.py:857
-msgid "Last edit location"
-msgstr "最後に編集した箇所"
+#: spyder/widgets/explorer.py:218
+msgid "Edit filename filters"
+msgstr "ファイル名フィルターを編集"
 
-#: spyderlib/plugins/editor.py:858
-msgid "Go to last edit location"
-msgstr "最後に編集した箇所へ移動"
+#: spyder/widgets/explorer.py:219
+msgid "Name filters:"
+msgstr "フィルター:"
 
-#: spyderlib/plugins/editor.py:864
-msgid "Previous cursor position"
-msgstr "前のカーソル位置"
+#: spyder/widgets/explorer.py:238
+msgid "File..."
+msgstr "ファイル..."
 
-#: spyderlib/plugins/editor.py:865
-msgid "Go to previous cursor position"
-msgstr "前のカーソル位置へ移動"
+#: spyder/widgets/explorer.py:242
+msgid "Module..."
+msgstr "モジュール..."
 
-#: spyderlib/plugins/editor.py:871
-msgid "Next cursor position"
-msgstr "次のカーソル位置"
+#: spyder/widgets/explorer.py:246
+msgid "Folder..."
+msgstr "フォルダー..."
 
-#: spyderlib/plugins/editor.py:872
-msgid "Go to next cursor position"
-msgstr "次のカーソル位置へ移動"
+#: spyder/widgets/explorer.py:250
+msgid "Package..."
+msgstr "パッケージ..."
 
-#: spyderlib/plugins/editor.py:880
-msgid "Comment current line or selection"
-msgstr "現在行あるいは選択範囲をコメントアウト"
+#: spyder/widgets/explorer.py:271
+#: spyder/widgets/variableexplorer/collectionseditor.py:650
+msgid "Edit"
+msgstr "編集"
 
-#: spyderlib/plugins/editor.py:884
-msgid "Add &block comment"
-msgstr "ブロックコメントを追加(&B)"
+#: spyder/widgets/explorer.py:273
+msgid "Move..."
+msgstr "移動..."
 
-#: spyderlib/plugins/editor.py:885
-msgid "Add block comment around current line or selection"
-msgstr "ブロックコメントを現在行あるいは選択範囲の周りに追加"
+#: spyder/widgets/explorer.py:276
+msgid "Delete..."
+msgstr "削除..."
 
-#: spyderlib/plugins/editor.py:891
-msgid "R&emove block comment"
-msgstr "ブロックコメントを削除(&R)"
+#: spyder/widgets/explorer.py:279
+msgid "Rename..."
+msgstr "リネーム..."
 
-#: spyderlib/plugins/editor.py:892
-msgid "Remove comment block around current line or selection"
-msgstr "現在行あるいは選択範囲の周りのブロックコメントを削除"
+#: spyder/widgets/explorer.py:282
+msgid "Open"
+msgstr "開く"
 
-#: spyderlib/plugins/editor.py:903
-msgid "Indent"
-msgstr "インデント"
+#: spyder/widgets/explorer.py:283 spyder/widgets/sourcecode/codeeditor.py:2490
+msgid "Convert to Python script"
+msgstr "Pythonスクリプトへ変換"
 
-#: spyderlib/plugins/editor.py:904
-msgid "Indent current line or selection"
-msgstr "現在行あるいは選択範囲をインデント"
+#: spyder/widgets/explorer.py:317
+msgid "Commit"
+msgstr "コミット"
 
-#: spyderlib/plugins/editor.py:907
-msgid "Unindent"
-msgstr "インデント解除"
+#: spyder/widgets/explorer.py:320
+msgid "Browse repository"
+msgstr "レポジトリを表示"
 
-#: spyderlib/plugins/editor.py:908
-msgid "Unindent current line or selection"
-msgstr "現在行あるいは選択範囲をインデント解除"
+#: spyder/widgets/explorer.py:331
+msgid "Open command prompt here"
+msgstr "コマンドプロンプトをここで開く"
 
-#: spyderlib/plugins/editor.py:913
-msgid "Carriage return and line feed (Windows)"
-msgstr "CR+LF (Windows)"
+#: spyder/widgets/explorer.py:333
+msgid "Open terminal here"
+msgstr "ターミナルをここで開く"
 
-#: spyderlib/plugins/editor.py:916
-msgid "Line feed (UNIX)"
-msgstr "LF (UNIX)"
+#: spyder/widgets/explorer.py:338
+msgid "Open Python console here"
+msgstr "Pythonコンソールをここで開く"
 
-#: spyderlib/plugins/editor.py:919
-msgid "Carriage return (Mac)"
-msgstr "CR (Mac)"
+#: spyder/widgets/explorer.py:352
+msgid "New"
+msgstr "新規"
 
-#: spyderlib/plugins/editor.py:925
-msgid "Convert end-of-line characters"
-msgstr "改行コードを変換する"
+#: spyder/widgets/explorer.py:360
+msgid "Import"
+msgstr "インポート"
 
-#: spyderlib/plugins/editor.py:929
-msgid "Remove trailing spaces"
-msgstr "無駄な後続スペースを削除"
+#: spyder/widgets/explorer.py:511
+msgid "Do you really want to delete <b>%s</b>?"
+msgstr "本当に <b>%s</b> を削除しますか?"
 
-#: spyderlib/plugins/editor.py:933
-msgid "Fix indentation"
-msgstr "インデントを修正"
+#: spyder/widgets/explorer.py:529
+msgid "delete"
+msgstr "削除"
 
-#: spyderlib/plugins/editor.py:934
-msgid "Replace tab characters by space characters"
-msgstr "タブ文字を空白に置換"
+#: spyder/widgets/explorer.py:530 spyder/widgets/projects/explorer.py:147
+msgid "Project Explorer"
+msgstr "プロジェクトエクスプローラー"
 
-#: spyderlib/plugins/editor.py:937
-msgid "Go to line..."
-msgstr "行へ移動..."
+#: spyder/widgets/explorer.py:531 spyder/widgets/projects/explorer.py:148
+msgid "<b>Unable to %s <i>%s</i></b><br><br>Error message:<br>%s"
+msgstr ""
+"<b>%s が <i>%s</i> に実行できませんでした。</b><br><br>エラーメッセージ:<br>"
+"%s"
 
-#: spyderlib/plugins/editor.py:945
-msgid "Set console working directory"
-msgstr "コンソールの作業ディレクトリをセット"
+#: spyder/widgets/explorer.py:554 spyder/widgets/sourcecode/codeeditor.py:2007
+msgid "Conversion error"
+msgstr "変換エラー"
 
-#: spyderlib/plugins/editor.py:947
+#: spyder/widgets/explorer.py:555 spyder/widgets/sourcecode/codeeditor.py:2008
 msgid ""
-"Set current console (and file explorer) working directory to current script "
-"directory"
+"It was not possible to convert this notebook. The error is:\n"
+"\n"
 msgstr ""
-"コンソール(とファイルエクスプローラー)の作業ディレクトリを現在のスクリプトの"
-"ディレクトリにセット"
-
-#: spyderlib/plugins/editor.py:952
-msgid "Maximum number of recent files..."
-msgstr "「最近使用したファイル」の最大履歴数..."
+"notebookが変換できませんでした。エラー:\n"
+"\n"
 
-#: spyderlib/plugins/editor.py:955
-msgid "Clear this list"
-msgstr "このリストをクリア"
+#: spyder/widgets/explorer.py:572 spyder/widgets/explorer.py:580
+#: spyder/widgets/explorer.py:591
+#: spyder/widgets/variableexplorer/collectionseditor.py:683
+#: spyder/widgets/variableexplorer/collectionseditor.py:924
+msgid "Rename"
+msgstr "リネーム"
 
-#: spyderlib/plugins/editor.py:955
-msgid "Clear recent files list"
-msgstr "最近使用したファイルのリストをクリア"
+#: spyder/widgets/explorer.py:573
+msgid "New name:"
+msgstr "新しい名前:"
 
-#: spyderlib/plugins/editor.py:957
-msgid "Open &recent"
-msgstr "最近使用したファイル(&R)"
+#: spyder/widgets/explorer.py:581
+msgid ""
+"Do you really want to rename <b>%s</b> and overwrite the existing file <b>"
+"%s</b>?"
+msgstr ""
+"本当に <b>%s</b> をリネームし、既存ファイル <b>%s</b> を上書きしますか?"
 
-#: spyderlib/plugins/editor.py:1263
-msgid "?"
-msgstr "?"
+#: spyder/widgets/explorer.py:592
+msgid "<b>Unable to rename file <i>%s</i></b><br><br>Error message:<br>%s"
+msgstr ""
+"<b>ファイル <i>%s</i> をリネームできません</b><br><br>エラーメッセージ:<br>%s"
 
-#: spyderlib/plugins/editor.py:1490
-msgid "Spyder Editor"
-msgstr "Spyderエディタ"
+#: spyder/widgets/explorer.py:628
+msgid "<b>Unable to move <i>%s</i></b><br><br>Error message:<br>%s"
+msgstr "<b> <i>%s</i> を移動できません </b><br><br>エラーメッセージ:<br>%s"
 
-#: spyderlib/plugins/editor.py:1491
-msgid "This is a temporary script file."
-msgstr "これは一時的なスクリプトファイルです"
+#: spyder/widgets/explorer.py:646
+msgid "<b>Unable to create folder <i>%s</i></b><br><br>Error message:<br>%s"
+msgstr ""
+"<b>フォルダ <i>%s</i> を作成できません</b><br><br>エラーメッセージ:<br>%s"
 
-#: spyderlib/plugins/editor.py:1559
-msgid "untitled"
-msgstr "タイトル無し"
+#: spyder/widgets/explorer.py:659 spyder/widgets/explorer.py:693
+msgid "<b>Unable to create file <i>%s</i></b><br><br>Error message:<br>%s"
+msgstr ""
+"<b>ファイル <i>%s</i> を作成できません</b><br><br>エラーメッセージ:<br>%s"
 
-#: spyderlib/plugins/editor.py:1637
-msgid "Maximum number of recent files"
-msgstr "「最近使用したファイル」の最大履歴数"
+#: spyder/widgets/explorer.py:667
+msgid "New folder"
+msgstr "新規フォルダー"
 
-#: spyderlib/plugins/editor.py:1768
-msgid "Printing..."
-msgstr "印刷中..."
+#: spyder/widgets/explorer.py:668
+msgid "Folder name:"
+msgstr "フォルダ名:"
 
-#: spyderlib/plugins/help.py:42
-msgid "Show help for objects in the Editor and Consoles in a dedicated pane"
-msgstr "専用ペインでエディタ・コンソール中のオブジェクトのヘルプを表示する"
+#: spyder/widgets/explorer.py:673
+msgid "New package"
+msgstr "新規パッケージ"
 
-#: spyderlib/plugins/help.py:115
-msgid "Automatic connections"
-msgstr "自動接続"
+#: spyder/widgets/explorer.py:674
+msgid "Package name:"
+msgstr "パッケージ名:"
 
-#: spyderlib/plugins/help.py:116
-msgid ""
-"This pane can automatically show an object's help information after a left "
-"parenthesis is written next to it. Below you can decide to which plugin you "
-"want to connect it to turn on this feature."
-msgstr ""
-"このペインは括弧の左側が入力されるとそのオブジェクトのヘルプ情報を自動的に表"
-"示します。この機能を有効にするために接続したいプラグインを選べます。"
+#: spyder/widgets/explorer.py:714
+msgid "New module"
+msgstr "新規モジュール"
 
-#: spyderlib/plugins/help.py:128
+#: spyder/widgets/explorer.py:729
 msgid ""
-"This feature requires the Rope or Jedi libraries.\n"
-"It seems you don't have either installed."
+"For %s support, please install one of the<br/> following tools:<br/><br/>  %s"
 msgstr ""
-"この機能はRopeあるいはJediライブラリを必要とします。\n"
-"どちらもインストールされていないようです。"
-
-#: spyderlib/plugins/help.py:131
-msgid "Python Console"
-msgstr "Pythonコンソール"
-
-#: spyderlib/plugins/help.py:133
-msgid "IPython Console"
-msgstr "IPythonコンソール"
-
-#: spyderlib/plugins/help.py:145
-msgid "Additional features"
-msgstr "追加機能"
+" %s をサポートするためには以下のツールをインストールしてください。<br/> ツー"
+"ル:<br/><br/>  %s"
 
-#: spyderlib/plugins/help.py:146
-msgid "Render mathematical equations"
-msgstr "数式を描画"
+#: spyder/widgets/explorer.py:733
+msgid "<b>Unable to find external program.</b><br><br>%s"
+msgstr "<b>外部プログラムが見つかりません。</b><br><br>%s"
 
-#: spyderlib/plugins/help.py:152
-msgid "This feature requires Sphinx 1.1 or superior."
-msgstr "この機能はSphinx 1.1以上を必要とします。"
+#: spyder/widgets/explorer.py:948
+msgid "Show current directory only"
+msgstr "現在のディレクトリのみを表示"
 
-#: spyderlib/plugins/help.py:153
-#, python-format
-msgid "Sphinx %s is currently installed."
-msgstr "Sphinx %s が現在インストールされています。"
+#: spyder/widgets/explorer.py:1046
+msgid "You don't have the right permissions to open this directory"
+msgstr "このディレクトリを開く権限がありません"
 
-#: spyderlib/plugins/help.py:351
-msgid "No further documentation available"
-msgstr "これ以上のドキュメントはありません"
+#: spyder/widgets/explorer.py:1076
+#: spyder/widgets/variableexplorer/importwizard.py:525
+msgid "Previous"
+msgstr "前"
 
-#: spyderlib/plugins/help.py:384
-msgid "Source"
-msgstr "ソース"
+#: spyder/widgets/explorer.py:1082
+msgid "Parent"
+msgstr "親"
 
-#: spyderlib/plugins/help.py:413
-msgid "Plain Text"
-msgstr "プレーンテキスト"
+#: spyder/widgets/externalshell/baseshell.py:129
+msgid "Run again this program"
+msgstr "プログラムを再度実行する"
 
-#: spyderlib/plugins/help.py:417
-msgid "Show Source"
-msgstr "ソースを表示"
+#: spyder/widgets/externalshell/baseshell.py:132
+msgid "Kill"
+msgstr "殺す"
 
-#: spyderlib/plugins/help.py:421
-msgid "Rich Text"
-msgstr "リッチテキスト"
+#: spyder/widgets/externalshell/baseshell.py:134
+msgid "Kills the current process, causing it to exit immediately"
+msgstr "現在のプロセスを殺し、直ちにexit"
 
-#: spyderlib/plugins/help.py:431
-msgid "Automatic import"
-msgstr "自動インポート"
+#: spyder/widgets/externalshell/baseshell.py:206
+msgid "<span style='color: #44AA44'><b>Running...</b></span>"
+msgstr "<span style='color: #44AA44'><b>実行中...</b></span>"
 
-#: spyderlib/plugins/help.py:700
-#, python-format
-msgid ""
-"Here you can get help of any object by pressing %s in front of it, either on "
-"the Editor or the Console.%sHelp can also be shown automatically after "
-"writing a left parenthesis next to an object. You can activate this behavior "
-"in %s."
-msgstr ""
-"エディタあるいはコンソールでは %s を直前で押すことで直後のオブジェクトのヘル"
-"プが得られます。%s ヘルプはオブジェクトの隣で左括弧を入力することでも自動的に"
-"表示されます。%sでこの機能を有効化できます。"
+#: spyder/widgets/externalshell/baseshell.py:213
+msgid "Terminated."
+msgstr "終了。"
 
-#: spyderlib/plugins/help.py:706
-msgid "Preferences > Help"
-msgstr "設定 > ヘルプ"
+#: spyder/widgets/externalshell/baseshell.py:238
+#: spyder/widgets/ipythonconsole/help.py:125 spyder/widgets/mixins.py:661
+msgid "Arguments"
+msgstr "引数"
 
-#: spyderlib/plugins/help.py:713
-msgid "Usage"
-msgstr "使用法"
+#: spyder/widgets/externalshell/baseshell.py:239
+msgid "Command line arguments:"
+msgstr "コマンドライン引数:"
 
-#: spyderlib/plugins/help.py:714
-msgid "New to Spyder? Read our"
-msgstr "Spypderは初めてですか? 読んでください。"
+#: spyder/widgets/externalshell/pythonshell.py:277
+msgid "Variables"
+msgstr "変数"
 
-#: spyderlib/plugins/help.py:715
-msgid "tutorial"
-msgstr "チュートリアル"
+#: spyder/widgets/externalshell/pythonshell.py:278
+msgid "Show/hide global variables explorer"
+msgstr "変数エクスプローラの表示/隠す"
 
-#: spyderlib/plugins/help.py:722
+#: spyder/widgets/externalshell/pythonshell.py:282
+msgid "Terminate"
+msgstr "終了"
+
+#: spyder/widgets/externalshell/pythonshell.py:283
 msgid ""
-"Please consider installing Sphinx to get documentation rendered in rich text."
+"Attempts to stop the process. The process\n"
+"may not exit as a result of clicking this\n"
+"button (it is given the chance to prompt\n"
+"the user for any unsaved files, etc)."
 msgstr ""
-"ドキュメントをリッチテキストで表示するためにSphinxをインストールした方が良い"
-"でしょう。"
+"プロセスを停止させる。 このボタンを\n"
+"押しただけではプロセスはまだ停止\n"
+"しません。(未保存のファイルの扱いを\n"
+"尋ねる,etc)"
 
-#: spyderlib/plugins/help.py:895
-msgid "Unlock"
-msgstr "アンロック"
+#: spyder/widgets/externalshell/pythonshell.py:296
+msgid "Interact"
+msgstr "相互作用"
 
-#: spyderlib/plugins/help.py:895
-msgid "Lock"
-msgstr "ロック"
+#: spyder/widgets/externalshell/pythonshell.py:298
+msgid "Debug"
+msgstr "デバッグ"
 
-#: spyderlib/plugins/help.py:941
-#, python-format
-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 ""
-"以下のエラーは <b>Sphinx %s</b> を呼んだ時に発生しました。 <br>Sphinxのバー"
-"ジョンが合っていないか文字列のデコードに失敗しました。<br><br>エラーメッセー"
-"ジ:<br>%s"
+#: spyder/widgets/externalshell/pythonshell.py:300
+#: spyder/widgets/externalshell/pythonshell.py:366
+msgid "Arguments..."
+msgstr "引数..."
 
-#: spyderlib/plugins/help.py:985
-msgid "No source code available."
-msgstr "ソースコードが利用できません"
+#: spyder/widgets/externalshell/pythonshell.py:302
+msgid "Post Mortem Debug"
+msgstr "事後デバッグ"
 
-#: spyderlib/plugins/findinfiles.py:135
-msgid "&Find in files"
-msgstr "ファイル内を検索(&F)"
+#: spyder/widgets/externalshell/pythonshell.py:308
+msgid "Working directory"
+msgstr "作業ディレクトリ"
 
-#: spyderlib/plugins/findinfiles.py:138
-msgid "Search text in multiple files"
-msgstr "複数のファイルからテキストを検索"
+#: spyder/widgets/externalshell/pythonshell.py:310
+msgid "Set current working directory"
+msgstr "現在のワーキングディレクトリを設定"
 
-#: spyderlib/plugins/ipythonconsole.py:62
-msgid "Symbolic mathematics in the IPython Console"
-msgstr "IPythonコンソールでの記号数学"
+#: spyder/widgets/externalshell/pythonshell.py:312
+msgid "Environment variables"
+msgstr "環境変数"
 
-#: spyderlib/plugins/ipythonconsole.py:111
-#, python-format
-msgid ""
-"The authenticity of host <b>%s</b> can't be established. Are you sure you "
-"want to continue connecting?"
-msgstr "ホスト <b>%s</b> の信頼性が確立できません。本当に接続を続けますか?"
+#: spyder/widgets/externalshell/pythonshell.py:316
+msgid "Show sys.path contents"
+msgstr "sys.pathの中身を表示"
 
-#: spyderlib/plugins/ipythonconsole.py:123
-msgid "The authenticity of the host can't be established"
-msgstr "ホストの信頼性が確立できません"
+#: spyder/widgets/externalshell/pythonshell.py:362
+msgid "Arguments: %s"
+msgstr "引数: %s"
 
-#: spyderlib/plugins/ipythonconsole.py:130
-#, python-format
-msgid "Tunnel '%s' failed to start"
-msgstr "Tunnel '%s' は開始できませんでした"
+#: spyder/widgets/externalshell/pythonshell.py:364
+msgid "No argument"
+msgstr "引数なし"
 
-#: spyderlib/plugins/ipythonconsole.py:135
-msgid "Could not connect to remote host"
-msgstr "リモートホストへ接続できませんでした"
+#: spyder/widgets/externalshell/pythonshell.py:534
+msgid "A Python console failed to start!"
+msgstr "Pythonコンソールを開始できませんでした!"
 
-#: spyderlib/plugins/ipythonconsole.py:151
-#: spyderlib/plugins/ipythonconsole.py:691
-msgid "IPython console"
-msgstr "IPythonコンソール"
+#: spyder/widgets/externalshell/systemshell.py:106
+msgid "Process failed to start"
+msgstr "プロセスを開始できませんでした"
 
-#: spyderlib/plugins/ipythonconsole.py:159
-msgid "Display initial banner"
-msgstr "初期バナーの表示"
+#: spyder/widgets/fileswitcher.py:109
+msgid "unsaved file"
+msgstr "保存されていないファイル"
 
-#: spyderlib/plugins/ipythonconsole.py:160
+#: spyder/widgets/fileswitcher.py:230
 msgid ""
-"This option lets you hide the message shown at\n"
-"the top of the console when it's opened."
+"Press <b>Enter</b> to switch files or <b>Esc</b> to cancel.<br><br>Type to "
+"filter filenames.<br><br>Use <b>:number</b> to go to a line, e.g. "
+"<b><code>main:42</code></b><br>Use <b>@symbol_text</b> to go to a symbol, e."
+"g. <b><code>@init</code></b><br><br> Press <b>Ctrl+W</b> to close current "
+"tab.<br>"
 msgstr ""
-"このオプションによりコンソールを開いた時に表示される\n"
-"一番上のメッセージを隠すことができます。"
+"ファイルを切り替えるために <b>Enter</b> を押すか <b>Esc</b> でキャンセルして"
+"ください。.<br><br>ファイルをフィルターするために入力してください。<br><br>行"
+"移動には<b>:数字</b> を使ってください。例: <b><code>main:42</code></b><br>シ"
+"ンボルへの移動は<b>@symbol_text</b> を使ってください。例: <b><code>@init</"
+"code></b><br><br> 現在のタブを閉じるには <b>Ctrl+W</b> を押してください。<br>"
 
-#: spyderlib/plugins/ipythonconsole.py:162
-msgid "Use a pager to display additional text inside the console"
-msgstr "コンソール内で追加テキストを表示するためにページャーを使用"
+#: spyder/widgets/fileswitcher.py:508
+msgid "lines"
+msgstr "行"
 
-#: spyderlib/plugins/ipythonconsole.py:164
-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 ""
-"補完テキストや長いヘルプでコンソールを埋めたくない場合有効です。\n"
-"注: このページャーから出るには Qキーを押してください。"
+#: spyder/widgets/findinfiles.py:158
+msgid "Unexpected error: see internal console"
+msgstr "予期しないエラー: 内部コンソールを参照してください"
 
-#: spyderlib/plugins/ipythonconsole.py:169
-msgid "Ask for confirmation before closing"
-msgstr "閉じる前に確認するようにする"
+#: spyder/widgets/findinfiles.py:209 spyder/widgets/findinfiles.py:233
+#: spyder/widgets/findinfiles.py:280
+msgid "invalid regular expression"
+msgstr "無効な正規表現"
 
-#: spyderlib/plugins/ipythonconsole.py:179
-msgid "Completion Type"
-msgstr "補完タイプ"
+#: spyder/widgets/findinfiles.py:278
+msgid "permission denied errors were encountered"
+msgstr "エラーが発生しました(権限がありません)"
 
-#: spyderlib/plugins/ipythonconsole.py:180
-msgid "Decide what type of completion to use"
-msgstr "どのタイプの補完を使うか選択"
+#: spyder/widgets/findinfiles.py:315
+msgid "Search pattern"
+msgstr "パターンを検索"
 
-#: spyderlib/plugins/ipythonconsole.py:183
-msgid "Completion:"
-msgstr "補完:"
+#: spyder/widgets/findinfiles.py:318 spyder/widgets/findinfiles.py:352
+#: spyder/widgets/findinfiles.py:364 spyder/widgets/findreplace.py:81
+msgid "Regular expression"
+msgstr "正規表現"
 
-#: spyderlib/plugins/ipythonconsole.py:192
-msgid "Light background"
-msgstr "明るい背景"
+#: spyder/widgets/findinfiles.py:327
+msgid "Search"
+msgstr "検索"
 
-#: spyderlib/plugins/ipythonconsole.py:194
-msgid "Dark background"
-msgstr "暗い背景"
+#: spyder/widgets/findinfiles.py:330
+msgid "Start search"
+msgstr "検索開始"
 
-#: spyderlib/plugins/ipythonconsole.py:204
-msgid "Buffer:  "
-msgstr "バッファー:"
+#: spyder/widgets/findinfiles.py:336
+msgid "Stop search"
+msgstr "検索終了"
 
-#: spyderlib/plugins/ipythonconsole.py:204
-#: spyderlib/plugins/externalconsole.py:82
-msgid " lines"
-msgstr "行"
+#: spyder/widgets/findinfiles.py:346
+msgid "Included filenames pattern"
+msgstr "含まれるファイル名パターン"
 
-#: spyderlib/plugins/ipythonconsole.py:206
-msgid ""
-"Set the maximum number of lines of text shown in the\n"
-"console before truncation. Specifying -1 disables it\n"
-"(not recommended!)"
-msgstr ""
-"コンソール内で表示するテキストの最大行数を設定。\n"
-"-1 を設定すると無効になります\n"
-"(非推奨です!)"
+#: spyder/widgets/findinfiles.py:355
+msgid "Include:"
+msgstr "含む:"
 
-#: spyderlib/plugins/ipythonconsole.py:215
-msgid "Support for graphics (Matplotlib)"
-msgstr "画像のサポート(Matplotlib)"
+#: spyder/widgets/findinfiles.py:358
+msgid "Excluded filenames pattern"
+msgstr "除外されるファイル名パターン"
 
-#: spyderlib/plugins/ipythonconsole.py:216
-msgid "Activate support"
-msgstr "サポートを有効化"
+#: spyder/widgets/findinfiles.py:367
+msgid "Exclude:"
+msgstr "除外:"
 
-#: spyderlib/plugins/ipythonconsole.py:217
-msgid "Automatically load Pylab and NumPy modules"
-msgstr "Pylab, NumPyモジュールを自動的にロード"
+#: spyder/widgets/findinfiles.py:377
+msgid "PYTHONPATH"
+msgstr "PYTHONPATH"
 
-#: spyderlib/plugins/ipythonconsole.py:220
+#: spyder/widgets/findinfiles.py:379
 msgid ""
-"This lets you load graphics support without importing \n"
-"the commands to do plots. Useful to work with other\n"
-"plotting libraries different to Matplotlib or to develop \n"
-"GUIs with Spyder."
+"Search in all directories listed in sys.path which are outside the Python "
+"installation directory"
 msgstr ""
-"プロットコマンドをインポートすることなしに画像サポートを\n"
-"有効にします。Matplotlib以外のプロットライブラリを利用\n"
-"している場合や、SpyderでGUIを開発している場合、\n"
-"有用です。"
+"Pythonインストールディレクトリ外のsys.pathにリストアップされたディレクトリ内"
+"を検索"
 
-#: spyderlib/plugins/ipythonconsole.py:238
-msgid ""
-"This feature requires the Matplotlib library.\n"
-"It seems you don't have it installed."
-msgstr ""
-"この機能にはMatplotlibライブラリが必要です。\n"
-"Matplotlibはインストールされていないようです。"
+#: spyder/widgets/findinfiles.py:382
+msgid "Hg repository"
+msgstr "Hgレポジトリ"
 
-#: spyderlib/plugins/ipythonconsole.py:243
-msgid "Inline"
-msgstr "インライン"
+#: spyder/widgets/findinfiles.py:385
+msgid "Search in current directory hg repository"
+msgstr "カレントディレクトリのHgレポジトリを検索"
 
-#: spyderlib/plugins/ipythonconsole.py:244
-msgid "Automatic"
-msgstr "自動"
+#: spyder/widgets/findinfiles.py:386
+msgid "Here:"
+msgstr "ここ:"
 
-#: spyderlib/plugins/ipythonconsole.py:245
-msgid "Graphics backend"
-msgstr "グラフィックスのバックエンド"
+#: spyder/widgets/findinfiles.py:390
+msgid "Search recursively in this directory"
+msgstr "ディレクトリ内を再帰的に検索"
 
-#: spyderlib/plugins/ipythonconsole.py:246
-#, python-format
-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 ""
-"コンソール内でどのように画像を表示するか選んでください。よくわからなければ、"
-"コンソール内で画像を表示したい場合 <b>%s</b> を選び、別ウィンドウで(ズーム、"
-"パン等)操作したい場合は <b>%s</b> を選んでください。"
+#: spyder/widgets/findinfiles.py:395
+msgid "Browse a search directory"
+msgstr "検索ディレクトリを表示"
 
-#: spyderlib/plugins/ipythonconsole.py:266
-#: spyderlib/plugins/externalconsole.py:290
-msgid "Backend:"
-msgstr "バックエンド:"
+#: spyder/widgets/findinfiles.py:425
+msgid "Hide advanced options"
+msgstr "詳細オプションを隠す"
 
-#: spyderlib/plugins/ipythonconsole.py:268
-#: spyderlib/plugins/externalconsole.py:292
-msgid "This option will be applied the next time a console is opened."
-msgstr "このオプションは次にコンソールを開いた時に適用されます"
+#: spyder/widgets/findinfiles.py:428
+msgid "Show advanced options"
+msgstr "詳細オプションを表示"
 
-#: spyderlib/plugins/ipythonconsole.py:279
-msgid "Inline backend"
-msgstr "インラインのバックエンド"
+#: spyder/widgets/findinfiles.py:569
+msgid "Search canceled"
+msgstr "検索をキャンセル"
 
-#: spyderlib/plugins/ipythonconsole.py:280
-msgid "Decide how to render the figures created by this backend"
-msgstr "このバックエンドで生成された画像をどのように描画するか選択"
+#: spyder/widgets/findinfiles.py:573
+msgid "String not found"
+msgstr "文字列が見つかりませんでした"
 
-#: spyderlib/plugins/ipythonconsole.py:284
-msgid "Format:"
-msgstr "フォーマット:"
+#: spyder/widgets/findinfiles.py:575
+msgid "matches in"
+msgstr "一致"
 
-#: spyderlib/plugins/ipythonconsole.py:287
-msgid "Resolution:"
-msgstr "解像度:"
+#: spyder/widgets/findinfiles.py:576
+msgid "file"
+msgstr "ファイル"
 
-#: spyderlib/plugins/ipythonconsole.py:287
-msgid "dpi"
-msgstr "dpi"
+#: spyder/widgets/findinfiles.py:584
+msgid "interrupted"
+msgstr "中断"
 
-#: spyderlib/plugins/ipythonconsole.py:289
-msgid "Only used when the format is PNG. Default is 72"
-msgstr "PNGフォーマットの場合のみ使われます。デフォルトは72"
+#: spyder/widgets/findreplace.py:63
+msgid "Search string"
+msgstr "検索文字列"
 
-#: spyderlib/plugins/ipythonconsole.py:292
-msgid "Width:"
-msgstr "幅:"
+#: spyder/widgets/findreplace.py:87
+msgid "Case Sensitive"
+msgstr "大文字/小文字を区別"
 
-#: spyderlib/plugins/ipythonconsole.py:292
-#: spyderlib/plugins/ipythonconsole.py:296
-msgid "inches"
-msgstr "インチ"
+#: spyder/widgets/findreplace.py:93
+msgid "Whole words"
+msgstr "単語全体"
+
+#: spyder/widgets/findreplace.py:99
+msgid "Highlight matches"
+msgstr "一致箇所を強調"
+
+#: spyder/widgets/findreplace.py:113
+msgid "Replace with:"
+msgstr "以下で置換:"
+
+#: spyder/widgets/findreplace.py:115
+msgid "Replace string"
+msgstr "置換文字列"
 
-#: spyderlib/plugins/ipythonconsole.py:294
-msgid "Default is 6"
-msgstr "デフォルトは6です"
+#: spyder/widgets/findreplace.py:118
+msgid "Replace/find"
+msgstr "置換/検索"
 
-#: spyderlib/plugins/ipythonconsole.py:296
-msgid "Height:"
-msgstr "高さ:"
+#: spyder/widgets/findreplace.py:125
+msgid "Replace all"
+msgstr "全て置換"
 
-#: spyderlib/plugins/ipythonconsole.py:298
-msgid "Default is 4"
-msgstr "デフォルトは4です"
+#: spyder/widgets/internalshell.py:262
+msgid "Help..."
+msgstr "ヘルプ..."
 
-#: spyderlib/plugins/ipythonconsole.py:325
-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 ""
-"コンソールを開始した時にコードを実行できます。それぞれをコンマで区切ってくだ"
-"さい。例:<br><i>import os, import sys</i>"
+#: spyder/widgets/internalshell.py:279
+msgid "Shell special commands:"
+msgstr "特別なシェルコマンド:"
 
-#: spyderlib/plugins/ipythonconsole.py:331
-msgid "Lines:"
-msgstr "行:"
+#: spyder/widgets/internalshell.py:280
+msgid "Internal editor:"
+msgstr "内部エディタ"
 
-#: spyderlib/plugins/ipythonconsole.py:340
-msgid "Run a file"
-msgstr "ファイルを実行"
+#: spyder/widgets/internalshell.py:281
+msgid "External editor:"
+msgstr "外部エディタ"
 
-#: spyderlib/plugins/ipythonconsole.py:341
-msgid ""
-"You can also run a whole file at startup instead of just some lines (This is "
-"similar to have a PYTHONSTARTUP file)."
-msgstr ""
-"行の一部だけではなくファイル全体をスタート時に実行できます(PYTHONSTARTUPファ"
-"イルと類似)"
+#: spyder/widgets/internalshell.py:282
+msgid "Run script:"
+msgstr "スクリプトを実行:"
 
-#: spyderlib/plugins/ipythonconsole.py:345
-msgid "Use the following file:"
-msgstr "以下のファイルを使う:"
+#: spyder/widgets/internalshell.py:283
+msgid "Remove references:"
+msgstr "参照を削除"
 
-#: spyderlib/plugins/ipythonconsole.py:359
-msgid "Greedy completion"
-msgstr "Greedy completion"
+#: spyder/widgets/internalshell.py:284
+msgid "System commands:"
+msgstr "システムコマンド:"
 
-#: spyderlib/plugins/ipythonconsole.py:360
-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 ""
-"リスト要素、関数呼び出し結果等を変数に<i>割り当てずに</i>に<tt>Tab</tt> 補完"
-"を有効にする。<br>例えば <tt>li[0].<Tab></tt> や <tt>ins.meth().<"
-"Tab></tt> のように補完できる"
+#: spyder/widgets/internalshell.py:285
+msgid "Python help:"
+msgstr "Pythonヘルプ:"
 
-#: spyderlib/plugins/ipythonconsole.py:368
-msgid "Use the greedy completer"
-msgstr "greedy completerを利用する"
+#: spyder/widgets/internalshell.py:286
+msgid "GUI-based editor:"
+msgstr "GUIエディタ:"
 
-#: spyderlib/plugins/ipythonconsole.py:379
-msgid "Autocall"
-msgstr "Autocall"
+#: spyder/widgets/ipythonconsole/client.py:187
+msgid "An error ocurred while starting the kernel"
+msgstr "カーネルを開始中にエラーが発生しました"
 
-#: spyderlib/plugins/ipythonconsole.py:380
-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 ""
-"明示的に括弧を省略している場合でも、IPythonで呼び出し可能なオブジェクトを"
-"Autocallによって自動的に呼ぶ。 <br>例えば、<i>str 43</i> と入力すると自動的"
-"に <i>str(43)</i> となる。"
+#: spyder/widgets/ipythonconsole/client.py:218
+msgid "Restart kernel"
+msgstr "カーネルの再起動"
 
-#: spyderlib/plugins/ipythonconsole.py:387
-msgid "Smart"
-msgstr "Smart"
+#: spyder/widgets/ipythonconsole/client.py:238
+msgid "Stop the current command"
+msgstr "現在のコマンドを停止する"
 
-#: spyderlib/plugins/ipythonconsole.py:388
-msgid "Full"
-msgstr "Full"
+#: spyder/widgets/ipythonconsole/client.py:261
+msgid "Inspect current object"
+msgstr "現在のオブジェクトを調査する"
 
-#: spyderlib/plugins/ipythonconsole.py:389
-msgid "Off"
-msgstr "オフPff"
+#: spyder/widgets/ipythonconsole/client.py:266
+msgid "Clear line or block"
+msgstr "ラインやブロックをクリアする"
 
-#: spyderlib/plugins/ipythonconsole.py:391
-msgid "Autocall:  "
-msgstr "Autocall:"
+#: spyder/widgets/ipythonconsole/client.py:270
+msgid "Reset namespace"
+msgstr "名前空間をリセットする"
 
-#: spyderlib/plugins/ipythonconsole.py:392
-#, python-format
-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 ""
-"<b>%s</b> モードでは、 呼び出し可能オブジェクトに引数がない場合Autocallは適用"
-"されません。 <b>%s</b> モードでは、(引数がない場合でも)全ての呼び出し可能オブ"
-"ジェクトが自動的に呼ばれます。"
+#: spyder/widgets/ipythonconsole/client.py:273
+msgid "Clear console"
+msgstr "コンソールをクリアする"
 
-#: spyderlib/plugins/ipythonconsole.py:404
-msgid "Symbolic Mathematics"
-msgstr "記号数学"
+#: spyder/widgets/ipythonconsole/client.py:314
+msgid "Are you sure you want to restart the kernel?"
+msgstr "本当にカーネルを再起動しますか?"
 
-#: spyderlib/plugins/ipythonconsole.py:405
-msgid ""
-"Perfom symbolic operations in the console (e.g. integrals, derivatives, "
-"vector calculus, etc) and get the outputs in a beautifully printed style."
-msgstr ""
-"記号演算をコンソール内で実行し(例:積分、微分、ベクトル演算等)、整えられた印刷"
-"可能スタイルで出力する。"
+#: spyder/widgets/ipythonconsole/client.py:316
+msgid "Restart kernel?"
+msgstr "カーネルを再起動しますか?"
 
-#: spyderlib/plugins/ipythonconsole.py:410
-msgid "Use symbolic math"
-msgstr "記号演算を使う"
+#: spyder/widgets/ipythonconsole/client.py:325
+#, fuzzy
+msgid "Error restarting kernel: %s\n"
+msgstr "カーネルを開始中にエラーが発生しました"
 
-#: spyderlib/plugins/ipythonconsole.py:411
+#: spyder/widgets/ipythonconsole/client.py:329
 msgid ""
-"This option loads the Sympy library to work with.<br>Please refer to its "
-"documentation to learn how to use it."
+"<br>Restarting kernel...\n"
+"<hr><br>"
 msgstr ""
-"このオプションはSympyライブラリをロードします。<br>Sympyドキュメントを参照"
-"し、使用方法を学んでください。"
 
-#: spyderlib/plugins/ipythonconsole.py:424
-msgid ""
-"This feature requires the Sympy library.\n"
-"It seems you don't have it installed."
+#: spyder/widgets/ipythonconsole/client.py:334
+msgid "Cannot restart a kernel not started by Spyder\n"
 msgstr ""
-"この機能にはSympyライブラリが必要です。\n"
-"インストールされていないようです。"
-
-#: spyderlib/plugins/ipythonconsole.py:429
-msgid "Prompts"
-msgstr "プロンプト"
-
-#: spyderlib/plugins/ipythonconsole.py:430
-msgid "Modify how Input and Output prompts are shown in the console."
-msgstr "プロンプトの入力と出力のコンソール内での表示を変更する。"
-
-#: spyderlib/plugins/ipythonconsole.py:433
-msgid "Input prompt:"
-msgstr "入力プロンプト:"
 
-#: spyderlib/plugins/ipythonconsole.py:435
-#, python-format
-msgid ""
-"Default is<br>In [<span class=\"in-prompt-number\">%i</span>]:"
-msgstr ""
-"デフォルトは<br>In [<span class=\"in-prompt-number\">%i</span>]:"
+#: spyder/widgets/ipythonconsole/client.py:374
+msgid "Changing backend to Qt for Mayavi"
+msgstr "MayaviのバックエンドをQtに変更中"
 
-#: spyderlib/plugins/ipythonconsole.py:439
-msgid "Output prompt:"
-msgstr "出力プロンプト:"
+#: spyder/widgets/ipythonconsole/client.py:385
+msgid "Connecting to kernel..."
+msgstr "カーネルへ接続中..."
 
-#: spyderlib/plugins/ipythonconsole.py:441
-#, python-format
+#: spyder/widgets/ipythonconsole/namespacebrowser.py:76
 msgid ""
-"Default is<br>Out[<span class=\"out-prompt-number\">%i</span>]:"
+"Inspecting and setting values while debugging in IPython consoles is not "
+"supported yet by Spyder."
 msgstr ""
-"デフォルトは<br>Out[<span class=\"out-prompt-number\">%i</span>]:"
-
-#: spyderlib/plugins/ipythonconsole.py:461
-#: spyderlib/plugins/externalconsole.py:275
-msgid "Graphics"
-msgstr "グラフィックス"
 
-#: spyderlib/plugins/ipythonconsole.py:463
-#: spyderlib/plugins/workingdirectory.py:44
-msgid "Startup"
-msgstr "スタートアップ"
-
-#: spyderlib/plugins/ipythonconsole.py:477
-#: spyderlib/plugins/ipythonconsole.py:751
-msgid "Connect to an existing kernel"
-msgstr "既存のカーネルに接続"
+#: spyder/widgets/ipythonconsole/shell.py:135
+msgid "Reset IPython namespace"
+msgstr "IPythonの名前空間をリセット"
 
-#: spyderlib/plugins/ipythonconsole.py:479
+#: spyder/widgets/ipythonconsole/shell.py:136
 msgid ""
-"Please enter the connection info of the kernel you want to connect to. For "
-"that you can either select its JSON connection file using the <tt>Browse</"
-"tt> button, or write directly its id, in case it's a local kernel (for "
-"example <tt>kernel-3764.json</tt> or just <tt>3764</tt>)."
+"All user-defined variables will be removed.<br>Are you sure you want to "
+"reset the namespace?"
 msgstr ""
-"接続したいカーネルの接続情報を入力してください。 <tt>表示</tt> ボタンを押し、"
-"JSON接続ファイルを選ぶか、ローカルカーネルの場合IDを入力してください (例: "
-"<tt>kernel-3764.json</tt> あるいは <tt>3764</tt>)。"
-
-#: spyderlib/plugins/ipythonconsole.py:490
-msgid "Connection info:"
-msgstr "接続情報:"
+"全てのユーザー定義変数は削除されます。<br>本当に名前空間をリセットしますか?"
 
-#: spyderlib/plugins/ipythonconsole.py:492
-msgid "Path to connection file or kernel id"
-msgstr "接続ファイルへのパスあるいはカーネルID"
+#: spyder/widgets/onecolumntree.py:52
+msgid "Collapse all"
+msgstr "全て折りたたむ"
 
-#: spyderlib/plugins/ipythonconsole.py:494
-#: spyderlib/plugins/ipythonconsole.py:511
-msgid "Browse"
-msgstr "表示"
+#: spyder/widgets/onecolumntree.py:56
+msgid "Expand all"
+msgstr "すべて展開"
 
-#: spyderlib/plugins/ipythonconsole.py:503
-msgid "This is a remote kernel"
-msgstr "これはリモートカーネルです"
+#: spyder/widgets/onecolumntree.py:60
+msgid "Restore"
+msgstr "復元"
 
-#: spyderlib/plugins/ipythonconsole.py:507
-msgid "username at hostname:port"
-msgstr "username at hostname:port"
+#: spyder/widgets/onecolumntree.py:61
+msgid "Restore original tree layout"
+msgstr "元のツリーレイアウトを復元"
 
-#: spyderlib/plugins/ipythonconsole.py:510
-msgid "Path to ssh key file"
-msgstr "sshキーファイルへのパス"
+#: spyder/widgets/onecolumntree.py:65
+msgid "Collapse selection"
+msgstr "現在の選択を折りたたむ"
 
-#: spyderlib/plugins/ipythonconsole.py:519
-msgid "Password or ssh key passphrase"
-msgstr "パスワードあるいはsshキーのパスフレーズ"
+#: spyder/widgets/onecolumntree.py:69
+msgid "Expand selection"
+msgstr "現在の選択を展開する"
 
-#: spyderlib/plugins/ipythonconsole.py:523
-msgid "Host name"
-msgstr "ホスト名"
+#: spyder/widgets/pathmanager.py:87
+msgid "Move to top"
+msgstr "一番上へ移動"
 
-#: spyderlib/plugins/ipythonconsole.py:524
-msgid "Ssh key"
-msgstr "sshキー"
+#: spyder/widgets/pathmanager.py:93
+msgid "Move up"
+msgstr "上へ移動"
 
-#: spyderlib/plugins/ipythonconsole.py:525
-msgid "Password"
-msgstr "パスワード"
+#: spyder/widgets/pathmanager.py:99
+msgid "Move down"
+msgstr "下へ移動"
 
-#: spyderlib/plugins/ipythonconsole.py:554
-msgid "Open IPython connection file"
-msgstr "IPython接続ファイルを開く"
+#: spyder/widgets/pathmanager.py:105
+msgid "Move to bottom"
+msgstr "一番下へ移動"
 
-#: spyderlib/plugins/ipythonconsole.py:560
-msgid "Select ssh key"
-msgstr "sshキーを選択"
+#: spyder/widgets/pathmanager.py:116 spyder/widgets/pathmanager.py:231
+msgid "Add path"
+msgstr "パスを追加"
 
-#: spyderlib/plugins/ipythonconsole.py:739
-msgid "Open an &IPython console"
-msgstr "IPythonコンソールを開く(&I)"
+#: spyder/widgets/pathmanager.py:121 spyder/widgets/pathmanager.py:214
+msgid "Remove path"
+msgstr "パスを削除"
 
-#: spyderlib/plugins/ipythonconsole.py:742
-#, python-format
-msgid "Use %s+T when the console is selected to open a new one"
-msgstr "コンソールを新しく開く場合 %s+T を使う"
+#: spyder/widgets/pathmanager.py:131
+msgid "Synchronize..."
+msgstr "同期..."
 
-#: spyderlib/plugins/ipythonconsole.py:745
-msgid "Open a new console"
-msgstr "新規コンソールを開く"
+#: spyder/widgets/pathmanager.py:133
+msgid "Synchronize Spyder's path list with PYTHONPATH environment variable"
+msgstr "SpyderのパスリストをPYTHONPATH環境変数に同期させる"
 
-#: spyderlib/plugins/ipythonconsole.py:752
-msgid "Open a new IPython console connected to an existing kernel"
-msgstr "既存カーネルに接続された新規IPythonコンソールを開く"
+#: spyder/widgets/pathmanager.py:145
+msgid "Synchronize"
+msgstr "同期"
 
-#: spyderlib/plugins/ipythonconsole.py:835
-#, python-format
+#: spyder/widgets/pathmanager.py:146
 msgid ""
-"No IPython console is currently available to run <b>%s</b>.<br><br>Please "
-"open a new one and try again."
+"This will synchronize Spyder's path list with <b>PYTHONPATH</b> environment "
+"variable for current user, allowing you to run your Python modules outside "
+"Spyder without having to configure sys.path. <br>Do you want to clear "
+"contents of PYTHONPATH before adding Spyder's path list?"
 msgstr ""
-"現在<b>%s</b>実行可能なIPythonコンソールがありません。.<br><br>新規に開いて再"
-"試行してください。"
-
-#: spyderlib/plugins/ipythonconsole.py:970
-msgid ""
-"Do you want to close all other consoles connected to the same kernel as this "
-"one?"
-msgstr "同じカーネルに接続している他の全てのコンソールを閉じますか?"
+"sys.pathを変更することなくSpypder外でPythonモジュールを実行できるように、"
+"Spyderのパスはユーザーの <b>PYTHONPATH</b> 環境変数に同期されます。 "
+"<br>Spyderのパスリストを追加する前にPYTHONPATHの値をクリアしますか?"
 
-#: spyderlib/plugins/ipythonconsole.py:1052
-msgid "Connection error"
-msgstr "接続エラー"
+#: spyder/widgets/pathmanager.py:215
+msgid "Do you really want to remove selected path?"
+msgstr "本当に選択したパスを削除しますか?"
 
-#: spyderlib/plugins/ipythonconsole.py:1053
+#: spyder/widgets/pathmanager.py:232
 msgid ""
-"Could not open ssh tunnel. The error was:\n"
-"\n"
+"This directory is already included in Spyder path list.<br>Do you want to "
+"move it to the top of the list?"
 msgstr ""
-"sshトンネルを開けませんでした。エラー:\n"
-"\n"
-
-#: spyderlib/plugins/ipythonconsole.py:1090
-msgid "IPython"
-msgstr "IPython"
+"このディレクトリは既にSpyderのパスリストに含まれています。<br>リストの一番上"
+"にパスを移動させますか?"
 
-#: spyderlib/plugins/ipythonconsole.py:1091
-#, python-format
-msgid "Unable to connect to IPython <b>%s"
-msgstr "IPythonに接続できませんでした。 <b>%s"
+#: spyder/widgets/projects/configdialog.py:30
+#, fuzzy
+msgid "Project preferences"
+msgstr "レイアウト設定"
 
-#: spyderlib/plugins/ipythonconsole.py:1142
-msgid "Are you sure you want to restart the kernel?"
-msgstr "本当にカーネルを再起動しますか?"
+#: spyder/widgets/projects/configdialog.py:82
+#: spyder/widgets/projects/configdialog.py:119
+#, fuzzy
+msgid "Restore data on startup"
+msgstr "起動時に更新をチェック"
 
-#: spyderlib/plugins/ipythonconsole.py:1144
-msgid "Restart kernel?"
-msgstr "カーネルを再起動しますか?"
+#: spyder/widgets/projects/configdialog.py:84
+#: spyder/widgets/projects/configdialog.py:121
+#, fuzzy
+msgid "Save data on exit"
+msgstr "データを保存"
 
-#: spyderlib/plugins/variableexplorer.py:24
-msgid "Autorefresh"
-msgstr "自動リフレッシュ"
+#: spyder/widgets/projects/configdialog.py:86
+#: spyder/widgets/projects/configdialog.py:123
+#, fuzzy
+msgid "Save history"
+msgstr "ヒストリログを保存"
 
-#: spyderlib/plugins/variableexplorer.py:25
-msgid "Enable autorefresh"
-msgstr "自動リフレッシュを有効化"
+#: spyder/widgets/projects/configdialog.py:88
+#: spyder/widgets/projects/configdialog.py:125
+msgid "Save non project files opened"
+msgstr ""
 
-#: spyderlib/plugins/variableexplorer.py:27
-msgid "Refresh interval: "
-msgstr "リフレッシュ間隔:"
+#: spyder/widgets/projects/configdialog.py:111
+msgid "Code"
+msgstr ""
 
-#: spyderlib/plugins/variableexplorer.py:28
-msgid " ms"
-msgstr "ms"
+#: spyder/widgets/projects/configdialog.py:118
+msgid "Workspace"
+msgstr "ワークスペース"
 
-#: spyderlib/plugins/variableexplorer.py:31
-msgid "Filter"
-msgstr "フィルター"
+#: spyder/widgets/projects/configdialog.py:148
+#: spyder/widgets/projects/configdialog.py:155
+#, fuzzy
+msgid "Version control"
+msgstr "デバッグコントロール"
 
-#: spyderlib/plugins/variableexplorer.py:46
-msgid "Edit data in the remote process"
-msgstr "リモートプロセスのデータを編集する"
+#: spyder/widgets/projects/configdialog.py:156
+#, fuzzy
+msgid "Use version control"
+msgstr "デバッグコントロール"
 
-#: spyderlib/plugins/variableexplorer.py:47
-msgid ""
-"Editors are opened in the remote process for NumPy arrays, PIL images, "
-"lists, tuples and dictionaries.\n"
-"This avoids transfering large amount of data between the remote process and "
-"Spyder (through the socket)."
+#: spyder/widgets/projects/configdialog.py:161
+msgid "Version control system"
 msgstr ""
-"エディタはリモートプロセスで開かれています(NumPy配列、PILイメージ、リストタプ"
-"ル及び辞書型のため)。\n"
-"これによりリモートプロセスとSpyder間のsokectによる膨大なデータ転送を避けるこ"
-"とができます。"
-
-#: spyderlib/plugins/variableexplorer.py:183
-msgid "Variable explorer"
-msgstr "変数エクスプローラー"
 
-#: spyderlib/plugins/console.py:108
-msgid "Internal console"
-msgstr "内部コンソール"
+#: spyder/widgets/projects/explorer.py:50
+msgid "Show horizontal scrollbar"
+msgstr "水平スクロールバーを表示"
 
-#: spyderlib/plugins/console.py:138 spyderlib/plugins/externalconsole.py:1033
-msgid "&Run..."
-msgstr "実行(&R)"
+#: spyder/widgets/projects/explorer.py:112
+msgid "File <b>%s</b> already exists.<br>Do you want to overwrite it?"
+msgstr "ファイル <b>%s</b> は既に存在します。<br>上書きしますか?"
 
-#: spyderlib/plugins/console.py:140 spyderlib/plugins/externalconsole.py:1034
-msgid "Run a Python script"
-msgstr "Pythonスクリプトを実行"
+#: spyder/widgets/projects/explorer.py:126
+msgid "Folder <b>%s</b> already exists."
+msgstr "フォルダ <b>%s</b> は既に存在します。"
 
-#: spyderlib/plugins/console.py:143
-msgid "Environment variables..."
-msgstr "環境変数.."
+#: spyder/widgets/projects/explorer.py:144
+msgid "copy"
+msgstr "コピー"
 
-#: spyderlib/plugins/console.py:145
-msgid "Show and edit environment variables (for current session)"
-msgstr "(現在のセッションのため)環境変数を表示・編集する"
+#: spyder/widgets/projects/explorer.py:146
+msgid "move"
+msgstr "移動"
 
-#: spyderlib/plugins/console.py:149
-msgid "Show sys.path contents..."
-msgstr "sys.pathの中身を表示..."
+#: spyder/widgets/projects/projectdialog.py:69
+#, fuzzy
+msgid "New directory"
+msgstr "ディレクトリを選択"
 
-#: spyderlib/plugins/console.py:151
-msgid "Show (read-only) sys.path"
-msgstr "sys.pathを読み取り専用で表示"
+#: spyder/widgets/projects/projectdialog.py:70
+msgid "Existing directory"
+msgstr "存在するディレクトリ"
 
-#: spyderlib/plugins/console.py:154
-msgid "Buffer..."
-msgstr "バッファー..."
+#: spyder/widgets/projects/projectdialog.py:72
+#, fuzzy
+msgid "Project name"
+msgstr "プロジェクト名:"
 
-#: spyderlib/plugins/console.py:155 spyderlib/plugins/history.py:39
-#: spyderlib/plugins/externalconsole.py:84
-msgid "Set maximum line count"
-msgstr "最大行数を設定"
+#: spyder/widgets/projects/projectdialog.py:73
+#, fuzzy
+msgid "Location"
+msgstr "情報"
 
-#: spyderlib/plugins/console.py:158
-msgid "External editor path..."
-msgstr "外部エディタのパス..."
+#: spyder/widgets/projects/projectdialog.py:74
+#, fuzzy
+msgid "Project type"
+msgstr "プロジェクト名:"
 
-#: spyderlib/plugins/console.py:159
-msgid "Set external editor executable path"
-msgstr "外部エディタ実行パスを設定"
+#: spyder/widgets/projects/projectdialog.py:75
+#, fuzzy
+msgid "Python version"
+msgstr "Pythonファイル"
 
-#: spyderlib/plugins/console.py:178
-msgid "Internal console settings"
-msgstr "内部コンソール設定"
+#: spyder/widgets/projects/projectdialog.py:83
+#: spyder/widgets/variableexplorer/importwizard.py:519
+msgid "Cancel"
+msgstr "キャンセル"
 
-#: spyderlib/plugins/console.py:231 spyderlib/plugins/externalconsole.py:1210
-msgid "Run Python script"
-msgstr "Pythonスクリプトを実行"
+#: spyder/widgets/projects/projectdialog.py:84
+msgid "Create"
+msgstr ""
 
-#: spyderlib/plugins/console.py:277
-msgid "Buffer"
-msgstr "バッファー"
+#: spyder/widgets/projects/projectdialog.py:102
+#, fuzzy
+msgid "Create new project"
+msgstr "関係するプロジェクト"
 
-#: spyderlib/plugins/console.py:278
-msgid "Maximum line count"
-msgstr "最大行数"
+#: spyder/widgets/projects/type/__init__.py:215
+#, fuzzy
+msgid "Empty project"
+msgstr "プロジェクトを開く"
 
-#: spyderlib/plugins/console.py:288
-msgid "External editor"
-msgstr "外部エディタ"
+#: spyder/widgets/projects/type/python.py:20
+#, fuzzy
+msgid "Python project"
+msgstr "プロジェクトを開く"
 
-#: spyderlib/plugins/console.py:289
-msgid "External editor executable path:"
-msgstr "外部エディタ実行パス:"
+#: spyder/widgets/projects/type/python.py:76
+#, fuzzy
+msgid "Python package"
+msgstr "Pythonパスマネージャ"
 
-#: spyderlib/plugins/projectexplorer.py:68
-msgid "&Font..."
-msgstr "フォント(&F)..."
+#: spyder/widgets/pydocgui.py:110
+msgid "Module or package:"
+msgstr "モジュールあるいはパッケージ:"
 
-#: spyderlib/plugins/projectexplorer.py:69
-msgid "Set font style"
-msgstr "フォントスタイルを設定"
+#: spyder/widgets/shell.py:129
+msgid "Save history log..."
+msgstr "ヒストリログを保存..."
 
-#: spyderlib/plugins/projectexplorer.py:126
-msgid "Select a new font"
-msgstr "新規フォントを選択"
+#: spyder/widgets/shell.py:131
+msgid "Save current history log (i.e. all inputs and outputs) in a text file"
+msgstr "現在のヒストリログ(全ての入出力)をテキストファイルに保存"
 
-#: spyderlib/plugins/workingdirectory.py:37
-msgid ""
-"The <b>global working directory</b> is the working directory for newly "
-"opened <i>consoles</i> (Python/IPython consoles and terminals), for the "
-"<i>file explorer</i>, for the <i>find in files</i> plugin and for new files "
-"created in the <i>editor</i>."
-msgstr ""
-"<b>グローバル作業ディレクトリ</b> は<i>ファイルエクスプローラー</i>、<i>ファ"
-"イル検索</i>プラグイン、<i>コンソール</i>(Python/IPython コンソールとターミナ"
-"ル) を新しく開いた場合、<i>エディタ</i>で新規ファイルを開いた場合の作業ディレ"
-"クトリです。 "
+#: spyder/widgets/shell.py:257
+msgid "Save history log"
+msgstr "ヒストリログを保存"
 
-#: spyderlib/plugins/workingdirectory.py:46
-msgid "At startup, the global working directory is:"
-msgstr "スタートアップ時のグローバル作業ディレクトリは:"
+#: spyder/widgets/shell.py:260
+msgid "History logs"
+msgstr "ヒストリログ"
 
-#: spyderlib/plugins/workingdirectory.py:50
-msgid "the same as in last session"
-msgstr "最後のセッションと同じ"
+#: spyder/widgets/shell.py:271
+msgid "<b>Unable to save file '%s'</b><br><br>Error message:<br>%s"
+msgstr "<b>ファイル '%s' を保存できません</b><br><br>エラーメッセージ:<br>%s"
 
-#: spyderlib/plugins/workingdirectory.py:52
-msgid "At startup, Spyder will restore the global directory from last session"
-msgstr ""
-"Spyderはスタートアップ時に最後のセッションからグローバル作業ディレクトリを復"
-"元します"
+#: spyder/widgets/shell.py:713
+msgid "Copy without prompts"
+msgstr "プロンプトなしでコピー"
 
-#: spyderlib/plugins/workingdirectory.py:56 spyderlib/plugins/runconfig.py:480
-msgid "the following directory:"
-msgstr "以下のディレクトリ:"
+#: spyder/widgets/shell.py:716 spyder/widgets/shell.py:720
+msgid "Clear line"
+msgstr "行をクリア"
 
-#: spyderlib/plugins/workingdirectory.py:58
-msgid "At startup, the global working directory will be the specified path"
-msgstr "グローバル作業ディレクトリはスタートアップ時にパスにより決定されます"
+#: spyder/widgets/shell.py:722
+msgid "Clear shell"
+msgstr "シェルをクリア"
 
-#: spyderlib/plugins/workingdirectory.py:70
-msgid "Files are opened from:"
-msgstr "ファイルは以下から開かれています:"
+#: spyder/widgets/shell.py:726
+msgid "Clear shell contents ('cls' command)"
+msgstr "シェルの中身をクリア(clsコマンド)"
 
-#: spyderlib/plugins/workingdirectory.py:74
-#: spyderlib/plugins/workingdirectory.py:87
-msgid "the current file directory"
-msgstr "現在ファイルのディレクトリ"
+#: spyder/widgets/sourcecode/codeeditor.py:100
+msgid "Go to line:"
+msgstr "行へ移動:"
 
-#: spyderlib/plugins/workingdirectory.py:78
-#: spyderlib/plugins/workingdirectory.py:91
-msgid "the global working directory"
-msgstr "グローバル作業ディレクトリ"
+#: spyder/widgets/sourcecode/codeeditor.py:108
+msgid "Line count:"
+msgstr "行数:"
 
-#: spyderlib/plugins/workingdirectory.py:83
-msgid "Files are created in:"
-msgstr "ファイルは以下で作成されています:"
+#: spyder/widgets/sourcecode/codeeditor.py:1296
+msgid "Breakpoint"
+msgstr "ブレークポイント"
 
-#: spyderlib/plugins/workingdirectory.py:97
-msgid "Change to file base directory"
-msgstr "ファイルの基本ディレクトリに変更"
+#: spyder/widgets/sourcecode/codeeditor.py:1297
+msgid "Condition:"
+msgstr "条件:"
 
-#: spyderlib/plugins/workingdirectory.py:99
-msgid "When opening a file"
-msgstr "ファイルを開いた時"
+#: spyder/widgets/sourcecode/codeeditor.py:1703
+msgid "Code analysis"
+msgstr "コード分析"
 
-#: spyderlib/plugins/workingdirectory.py:101
-msgid "When saving a file"
-msgstr "ファイルを保存する時"
+#: spyder/widgets/sourcecode/codeeditor.py:1757
+msgid "To do"
+msgstr "To do"
 
-#: spyderlib/plugins/workingdirectory.py:171
-msgid "Back"
-msgstr "戻る"
+#: spyder/widgets/sourcecode/codeeditor.py:1994
+msgid "Removal error"
+msgstr "削除エラー"
 
-#: spyderlib/plugins/workingdirectory.py:190
+#: spyder/widgets/sourcecode/codeeditor.py:1995
 msgid ""
-"This is the working directory for newly\n"
-"opened consoles (Python/IPython consoles and\n"
-"terminals), for the file explorer, for the\n"
-"find in files plugin and for new files\n"
-"created in the editor"
+"It was not possible to remove outputs from this notebook. The error is:\n"
+"\n"
 msgstr ""
-"これは、ファイルエクスプローラー、\n"
-"ファイル検索プラグイン、新規コンソール\n"
-"(Python/IPythonコンソール及びターミナル)\n"
-"及びエディタで作成した新規ファイルの\n"
-"作業ディレクトリです。"
+"notebookからoutputを削除できませんでした。エラー:\n"
+"\n"
 
-#: spyderlib/plugins/workingdirectory.py:218
-msgid "Browse a working directory"
-msgstr "作業ディレクトリを表示"
+#: spyder/widgets/sourcecode/codeeditor.py:2487
+msgid "Clear all ouput"
+msgstr "全ての出力をクリア"
 
-#: spyderlib/plugins/workingdirectory.py:225
-msgid "Change to parent directory"
-msgstr "親ディレクトリへ移動"
+#: spyder/widgets/sourcecode/codeeditor.py:2493
+msgid "Go to definition"
+msgstr "定義へ移動"
 
-#: spyderlib/plugins/workingdirectory.py:232
-msgid "Global working directory"
-msgstr "グローバル作業ディレクトリ"
+#: spyder/widgets/sourcecode/codeeditor.py:2522
+msgid "Zoom reset"
+msgstr "ズームリセット"
 
-#: spyderlib/plugins/explorer.py:50
-msgid "File explorer"
-msgstr "ファイルエクスプローラー"
+#: spyder/widgets/status.py:25
+msgid "CPU and memory usage info in the status bar"
+msgstr "CPUとメモリの使用状況をステータスバーに表示"
+
+#: spyder/widgets/status.py:94
+msgid "Memory:"
+msgstr "メモリ:"
 
-#: spyderlib/plugins/shortcuts.py:134
+#: spyder/widgets/status.py:95
 msgid ""
-"Press the new shortcut and select 'Ok': \n"
-"(Press 'Tab' once to switch focus between the shortcut entry \n"
-"and the buttons below it)"
+"Memory usage status: requires the `psutil` (>=v0.3) library on non-Windows "
+"platforms"
 msgstr ""
-"新しショートカットを押し、 'Ok'を選択してください: \n"
-"(ショートカットエントリ間やボタン間のフォーカス移動には\n"
-"'Tab'を押してください)"
+"メモリ使用状況の表示には非Windows環境では`psutil` (>=v0.3) が必要になります"
 
-#: spyderlib/plugins/shortcuts.py:137
-msgid "Current shortcut:"
-msgstr "現在のショートカット:"
+#: spyder/widgets/status.py:107
+msgid "CPU:"
+msgstr "CPU:"
 
-#: spyderlib/plugins/shortcuts.py:139
-msgid "New shortcut:"
-msgstr "新規ショートカット:"
+#: spyder/widgets/status.py:108
+msgid "CPU usage status: requires the `psutil` (>=v0.3) library"
+msgstr ""
+"CPU使用状況の表示には非Windows環境では`psutil` (>=v0.3) が必要になります"
 
-#: spyderlib/plugins/shortcuts.py:152
-msgid "Shortcut: {0}"
-msgstr "ショートカット: {0}"
+#: spyder/widgets/status.py:130
+msgid "Permissions:"
+msgstr "権限:"
 
-#: spyderlib/plugins/shortcuts.py:273
-msgid "Please introduce a different shortcut"
-msgstr "異なるショートカットを設定してください"
+#: spyder/widgets/status.py:144
+msgid "End-of-lines:"
+msgstr "改行:"
 
-#: spyderlib/plugins/shortcuts.py:310
-msgid "The new shorcut conflicts with:"
-msgstr "新しいショートカットは以下と競合しています:"
+#: spyder/widgets/status.py:158
+msgid "Encoding:"
+msgstr "エンコード"
 
-#: spyderlib/plugins/shortcuts.py:321
-msgid ""
-"A compound sequence can have {break} a maximum of 4 subsequences.{break}"
-msgstr "複合シーケンスは{break} 最大4個のサブシーケンス{break}を持てます。"
+#: spyder/widgets/status.py:171
+msgid "Line:"
+msgstr "行:"
+
+#: spyder/widgets/status.py:175
+msgid "Column:"
+msgstr "列:"
+
+#: spyder/widgets/tabs.py:146
+msgid "Browse tabs"
+msgstr "tabを表示"
+
+#: spyder/widgets/tabs.py:275
+msgid "Close current tab"
+msgstr "現在のタブを閉じる"
+
+#: spyder/widgets/variableexplorer/arrayeditor.py:497
+msgid "It was not possible to copy values for this array"
+msgstr "配列の値をコピーできませんでした"
+
+#: spyder/widgets/variableexplorer/arrayeditor.py:532
+#: spyder/widgets/variableexplorer/arrayeditor.py:565
+#: spyder/widgets/variableexplorer/dataframeeditor.py:544
+#: spyder/widgets/variableexplorer/dataframeeditor.py:584
+msgid "Format"
+msgstr "フォーマット"
+
+#: spyder/widgets/variableexplorer/arrayeditor.py:537
+#: spyder/widgets/variableexplorer/dataframeeditor.py:548
+msgid "Resize"
+msgstr "リサイズ"
+
+#: spyder/widgets/variableexplorer/arrayeditor.py:566
+#: spyder/widgets/variableexplorer/dataframeeditor.py:585
+msgid "Float formatting"
+msgstr "浮動小数点フォーマット"
 
-#: spyderlib/plugins/shortcuts.py:326
-msgid "Invalid key entered"
-msgstr "不正なキー入力"
+#: spyder/widgets/variableexplorer/arrayeditor.py:574
+#: spyder/widgets/variableexplorer/dataframeeditor.py:594
+msgid "Format (%s) is incorrect"
+msgstr "フォーマット (%s) が不正です"
 
-#: spyderlib/plugins/shortcuts.py:515
-msgid "Context"
-msgstr "コンテキスト"
+#: spyder/widgets/variableexplorer/arrayeditor.py:609
+msgid "Array is empty"
+msgstr "配列が空です"
 
-#: spyderlib/plugins/shortcuts.py:519
-msgid "Shortcut"
-msgstr "ショートカット"
+#: spyder/widgets/variableexplorer/arrayeditor.py:612
+msgid "Arrays with more than 3 dimensions are not supported"
+msgstr "3次元以上の配列はサポートされていません"
 
-#: spyderlib/plugins/shortcuts.py:521
-msgid "Score"
-msgstr "スコア"
+#: spyder/widgets/variableexplorer/arrayeditor.py:615
+msgid "The 'xlabels' argument length do no match array column number"
+msgstr "'xlabels'引数の長さが配列の列数に一致していません"
 
-#: spyderlib/plugins/shortcuts.py:681
-msgid "Conflicts"
-msgstr "競合"
+#: spyder/widgets/variableexplorer/arrayeditor.py:619
+msgid "The 'ylabels' argument length do no match array row number"
+msgstr "'ylabels'引数の長さが配列の行数に一致していません"
 
-#: spyderlib/plugins/shortcuts.py:682
-msgid "The following conflicts have been detected:"
-msgstr "以下の競合が検知されました:"
+#: spyder/widgets/variableexplorer/arrayeditor.py:626
+msgid "%s arrays"
+msgstr "%s 配列"
 
-#: spyderlib/plugins/shortcuts.py:767
-msgid "Keyboard shortcuts"
-msgstr "キーボード・ショートカット"
+#: spyder/widgets/variableexplorer/arrayeditor.py:627
+msgid "%s are currently not supported"
+msgstr "%s は現在サポートされていません"
 
-#: spyderlib/plugins/shortcuts.py:775
-msgid "Search: "
-msgstr "検索:"
+#: spyder/widgets/variableexplorer/arrayeditor.py:634
+msgid "NumPy array"
+msgstr "NumPy配列"
 
-#: spyderlib/plugins/shortcuts.py:776
-msgid "Reset to default values"
-msgstr "デフォルト値に戻す"
+#: spyder/widgets/variableexplorer/arrayeditor.py:636
+#: spyder/widgets/variableexplorer/arrayeditor.py:790
+msgid "Array editor"
+msgstr "配列エディタ"
 
-#: spyderlib/plugins/runconfig.py:28
-msgid "Execute in current Python or IPython console"
-msgstr "現在のPython/IPythonコンソールで実行"
+#: spyder/widgets/variableexplorer/arrayeditor.py:638
+msgid "read only"
+msgstr "読み取り専用"
 
-#: spyderlib/plugins/runconfig.py:29
-msgid "Execute in a new dedicated Python console"
-msgstr "Pythonに特化した新規コンソールで実行"
+#: spyder/widgets/variableexplorer/arrayeditor.py:668
+msgid "Record array fields:"
+msgstr "配列のフィールドを記録:"
 
-#: spyderlib/plugins/runconfig.py:30
-msgid "Execute in an external System terminal"
-msgstr "外部システムターミナルで実行"
+#: spyder/widgets/variableexplorer/arrayeditor.py:680
+msgid "Data"
+msgstr "データ"
 
-#: spyderlib/plugins/runconfig.py:40
-#, python-format
-msgid "Always show %s on a first file run"
-msgstr "ファイルの先頭に %s を常に表示"
+#: spyder/widgets/variableexplorer/arrayeditor.py:680
+msgid "Mask"
+msgstr "マスク"
 
-#: spyderlib/plugins/runconfig.py:159
-msgid "General settings"
-msgstr "一般設定"
+#: spyder/widgets/variableexplorer/arrayeditor.py:680
+msgid "Masked data"
+msgstr "Maskedデータ"
 
-#: spyderlib/plugins/runconfig.py:162 spyderlib/plugins/runconfig.py:208
-msgid "Command line options:"
-msgstr "コマンドラインオプション:"
+#: spyder/widgets/variableexplorer/arrayeditor.py:691
+msgid "Axis:"
+msgstr "軸:"
 
-#: spyderlib/plugins/runconfig.py:168
-msgid "Working directory:"
-msgstr "作業ディレクトリ:"
+#: spyder/widgets/variableexplorer/arrayeditor.py:696
+msgid "Index:"
+msgstr "インデックス:"
 
-#: spyderlib/plugins/runconfig.py:180 spyderlib/plugins/runconfig.py:491
-msgid "Enter debugging mode when errors appear during execution"
-msgstr "実行中にエラーが発生した場合デバッグモードに入る"
+#: spyder/widgets/variableexplorer/arrayeditor.py:709
+msgid "<u>Warning</u>: changes are applied separately"
+msgstr "<u>警告</u>: 変更は別々に適用されます"
 
-#: spyderlib/plugins/runconfig.py:196 spyderlib/plugins/runconfig.py:501
-msgid "Dedicated Python console"
-msgstr "Dedicated Pythonコンソール"
+#: spyder/widgets/variableexplorer/arrayeditor.py:710
+msgid ""
+"For performance reasons, changes applied to masked array won't be reflected "
+"in array's data (and vice-versa)."
+msgstr ""
+"実行性能に関する理由により、masked配列に適用された変更は配列内のデータには反"
+"映されません(逆もまた同様)。"
 
-#: spyderlib/plugins/runconfig.py:200 spyderlib/plugins/runconfig.py:503
-msgid "Interact with the Python console after execution"
-msgstr "実行後Pythonコンソールと相互作用する"
+#: spyder/widgets/variableexplorer/collectionseditor.py:116
+msgid "Index"
+msgstr "インデックス"
 
-#: spyderlib/plugins/runconfig.py:204
-msgid "Show warning when killing running process"
-msgstr "実行中プロセスが殺された場合には警告を表示"
+#: spyder/widgets/variableexplorer/collectionseditor.py:121
+msgid "Tuple"
+msgstr "タプル"
 
-#: spyderlib/plugins/runconfig.py:213
-msgid "<b>-u</b> is added to the other options you set here"
-msgstr "ここで設定した以外に、<b>-u</b> がオプションに追加されました。"
+#: spyder/widgets/variableexplorer/collectionseditor.py:124
+msgid "List"
+msgstr "リスト"
 
-#: spyderlib/plugins/runconfig.py:223
-msgid "this dialog"
-msgstr "このダイアログ"
+#: spyder/widgets/variableexplorer/collectionseditor.py:127
+msgid "Dictionary"
+msgstr "辞書"
 
-#: spyderlib/plugins/runconfig.py:282
-msgid "Run configuration"
-msgstr "設定を実行"
+#: spyder/widgets/variableexplorer/collectionseditor.py:129
+msgid "Key"
+msgstr "キー"
 
-#: spyderlib/plugins/runconfig.py:283
-#, python-format
-msgid "The following working directory is not valid:<br><b>%s</b>"
-msgstr "以下の作業ディレクトリは不正です:<br><b>%s</b>"
+#: spyder/widgets/variableexplorer/collectionseditor.py:135
+msgid "Attribute"
+msgstr "属性"
 
-#: spyderlib/plugins/runconfig.py:361
-#, python-format
-msgid "Run settings for %s"
-msgstr "%s の設定を実行"
+#: spyder/widgets/variableexplorer/collectionseditor.py:137
+msgid "elements"
+msgstr "要素"
 
-#: spyderlib/plugins/runconfig.py:393
-msgid "Select a run configuration:"
-msgstr "実行する設定を選択"
+#: spyder/widgets/variableexplorer/collectionseditor.py:313
+msgid "Size"
+msgstr "サイズ"
 
-#: spyderlib/plugins/runconfig.py:422 spyderlib/plugins/runconfig.py:447
-msgid "Run Settings"
-msgstr "設定を実行"
+#: spyder/widgets/variableexplorer/collectionseditor.py:313
+msgid "Type"
+msgstr "型"
 
-#: spyderlib/plugins/runconfig.py:449
-#, python-format
+#: spyder/widgets/variableexplorer/collectionseditor.py:313
+msgid "Value"
+msgstr "値"
+
+#: spyder/widgets/variableexplorer/collectionseditor.py:411
 msgid ""
-"The following are the default <i>%s</i>. These options may be overriden "
-"using the <b>%s</b> dialog box (see the <b>%s</b> menu)"
+"Opening this variable can be slow\n"
+"\n"
+"Do you want to continue anyway?"
 msgstr ""
-"以下はデフォルトです <i>%s</i>。 これらのオプションは <b>%s</b> ダイアログ"
-"ボックスで上書き可能です (see the <b>%s</b> メニュー)"
-
-#: spyderlib/plugins/runconfig.py:475
-msgid "Default working directory is:"
-msgstr "デフォルト作業ディレクトリは:"
+"この変数を開くには時間がかかる場合があります\n"
+"\n"
+"続行しますか?"
 
-#: spyderlib/plugins/runconfig.py:477
-msgid "the script directory"
-msgstr "スクリプトディレクトリ"
+#: spyder/widgets/variableexplorer/collectionseditor.py:420
+msgid ""
+"Spyder was unable to retrieve the value of this variable from the console."
+"<br><br>The error mesage was:<br><i>%s</i>"
+msgstr ""
 
-#: spyderlib/plugins/runconfig.py:506
-msgid "Show warning when killing running processes"
-msgstr "実行中のプロセスが殺された場合警告を表示"
+#: spyder/widgets/variableexplorer/collectionseditor.py:579
+msgid "Edit item"
+msgstr "アイテムを編集"
 
-#: spyderlib/plugins/runconfig.py:515
-msgid "Run Settings dialog"
-msgstr "設定ダイアログを実行"
+#: spyder/widgets/variableexplorer/collectionseditor.py:580
+msgid "<b>Unable to assign data to item.</b><br><br>Error message:<br>%s"
+msgstr ""
+"<b>アイテムにデータを割り当てられません。</b><br><br>エラーメッセージ:<br>%s"
 
-#: spyderlib/plugins/history.py:35
-msgid "Settings"
-msgstr "設定"
+#: spyder/widgets/variableexplorer/collectionseditor.py:642
+msgid "Resize rows to contents"
+msgstr "行数を中身に応じて変更"
 
-#: spyderlib/plugins/history.py:37
-msgid "History depth: "
-msgstr "ヒストリー階層:"
+#: spyder/widgets/variableexplorer/collectionseditor.py:653
+#: spyder/widgets/variableexplorer/collectionseditor.py:998
+#: spyder/widgets/variableexplorer/collectionseditor.py:1015
+msgid "Plot"
+msgstr "プロット"
 
-#: spyderlib/plugins/history.py:37
-msgid " entries"
-msgstr " エントリ"
+#: spyder/widgets/variableexplorer/collectionseditor.py:657
+msgid "Histogram"
+msgstr "ヒストグラム"
 
-#: spyderlib/plugins/history.py:44
-msgid "Scroll automatically to last entry"
-msgstr "最後のエントリーまで自動的にスクロール"
+#: spyder/widgets/variableexplorer/collectionseditor.py:661
+msgid "Show image"
+msgstr "画像を表示"
 
-#: spyderlib/plugins/history.py:123
-msgid "History log"
-msgstr "ヒストリログ"
+#: spyder/widgets/variableexplorer/collectionseditor.py:665
+#: spyder/widgets/variableexplorer/collectionseditor.py:1023
+msgid "Save array"
+msgstr "配列を保存"
 
-#: spyderlib/plugins/history.py:150
-msgid "History..."
-msgstr "ヒストリ..."
+#: spyder/widgets/variableexplorer/collectionseditor.py:669
+#: spyder/widgets/variableexplorer/collectionseditor.py:962
+#: spyder/widgets/variableexplorer/collectionseditor.py:970
+msgid "Insert"
+msgstr "挿入"
 
-#: spyderlib/plugins/history.py:152
-msgid "Set history maximum entries"
-msgstr "ヒストリの最大エントリ数"
+#: spyder/widgets/variableexplorer/collectionseditor.py:672
+#: spyder/widgets/variableexplorer/collectionseditor.py:906
+msgid "Remove"
+msgstr "除去"
 
-#: spyderlib/plugins/history.py:263
-msgid "History"
-msgstr "ヒストリ"
+#: spyder/widgets/variableexplorer/collectionseditor.py:686
+#: spyder/widgets/variableexplorer/collectionseditor.py:927
+msgid "Duplicate"
+msgstr "複製"
 
-#: spyderlib/plugins/history.py:264
-msgid "Maximum entries"
-msgstr "最大エントリ数"
+#: spyder/widgets/variableexplorer/collectionseditor.py:904
+#, fuzzy
+msgid "Do you want to remove the selected item?"
+msgstr "選択されたアイテムを除去しますか?"
 
-#: spyderlib/plugins/externalconsole.py:48
-msgid "Interactive data plotting in the consoles"
-msgstr "コンソールでの対話的データプロット"
+#: spyder/widgets/variableexplorer/collectionseditor.py:905
+msgid "Do you want to remove all selected items?"
+msgstr "選択された全てのアイテムを除去しますか?"
 
-#: spyderlib/plugins/externalconsole.py:68
-msgid "One tab per script"
-msgstr "スクリプトあたりのタブを1つ"
+#: spyder/widgets/variableexplorer/collectionseditor.py:925
+#, fuzzy
+msgid "New variable name:"
+msgstr "variable_name"
 
-#: spyderlib/plugins/externalconsole.py:82
-msgid "Buffer: "
-msgstr "バッファー:"
+#: spyder/widgets/variableexplorer/collectionseditor.py:928
+#, fuzzy
+msgid "Variable name:"
+msgstr "変数名"
 
-#: spyderlib/plugins/externalconsole.py:87
-msgid "Merge process standard output/error channels"
-msgstr "プロセス標準出力/エラーチャンネルをマージ"
+#: spyder/widgets/variableexplorer/collectionseditor.py:962
+msgid "Key:"
+msgstr "キー:"
 
-#: spyderlib/plugins/externalconsole.py:89
-msgid ""
-"Merging the output channels of the process means that\n"
-"the standard error won't be written in red anymore,\n"
-"but this has the effect of speeding up display."
-msgstr ""
-"プロセスの出力チャンネルをマージした場合\n"
-"標準エラーは赤色で表示されなくなりますが、\n"
-"表示は高速化されます。"
+#: spyder/widgets/variableexplorer/collectionseditor.py:970
+msgid "Value:"
+msgstr "値:"
 
-#: spyderlib/plugins/externalconsole.py:93
-msgid "Colorize standard error channel using ANSI escape codes"
-msgstr "標準エラーチャンネルをANSIエスケープコードで色分け"
+#: spyder/widgets/variableexplorer/collectionseditor.py:986
+msgid "Import error"
+msgstr "インポートエラー"
 
-#: spyderlib/plugins/externalconsole.py:95
-msgid ""
-"This method is the only way to have colorized standard\n"
-"error channel when the output channels have been merged."
-msgstr ""
-"出力チャンネルがマージされた場合、これは標準エラーチャンネルを\n"
-"色分けする唯一の方法となります。"
+#: spyder/widgets/variableexplorer/collectionseditor.py:987
+msgid "Please install <b>matplotlib</b> or <b>guiqwt</b>."
+msgstr "<b>matplotlib</b> か <b>guiqwt</b> をインストールしてください。"
 
-#: spyderlib/plugins/externalconsole.py:112
-msgid ""
-"This option will be applied the next time a Python console or a terminal is "
-"opened."
-msgstr ""
-"このオプションは次回Pythonコンソールかターミナルが開かれた時適用されます。"
+#: spyder/widgets/variableexplorer/collectionseditor.py:999
+msgid "<b>Unable to plot data.</b><br><br>Error message:<br>%s"
+msgstr "<b>データをプロットできません。</b><br><br>エラーメッセージ:<br>%s"
 
-#: spyderlib/plugins/externalconsole.py:115
-msgid "Light background (white color)"
-msgstr "明るい背景(白色)"
+#: spyder/widgets/variableexplorer/collectionseditor.py:1016
+msgid "<b>Unable to show image.</b><br><br>Error message:<br>%s"
+msgstr "<b>画像を表示できません。</b><br><br>エラーメッセージ:<br>%s"
 
-#: spyderlib/plugins/externalconsole.py:140
-msgid "User Module Reloader (UMR)"
-msgstr "モジュールリローダーを使用(UMR)"
+#: spyder/widgets/variableexplorer/collectionseditor.py:1039
+msgid "<b>Unable to save array</b><br><br>Error message:<br>%s"
+msgstr "<b>配列を保存できません</b><br><br>エラーメッセージ:<br>%s"
 
-#: spyderlib/plugins/externalconsole.py:141
-msgid ""
-"UMR forces Python to reload modules which were imported when executing a \n"
-"script in the external console with the 'runfile' function."
-msgstr ""
-"外部コンソールで'runfile'機能を使うスクリプトを実行する時、\n"
-"UMRはモジュール再読み込みを強制します。"
+#: spyder/widgets/variableexplorer/collectionseditor.py:1064
+msgid "It was not possible to copy this array"
+msgstr "配列をコピーできませんでした"
 
-#: spyderlib/plugins/externalconsole.py:144
-msgid "Enable UMR"
-msgstr "UMRを有効化"
+#: spyder/widgets/variableexplorer/collectionseditor.py:1089
+msgid "Clipboard contents"
+msgstr "クリップボードの内容"
 
-#: spyderlib/plugins/externalconsole.py:146
-msgid ""
-"This option will enable the User Module Reloader (UMR) in Python/IPython "
-"consoles. UMR forces Python to reload deeply modules during import when "
-"running a Python script using the Spyder's builtin function <b>runfile</b>."
-"<br><br><b>1.</b> UMR may require to restart the console in which it will be "
-"called (otherwise only newly imported modules will be reloaded when "
-"executing scripts).<br><br><b>2.</b> If errors occur when re-running a PyQt-"
-"based program, please check that the Qt objects are properly destroyed (e.g. "
-"you may have to use the attribute <b>Qt.WA_DeleteOnClose</b> on your main "
-"window, using the <b>setAttribute</b> method)"
-msgstr ""
-"このオプションはPython/IPython コンソールでユーザーモジュールリローダー (UMR)"
-"を有効化します。UMRはSpyderの組み込み関数<b>runfile</b>を使うPythonスクリプト"
-"を実行する場合インポート時にモジュールの再読み込みを強制します。<br><br><b>1."
-"</b> UMRは実行するコンソールの再起動を必要とする場合が有ります(あるいはスクリ"
-"プト実行時に新しくインポートされたモジュールのみが再読み込みされます)。"
-"<br><br><b>2.</b> PyQtを使ったプログラムの再実行時にエラーが発生した場合、Qt"
-"オブジェクトが適切に破棄されているか確認してください。(例: <b>setAttribute</"
-"b>メソッドを使ってアトリビュート<b>Qt.WA_DeleteOnClose</b> をメインウインドウ"
-"に適用するなど)"
+#: spyder/widgets/variableexplorer/collectionseditor.py:1104
+msgid "Import from clipboard"
+msgstr "クリップボードからインポート"
 
-#: spyderlib/plugins/externalconsole.py:161
-msgid "Show reloaded modules list"
-msgstr "再読込されたモジュールのリストを表示"
+#: spyder/widgets/variableexplorer/collectionseditor.py:1106
+msgid "Empty clipboard"
+msgstr "クリップボードを空にする"
 
-#: spyderlib/plugins/externalconsole.py:163
-msgid "Please note that these changes will be applied only to new consoles"
-msgstr "これらの変更は新規コンソールのみに適用されることに注意してください"
+#: spyder/widgets/variableexplorer/collectionseditor.py:1107
+msgid "Nothing to be imported from clipboard."
+msgstr "クリップボードからインポートするものはありません。"
 
-#: spyderlib/plugins/externalconsole.py:166
-msgid "Set UMR excluded (not reloaded) modules"
-msgstr "UMRから排除される(=再読込されない)モジュールを設定"
+#: spyder/widgets/variableexplorer/dataframeeditor.py:450
+msgid "To bool"
+msgstr "真偽値へ"
 
-#: spyderlib/plugins/externalconsole.py:177
-msgid "Python executable"
-msgstr "Python実行可能ファイル"
+#: spyder/widgets/variableexplorer/dataframeeditor.py:450
+msgid "To complex"
+msgstr "複素数へ"
 
-#: spyderlib/plugins/externalconsole.py:179
-msgid ""
-"Select the Python interpreter executable binary in which Spyder will run "
-"scripts:"
-msgstr ""
-"Spyderにスクリプトを実行させる(Pythonインタープリター)実行可能ファイルを選ぶ:"
+#: spyder/widgets/variableexplorer/dataframeeditor.py:451
+msgid "To float"
+msgstr "浮動小数点数へ"
 
-#: spyderlib/plugins/externalconsole.py:182
-msgid "Default (i.e. the same as Spyder's)"
-msgstr "デフォルト(=Spyderと同じ)"
+#: spyder/widgets/variableexplorer/dataframeeditor.py:451
+msgid "To int"
+msgstr "整数へ"
 
-#: spyderlib/plugins/externalconsole.py:186
-msgid "Use the following Python interpreter:"
-msgstr "以下のPythonインタープリターを使う"
+#: spyder/widgets/variableexplorer/dataframeeditor.py:452
+msgid "To str"
+msgstr "文字列へ"
 
-#: spyderlib/plugins/externalconsole.py:190
-msgid "Executables"
-msgstr "実行可能ファイル"
+#: spyder/widgets/variableexplorer/dataframeeditor.py:526
+msgid "%s editor"
+msgstr "%s エディタ"
 
-#: spyderlib/plugins/externalconsole.py:208
-msgid "PYTHONSTARTUP replacement"
-msgstr "PYTHONSTARTUP代替物"
+#: spyder/widgets/variableexplorer/dataframeeditor.py:558
+msgid "Column min/max"
+msgstr "列の 最小/最大"
 
-#: spyderlib/plugins/externalconsole.py:210
-msgid ""
-"This option will override the PYTHONSTARTUP environment variable which\n"
-"defines the script to be executed during the Python console startup."
-msgstr ""
-"このオプションはPYTHONSTARTUP環境変数(Pythonコンソール起動時に実行する\n"
-"スクリプトを指定する)を上書きします。"
+#: spyder/widgets/variableexplorer/importwizard.py:116
+#: spyder/widgets/variableexplorer/importwizard.py:431
+msgid "Import as"
+msgstr "形式を指定してインポート"
 
-#: spyderlib/plugins/externalconsole.py:215
-msgid "Default PYTHONSTARTUP script"
-msgstr "デフォルトPYTHONSTARTUPスクリプト"
+#: spyder/widgets/variableexplorer/importwizard.py:118
+msgid "data"
+msgstr "データ"
 
-#: spyderlib/plugins/externalconsole.py:219
-msgid "Use the following startup script:"
-msgstr "以下のスタートアップスクリプトを実行:"
+#: spyder/widgets/variableexplorer/importwizard.py:122
+msgid "code"
+msgstr "コード"
 
-#: spyderlib/plugins/externalconsole.py:236
-msgid "Monitor"
-msgstr "モニター"
+#: spyder/widgets/variableexplorer/importwizard.py:125
+#: spyder/widgets/variableexplorer/importwizard.py:504
+msgid "text"
+msgstr "テキスト"
 
-#: spyderlib/plugins/externalconsole.py:237
-msgid ""
-"The monitor provides introspection features to console: code completion, "
-"calltips and variable explorer. Because it relies on several modules, "
-"disabling the monitor may be useful to accelerate console startup."
-msgstr ""
-"モニターによりコンソールでコード補完、 コールティップス及び変数エクスプロー"
-"ラー等のintrospection機能が利用できます。モニターは複数のモジュールに依存する"
-"ため、無効化した場合コンソールのスタートアップを高速化できます。"
+#: spyder/widgets/variableexplorer/importwizard.py:138
+msgid "Column separator:"
+msgstr "列セパレータ"
 
-#: spyderlib/plugins/externalconsole.py:244
-msgid "Enable monitor"
-msgstr "モニターを有効化"
+#: spyder/widgets/variableexplorer/importwizard.py:142
+msgid "Tab"
+msgstr "タブ"
 
-#: spyderlib/plugins/externalconsole.py:257
-msgid "Default library"
-msgstr "デフォルトライブラリ"
+#: spyder/widgets/variableexplorer/importwizard.py:145
+#: spyder/widgets/variableexplorer/importwizard.py:163
+msgid "other"
+msgstr "その他"
 
-#: spyderlib/plugins/externalconsole.py:262
-msgid "Qt-Python Bindings"
-msgstr "Qt-Pythonバインディング"
+#: spyder/widgets/variableexplorer/importwizard.py:156
+msgid "Row separator:"
+msgstr "行セパレーター"
 
-#: spyderlib/plugins/externalconsole.py:264
-msgid "Library:"
-msgstr "ライブラリ:"
+#: spyder/widgets/variableexplorer/importwizard.py:160
+msgid "EOL"
+msgstr "EOL"
 
-#: spyderlib/plugins/externalconsole.py:266
-msgid ""
-"This option will act on<br> libraries such as Matplotlib, guidata or ETS"
-msgstr "このオプションは<br>Matplotlib、guidata、ETS等のライブラリで機能します"
+#: spyder/widgets/variableexplorer/importwizard.py:175
+msgid "Additional options"
+msgstr "追加オプション"
 
-#: spyderlib/plugins/externalconsole.py:276
-msgid ""
-"Decide which backend to use to display graphics. If unsure, please select "
-"the <b>Automatic</b> backend.<br><br><b>Note:</b> We support a very limited "
-"number of backends in our Python consoles. If you prefer to work with a "
-"different one, please use an IPython console."
-msgstr ""
-"画像を表示するためにどのバックエンドを使うか選択してください。よくわからない"
-"場合<b>Automatic</b> バックエンドを選んでください。<br><br><b>注:</b> Python"
-"コンソールでサポートされるバックエンドは非常に限られています。もし別のバック"
-"エンドを使いたい場合IPythonコンソールを使ってください。"
+#: spyder/widgets/variableexplorer/importwizard.py:179
+msgid "Skip rows:"
+msgstr "行を飛ばす:"
 
-#: spyderlib/plugins/externalconsole.py:303
-msgid "Enthought Tool Suite"
-msgstr "Enthoughtツールスイート"
+#: spyder/widgets/variableexplorer/importwizard.py:190
+msgid "Comments:"
+msgstr "コメント:"
 
-#: spyderlib/plugins/externalconsole.py:304
-msgid ""
-"Enthought Tool Suite (ETS) supports PyQt4 (qt4) and wxPython (wx) graphical "
-"user interfaces."
-msgstr ""
-"Enthoughtツールスイート(ETS)はPyQt4(qt4)とwxPython(wx)GUIをサポートします。"
+#: spyder/widgets/variableexplorer/importwizard.py:196
+msgid "Transpose"
+msgstr "転置"
 
-#: spyderlib/plugins/externalconsole.py:308
-msgid "ETS_TOOLKIT:"
-msgstr "ETS_TOOLKIT:"
+#: spyder/widgets/variableexplorer/importwizard.py:434
+msgid "array"
+msgstr "配列"
 
-#: spyderlib/plugins/externalconsole.py:333
-msgid "External modules"
-msgstr "外部モジュール"
+#: spyder/widgets/variableexplorer/importwizard.py:439
+msgid "list"
+msgstr "リスト"
 
-#: spyderlib/plugins/externalconsole.py:369
-#, python-format
-msgid ""
-"You selected a <b>Python %d</b> interpreter for the console but Spyder is "
-"running on <b>Python %d</b>!.<br><br>Although this is possible, we recommend "
-"you to install and run Spyder directly with your selected interpreter, to "
-"avoid seeing false warnings and errors due to the incompatible syntax "
-"between these two Python versions."
-msgstr ""
-"コンソール用に<b>Python %d</b>インタープリターが選択されましたがSpyder上では"
-"<b>Python %d</b>が実行されています!<br><br>この選択は可能ですが、Pythonバー"
-"ジョン間での構文非互換性による偽の警告/エラーを避けるため、Spyder上でも選択し"
-"たバージョンのインタープリターをインストール・実行することが推奨されます。"
+#: spyder/widgets/variableexplorer/importwizard.py:444
+msgid "DataFrame"
+msgstr "DataFrame"
 
-#: spyderlib/plugins/externalconsole.py:532
-msgid "Trying to kill a kernel?"
-msgstr "カーネルをキルしますか?"
+#: spyder/widgets/variableexplorer/importwizard.py:487
+#: spyder/widgets/variableexplorer/importwizard.py:571
+msgid "Import wizard"
+msgstr "インポートウィザード"
 
-#: spyderlib/plugins/externalconsole.py:533
-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 "
-"the second button from right to left."
-msgstr ""
-"接続されているコンソールがあるためカーネルを閉じることができません。<br><br>"
-"接続済みコンソールを閉じるか、右から2番めのボタンを押してカーネルをキルしてく"
-"ださい。"
+#: spyder/widgets/variableexplorer/importwizard.py:492
+msgid "Raw text"
+msgstr "Rawテキスト"
 
-#: spyderlib/plugins/externalconsole.py:612
-#, python-format
-msgid ""
-"No Python console is currently selected to run <b>%s</b>.<br><br>Please "
-"select or open a new Python console and try again."
-msgstr ""
-"実行対象として選ばれているPythonコンソールがありません: <b>%s</b>。<br><br>選"
-"択するか新規Pythonコンソールを開いて再試行してください。"
+#: spyder/widgets/variableexplorer/importwizard.py:495
+msgid "variable_name"
+msgstr "variable_name"
 
-#: spyderlib/plugins/externalconsole.py:692
-#, python-format
-msgid ""
-"%s is already running in a separate process.\n"
-"Do you want to kill the process before starting a new one?"
-msgstr ""
-"%s は既に別プロセスで実行されています。\n"
-"新しいプロセスを開始する前にそのプロセスを殺しますか?"
+#: spyder/widgets/variableexplorer/importwizard.py:506
+msgid "table"
+msgstr "テーブル"
+
+#: spyder/widgets/variableexplorer/importwizard.py:507
+msgid "Preview"
+msgstr "プレビュー"
+
+#: spyder/widgets/variableexplorer/importwizard.py:511
+msgid "Variable Name"
+msgstr "変数名"
 
-#: spyderlib/plugins/externalconsole.py:852
-msgid "Kernel"
-msgstr "カーネル"
+#: spyder/widgets/variableexplorer/importwizard.py:534
+msgid "Done"
+msgstr "完了"
 
-#: spyderlib/plugins/externalconsole.py:862
+#: spyder/widgets/variableexplorer/importwizard.py:572
 msgid ""
-"Either:<ol><li>Your IPython frontend and kernel versions are "
-"<b>incompatible</b> or</li><li>You <b>don't have</b> IPython installed in "
-"your external interpreter.</li></ol>In any case, we're sorry but we can't "
-"create a console for you."
+"<b>Unable to proceed to next step</b><br><br>Please check your entries."
+"<br><br>Error message:<br>%s"
 msgstr ""
-"どちらか:<ol><li>IPythonフロントエンドとカーネルのバージョンは <b>非互換</b> "
-"か</li><li>外部インタープリターとしてIPythonがインストール<b>されていません</"
-"b> 。</li></ol>いずれの理由にせよコンソールを作成できません。"
-
-#: spyderlib/plugins/externalconsole.py:886
-msgid "Command Window"
-msgstr "コマンドウインドウ"
+"<b>次のステップを実行できません</b><br><br>入力をチェックしてください。"
+"<br><br>エラーメッセージ:<br>%s"
 
-#: spyderlib/plugins/externalconsole.py:888
-msgid "Terminal"
-msgstr "ターミナル"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:199
+msgid "Refresh"
+msgstr "リフレッシュ"
 
-#: spyderlib/plugins/externalconsole.py:941
-#, python-format
-msgid "Kernel %s"
-msgstr "カーネル %s"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:203
+msgid "Refresh periodically"
+msgstr "定期的にリフレッシュ"
 
-#: spyderlib/plugins/externalconsole.py:1021
-msgid "Open a &Python console"
-msgstr "Pythonコンソールを開く(&O)"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:210
+#: spyder/widgets/variableexplorer/namespacebrowser.py:490
+msgid "Import data"
+msgstr "データをインポート"
 
-#: spyderlib/plugins/externalconsole.py:1025
-msgid "Open &command prompt"
-msgstr "コマンドプロンプトを開く(&C)"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:213
+#: spyder/widgets/variableexplorer/namespacebrowser.py:568
+#: spyder/widgets/variableexplorer/namespacebrowser.py:587
+msgid "Save data"
+msgstr "データを保存"
 
-#: spyderlib/plugins/externalconsole.py:1026
-msgid "Open a Windows command prompt"
-msgstr "Windowsコマンドプロンプトを開く"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:218
+msgid "Save data as..."
+msgstr "形式を指定してデータ保存"
 
-#: spyderlib/plugins/externalconsole.py:1028
-msgid "Open a &terminal"
-msgstr "ターミナルを開く(&T)"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:230
+msgid "Exclude references which name starts with an underscore"
+msgstr "アンダースコアで始まる参照を除外"
 
-#: spyderlib/plugins/externalconsole.py:1029
-msgid "Open a terminal window"
-msgstr "ターミナルウインドウを開く"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:238
+msgid "Exclude references which name is uppercase"
+msgstr "名前が大文字の参照を除外"
 
-#: spyderlib/plugins/externalconsole.py:1186
-msgid "Open an IPython console"
-msgstr "IPythonコンソールを開く"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:245
+msgid "Exclude references which name starts with an uppercase character"
+msgstr "大文字で始まる参照を除外"
 
-#: spyderlib/plugins/externalconsole.py:1187
+#: spyder/widgets/variableexplorer/namespacebrowser.py:253
 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 ""
-"コンソールモニターは無効化されています:IPythonカーネルは開始されましたが"
-"IPythonコンソールは手動でカーネルに接続する必要が有ります。"
+"Exclude references to unsupported data types (i.e. which won't be handled/"
+"saved correctly)"
+msgstr "非サポートデータ型(例:正しくhandle/saveがができない型)への参照を除外 "
 
-#: spyderlib/plugins/externalconsole.py:1219
-#: spyderlib/plugins/externalconsole.py:1232
-#: spyderlib/plugins/externalconsole.py:1236
-msgid "UMR"
-msgstr "UMR"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:348
+msgid "Object <b>%s</b> is not picklable"
+msgstr "オブジェクト <b>%s</b> はpickle化できません"
 
-#: spyderlib/plugins/externalconsole.py:1220
+#: spyder/widgets/variableexplorer/namespacebrowser.py:510
 msgid ""
-"UMR excluded modules:\n"
-"(example: guidata, guiqwt)"
+"<b>Unsupported file extension '%s'</b><br><br>Would you like to import it "
+"anyway (by selecting a known file format)?"
 msgstr ""
-"UMRから除外するモジュール:\n"
-"(例: guidata, guiqwt)"
+"<b>サポートされていないファイル拡張 '%s'</b><br><br>(既知のファイルフォーマッ"
+"トを選択して)とにかくインポートしますか ?"
 
-#: spyderlib/plugins/externalconsole.py:1233
-#, python-format
-msgid ""
-"The following modules are not installed on your machine:\n"
-"%s"
-msgstr ""
-"以下のモジュールがコンピュータにインストールされていません:\n"
-"%s"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:518
+msgid "Open file as:"
+msgstr "形式を指定して開く:"
 
-#: spyderlib/plugins/externalconsole.py:1237
-msgid ""
-"Please note that these changes will be applied only to new Python/IPython "
-"consoles"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:556
+msgid "<b>Unable to load '%s'</b><br><br>Error message:<br>%s"
+msgstr "<b> '%s' をロードできません</b><br><br>エラーメッセージ:<br>%s"
+
+#: spyder/widgets/variableexplorer/namespacebrowser.py:588
+msgid "<b>Unable to save current workspace</b><br><br>Error message:<br>%s"
 msgstr ""
-"これらの変更は新規Python/IPythonコンソールにのみ適用されることに注意してくだ"
-"さい"
+"<b>現在のワークスペースを保存できません</b><br><br>エラーメッセージ:<br>%s"
 
-#: spyderlib/plugins/layoutdialog.py:174
-msgid "Move Up"
-msgstr "上へ移動"
+#: spyder/widgets/variableexplorer/texteditor.py:74
+msgid "Text editor"
+msgstr "テキストエディタ"
 
-#: spyderlib/plugins/layoutdialog.py:175
-msgid "Move Down"
-msgstr "下へ移動"
+#: spyder/widgets/variableexplorer/utils.py:29
+msgid "View and edit DataFrames and Series in the Variable Explorer"
+msgstr "変数エクスプローラーでのDataFrameとSeriesの表示・編集"
 
-#: spyderlib/plugins/layoutdialog.py:176
-msgid "Delete Layout"
-msgstr "レイアウトの削除"
+#: spyder/widgets/variableexplorer/utils.py:34
+msgid "View and edit two and three dimensional arrays in the Variable Explorer"
+msgstr "変数エクスプローラーでの2, 3次元配列の表示・編集"
 
-#: spyderlib/plugins/layoutdialog.py:180
-msgid "Layout Display and Order"
-msgstr "レイアウトの表示と順序"
+#: spyder/workers/updates.py:89 spyder/workers/updates.py:91
+msgid "Unable to retrieve information."
+msgstr "情報が取得できません"
 
-#: spyderlib/plugins/onlinehelp.py:68
-msgid "Online help"
-msgstr "オンラインヘルプ"
+#: spyder/workers/updates.py:93
+msgid ""
+"Unable to connect to the internet. <br><br>Make sure the connection is "
+"working properly."
+msgstr ""
+"インターネットに接続できません。 <br><br>接続が正しく動作しているか確認してく"
+"ださい。"
+
+#: spyder/workers/updates.py:96
+msgid "Unable to check for updates."
+msgstr "更新をチェックできません"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "{0}"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "{0}"
+
+#~ msgid "Reload last session"
+#~ msgstr "前回のセッションをリロードする"
+
+#~ msgid "Load session..."
+#~ msgstr "セッションをロード..."
+
+#~ msgid "Load Spyder session"
+#~ msgstr "Spyderのセッションをロード"
+
+#, fuzzy
+#~ msgid "Save session..."
+#~ msgstr "セッションを保存"
+
+#~ msgid "Save current session and quit application"
+#~ msgstr "現在のセッションを保存しアプリケーションを終了"
+
+#~ msgid "Open session"
+#~ msgstr "セッションを開く"
+
+#~ msgid "Spyder sessions"
+#~ msgstr "Spyderセッション"
+
+#~ msgid "Save session"
+#~ msgstr "セッションを保存"
+
+#~ msgid "Jupyter Qtconsole integration"
+#~ msgstr "Jupyter Qtconsole 統合"
+
+#~ msgid "Python executable"
+#~ msgstr "Python実行可能ファイル"
+
+#~ msgid "Trying to kill a kernel?"
+#~ msgstr "カーネルをキルしますか?"
+
+#~ 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 the second button from right to left."
+#~ msgstr ""
+#~ "接続されているコンソールがあるためカーネルを閉じることができません。"
+#~ "<br><br>接続済みコンソールを閉じるか、右から2番めのボタンを押してカーネル"
+#~ "をキルしてください。"
+
+#~ msgid "Kernel"
+#~ msgstr "カーネル"
+
+#~ msgid ""
+#~ "Either:<ol><li>Your IPython frontend and kernel versions are "
+#~ "<b>incompatible</b> or</li><li>You <b>don't have</b> IPython installed in "
+#~ "your external interpreter.</li></ol>In any case, we're sorry but we can't "
+#~ "create a console for you."
+#~ msgstr ""
+#~ "どちらか:<ol><li>IPythonフロントエンドとカーネルのバージョンは <b>非互換</"
+#~ "b> か</li><li>外部インタープリターとしてIPythonがインストール<b>されていま"
+#~ "せん</b> 。</li></ol>いずれの理由にせよコンソールを作成できません。"
+
+#~ msgid "Kernel %s"
+#~ msgstr "カーネル %s"
+
+#~ msgid "Open an IPython console"
+#~ msgstr "IPythonコンソールを開く"
+
+#~ 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 ""
+#~ "コンソールモニターは無効化されています:IPythonカーネルは開始されましたが"
+#~ "IPythonコンソールは手動でカーネルに接続する必要が有ります。"
+
+#~ msgid ""
+#~ "UMR excluded modules:\n"
+#~ "(example: guidata, guiqwt)"
+#~ msgstr ""
+#~ "UMRから除外するモジュール:\n"
+#~ "(例: guidata, guiqwt)"
+
+#~ msgid ""
+#~ "This feature requires the Matplotlib library.\n"
+#~ "It seems you don't have it installed."
+#~ msgstr ""
+#~ "この機能にはMatplotlibライブラリが必要です。\n"
+#~ "Matplotlibはインストールされていないようです。"
+
+#~ msgid ""
+#~ "This feature requires the Sympy library.\n"
+#~ "It seems you don't have it installed."
+#~ msgstr ""
+#~ "この機能にはSympyライブラリが必要です。\n"
+#~ "インストールされていないようです。"
+
+#~ msgid "&Font..."
+#~ msgstr "フォント(&F)..."
+
+#~ msgid "Set font style"
+#~ msgstr "フォントスタイルを設定"
+
+#~ msgid "Select a new font"
+#~ msgstr "新規フォントを選択"
+
+#~ msgid ""
+#~ "The kernel failed to start!! That's all we know... Please close this "
+#~ "console and open a new one."
+#~ msgstr ""
+#~ "カーネルは開始できませんでした!!これがわかっていることの全てです...この"
+#~ "コンソールを閉じて再度新しく開いてください。"
+
+#~ msgid ""
+#~ "It seems the kernel died unexpectedly. Use 'Restart kernel' to continue "
+#~ "using this console."
+#~ msgstr ""
+#~ "カーネルが予期せず停止したようです。このコンソールを続行するには\"カーネル"
+#~ "の再起動\"を利用してください。"
+
+#~ msgid "Kernel process is either remote or unspecified. Cannot interrupt"
+#~ msgstr "カーネルプロセスはリモートあるいは詳細不明です。中断できません"
+
+#~ msgid "Kernel process is either remote or unspecified. Cannot restart."
+#~ msgstr "カーネルプロセスはリモートあるいは詳細不明です。再起動できません。"
+
+#~ msgid "its own configuration file"
+#~ msgstr "独自の設定ファイル"
+
+#~ msgid " and "
+#~ msgstr "及び"
+
+#~ msgid "the following projects:<br>%s"
+#~ msgstr "以下のプロジェクト:<br>%s"
+
+#~ msgid "Existing Pydev project"
+#~ msgstr "存在するPydevプロジェクト"
+
+#~ msgid "Close unrelated projects"
+#~ msgstr "関係のないプロジェクトを閉じる"
+
+#~ msgid "Edit related projects"
+#~ msgstr "関係するプロジェクトを編集"
+
+#~ msgid "Add to PYTHONPATH"
+#~ msgstr "PYTHONPATHに追加"
+
+#~ msgid "Remove from PYTHONPATH"
+#~ msgstr "PYTHONPATHから削除"
+
+#~ msgid "Properties"
+#~ msgstr "プロパティ"
+
+#~ 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."
+#~ msgstr ""
+#~ "ワークスペースは保存あるいは復元できませんでした。 %s<br><br>関係づけられ"
+#~ "ている設定ファイルへの書き込み権限があるかチェックしてください。"
+
+#~ msgid "Import directory"
+#~ msgstr "ディレクトリのインポート"
+
+#~ 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)?"
+#~ msgstr ""
+#~ "以下のディレクトリがワークスーペース内にありません。<br><b>%s</"
+#~ "b><br><br>(ディレクトリをワークスペースにコピーして)続行しますか?"
+
+#~ msgid "The project <b>%s</b> is already opened!"
+#~ msgstr "プロジェクト<b>%s</b>は既に開いています!"
+
+#~ 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>"
+#~ msgstr ""
+#~ "プロジェクトのルートディレクトリはワークスペース内に有りますが想定された階"
+#~ "層にありません。 ワークスペース:<br><b>%s</b>のディレクトリではありません"
+
+#~ msgid "A project named <b>%s</b> already exists"
+#~ msgstr "<b>%s</b>という名前のプロジェクトは既に存在します"
+
+#~ msgid ""
+#~ "Invalid project name.<br><br>Name must match the following regular "
+#~ "expression:<br><b>%s</b>"
+#~ msgstr ""
+#~ "無効なプロジェクト名。<br><br>プロジェクト名は以下の正規表現に従ってくださ"
+#~ "い:<br><b>%s</b>"
+
+#~ msgid ""
+#~ "The following directory is not empty:<br><b>%s</b><br><br>Do you want to "
+#~ "continue?"
+#~ msgstr ""
+#~ "以下のディレクトリは空ではありません:<br><b>%s</b><br><br> 続行しますか?"
+
+#~ msgid "New project"
+#~ msgstr "New project_"
+
+#~ msgid ""
+#~ "The current workspace has not been configured yet.\n"
+#~ "Do you want to do this now?"
+#~ msgstr ""
+#~ "現在のワークスペースはまだ設定がされていません。\n"
+#~ "すぐに設定しますか?"
+
+#~ msgid "Import existing project"
+#~ msgstr "既存のプロジェクトをインポート"
+
+#~ msgid "Select projects to import"
+#~ msgstr "インポートするプロジェクトを選択"
+
+#~ msgid "The folder <i>%s</i> does not contain a valid %s project"
+#~ msgstr "フォルダー <i>%s</i>  は有効な %s プロジェクトを含んでいません"
+
+#~ msgid "Import existing Pydev project"
+#~ msgstr "既存のPydevプロジェクトをインポート"
+
+#~ msgid ""
+#~ "<b>Unable to read Pydev project <i>%s</i></b><br><br>Error message:<br>%s"
+#~ msgstr ""
+#~ "<b>Pydevプロジェクト<i>%s</i>を読み取れません</b><br><br>エラーメッセージ:"
+#~ "<br>%s"
+
+#~ msgid ""
+#~ "Do you really want to delete project <b>%s</b>?<br><br>Note: project "
+#~ "files won't be deleted from disk."
+#~ msgstr ""
+#~ "本当にプロジェクト<b>%s</b>を削除しますか?<br><br>注: プロジェクトファイ"
+#~ "ルはディスク上からは削除されません。"
+
+#~ msgid "Select projects which are related to <b>%s</b>"
+#~ msgstr "<b>%s</b>に関連するプロジェクトを選択"
+
+#~ msgid ""
+#~ "Statistics on source files only:<br>(Python, Cython, IPython, Enaml,C/C+"
+#~ "+, Fortran)<br><br><b>%s</b> files.<br><b>%s</b> lines of code."
+#~ msgstr ""
+#~ "ソースファイルのみの統計:<br>(Python, Cython, IPython, Enaml,C/C++, "
+#~ "Fortran)<br><br><b>%s</b> ファイル。<br><b>%s</b> 行のコード。"
+
+#~ msgid "Select an existing workspace directory, or create a new one"
+#~ msgstr "既存のワークスペースを選択するか新規に作成する"
+
+#~ 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>."
+#~ "spyderworkspace</b> configuration file.<br><br>A <b>Spyder project</b> is "
+#~ "a directory with source code (and other related files) and a "
+#~ "configuration file (named <b>.spyderproject</b>) with project settings "
+#~ "(PYTHONPATH, linked projects, ...).<br>"
+#~ msgstr ""
+#~ "<u><b>ワークスペースとは何か?</b></u><br><br><b>Spyderワークスペース</b> "
+#~ "とはファイルシステム上のSpyderプロジェクトと<b>.spyderworkspace</b>設定"
+#~ "ファイルを含むディレクトリである。<br><br> <b>Spyderプロジェクト</b> は"
+#~ "ソースコード(とその他関連ファイル)や(PYTHONPATHや関連プロジェクト.等の)設"
+#~ "定ファイル(<b>.spyderproject</b>)を保存しているディレクトリである。<br>"
+
+#~ msgid "This is the current workspace directory"
+#~ msgstr "これは現在のワークスペースディレクトリです"
+
+#~ msgid ""
+#~ "The following directory is not a Spyder workspace:<br>%s<br><br>Do you "
+#~ "want to create a new workspace in this directory?"
+#~ msgstr ""
+#~ "以下のディレクトリはSpyderワークスペースではありません:<br>%s<br><br>この"
+#~ "ディレクトリに新規ワークスペースを作成しますか?"
+
+#~ msgid "<b>Unable to retrieve data.</b><br><br>Error message:<br>%s"
+#~ msgstr "<b>データを取得できません。</b><br><br>エラーメッセージ:<br>%s"
+
+#~ msgid "Save session and quit..."
+#~ msgstr "セッションを保存して終了"
+
+#~ msgid "Breakpoints"
+#~ msgstr "ブレークポイント"
+
+#~ msgid "Exit"
+#~ msgstr "Exit"
+
+#~ msgid "Exit Debug"
+#~ msgstr "デバッグを終了する"
diff --git a/spyder/locale/pt_BR/LC_MESSAGES/spyder.mo b/spyder/locale/pt_BR/LC_MESSAGES/spyder.mo
new file mode 100644
index 0000000..c6c0314
Binary files /dev/null and b/spyder/locale/pt_BR/LC_MESSAGES/spyder.mo differ
diff --git a/spyderlib/locale/pt_BR/LC_MESSAGES/spyderlib.po b/spyder/locale/pt_BR/LC_MESSAGES/spyder.po
similarity index 52%
rename from spyderlib/locale/pt_BR/LC_MESSAGES/spyderlib.po
rename to spyder/locale/pt_BR/LC_MESSAGES/spyder.po
index d24c336..7df617b 100644
--- a/spyderlib/locale/pt_BR/LC_MESSAGES/spyderlib.po
+++ b/spyder/locale/pt_BR/LC_MESSAGES/spyder.po
@@ -4,3401 +4,3371 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.3\n"
-"POT-Creation-Date: 2015-08-29 22:49+COT\n"
-"PO-Revision-Date: 2015-02-26 03:04-0400\n"
-"Last-Translator: Valter Nazianzeno <manipuladordedados at gmail.com>\n"
+"Project-Id-Version: 3.0"
+"POT-Creation-Date: 2016-09-21 11:43-0300\n"
+"PO-Revision-Date: 2016-09-24 07:03-0300\n"
 "Language-Team: pt_BR\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: pygettext.py 1.5\n"
+"X-Generator: Poedit 1.8.9\n"
+"Last-Translator: Valter Nazianzeno <manipuladordedados at gmail.com>\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 1.7.4\n"
-"X-Poedit-SourceCharset: UTF-8\n"
+"Language: pt_BR\n"
 
-#: spyderlib/config/base.py:241
-msgid ""
-"Update LANGUAGE_CODES (inside config/base.py) if a new translation has been "
-"added to Spyder"
-msgstr ""
+#: spyder/app/mainwindow.py:120
+msgid "Initializing..."
+msgstr "Iniciando..."
 
-#: spyderlib/config/ipython.py:23 spyderlib/config/ipython.py:25
-#: spyderlib/config/ipython.py:32
-msgid "IPython Console integration"
-msgstr "Integração com console IPython"
+#: spyder/app/mainwindow.py:236
+msgid "Numpy and Scipy documentation"
+msgstr "Documentação do Numpy e Scipy"
 
-#: spyderlib/config/main.py:29
-msgid "Python files"
-msgstr "Arquivos Python"
+#: spyder/app/mainwindow.py:238 spyder/app/mainwindow.py:1022
+msgid "Matplotlib documentation"
+msgstr "Documentação do Matplotlib"
 
-#: spyderlib/config/main.py:30
-msgid "Cython/Pyrex files"
-msgstr "Arquivos Cython/Pyrex"
+#: spyder/app/mainwindow.py:241
+msgid "PyQt4 Reference Guide"
+msgstr "Guia de referência do PyQt4"
 
-#: spyderlib/config/main.py:31
-msgid "C files"
-msgstr "Arquivos C"
+#: spyder/app/mainwindow.py:244
+msgid "PyQt4 API Reference"
+msgstr "Referência da API do PyQt4"
 
-#: spyderlib/config/main.py:32
-msgid "C++ files"
-msgstr "Arquivos C++"
+#: spyder/app/mainwindow.py:246
+msgid "Python(x,y)"
+msgstr "Python(x,y)"
 
-#: spyderlib/config/main.py:33
-msgid "OpenCL files"
-msgstr "Arquivos OpenCL"
+#: spyder/app/mainwindow.py:248
+msgid "WinPython"
+msgstr "WinPython"
 
-#: spyderlib/config/main.py:34
-msgid "Fortran files"
-msgstr "Arquivos Fortran"
+#: spyder/app/mainwindow.py:519
+msgid "Close current pane"
+msgstr "Fechar painel atual"
 
-#: spyderlib/config/main.py:35
-msgid "IDL files"
-msgstr "Arquivos IDL"
+#: spyder/app/mainwindow.py:524
+msgid "Lock panes"
+msgstr "Travar painéis"
 
-#: spyderlib/config/main.py:36
-msgid "MATLAB files"
-msgstr "Arquivos MATLAB"
+#: spyder/app/mainwindow.py:531
+msgid "Use next layout"
+msgstr "Usar próximo layout"
 
-#: spyderlib/config/main.py:37
-msgid "Julia files"
-msgstr "Arquivos Julia"
+#: spyder/app/mainwindow.py:535
+msgid "Use previous layout"
+msgstr "Usar layout anterior"
 
-#: spyderlib/config/main.py:38
-msgid "Yaml files"
-msgstr "Arquivos Yaml"
+#: spyder/app/mainwindow.py:554 spyder/widgets/sourcecode/codeeditor.py:2464
+msgid "Undo"
+msgstr "Desfazer"
 
-#: spyderlib/config/main.py:39
-msgid "Patch and diff files"
-msgstr "Arquivos Patch e diff"
+#: spyder/app/mainwindow.py:556 spyder/widgets/sourcecode/codeeditor.py:2467
+msgid "Redo"
+msgstr "Refazer"
 
-#: spyderlib/config/main.py:40
-msgid "Batch files"
-msgstr "Arquivos Batch"
+#: spyder/app/mainwindow.py:558 spyder/widgets/shell.py:121
+#: spyder/widgets/sourcecode/codeeditor.py:2473
+#: spyder/widgets/variableexplorer/arrayeditor.py:453
+#: spyder/widgets/variableexplorer/collectionseditor.py:647
+#: spyder/widgets/variableexplorer/dataframeeditor.py:445
+msgid "Copy"
+msgstr "Copiar"
 
-#: spyderlib/config/main.py:41 spyderlib/utils/iofuncs.py:500
-msgid "Text files"
-msgstr "Arquivos de texto"
+#: spyder/app/mainwindow.py:560 spyder/widgets/shell.py:117
+#: spyder/widgets/sourcecode/codeeditor.py:2470
+msgid "Cut"
+msgstr "Recortar"
 
-#: spyderlib/config/main.py:42
-msgid "reStructuredText files"
-msgstr "Arquivos de texto reeStruturado"
+#: spyder/app/mainwindow.py:562 spyder/widgets/shell.py:125
+#: spyder/widgets/sourcecode/codeeditor.py:2476
+#: spyder/widgets/variableexplorer/collectionseditor.py:644
+msgid "Paste"
+msgstr "Colar"
 
-#: spyderlib/config/main.py:43
-msgid "gettext files"
-msgstr "Arquivos gettext "
+#: spyder/app/mainwindow.py:565 spyder/widgets/shell.py:138
+#: spyder/widgets/sourcecode/codeeditor.py:2479
+msgid "Select All"
+msgstr "Selecionar tudo"
 
-#: spyderlib/config/main.py:44
-msgid "NSIS files"
-msgstr "Arquivos NSIS "
+#: spyder/app/mainwindow.py:575 spyder/plugins/editor.py:1342
+msgid "&File"
+msgstr "&Arquivo"
 
-#: spyderlib/config/main.py:45
-msgid "Web page files"
-msgstr "Arquivos de Páginas web"
+#: spyder/app/mainwindow.py:576 spyder/plugins/editor.py:1334
+msgid "File toolbar"
+msgstr "Barra de arquivo"
 
-#: spyderlib/config/main.py:46
-msgid "XML files"
-msgstr "Arquivos XML"
+#: spyder/app/mainwindow.py:580 spyder/plugins/editor.py:1343
+msgid "&Edit"
+msgstr "&Editar"
 
-#: spyderlib/config/main.py:47
-msgid "Javascript files"
-msgstr "Arquivos Javascript"
+#: spyder/app/mainwindow.py:581 spyder/plugins/editor.py:1339
+msgid "Edit toolbar"
+msgstr "Barra de edição"
 
-#: spyderlib/config/main.py:48
-msgid "Json files"
-msgstr "Arquivos Json"
+#: spyder/app/mainwindow.py:585 spyder/plugins/editor.py:1344
+msgid "&Search"
+msgstr "&Pesquisar"
 
-#: spyderlib/config/main.py:49
-msgid "IPython notebooks"
-msgstr "Notebooks do IPython"
+#: spyder/app/mainwindow.py:586 spyder/plugins/editor.py:1335
+msgid "Search toolbar"
+msgstr "Barra de pesquisa"
 
-#: spyderlib/config/main.py:50
-msgid "Enaml files"
-msgstr "Arquivos Enaml"
+#: spyder/app/mainwindow.py:590 spyder/plugins/editor.py:1345
+msgid "Sour&ce"
+msgstr "Códi&go"
 
-#: spyderlib/config/main.py:51
-msgid "Configuration files"
-msgstr "Arquivos de Configuração"
+#: spyder/app/mainwindow.py:591 spyder/plugins/editor.py:1336
+msgid "Source toolbar"
+msgstr "Barra de código"
 
-#: spyderlib/config/main.py:58 spyderlib/widgets/explorer.py:660
-msgid "All files"
-msgstr "Todos os arquivos"
+#: spyder/app/mainwindow.py:595 spyder/plugins/editor.py:780
+#: spyder/plugins/editor.py:1346
+msgid "&Run"
+msgstr "&Executar"
 
-#: spyderlib/plugins/__init__.py:513 spyderlib/plugins/editor.py:95
-#: spyderlib/plugins/editor.py:551 spyderlib/plugins/editor.py:1600
-#: spyderlib/plugins/inspector.py:139 spyderlib/plugins/inspector.py:419
-#: spyderlib/widgets/editor.py:357
-#: spyderlib/widgets/sourcecode/codeeditor.py:95
-#: spyderlib/widgets/sourcecode/codeeditor.py:2902
-msgid "Editor"
-msgstr "Editor"
+#: spyder/app/mainwindow.py:596 spyder/plugins/editor.py:1337
+msgid "Run toolbar"
+msgstr "Barra de execução "
 
-#: spyderlib/plugins/configdialog.py:133
-#, fuzzy
-msgid "Reset to defaults"
-msgstr "Restaurar os valores padrões."
+#: spyder/app/mainwindow.py:600 spyder/plugins/editor.py:739
+msgid "&Debug"
+msgstr "&Depurar"
 
-#: spyderlib/plugins/configdialog.py:145
-msgid "Preferences"
-msgstr "Preferências"
+#: spyder/app/mainwindow.py:601 spyder/plugins/editor.py:1338
+msgid "Debug toolbar"
+msgstr "Barra de depuração"
 
-#: spyderlib/plugins/configdialog.py:473
-msgid "Invalid directory path"
-msgstr "Caminho de diretório inválido"
+#: spyder/app/mainwindow.py:605
+msgid "C&onsoles"
+msgstr "C&onsoles"
 
-#: spyderlib/plugins/configdialog.py:476 spyderlib/plugins/configdialog.py:491
-#: spyderlib/plugins/runconfig.py:176 spyderlib/plugins/runconfig.py:240
-#: spyderlib/plugins/workingdirectory.py:295 spyderlib/widgets/explorer.py:574
-#: spyderlib/widgets/externalshell/pythonshell.py:640
-#: spyderlib/widgets/findinfiles.py:505 spyderlib/widgets/pathmanager.py:223
-#: spyderlib/widgets/projectexplorer.py:899
-msgid "Select directory"
-msgstr "Selecionar diretório"
+#: spyder/app/mainwindow.py:608
+msgid "&Projects"
+msgstr "&Projetos"
 
-#: spyderlib/plugins/configdialog.py:503
-msgid "Invalid file path"
-msgstr "Caminho de arquivo inválido "
+#: spyder/app/mainwindow.py:611 spyder/plugins/editor.py:1347
+msgid "&Tools"
+msgstr "&Ferramentas"
 
-#: spyderlib/plugins/configdialog.py:506 spyderlib/plugins/configdialog.py:523
-msgid "Select file"
-msgstr "Selecionar arquivo"
+#: spyder/app/mainwindow.py:614
+msgid "&View"
+msgstr "&Ver"
 
-#: spyderlib/plugins/configdialog.py:522
-msgid "All files (*)"
-msgstr "Todos os arquivos (*)"
+#: spyder/app/mainwindow.py:617
+msgid "&Help"
+msgstr "A&juda"
 
-#: spyderlib/plugins/configdialog.py:595 spyderlib/widgets/formlayout.py:214
-msgid "Bold"
-msgstr "Negrito"
+#: spyder/app/mainwindow.py:622
+msgid "Welcome to Spyder!"
+msgstr "Bem-vindo ao Spyder!"
 
-#: spyderlib/plugins/configdialog.py:598 spyderlib/widgets/formlayout.py:209
-msgid "Italic"
-msgstr "Itálico"
+#: spyder/app/mainwindow.py:627
+msgid "Pre&ferences"
+msgstr "Pre&ferências"
 
-#: spyderlib/plugins/configdialog.py:640
-msgid "Font: "
-msgstr "Fonte:"
+#: spyder/app/mainwindow.py:634 spyder/widgets/pathmanager.py:49
+msgid "PYTHONPATH manager"
+msgstr "Gerenciar PYTHONPATH"
 
-#: spyderlib/plugins/configdialog.py:644
-msgid "Size: "
-msgstr "Tamanho:"
+#: spyder/app/mainwindow.py:637
+msgid "Python Path Manager"
+msgstr "Gerenciador de caminhos do Python"
 
-#: spyderlib/plugins/configdialog.py:653 spyderlib/plugins/history.py:48
-msgid "Font style"
-msgstr "Estilo de fonte"
+#: spyder/app/mainwindow.py:640
+msgid "Update module names list"
+msgstr "Atualizar a lista de nomes dos módulos"
 
-#: spyderlib/plugins/configdialog.py:708
-msgid "Spyder needs to restart to change the following setting:"
-msgstr ""
+#: spyder/app/mainwindow.py:643
+msgid "Refresh list of module names available in PYTHONPATH"
+msgstr "Atualizar a lista de nomes dos módulos disponíveis no PYTHONPATH"
 
-#: spyderlib/plugins/configdialog.py:711
-msgid "Spyder needs to restart to change the following settings:"
-msgstr ""
+#: spyder/app/mainwindow.py:646
+msgid "Reset Spyder to factory defaults"
+msgstr "Resetar configuração padrão do Spyder"
 
-#: spyderlib/plugins/configdialog.py:713
-msgid "Do you wish to restart now?"
-msgstr ""
+#: spyder/app/mainwindow.py:651
+msgid "Current user environment variables..."
+msgstr "Variáveis de ambiente do usuário atual..."
 
-#: spyderlib/plugins/configdialog.py:719
-msgid "Information"
+#: spyder/app/mainwindow.py:653
+msgid ""
+"Show and edit current user environment variables in Windows registry (i.e. "
+"for all sessions)"
 msgstr ""
+"Mostrar e editar as variáveis de\n"
+"ambiente do usuário atual no\n"
+"registro do Windows (para todas\n"
+"as sessões)"
 
-#: spyderlib/plugins/configdialog.py:734
-msgid "General"
-msgstr "Geral"
+#: spyder/app/mainwindow.py:662 spyder/app/mainwindow.py:1118
+msgid "External Tools"
+msgstr "Ferramentas externas"
 
-#: spyderlib/plugins/configdialog.py:741 spyderlib/plugins/editor.py:104
-#: spyderlib/plugins/externalconsole.py:67
-#: spyderlib/plugins/ipythonconsole.py:162
-msgid "Interface"
-msgstr "Interface"
+#: spyder/app/mainwindow.py:666
+msgid "Python(x,y) launcher"
+msgstr "Lançador do Python(x,y)"
 
-#: spyderlib/plugins/configdialog.py:744
-msgid "Qt windows style"
-msgstr "Tema do Qt"
+#: spyder/app/mainwindow.py:673
+msgid "WinPython control panel"
+msgstr "Painel de controle WinPython"
 
-#: spyderlib/plugins/configdialog.py:750
-msgid "Icon theme"
-msgstr ""
+#: spyder/app/mainwindow.py:682
+msgid "Qt Designer"
+msgstr "Qt Designer"
 
-#: spyderlib/plugins/configdialog.py:755
-msgid "Language"
-msgstr ""
+#: spyder/app/mainwindow.py:687
+msgid "Qt Linguist"
+msgstr "Qt Linguist"
 
-#: spyderlib/plugins/configdialog.py:759
-msgid "Use a single instance"
-msgstr "Usar uma única instância "
+#: spyder/app/mainwindow.py:693
+msgid "Qt examples"
+msgstr "Exemplos do Qt"
 
-#: spyderlib/plugins/configdialog.py:761
-msgid ""
-"Set this to open external<br> Python files in an already running instance "
-"(Requires a restart)"
-msgstr ""
-"Selecione esta opção<br> para abrir arquivos externos de Python nessa "
-"instância atual (Requer que seja reiniciado)"
+#: spyder/app/mainwindow.py:714
+msgid "guidata examples"
+msgstr "Exemplos do guidata"
 
-#: spyderlib/plugins/configdialog.py:764
-#, fuzzy
-msgid "Vertical title bars in panes"
-msgstr "Abas de título verticais para os componentes"
+#: spyder/app/mainwindow.py:725
+msgid "guiqwt examples"
+msgstr "Exemplos do guiqwt"
 
-#: spyderlib/plugins/configdialog.py:766
-msgid "Vertical tabs in panes"
-msgstr ""
+#: spyder/app/mainwindow.py:730
+msgid "Sift"
+msgstr "Sift"
 
-#: spyderlib/plugins/configdialog.py:768
-#, fuzzy
-msgid "Animated toolbars and panes"
-msgstr "Aba de ferramentas e componentes animados"
+#: spyder/app/mainwindow.py:740
+msgid "ViTables"
+msgstr "ViTables"
 
-#: spyderlib/plugins/configdialog.py:770
-msgid "Tear off menus"
-msgstr "Separar os menus"
+#: spyder/app/mainwindow.py:754
+msgid "Fullscreen mode"
+msgstr "Modo tela cheia"
 
-#: spyderlib/plugins/configdialog.py:771
-msgid "Set this to detach any<br> menu from the main window"
-msgstr "Habilite esta opção<br> se deseja separar os menus da janela principal"
+#: spyder/app/mainwindow.py:766
+msgid "Main toolbar"
+msgstr "Barra principal"
 
-#: spyderlib/plugins/configdialog.py:773
-msgid "Custom margin for panes:"
+#: spyder/app/mainwindow.py:775
+msgid ""
+"Spyder Internal Console\n"
+"\n"
+"This console is used to report application\n"
+"internal errors and to inspect Spyder\n"
+"internals with the following commands:\n"
+"  spy.app, spy.window, dir(spy)\n"
+"\n"
+"Please don't use it to run your code\n"
+"\n"
 msgstr ""
+"Console interno do Spyder!\n"
+"\n"
+"Este console é usado para reportar erros\n"
+"internos do aplicativo e para inspecionar\n"
+"as características internas do Spyder com\n"
+"os seguintes comandos:\n"
+"  spy.app, spy.window, dir(spy)\n"
+"\n"
+"Por favor não execute seu código neste console\n"
 
-#: spyderlib/plugins/configdialog.py:782
-msgid "Prompt when exiting"
-msgstr ""
+#: spyder/app/mainwindow.py:792
+msgid "Loading help..."
+msgstr "Carregando ajuda..."
 
-#: spyderlib/plugins/configdialog.py:813
-msgid "Status bar"
-msgstr "Barra de status"
+#: spyder/app/mainwindow.py:799
+msgid "Loading outline explorer..."
+msgstr "Carregando o explorador de código..."
 
-#: spyderlib/plugins/configdialog.py:814
-#, fuzzy
-msgid "Show status bar"
-msgstr "Mostrar barra de abas"
+#: spyder/app/mainwindow.py:807
+msgid "Loading editor..."
+msgstr "Carregando editor..."
 
-#: spyderlib/plugins/configdialog.py:816
-msgid "Show memory usage every"
-msgstr "Mostrar uso da memória a cada"
+#: spyder/app/mainwindow.py:813 spyder/plugins/console.py:134
+#: spyder/widgets/ipythonconsole/client.py:278
+msgid "&Quit"
+msgstr "&Sair"
 
-#: spyderlib/plugins/configdialog.py:825
-msgid "Show CPU usage every"
-msgstr "Mostrar uso da CPU a cada"
+#: spyder/app/mainwindow.py:815 spyder/plugins/console.py:136
+msgid "Quit"
+msgstr "Sair"
 
-#: spyderlib/plugins/configdialog.py:858
-msgid "Debugging"
-msgstr "Depuração"
+#: spyder/app/mainwindow.py:819
+msgid "&Restart"
+msgstr "&Reiniciar"
 
-#: spyderlib/plugins/configdialog.py:859
-msgid "Pop up internal console when internal errors appear"
-msgstr "Mostrar o terminal interno quando houver erros"
+#: spyder/app/mainwindow.py:821
+msgid "Restart"
+msgstr "Reiniciar"
 
-#: spyderlib/plugins/configdialog.py:868
-msgid "Updates"
-msgstr ""
+#: spyder/app/mainwindow.py:838
+msgid "Loading file explorer..."
+msgstr "Carregando explorador de arquivos..."
 
-#: spyderlib/plugins/configdialog.py:869 spyderlib/spyder.py:2872
-msgid "Check for updates on startup"
-msgstr ""
+#: spyder/app/mainwindow.py:845
+msgid "Loading history plugin..."
+msgstr "Carregando histórico..."
 
-#: spyderlib/plugins/configdialog.py:902
-msgid "Syntax coloring"
-msgstr "Sintaxe colorida"
+#: spyder/app/mainwindow.py:856
+msgid "Loading online help..."
+msgstr "Carregando ajuda online..."
 
-#: spyderlib/plugins/configdialog.py:911
-msgid "Background:"
-msgstr "Fundo:"
+#: spyder/app/mainwindow.py:862
+msgid "Loading project explorer..."
+msgstr "Carregando explorador de projetos..."
 
-#: spyderlib/plugins/configdialog.py:912
-#: spyderlib/widgets/sourcecode/codeeditor.py:104
-msgid "Current line:"
-msgstr "Linha atual:"
+#: spyder/app/mainwindow.py:869
+msgid "Loading external console..."
+msgstr "Carregando console externo..."
 
-#: spyderlib/plugins/configdialog.py:913
-msgid "Current cell:"
-msgstr "Célula selecionada:"
+#: spyder/app/mainwindow.py:875
+msgid "Loading namespace browser..."
+msgstr "Carregando explorador de variáveis..."
 
-#: spyderlib/plugins/configdialog.py:914
-msgid "Occurrence:"
-msgstr "Ocorrência:"
+#: spyder/app/mainwindow.py:882
+msgid "Loading IPython console..."
+msgstr "Carregando console IPython..."
 
-#: spyderlib/plugins/configdialog.py:915
-msgid "Link:"
-msgstr "Link:"
+#: spyder/app/mainwindow.py:887
+msgid "Setting up main window..."
+msgstr "Configurando tela principal..."
 
-#: spyderlib/plugins/configdialog.py:916
-msgid "Side areas:"
-msgstr "Áreas laterais:"
+#: spyder/app/mainwindow.py:890
+msgid "Dependencies..."
+msgstr "Dependências..."
 
-#: spyderlib/plugins/configdialog.py:917
-msgid "Matched parentheses:"
-msgstr "Parênteses fechados:"
+#: spyder/app/mainwindow.py:894
+msgid "Report issue..."
+msgstr "Reportar problema..."
 
-#: spyderlib/plugins/configdialog.py:918
-msgid "Unmatched parentheses:"
-msgstr "Parênteses abertos:"
+#: spyder/app/mainwindow.py:898
+msgid "Spyder support..."
+msgstr "Suporte do Spyder..."
 
-#: spyderlib/plugins/configdialog.py:919
-msgid "Normal text:"
-msgstr "Texto normal:"
+#: spyder/app/mainwindow.py:901
+msgid "Check for updates..."
+msgstr "Verificar por atualizações..."
 
-#: spyderlib/plugins/configdialog.py:920
-msgid "Keyword:"
-msgstr "Palavra chave:"
+#: spyder/app/mainwindow.py:924
+msgid "Spyder documentation"
+msgstr "Documentação do Spyder"
 
-#: spyderlib/plugins/configdialog.py:921
-msgid "Builtin:"
-msgstr "Objeto integrado:"
+#: spyder/app/mainwindow.py:929
+msgid "Spyder tutorial"
+msgstr "Tutorial do Spyder"
 
-#: spyderlib/plugins/configdialog.py:922
-msgid "Definition:"
-msgstr "Definição:"
+#: spyder/app/mainwindow.py:936
+msgid "Interactive tours"
+msgstr "Tours interativas"
 
-#: spyderlib/plugins/configdialog.py:923
-msgid "Comment:"
-msgstr "Comentário:"
+#: spyder/app/mainwindow.py:964
+msgid "Python documentation"
+msgstr "Documentação do Python"
 
-#: spyderlib/plugins/configdialog.py:924
-msgid "String:"
-msgstr "String:"
+#: spyder/app/mainwindow.py:970 spyder/app/mainwindow.py:1014
+msgid "IPython documentation"
+msgstr "Documentação do IPython"
 
-#: spyderlib/plugins/configdialog.py:925
-msgid "Number:"
-msgstr "Número:"
+#: spyder/app/mainwindow.py:971
+msgid "Intro to IPython"
+msgstr "Introdução ao IPython"
 
-#: spyderlib/plugins/configdialog.py:926
-msgid "Instance:"
-msgstr "Instância:"
+#: spyder/app/mainwindow.py:973
+msgid "Quick reference"
+msgstr "Referência rápida"
 
-#: spyderlib/plugins/configdialog.py:932
-msgid "Color scheme"
-msgstr "Esquema de cores"
+#: spyder/app/mainwindow.py:975
+msgid "Console help"
+msgstr "Ajuda do console"
 
-#: spyderlib/plugins/configdialog.py:954 spyderlib/plugins/shortcuts.py:776
-msgid "Reset to default values"
-msgstr "Restaurar os valores padrões."
+#: spyder/app/mainwindow.py:1012
+msgid "Python(x,y) documentation folder"
+msgstr "Pasta de documentação do Python(x,y)"
 
-#: spyderlib/plugins/console.py:109
-msgid "Internal console"
-msgstr "Console interno"
+#: spyder/app/mainwindow.py:1016
+msgid "guidata documentation"
+msgstr "Documentação do guidata "
 
-#: spyderlib/plugins/console.py:129 spyderlib/spyder.py:869
-#: spyderlib/widgets/ipython.py:595
-msgid "&Quit"
-msgstr "&Sair"
+#: spyder/app/mainwindow.py:1019
+msgid "guiqwt documentation"
+msgstr "Documentação do guiqwt"
 
-#: spyderlib/plugins/console.py:131 spyderlib/spyder.py:871
-msgid "Quit"
-msgstr "Sair"
+#: spyder/app/mainwindow.py:1025
+msgid "NumPy documentation"
+msgstr "Documentação do NumPy"
 
-#: spyderlib/plugins/console.py:134 spyderlib/plugins/externalconsole.py:1039
-msgid "&Run..."
-msgstr "E&xecutar"
+#: spyder/app/mainwindow.py:1027
+msgid "NumPy reference guide"
+msgstr "Guia de referência do NumPy"
 
-#: spyderlib/plugins/console.py:136 spyderlib/plugins/externalconsole.py:1040
-msgid "Run a Python script"
-msgstr "Executar um script Python"
+#: spyder/app/mainwindow.py:1029
+msgid "NumPy user guide"
+msgstr "Guia do usuário do NumPy"
 
-#: spyderlib/plugins/console.py:139
-msgid "Environment variables..."
-msgstr "Variáveis de ambiente..."
+#: spyder/app/mainwindow.py:1031
+msgid "SciPy documentation"
+msgstr "Documentação do SciPy"
 
-#: spyderlib/plugins/console.py:141
-msgid "Show and edit environment variables (for current session)"
-msgstr "Mostrar e editar as variáveis de ambiente (para a sessão atual)"
+#: spyder/app/mainwindow.py:1038
+msgid "Installed Python modules"
+msgstr "Módulos instalados do Python"
 
-#: spyderlib/plugins/console.py:145
-msgid "Show sys.path contents..."
-msgstr "Mostrar conteúdo da sys.path..."
+#: spyder/app/mainwindow.py:1042
+msgid "Online documentation"
+msgstr "Documentação online"
 
-#: spyderlib/plugins/console.py:147
-msgid "Show (read-only) sys.path"
-msgstr "Mostrar conteúdo da sys.path em modo de leitura"
+#: spyder/app/mainwindow.py:1054
+msgid "Qt documentation"
+msgstr "Documentação do Qt"
 
-#: spyderlib/plugins/console.py:150
-msgid "Buffer..."
-msgstr "Buffer..."
+#: spyder/app/mainwindow.py:1060
+msgid "About %s..."
+msgstr "Sobre o %s..."
 
-#: spyderlib/plugins/console.py:151 spyderlib/plugins/externalconsole.py:87
-#: spyderlib/plugins/history.py:41
-msgid "Set maximum line count"
-msgstr "Definir número máximo de linhas"
+#: spyder/app/mainwindow.py:1084
+msgid "Panes"
+msgstr "Painéis"
 
-#: spyderlib/plugins/console.py:154 spyderlib/plugins/explorer.py:67
-#: spyderlib/plugins/history.py:169 spyderlib/plugins/inspector.py:388
-#: spyderlib/plugins/projectexplorer.py:68
-msgid "&Font..."
-msgstr "&Fonte..."
+#: spyder/app/mainwindow.py:1086
+msgid "Toolbars"
+msgstr "Barra de ferramentas"
 
-#: spyderlib/plugins/console.py:155 spyderlib/plugins/history.py:170
-msgid "Set shell font style"
-msgstr "Definir tipo de fonte do shell"
+#: spyder/app/mainwindow.py:1087
+msgid "Window layouts"
+msgstr "Layouts da janela"
 
-#: spyderlib/plugins/console.py:158
-msgid "External editor path..."
-msgstr "Caminho de editor externo:"
+#: spyder/app/mainwindow.py:1096 spyder/app/mainwindow.py:1893
+#: spyder/app/mainwindow.py:1894
+msgid "Show toolbars"
+msgstr "Mostrar barra de ferramentas"
 
-#: spyderlib/plugins/console.py:159
-msgid "Set external editor executable path"
-msgstr "Definir caminho de editor externo"
+#: spyder/app/mainwindow.py:1111
+msgid "Attached console window (debugging)"
+msgstr "Janela do console anexada (depuração)"
 
-#: spyderlib/plugins/console.py:162 spyderlib/plugins/editor.py:139
-#: spyderlib/plugins/externalconsole.py:88 spyderlib/plugins/history.py:44
-#: spyderlib/plugins/history.py:172 spyderlib/plugins/inspector.py:180
-#: spyderlib/plugins/inspector.py:391
-msgid "Wrap lines"
-msgstr "Ajuste de linha automático"
+#: spyder/app/mainwindow.py:1294 spyder/plugins/projects.py:238
+#: spyder/widgets/explorer.py:627 spyder/widgets/explorer.py:732
+#: spyder/widgets/externalshell/pythonshell.py:533
+#: spyder/widgets/externalshell/systemshell.py:105
+#: spyder/widgets/variableexplorer/arrayeditor.py:573
+#: spyder/widgets/variableexplorer/collectionseditor.py:419
+#: spyder/widgets/variableexplorer/dataframeeditor.py:593
+msgid "Error"
+msgstr "Erro"
 
-#: spyderlib/plugins/console.py:165 spyderlib/plugins/editor.py:181
-#: spyderlib/plugins/externalconsole.py:133
-#: spyderlib/plugins/ipythonconsole.py:172
-msgid "Display balloon tips"
-msgstr "Mostrar sugestões"
+#: spyder/app/mainwindow.py:1295
+msgid ""
+"<b>You have missing dependencies!</b><br><br><tt>%s</tt><br><br><b>Please "
+"install them to avoid this message.</b><br><br><i>Note</i>: Spyder could "
+"work without some of these dependencies, however to have a smooth experience "
+"when using Spyder we <i>strongly</i> recommend you to install all the listed "
+"missing dependencies.<br><br>Failing to install these dependencies might "
+"result in bugs. Please be sure that any found bugs are not the direct result "
+"of missing dependencies, prior to reporting a new issue."
+msgstr ""
+"<b>Você tem dependências faltando!</b><br><br><tt>%s</tt><br><br><b>Por "
+"favor instale elas para evitar esta mensagem.</b><br><br><i>Nota</i>: O "
+"Spyder pode funcionar sem algumas dependências, porém para ter uma "
+"experiência melhor ao utilizar o software recomendamos <i>fortemente</i> a "
+"instalação das dependências listadas que estão faltando.<br><br>A não "
+"instalação destas dependências pode gerar bugs. Antes de relatar um novo "
+"problema certifique-se de que quaisquer bugs encontrados não são o resultado "
+"das dependências que estão faltando."
+
+#: spyder/app/mainwindow.py:1740
+msgid "Spyder Default Layout"
+msgstr "Layout padrão do Spyder"
 
-#: spyderlib/plugins/console.py:169 spyderlib/plugins/editor.py:175
-#: spyderlib/plugins/externalconsole.py:127
-msgid "Automatic code completion"
-msgstr "Completar código automáticamente"
+#: spyder/app/mainwindow.py:1758
+msgid "Save current layout"
+msgstr "Salvar layout atual"
 
-#: spyderlib/plugins/console.py:173 spyderlib/plugins/editor.py:179
-#: spyderlib/plugins/externalconsole.py:131
-msgid "Enter key selects completion"
-msgstr "A tecla Enter seleciona o resultado a completar"
+#: spyder/app/mainwindow.py:1762
+msgid "Layout preferences"
+msgstr "Preferências do Layout"
 
-#: spyderlib/plugins/console.py:178
-msgid "Internal console settings"
-msgstr "Configurações do console interno"
+#: spyder/app/mainwindow.py:1766
+msgid "Reset to spyder default"
+msgstr "Resetar para o layout padrão do Spyder"
+
+#: spyder/app/mainwindow.py:1786 spyder/app/mainwindow.py:1808
+#: spyder/app/mainwindow.py:1871 spyder/app/mainwindow.py:2655
+#: spyder/plugins/configdialog.py:1250 spyder/plugins/externalconsole.py:446
+#: spyder/plugins/ipythonconsole.py:119 spyder/plugins/ipythonconsole.py:835
+#: spyder/plugins/maininterpreter.py:167 spyder/utils/environ.py:100
+#: spyder/utils/environ.py:113
+#: spyder/widgets/variableexplorer/arrayeditor.py:496
+#: spyder/widgets/variableexplorer/collectionseditor.py:410
+#: spyder/widgets/variableexplorer/collectionseditor.py:1063
+msgid "Warning"
+msgstr "Aviso"
 
-#: spyderlib/plugins/console.py:231 spyderlib/plugins/externalconsole.py:1220
-msgid "Run Python script"
-msgstr "Executar script Python"
+#: spyder/app/mainwindow.py:1787
+msgid ""
+"Window layout will be reset to default settings: this affects window "
+"position, size and dockwidgets.\n"
+"Do you want to continue?"
+msgstr ""
+"O esquema das janelas será reiniciado para as configurações padrões: isso "
+"afeta a posição, tamanho e componentes da janela.\n"
+"Deseja continuar?"
 
-#: spyderlib/plugins/console.py:232 spyderlib/plugins/externalconsole.py:226
-#: spyderlib/plugins/externalconsole.py:1221 spyderlib/widgets/explorer.py:675
-msgid "Python scripts"
-msgstr "Scripts Python"
+#: spyder/app/mainwindow.py:1809
+msgid ""
+"Layout <b>%s</b> will be                                                "
+"overwritten. Do you want to                                                "
+"continue?"
+msgstr ""
+"Layout <b>%s</b> será                                                "
+"sobrescrito. Você deseja                                               "
+"Continuar?"
 
-#: spyderlib/plugins/console.py:278 spyderlib/plugins/explorer.py:117
-#: spyderlib/plugins/history.py:285 spyderlib/plugins/inspector.py:665
-#: spyderlib/plugins/projectexplorer.py:126
-msgid "Select a new font"
-msgstr "Selecionar uma nova fonte"
+#: spyder/app/mainwindow.py:1872
+msgid "Quick switch layout #%s has not yet been defined."
+msgstr "Troca rápida do layout #%s ainda não foi definida."
 
-#: spyderlib/plugins/console.py:286
-msgid "Buffer"
-msgstr "Buffer"
+#: spyder/app/mainwindow.py:1890 spyder/app/mainwindow.py:1891
+msgid "Hide toolbars"
+msgstr "Esconder barra de ferramentas"
 
-#: spyderlib/plugins/console.py:287
-msgid "Maximum line count"
-msgstr "Número máximo de linhas"
+#: spyder/app/mainwindow.py:2184 spyder/app/mainwindow.py:2185
+msgid "Maximize current pane"
+msgstr "Maximizar painel atual"
 
-#: spyderlib/plugins/console.py:297
-msgid "External editor"
-msgstr "Editor externo"
+#: spyder/app/mainwindow.py:2188
+msgid "Restore current pane"
+msgstr "Restaurar painel atual"
 
-#: spyderlib/plugins/console.py:298
-msgid "External editor executable path:"
-msgstr "Caminho do executável do editor externo:"
+#: spyder/app/mainwindow.py:2189
+msgid "Restore pane to its original size"
+msgstr "Restaurar painel ao seu tamanho original"
 
-#: spyderlib/plugins/editor.py:101
-msgid "Edit template for new modules"
-msgstr "Editar template para novos módulos"
+#: spyder/app/mainwindow.py:2273
+msgid "About %s"
+msgstr "Sobre o %s"
 
-#: spyderlib/plugins/editor.py:106
-msgid "Text and margin font style"
-msgstr "Estilo de fonte para o texto e margens"
+#: spyder/app/mainwindow.py:2400 spyder/plugins/editor.py:158
+#: spyder/plugins/runconfig.py:322 spyder/plugins/runconfig.py:444
+#: spyder/plugins/runconfig.py:449 spyder/utils/programs.py:285
+#: spyder/widgets/explorer.py:269 spyder/widgets/externalshell/baseshell.py:127
+msgid "Run"
+msgstr "Executar"
 
-#: spyderlib/plugins/editor.py:109
-msgid "Sort files according to full path"
-msgstr "Ordenar arquivos seguindo seu caminho completo"
+#: spyder/app/mainwindow.py:2401
+msgid "Running an external system terminal is not supported on platform %s."
+msgstr "Executar um terminal externo não é suportado na plataforma %s."
 
-#: spyderlib/plugins/editor.py:111
-msgid "Show tab bar"
-msgstr "Mostrar barra de abas"
+#: spyder/app/mainwindow.py:2656
+msgid ""
+"Spyder will restart and reset to default settings: <br><br>Do you want to "
+"continue?"
+msgstr ""
+"O Spyder será reiniciado e resetado para suas definições padrões: "
+"<br><br>Deseja continuar?"
 
-#: spyderlib/plugins/editor.py:118 spyderlib/plugins/editor.py:195
-#: spyderlib/plugins/externalconsole.py:83
-#: spyderlib/plugins/externalconsole.py:126 spyderlib/plugins/history.py:43
-#: spyderlib/plugins/inspector.py:179 spyderlib/plugins/ipythonconsole.py:206
-msgid "Source code"
-msgstr "Código fonte"
+#: spyder/app/mainwindow.py:2753 spyder/widgets/helperwidgets.py:250
+msgid "Spyder updates"
+msgstr "Atualizações do Spyder"
 
-#: spyderlib/plugins/editor.py:119
-msgid "Show line numbers"
-msgstr "Mostrar número de linhas"
+#: spyder/app/mainwindow.py:2754 spyder/plugins/configdialog.py:819
+msgid "Check for updates on startup"
+msgstr "Verificar por atualizações na inicialização"
 
-#: spyderlib/plugins/editor.py:120 spyderlib/plugins/editor.py:916
-msgid "Show blank spaces"
+#: spyder/app/mainwindow.py:2772
+msgid ""
+"<b>Spyder %s is available!</b> <br><br>Please use your package manager to "
+"update Spyder or go to our <a href=\"%s\">Releases</a> page to download this "
+"new version. <br><br>If you are not sure how to proceed to update Spyder "
+"please refer to our  <a href=\"%s\">Installation</a> instructions."
 msgstr ""
+"<b>Spyder %s está disponível!</b> <br><br>Por favor utilize o seu "
+"gerenciador de pacotes ou visite a página <a href=\"%s\">Releases</a> para "
+"baixar a nova versão. <br><br>Se você não sabe como atualizar o Spyder "
+"visite a página de instruções  <a href=\"%s\">Installation</a>."
 
-#: spyderlib/plugins/editor.py:121
-msgid "Show vertical line after"
-msgstr "Mostrar uma linha vertical depois de"
+#: spyder/app/mainwindow.py:2784
+msgid "Spyder is up to date."
+msgstr "O Spyder está atualizado."
 
-#: spyderlib/plugins/editor.py:122
-msgid "characters"
-msgstr "caracteres"
+#: spyder/app/restart.py:133
+msgid ""
+"It was not possible to close the previous Spyder instance.\n"
+"Restart aborted."
+msgstr ""
+"Não foi possível fechar a última instância do Spyder.\n"
+"Reiniciamento abortado."
 
-#: spyderlib/plugins/editor.py:127
-msgid "Highlight current line"
-msgstr "Realçar linha atual"
+#: spyder/app/restart.py:135
+msgid ""
+"Spyder could not reset to factory defaults.\n"
+"Restart aborted."
+msgstr ""
+"Não é possível resetar o Spyder para suas definições padrões.\n"
+"Reiniciamento abortado."
 
-#: spyderlib/plugins/editor.py:129
-msgid "Highlight current cell"
-msgstr "Realçar célula atual"
+#: spyder/app/restart.py:137
+msgid ""
+"It was not possible to restart Spyder.\n"
+"Operation aborted."
+msgstr ""
+"Não foi possível reiniciar o Spyder.\n"
+"Operação abortada."
 
-#: spyderlib/plugins/editor.py:131
-msgid "Highlight occurrences after"
-msgstr "Realçar ocorrências depois de"
+#: spyder/app/restart.py:139
+msgid "Spyder exit error"
+msgstr "Erro de saída do Spyder"
 
-#: spyderlib/plugins/editor.py:142 spyderlib/plugins/history.py:52
-#: spyderlib/plugins/inspector.py:183
-msgid "Syntax color scheme: "
-msgstr "Esquema de cores da sintaxe:"
+#: spyder/app/restart.py:140
+msgid "Spyder reset error"
+msgstr "Erro ao resetar"
 
-#: spyderlib/plugins/editor.py:164 spyderlib/plugins/runconfig.py:321
-#: spyderlib/plugins/runconfig.py:443 spyderlib/plugins/runconfig.py:448
-#: spyderlib/spyder.py:2501 spyderlib/utils/programs.py:175
-#: spyderlib/widgets/explorer.py:240
-#: spyderlib/widgets/externalshell/baseshell.py:140
-msgid "Run"
-msgstr "Executar"
+#: spyder/app/restart.py:141
+msgid "Spyder restart error"
+msgstr "Erro de reiniciamento"
 
-#: spyderlib/plugins/editor.py:165
-msgid "Save all files before running script"
-msgstr "Salvar tudo antes de executar um script"
+#: spyder/app/restart.py:145
+msgid ""
+"\n"
+"\n"
+"{0}"
+msgstr ""
+"\n"
+"\n"
+"{0}"
 
-#: spyderlib/plugins/editor.py:168
-msgid "Run selection"
-msgstr "Executar seleção"
+#: spyder/app/restart.py:165
+msgid "Closing Spyder"
+msgstr "Fechando o Spyder"
 
-#: spyderlib/plugins/editor.py:169
-msgid "Maintain focus in the Editor after running cells or selections"
-msgstr "Manter o foco no editor depois de executar células ou seleções"
-
-#: spyderlib/plugins/editor.py:172 spyderlib/plugins/externalconsole.py:334
-msgid "Introspection"
-msgstr "Introspecção"
+#: spyder/app/restart.py:239
+msgid "Resetting Spyder to defaults"
+msgstr "Resetando definições padrões do Spyder"
 
-#: spyderlib/plugins/editor.py:177 spyderlib/plugins/externalconsole.py:129
-msgid "Case sensitive code completion"
-msgstr "Diferenciar entre maiúsculas e minusculas ao completar código"
+#: spyder/app/restart.py:271
+msgid "Restarting"
+msgstr "Reiniciando"
 
-#: spyderlib/plugins/editor.py:182
-msgid "Link to object definition"
-msgstr "Link para a definição do objeto"
+#: spyder/app/tour.py:124
+msgid "Welcome to the Introduction tour"
+msgstr "Bem-vindo ao tour de introdução"
 
-#: spyderlib/plugins/editor.py:184
+#: spyder/app/tour.py:125
 msgid ""
-"If this option is enabled, clicking on an object\n"
-"name (left-click + Ctrl key) will go this object\n"
-"definition (if resolved)."
+"<b>Spyder</b> is a powerful Interactive Development Environment (or IDE) for "
+"the Python programming language.<br><br>Here we are going to guide you "
+"through its most important features.<br><br>Please use the arrow keys or "
+"click on the buttons below to move along the tour."
 msgstr ""
-"Se esta opção estiver ativada, clicando no nome\n"
-"de um objeto (clique-esquerdo + Ctrl) o editor irá\n"
-"mostrar a definição do mesmo."
+"<b>Spyder</b> é um poderoso Ambiente de Desenvolvimento Integrado (ou IDE) "
+"para a linguagem de programação Python.<br><br>Aqui vamos guiar você nas "
+"mais importantes características e funcionalidades do Spyder.<br><br>Por "
+"favor use as teclas de seta ou clique nos botões abaixo para se mover "
+"durante a tour."
 
-#: spyderlib/plugins/editor.py:188
+#: spyder/app/tour.py:134
+msgid "The Editor"
+msgstr "O Editor"
+
+#: spyder/app/tour.py:135
 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."
+"This is the pane where you write Python code before evaluating it. You can "
+"get automatic suggestions and completions while writing, by pressing the "
+"<b>Tab</b> key next to a given text.<br><br>The Editor comes with a line "
+"number area (highlighted here in red), where Spyder shows warnings and "
+"syntax errors. They can help you to detect potential problems before running "
+"the code.<br><br>You can also set debug breakpoints in the line number area, "
+"by doing a double click next to a non-empty line."
 msgstr ""
-"<b>Aviso:</b><br>O módulo <i>rope</i> não está instalado neste computador: "
-"Por tanto a completação de código, balões de dicas e o método ir para função "
-"não estão disponíveis."
-
-#: spyderlib/plugins/editor.py:196
-msgid "Automatic insertion of parentheses, braces and brackets"
-msgstr "Inserção automática de parênteses, chaves e colchetes"
-
-#: spyderlib/plugins/editor.py:199
-msgid "Automatic insertion of closing quotes"
-msgstr "Inserção automática de aspas"
-
-#: spyderlib/plugins/editor.py:201
-msgid "Automatic insertion of colons after 'for', 'if', 'def', etc"
-msgstr "Inserção automática de \":\" depois de 'for', 'if', 'def', etc"
-
-#: spyderlib/plugins/editor.py:204
-msgid "Automatic indentation after 'else', 'elif', etc."
-msgstr "Indentação automática depois do 'else', 'elif', etc."
-
-#: spyderlib/plugins/editor.py:206
-msgid "Indentation characters: "
-msgstr "Caracteres de indentação:"
-
-#: spyderlib/plugins/editor.py:207
-msgid "4 spaces"
-msgstr "4 espaços"
-
-#: spyderlib/plugins/editor.py:208
-msgid "2 spaces"
-msgstr "2 espaços"
+"Este é o painel aonde você escreve seu código Python antes de testa-lo. "
+"Enquanto digita você pode receber sugestões automáticas e completação "
+"apertando a tecla <b>Tab</b> depois do texto inserido.<br><br>O Editor "
+"possui uma área com uma linha numérica (destacada aqui em vermelho), nesta "
+"mesma área o Spyder mostra avisos e erros de sintaxe. Isso pode ajudar você "
+"a detectar potencial problemas antes de executar o código.<br><br>Você "
+"também pode definir pontos de interrupção para debugação nesta área."
 
-#: spyderlib/plugins/editor.py:209
-msgid "tab"
-msgstr "tabulador"
+#: spyder/app/tour.py:150
+msgid "The IPython console"
+msgstr "O console IPython"
 
-#: spyderlib/plugins/editor.py:210
-msgid "Tab stop width:"
-msgstr "Largura da tabulação:"
+#: spyder/app/tour.py:151
+msgid ""
+"This is one of panes where you can run or execute the code you wrote on the "
+"Editor. To do it you need to press the <b>F5</b> key.<br><br>This console "
+"comes with several useful features that greatly improve your programming "
+"workflow (like syntax highlighting and inline plots). If you want to know "
+"more about them, please follow this <a href=\"{0}\">link</a>.<br><br>Please "
+"click on the button below to run some simple code in this console. This will "
+"be useful to show you other important features."
+msgstr ""
+"Este é um dos painéis aonde você consegue executar o código que você "
+"escreveu no Editor. Para fazer isso pressione a tecla <b>F5</b>.<br><br>Este "
+"console possui diversas funcionalidades úteis que podem improvisar sua "
+"experiência programando (como sintaxe colorida). Se você quiser saber mais "
+"sobre isso, visite <a href=\"{0}\">link</a>.<br><br>Por favor clique no "
+"botão abaixo para executar um simples código neste console. Isso será útil "
+"para mostrar para você outras funcionalidades importantes."
+
+#: spyder/app/tour.py:167
+msgid "The Variable Explorer"
+msgstr "O Explorador de Variáveis"
 
-#: spyderlib/plugins/editor.py:210
-msgid "pixels"
-msgstr "pixels"
+#: spyder/app/tour.py:168
+msgid ""
+"In this pane you can view and edit the variables generated during the "
+"execution of a program, or those entered directly in one of Spyder consoles."
+"<br><br>As you can see, the Variable Explorer is showing the variables "
+"generated during the last step of this tour. By doing a double-click on any "
+"of them, a new window will be opened, where you can inspect and modify their "
+"contents."
+msgstr ""
+"Neste painel você pode ver e editar as variáveis geradas durante a execução "
+"de um programa ou quando digitadas diretamente em um dos consoles do Spyder."
+"<br><br>Como você pode ver, o Explorador de Variáveis está mostrando as "
+"variáveis geradas durante o passo anterior desta tour. Clicando duas vezes "
+"em qualquer uma delas uma nova janela será aberta, aonde você poderá "
+"inspecionar e modificar seus valores."
 
-#: spyderlib/plugins/editor.py:212
-msgid "Tab always indent"
-msgstr "Sempre indentar com a tecla Tab"
+#: spyder/app/tour.py:180
+msgid "The Python console"
+msgstr "O Console Python"
 
-#: spyderlib/plugins/editor.py:214
+#: spyder/app/tour.py:181
 msgid ""
-"If enabled, pressing Tab will always indent,\n"
-"even when the cursor is not at the beginning\n"
-"of a line (when this option is enabled, code\n"
-"completion may be triggered using the alternate\n"
-"shortcut: Ctrl+Space)"
+"You can also run your code on a Python console. These consoles are useful "
+"because they let you run a file in a console dedicated only to it.To select "
+"this behavior, please press the <b>F6</b> key.<br><br>By pressing the button "
+"below and then focusing the Variable Explorer, you will notice that Python "
+"consoles are also connected to that pane, and that the Variable Explorer "
+"only shows the variables of the currently focused console."
 msgstr ""
-"Se ativada, pressionando Tab o código\n"
-"será indentado, mesmo se o cursor não estiver\n"
-"no inicio da linha (se essa opção for ativada a\n"
-"completação de código poderá ser usada\n"
-"pressionando Ctrl+Espaço)"
+"Você também pode executar seu código em um console Python. Estes consoles "
+"são úteis porque permitem que você execute um arquivo em um console dedicado "
+"apenas para ele. Para selecionar este comportamento por favor pressione a "
+"tecla <b>F6</b>.<br><br>Apertando o botão abaixo e indo no Explorador de "
+"Variáveis você irá notar que os consoles Python também estão conectados a "
+"este painel e que o Explorador de Variáveis só mostra as variáveis do "
+"console atual."
 
-#: spyderlib/plugins/editor.py:219
-msgid "Intelligent backspace"
-msgstr "Tecla de retorno (\"backspace\") inteligente"
+#: spyder/app/tour.py:195 spyder/plugins/help.py:485 spyder/plugins/help.py:929
+#: spyder/widgets/internalshell.py:270
+msgid "Help"
+msgstr "Ajuda"
 
-#: spyderlib/plugins/editor.py:221
-msgid "Automatically remove trailing spaces when saving files"
-msgstr "Remover automaticamente espaços em branco ao salvar arquivos"
+#: spyder/app/tour.py:196
+msgid ""
+"This pane displays documentation of the functions, classes, methods or "
+"modules you are currently using in the Editor or the Consoles.<br><br>To use "
+"it, you need to press <b>Ctrl+I</b> in front of an object. If that object "
+"has some documentation associated with it, it will be displayed here."
+msgstr ""
+"Este painel mostra a documentação de funções, classes, métodos ou módulos "
+"que você está usando no Editor ou nos Consoles.<br><br>Para usar esta "
+"funcionalidade você deve pressionar <b>Ctrl+I</b> na frente de um objeto. Se "
+"este objeto possuir alguma documentação associada a ele, ela será mostrada "
+"aqui."
 
-#: spyderlib/plugins/editor.py:225
-msgid "Analysis"
-msgstr "Análise"
+#: spyder/app/tour.py:206
+msgid "The File Explorer"
+msgstr "O Explorador de Arquivos"
 
-#: spyderlib/plugins/editor.py:227
-msgid "<i>(Refer to the {} page)</i>"
+#: spyder/app/tour.py:207
+msgid ""
+"This pane lets you navigate through the directories and files present in "
+"your computer.<br><br>You can also open any of these files with its "
+"corresponding application, by doing a double click on it.<br><br>There is "
+"one exception to this rule: plain-text files will always be opened in the "
+"Spyder Editor."
 msgstr ""
+"Este painel permite você navegar entre os diretórios e arquivos presentes no "
+"seu computador.<br><br>Você também pode abrir qualquer arquivo com a "
+"aplicação correspondente ao mesmo clicando duas vezes nele.<br><br>Existe "
+"apenas uma exceção para isso: arquivos de texto simples, esses sempre serão "
+"abertos no editor do Spyder."
 
-#: spyderlib/plugins/editor.py:231
-#, fuzzy
-msgid "Real-time code analysis"
-msgstr "Análise de código em tempo real no editor"
+#: spyder/app/tour.py:217
+msgid "The History Log"
+msgstr "O Log do Histórico"
 
-#: spyderlib/plugins/editor.py:233
-#, fuzzy
+#: spyder/app/tour.py:218
 msgid ""
-"<p>If enabled, Python source code will be analyzedusing pyflakes, lines "
-"containing errors or warnings will be highlighted.</p><p><u>Note</u>: add "
-"<b>analysis:ignore</b> in a comment to ignore code analysis warnings.</p>"
+"This pane records all commands introduced in the Python and IPython consoles."
 msgstr ""
-"Se ativado, o  código fonte será analisado\n"
-"usando o pyflakes, linhas contendo erros ou\n"
-"avisos serão realçadas"
+"Este painel grava todos os comandos executados nos consoles do Python e "
+"IPython."
 
-#: spyderlib/plugins/editor.py:241
-msgid "Code analysis requires pyflakes %s+"
-msgstr "A análise de código requer pyflakes %s+"
+#: spyder/app/tour.py:266
+msgid "<b>Spyder</b> is an interactive development environment based on bla"
+msgstr ""
 
-#: spyderlib/plugins/editor.py:243
-#, fuzzy
-msgid "Real-time code style analysis"
-msgstr "Análise de estilo em tempo real no editor."
+#: spyder/app/tour.py:270
+msgid "Welcome to Spyder introduction tour"
+msgstr "Bem-vindo ao tour de introdução ao Spyder"
 
-#: spyderlib/plugins/editor.py:245
-#, fuzzy
-msgid ""
-"<p>If enabled, Python source code will be analyzedusing pep8, lines that are "
-"not following PEP8 style guide will be highlighted.</p><p><u>Note</u>: add "
-"<b>analysis:ignore</b> in a comment to ignore style analysis warnings.</p>"
+#: spyder/app/tour.py:271
+msgid "Spyder is an interactive development environment based on bla"
 msgstr ""
-"Se ativado, o  código fonte será analisado\n"
-"usando o pep8, linhas que não seguem o guia de estilo\n"
-"PEP8 serão realçadas"
 
-#: spyderlib/plugins/editor.py:252
-#, fuzzy
-msgid "Code annotations (TODO, FIXME, XXX, HINT, TIP, @todo)"
-msgstr "Tarefas (TODO, FIXME, XXX, HINT, TIP, @todo)"
+#: spyder/app/tour.py:276
+msgid "Introduction tour"
+msgstr "Tour de introdução"
 
-#: spyderlib/plugins/editor.py:255
-msgid "Perform analysis when saving file and every"
-msgstr "Fazer análise de código ao guardar arquivo e a cada"
+#: spyder/app/tour.py:277
+msgid "New features in version 3.0"
+msgstr "Novidades na versão 3.0"
 
-#: spyderlib/plugins/editor.py:259
-msgid "Perform analysis only when saving file"
-msgstr "Fazer análise só quando o arquivo for salvo"
+#: spyder/app/tour.py:555 spyder/plugins/ipythonconsole.py:431
+msgid "Run code"
+msgstr "Executar código"
 
-#: spyderlib/plugins/editor.py:318
-msgid "End-of-line characters"
-msgstr "Caracteres de fim de linha"
+#: spyder/app/tour.py:824
+msgid "Go to step: "
+msgstr "Vá para a etapa: "
 
-#: spyderlib/plugins/editor.py:319
+#: spyder/config/base.py:249
 msgid ""
-"When opening a text file containing mixed end-of-line characters (this may "
-"raise syntax errors in the consoles on Windows platforms), Spyder may fix "
-"the file automatically."
+"Update LANGUAGE_CODES (inside config/base.py) if a new translation has been "
+"added to Spyder"
 msgstr ""
-"Quando for aberto um arquivo de texto que contenha vários tipos de "
-"caracteres de fim de linha (o qual pode dar erros no Windows). O Spyder pode "
-"consertar o arquivo automaticamente."
+"Atualize LANGUAGE_CODES (config/base.py) se um novo idioma for adicionado ao "
+"Spyder"
 
-#: spyderlib/plugins/editor.py:325
-msgid "Fix automatically and show warning message box"
-msgstr "Corrigir automaticamente e exibir uma mensagem de aviso"
+#: spyder/config/ipython.py:23
+msgid "Integrate the IPython console"
+msgstr "Integração com o console IPython"
 
-#: spyderlib/plugins/editor.py:336 spyderlib/plugins/externalconsole.py:332
-#: spyderlib/plugins/ipythonconsole.py:463
-#: spyderlib/plugins/variableexplorer.py:41
-msgid "Display"
-msgstr "Visualização"
+#: spyder/config/ipython.py:25
+msgid "Manipulate Jupyter notebooks on the Editor"
+msgstr "Permite manipular Jupyter notebooks no Editor"
 
-#: spyderlib/plugins/editor.py:338
-msgid "Code Introspection/Analysis"
-msgstr "Análise e introspecção de código"
+#: spyder/config/utils.py:24
+msgid "Python files"
+msgstr "Arquivos Python"
 
-#: spyderlib/plugins/editor.py:341 spyderlib/plugins/externalconsole.py:336
-msgid "Advanced settings"
-msgstr "Configurações avançadas"
+#: spyder/config/utils.py:25
+msgid "Cython/Pyrex files"
+msgstr "Arquivos Cython/Pyrex"
 
-#: spyderlib/plugins/editor.py:607 spyderlib/widgets/editortools.py:510
-msgid "Show/hide outline explorer"
-msgstr "Mostrar/esconder o explorador de código"
+#: spyder/config/utils.py:26
+msgid "C files"
+msgstr "Arquivos C"
 
-#: spyderlib/plugins/editor.py:613
-msgid "Show/hide project explorer"
-msgstr "Mostrar/esconder o explorador de projetos"
+#: spyder/config/utils.py:27
+msgid "C++ files"
+msgstr "Arquivos C++"
 
-#: spyderlib/plugins/editor.py:621
-msgid "&New file..."
-msgstr "&Novo arquivo..."
+#: spyder/config/utils.py:28
+msgid "OpenCL files"
+msgstr "Arquivos OpenCL"
 
-#: spyderlib/plugins/editor.py:622 spyderlib/plugins/workingdirectory.py:82
-#: spyderlib/widgets/explorer.py:652 spyderlib/widgets/explorer.py:659
-msgid "New file"
-msgstr "Novo arquivo"
+#: spyder/config/utils.py:29
+msgid "Fortran files"
+msgstr "Arquivos Fortran"
 
-#: spyderlib/plugins/editor.py:629
-msgid "&Open..."
-msgstr "&Abrir..."
+#: spyder/config/utils.py:30
+msgid "IDL files"
+msgstr "Arquivos IDL"
 
-#: spyderlib/plugins/editor.py:630 spyderlib/plugins/editor.py:1643
-#: spyderlib/plugins/workingdirectory.py:69
-msgid "Open file"
-msgstr "Abrir arquivo"
+#: spyder/config/utils.py:31
+msgid "MATLAB files"
+msgstr "Arquivos MATLAB"
 
-#: spyderlib/plugins/editor.py:637
-msgid "&Revert"
-msgstr "Resta&urar"
+#: spyder/config/utils.py:32
+msgid "Julia files"
+msgstr "Arquivos Julia"
 
-#: spyderlib/plugins/editor.py:638
-msgid "Revert file from disk"
-msgstr "Reverter arquivo do disco"
+#: spyder/config/utils.py:33
+msgid "Yaml files"
+msgstr "Arquivos Yaml"
 
-#: spyderlib/plugins/editor.py:641
-msgid "&Save"
-msgstr "&Salvar"
+#: spyder/config/utils.py:34
+msgid "Patch and diff files"
+msgstr "Arquivos Patch e diff"
 
-#: spyderlib/plugins/editor.py:642
-msgid "Save file"
-msgstr "Salvar arquivo"
+#: spyder/config/utils.py:35
+msgid "Batch files"
+msgstr "Arquivos Batch"
 
-#: spyderlib/plugins/editor.py:649
-msgid "Sav&e all"
-msgstr "Sal&var tudo"
+#: spyder/config/utils.py:36 spyder/utils/iofuncs.py:426
+msgid "Text files"
+msgstr "Arquivos de texto"
 
-#: spyderlib/plugins/editor.py:650
-msgid "Save all files"
-msgstr "Salvar todos os arquivos"
+#: spyder/config/utils.py:37
+msgid "reStructuredText files"
+msgstr "Arquivos de texto reeStruturado"
 
-#: spyderlib/plugins/editor.py:658
-msgid "Save &as..."
-msgstr "Salvar c&omo..."
+#: spyder/config/utils.py:38
+msgid "gettext files"
+msgstr "Arquivos gettext "
 
-#: spyderlib/plugins/editor.py:659
-msgid "Save current file as..."
-msgstr "Salvar arquivo atual como..."
+#: spyder/config/utils.py:39
+msgid "NSIS files"
+msgstr "Arquivos NSIS "
 
-#: spyderlib/plugins/editor.py:663 spyderlib/plugins/editor.py:664
-msgid "Print preview..."
-msgstr "Pré-visualizar impressão..."
+#: spyder/config/utils.py:40
+msgid "Web page files"
+msgstr "Arquivos de Páginas web"
 
-#: spyderlib/plugins/editor.py:665
-msgid "&Print..."
-msgstr "&Imprimir..."
+#: spyder/config/utils.py:41
+msgid "XML files"
+msgstr "Arquivos XML"
 
-#: spyderlib/plugins/editor.py:666
-msgid "Print current file..."
-msgstr "Imprimir o arquivo atual..."
+#: spyder/config/utils.py:42
+msgid "Javascript files"
+msgstr "Arquivos Javascript"
 
-#: spyderlib/plugins/editor.py:669
-msgid "&Close"
-msgstr "&Fechar"
+#: spyder/config/utils.py:43
+msgid "Json files"
+msgstr "Arquivos Json"
 
-#: spyderlib/plugins/editor.py:670
-msgid "Close current file"
-msgstr "Fechar arquivo atual"
+#: spyder/config/utils.py:44
+msgid "IPython notebooks"
+msgstr "Notebooks do IPython"
 
-#: spyderlib/plugins/editor.py:673
-msgid "C&lose all"
-msgstr "Fechar &tudo"
+#: spyder/config/utils.py:45
+msgid "Enaml files"
+msgstr "Arquivos Enaml"
 
-#: spyderlib/plugins/editor.py:674
-msgid "Close all opened files"
-msgstr "Fechar todos os arquivos abertos"
+#: spyder/config/utils.py:46
+msgid "Configuration files"
+msgstr "Arquivos de Configuração"
 
-#: spyderlib/plugins/editor.py:681
-msgid "Set/Clear breakpoint"
-msgstr "Adicionar ou limpar um ponto de interrupção"
+#: spyder/config/utils.py:51 spyder/widgets/explorer.py:700
+msgid "All files"
+msgstr "Todos os arquivos"
 
-#: spyderlib/plugins/editor.py:688
-msgid "Set/Edit conditional breakpoint"
-msgstr "Adicionar ou editar um ponto de interrupção condicional"
+#: spyder/config/utils.py:121
+msgid "Supported text files"
+msgstr "Arquivos de texto suportados"
 
-#: spyderlib/plugins/editor.py:695
-msgid "Clear breakpoints in all files"
-msgstr "Limpar pontos de interrupção em todos os arquivos"
+#: spyder/plugins/__init__.py:508 spyder/plugins/editor.py:98
+#: spyder/plugins/editor.py:545 spyder/plugins/editor.py:1718
+#: spyder/plugins/help.py:118 spyder/plugins/help.py:385
+#: spyder/widgets/editor.py:369 spyder/widgets/sourcecode/codeeditor.py:97
+#: spyder/widgets/sourcecode/codeeditor.py:2960
+msgid "Editor"
+msgstr "Editor"
 
-#: spyderlib/plugins/editor.py:697
-msgid "Breakpoints"
-msgstr "Pontos de interrupção (Breakpoints)"
+#: spyder/plugins/configdialog.py:139
+msgid "Reset to defaults"
+msgstr "Redefinir Preferências"
 
-#: spyderlib/plugins/editor.py:701
-msgid "Debug with winpdb"
-msgstr "Depurar com winpdb"
+#: spyder/plugins/configdialog.py:151
+msgid "Preferences"
+msgstr "Preferências"
 
-#: spyderlib/plugins/editor.py:708 spyderlib/spyder.py:659
-msgid "&Debug"
-msgstr "&Depurar"
+#: spyder/plugins/configdialog.py:491
+msgid "Invalid directory path"
+msgstr "Caminho de diretório inválido"
 
-#: spyderlib/plugins/editor.py:709
-msgid "Debug file"
-msgstr "Depurar arquivo"
+#: spyder/plugins/configdialog.py:494 spyder/plugins/configdialog.py:509
+#: spyder/plugins/runconfig.py:177 spyder/plugins/runconfig.py:241
+#: spyder/plugins/workingdirectory.py:291 spyder/widgets/explorer.py:614
+#: spyder/widgets/externalshell/pythonshell.py:616
+#: spyder/widgets/findinfiles.py:504 spyder/widgets/pathmanager.py:224
+#: spyder/widgets/projects/projectdialog.py:155
+msgid "Select directory"
+msgstr "Selecionar diretório"
 
-#: spyderlib/plugins/editor.py:713
-msgid "Step"
-msgstr "Executar linha"
+#: spyder/plugins/configdialog.py:521
+msgid "Invalid file path"
+msgstr "Caminho de arquivo inválido "
 
-#: spyderlib/plugins/editor.py:714
-msgid "Run current line"
-msgstr "Executar linha selecionada"
+#: spyder/plugins/configdialog.py:524 spyder/plugins/configdialog.py:541
+msgid "Select file"
+msgstr "Selecionar arquivo"
 
-#: spyderlib/plugins/editor.py:720
-msgid "Continue"
-msgstr "Continuar"
+#: spyder/plugins/configdialog.py:540
+msgid "All files (*)"
+msgstr "Todos os arquivos (*)"
 
-#: spyderlib/plugins/editor.py:721
-msgid "Continue execution until next breakpoint"
-msgstr "Continuar a execução até o próximo ponto de interrupção"
+#: spyder/plugins/configdialog.py:613 spyder/widgets/formlayout.py:215
+msgid "Bold"
+msgstr "Negrito"
 
-#: spyderlib/plugins/editor.py:728
-msgid "Step Into"
-msgstr "Ingressar na função/método"
+#: spyder/plugins/configdialog.py:616 spyder/widgets/formlayout.py:210
+msgid "Italic"
+msgstr "Itálico"
 
-#: spyderlib/plugins/editor.py:729
-msgid "Step into function or method of current line"
-msgstr "Ingressar na função ou método da linha atual"
+#: spyder/plugins/configdialog.py:670
+msgid "Font: "
+msgstr "Fonte:"
 
-#: spyderlib/plugins/editor.py:736
-msgid "Step Return"
-msgstr "Sair da função/método"
+#: spyder/plugins/configdialog.py:676
+msgid "Size: "
+msgstr "Tamanho:"
 
-#: spyderlib/plugins/editor.py:737
-msgid "Run until current function or method returns"
-msgstr "Executar até que a função ou método atual terminem"
+#: spyder/plugins/configdialog.py:695
+msgid "Font style"
+msgstr "Estilo de fonte"
 
-#: spyderlib/plugins/editor.py:744
-msgid "Exit"
-msgstr "Sair"
+#: spyder/plugins/configdialog.py:772
+msgid "Spyder needs to restart to change the following setting:"
+msgstr "O Spyder precisa ser reiniciado para mudança de tal configuração:"
 
-#: spyderlib/plugins/editor.py:745
-msgid "Exit Debug"
-msgstr "Terminar depuração"
+#: spyder/plugins/configdialog.py:775
+msgid "Spyder needs to restart to change the following settings:"
+msgstr "O Spyder precisa ser reiniciado para mudança de tais configurações:"
 
-#: spyderlib/plugins/editor.py:756
-msgid "Debugging control"
-msgstr "Controle de depuração"
+#: spyder/plugins/configdialog.py:777
+msgid "Do you wish to restart now?"
+msgstr "Você deseja reiniciar agora?"
 
-#: spyderlib/plugins/editor.py:760 spyderlib/plugins/editor.py:1236
-#: spyderlib/spyder.py:654
-msgid "&Run"
-msgstr "E&xecutar"
+#: spyder/plugins/configdialog.py:783
+msgid "Information"
+msgstr "Informação"
 
-#: spyderlib/plugins/editor.py:761
-msgid "Run file"
-msgstr "Executar arquivo"
+#: spyder/plugins/configdialog.py:797 spyder/plugins/configdialog.py:804
+#: spyder/widgets/projects/configdialog.py:74
+msgid "General"
+msgstr "Geral"
 
-#: spyderlib/plugins/editor.py:766
-msgid "&Configure..."
-msgstr "&Configurar..."
+#: spyder/plugins/configdialog.py:807
+msgid "Language"
+msgstr "Idioma"
 
-#: spyderlib/plugins/editor.py:768
-#: spyderlib/widgets/externalshell/pythonshell.py:311
-msgid "Run settings"
-msgstr "Executar configurações"
+#: spyder/plugins/configdialog.py:810
+msgid "Use a single instance"
+msgstr "Usar uma única instância "
 
-#: spyderlib/plugins/editor.py:776
-msgid "Re-run &last script"
-msgstr "Executar &novamente o último script"
+#: spyder/plugins/configdialog.py:812
+msgid ""
+"Set this to open external<br> Python files in an already running instance "
+"(Requires a restart)"
+msgstr ""
+"Selecione esta opção<br> para abrir arquivos externos de Python nessa "
+"instância atual (Requer que seja reiniciado)"
 
-#: spyderlib/plugins/editor.py:778
-msgid "Run again last file"
-msgstr "Executar novamente o mesmo arquivo"
+#: spyder/plugins/configdialog.py:815
+msgid "Prompt when exiting"
+msgstr "Mostrar mensagem de confirmação ao sair"
 
-#: spyderlib/plugins/editor.py:785
-#: spyderlib/widgets/sourcecode/codeeditor.py:2462
-msgid "Run &selection or current line"
-msgstr "Executar &seleção ou linha atual"
+#: spyder/plugins/configdialog.py:816
+msgid "Pop up internal console when internal errors appear"
+msgstr "Mostrar o terminal interno quando houver erros"
 
-#: spyderlib/plugins/editor.py:788
-msgid "Run selection or current line"
-msgstr "Executar seleção ou linha atual"
+#: spyder/plugins/configdialog.py:836 spyder/plugins/editor.py:107
+#: spyder/plugins/externalconsole.py:57 spyder/plugins/ipythonconsole.py:273
+msgid "Interface"
+msgstr "Interface"
 
-#: spyderlib/plugins/editor.py:801
-msgid "Run cell"
-msgstr "Executar célula"
+#: spyder/plugins/configdialog.py:844
+msgid "Qt windows style"
+msgstr "Tema do Qt"
 
-#: spyderlib/plugins/editor.py:804
-msgid ""
-"Run current cell (Ctrl+Enter)\n"
-"[Use #%% to create cells]"
-msgstr ""
-"Executar a célula atual (Ctrl+Enter)\n"
-"[Usar #%% para criar células]"
+#: spyder/plugins/configdialog.py:850
+msgid "Icon theme"
+msgstr "Tema dos icones"
 
-#: spyderlib/plugins/editor.py:809
-msgid "Run cell and advance"
-msgstr "Executar célula e avançar"
+#: spyder/plugins/configdialog.py:854
+msgid "Vertical title bars in panes"
+msgstr "Barra de titulo em vertical"
 
-#: spyderlib/plugins/editor.py:812
-msgid "Run current cell and go to the next one (Shift+Enter)"
-msgstr "Executar célula atual e ir para a próxima (Shift+Enter)"
+#: spyder/plugins/configdialog.py:856
+msgid "Vertical tabs in panes"
+msgstr "Abas dos painéis na vertical"
 
-#: spyderlib/plugins/editor.py:818
-msgid "Show todo list"
-msgstr "Mostrar lista de tarefas"
+#: spyder/plugins/configdialog.py:858
+msgid "Animated toolbars and panes"
+msgstr "Barras e painéis animados"
 
-#: spyderlib/plugins/editor.py:819
-msgid "Show TODO/FIXME/XXX/HINT/TIP/@todo comments list"
-msgstr ""
-"Mostrar a lista de comentários dos\n"
-"TODO/FIXME/XXX/HINT/TIP/@todo"
+#: spyder/plugins/configdialog.py:860
+msgid "Tear off menus"
+msgstr "Separar os menus"
 
-#: spyderlib/plugins/editor.py:826
-msgid "Show warning/error list"
-msgstr "Mostrar lista de erros e avisos"
+#: spyder/plugins/configdialog.py:861
+msgid "Set this to detach any<br> menu from the main window"
+msgstr "Habilite esta opção<br> se deseja separar os menus da janela principal"
 
-#: spyderlib/plugins/editor.py:827
-msgid "Show code analysis warnings/errors"
-msgstr "Mostrar erros e avisos da análise de código"
+#: spyder/plugins/configdialog.py:863
+msgid "Custom margin for panes:"
+msgstr "Margem personalizada para os painéis:"
 
-#: spyderlib/plugins/editor.py:833
-msgid "Previous warning/error"
-msgstr "Aviso ou erro anterior"
+#: spyder/plugins/configdialog.py:893
+msgid "Status bar"
+msgstr "Barra de status"
 
-#: spyderlib/plugins/editor.py:834
-msgid "Go to previous code analysis warning/error"
-msgstr "Ir para linha anterior de aviso ou erro"
+#: spyder/plugins/configdialog.py:894
+msgid "Show status bar"
+msgstr "Mostrar barra de status"
 
-#: spyderlib/plugins/editor.py:837
-msgid "Next warning/error"
-msgstr "Próximo aviso ou erro"
+#: spyder/plugins/configdialog.py:896
+msgid "Show memory usage every"
+msgstr "Mostrar uso da memória a cada"
 
-#: spyderlib/plugins/editor.py:838
-msgid "Go to next code analysis warning/error"
-msgstr "Ir para próxima linha de aviso ou erro"
+#: spyder/plugins/configdialog.py:905
+msgid "Show CPU usage every"
+msgstr "Mostrar uso da CPU a cada"
 
-#: spyderlib/plugins/editor.py:842
-msgid "Last edit location"
-msgstr "Última posição da edição"
+#: spyder/plugins/configdialog.py:940
+msgid "Plain text font"
+msgstr "Texto simples"
 
-#: spyderlib/plugins/editor.py:843
-msgid "Go to last edit location"
-msgstr "Ir para posição anterior da edição"
+#: spyder/plugins/configdialog.py:946
+msgid "Rich text font"
+msgstr "Texto formatado"
 
-#: spyderlib/plugins/editor.py:849
-msgid "Previous cursor position"
-msgstr "Posição anterior do cursor"
+#: spyder/plugins/configdialog.py:949
+msgid "Fonts"
+msgstr "Fontes"
 
-#: spyderlib/plugins/editor.py:850
-msgid "Go to previous cursor position"
-msgstr "Ir a posição anterior do cursor"
+#: spyder/plugins/configdialog.py:963
+msgid "Appearance"
+msgstr "Aparência"
 
-#: spyderlib/plugins/editor.py:856
-msgid "Next cursor position"
-msgstr "Próxima posição do cursor"
+#: spyder/plugins/configdialog.py:965 spyder/plugins/ipythonconsole.py:564
+msgid "Advanced Settings"
+msgstr "Configurações avançadas"
 
-#: spyderlib/plugins/editor.py:857
-msgid "Go to next cursor position"
-msgstr "Ir para a próxima posição do cursor"
+#: spyder/plugins/configdialog.py:1001
+msgid "Syntax coloring"
+msgstr "Sintaxe colorida"
 
-#: spyderlib/plugins/editor.py:864
-#: spyderlib/widgets/sourcecode/codeeditor.py:2449
-msgid "Comment"
-msgstr "Comentar"
+#: spyder/plugins/configdialog.py:1014
+msgid ""
+"Here you can select the color scheme used in the Editor and all other Spyder "
+"plugins.<br><br>You can also edit the color schemes provided by Spyder or "
+"create your own ones by using the options provided below.<br>"
+msgstr ""
+"Aqui você pode escolher o esquema de cor usado no Editor e em todos outros "
+"plugins do Spyder.<br><br>Você pode também editar os esquemas padrões do "
+"Spyder ou criar os seus próprios utilizando as opções abaixo.<br>"
 
-#: spyderlib/plugins/editor.py:864
-#: spyderlib/widgets/sourcecode/codeeditor.py:2449
-msgid "Uncomment"
-msgstr "Descomentar"
+#: spyder/plugins/configdialog.py:1019
+msgid "Edit selected"
+msgstr "Editar"
 
-#: spyderlib/plugins/editor.py:865
-msgid "Comment current line or selection"
-msgstr "Comentar linha ou seleção atual"
+#: spyder/plugins/configdialog.py:1020
+msgid "Create new scheme"
+msgstr "Criar novo esquema"
 
-#: spyderlib/plugins/editor.py:869
-msgid "Add &block comment"
-msgstr "Adicionar &bloco de comentário "
+#: spyder/plugins/configdialog.py:1021 spyder/widgets/explorer.py:510
+#: spyder/widgets/shell.py:134
+msgid "Delete"
+msgstr "Deletar"
 
-#: spyderlib/plugins/editor.py:870
-msgid "Add block comment around current line or selection"
-msgstr "Adicionar bloco de comentário ao redor da linha ou seleção atual"
+#: spyder/plugins/configdialog.py:1024
+msgid "Reset"
+msgstr "Restaurar"
 
-#: spyderlib/plugins/editor.py:876
-msgid "R&emove block comment"
-msgstr "R&emover bloco de comentário"
+#: spyder/plugins/configdialog.py:1031
+msgid "Scheme:"
+msgstr "Esquema:"
 
-#: spyderlib/plugins/editor.py:877
-msgid "Remove comment block around current line or selection"
-msgstr "Remover bloco de comentário ao redor da linha ou seleção atual"
+#: spyder/plugins/configdialog.py:1062
+msgid "Manage color schemes"
+msgstr "Gerenciar esquemas de cores"
 
-#: spyderlib/plugins/editor.py:888
-msgid "Indent"
-msgstr "Indentar"
+#: spyder/plugins/configdialog.py:1251
+msgid "Are you sure you want to delete this scheme?"
+msgstr "Você tem certeza que deseja deletar esse esquema?"
 
-#: spyderlib/plugins/editor.py:889
-msgid "Indent current line or selection"
-msgstr "Indentar a linha ou seleção atual"
+#: spyder/plugins/configdialog.py:1368
+msgid "Text"
+msgstr "Texto"
 
-#: spyderlib/plugins/editor.py:892
-msgid "Unindent"
-msgstr "Desfazer indentação"
+#: spyder/plugins/configdialog.py:1370
+msgid "Highlight"
+msgstr "Destaque"
 
-#: spyderlib/plugins/editor.py:893
-msgid "Unindent current line or selection"
-msgstr "Desfazer indentação da linha ou seleção atual"
+#: spyder/plugins/configdialog.py:1372
+msgid "Background"
+msgstr "Plano de fundo"
 
-#: spyderlib/plugins/editor.py:898
-msgid "Carriage return and line feed (Windows)"
-msgstr "Carriage return e salto de linha (Windows)"
+#: spyder/plugins/configdialog.py:1376
+msgid "Scheme name:"
+msgstr "Nome do esquema:"
 
-#: spyderlib/plugins/editor.py:901
-msgid "Line feed (UNIX)"
-msgstr "Salto de linha (UNIX)"
+#: spyder/plugins/configdialog.py:1383
+msgid "Color scheme editor"
+msgstr "Edição do esquema de cores"
 
-#: spyderlib/plugins/editor.py:904
-msgid "Carriage return (Mac)"
-msgstr "Carriage return (Mac)"
+#: spyder/plugins/console.py:109
+msgid "Internal console"
+msgstr "Console interno"
 
-#: spyderlib/plugins/editor.py:910
-msgid "Convert end-of-line characters"
-msgstr "Converter caracteres de fim de linha"
+#: spyder/plugins/console.py:139 spyder/plugins/externalconsole.py:743
+msgid "&Run..."
+msgstr "&Executar..."
 
-#: spyderlib/plugins/editor.py:914
-msgid "Remove trailing spaces"
-msgstr "Remover espaços em branco"
+#: spyder/plugins/console.py:141 spyder/plugins/externalconsole.py:744
+msgid "Run a Python script"
+msgstr "Executar um script Python"
 
-#: spyderlib/plugins/editor.py:918
-msgid "Fix indentation"
-msgstr "Consertar indentação"
+#: spyder/plugins/console.py:144
+msgid "Environment variables..."
+msgstr "Variáveis de ambiente..."
 
-#: spyderlib/plugins/editor.py:919
-msgid "Replace tab characters by space characters"
-msgstr "Substituir caracteres de tabulação por espaços"
+#: spyder/plugins/console.py:146
+msgid "Show and edit environment variables (for current session)"
+msgstr "Mostrar e editar as variáveis de ambiente (para a sessão atual)"
 
-#: spyderlib/plugins/editor.py:922
-msgid "Go to line..."
-msgstr "Ir para linha..."
+#: spyder/plugins/console.py:150
+msgid "Show sys.path contents..."
+msgstr "Mostrar conteúdo da sys.path..."
 
-#: spyderlib/plugins/editor.py:930
-msgid "Set console working directory"
-msgstr "Definir diretório de trabalho"
+#: spyder/plugins/console.py:152
+msgid "Show (read-only) sys.path"
+msgstr "Mostrar conteúdo da sys.path em modo de leitura"
 
-#: spyderlib/plugins/editor.py:932
-msgid ""
-"Set current console (and file explorer) working directory to current script "
-"directory"
-msgstr ""
-"Definir o diretório de trabalho do console (e do explorador de arquivos) "
-"para o diretório do script atual."
+#: spyder/plugins/console.py:155
+msgid "Buffer..."
+msgstr "Buffer..."
 
-#: spyderlib/plugins/editor.py:937
-msgid "Maximum number of recent files..."
-msgstr "Número máximo de arquivos recentes..."
+#: spyder/plugins/console.py:156 spyder/plugins/externalconsole.py:75
+#: spyder/plugins/history.py:43
+msgid "Set maximum line count"
+msgstr "Definir número máximo de linhas"
 
-#: spyderlib/plugins/editor.py:940
-msgid "Clear recent files list"
-msgstr "Limpar lista de arquivos recentes"
+#: spyder/plugins/console.py:159
+msgid "External editor path..."
+msgstr "Caminho de editor externo:"
 
-#: spyderlib/plugins/editor.py:940
-msgid "Clear this list"
-msgstr "Limpar esta lista"
+#: spyder/plugins/console.py:160
+msgid "Set external editor executable path"
+msgstr "Definir caminho de editor externo"
 
-#: spyderlib/plugins/editor.py:942
-msgid "Open &recent"
-msgstr "Abrir &recente"
+#: spyder/plugins/console.py:163 spyder/plugins/editor.py:139
+#: spyder/plugins/externalconsole.py:76 spyder/plugins/help.py:157
+#: spyder/plugins/help.py:360 spyder/plugins/history.py:46
+#: spyder/plugins/history.py:157
+msgid "Wrap lines"
+msgstr "Ajuste de linha automático"
 
-#: spyderlib/plugins/editor.py:1224 spyderlib/spyder.py:635
-msgid "File toolbar"
-msgstr "Barra de arquivo"
+#: spyder/plugins/console.py:166 spyder/plugins/editor.py:175
+#: spyder/plugins/externalconsole.py:121 spyder/plugins/ipythonconsole.py:283
+msgid "Display balloon tips"
+msgstr "Mostrar sugestões"
 
-#: spyderlib/plugins/editor.py:1225 spyderlib/spyder.py:645
-msgid "Search toolbar"
-msgstr "Barra de pesquisa"
+#: spyder/plugins/console.py:170 spyder/plugins/editor.py:169
+#: spyder/plugins/externalconsole.py:115
+msgid "Automatic code completion"
+msgstr "Completar código automáticamente"
 
-#: spyderlib/plugins/editor.py:1226 spyderlib/spyder.py:650
-msgid "Source toolbar"
-msgstr "Barra de código"
+#: spyder/plugins/console.py:174 spyder/plugins/editor.py:173
+#: spyder/plugins/externalconsole.py:119
+msgid "Enter key selects completion"
+msgstr "A tecla Enter seleciona o resultado a completar"
 
-#: spyderlib/plugins/editor.py:1227 spyderlib/spyder.py:655
-msgid "Run toolbar"
-msgstr "Barra de execução "
+#: spyder/plugins/console.py:179
+msgid "Internal console settings"
+msgstr "Configurações do console interno"
 
-#: spyderlib/plugins/editor.py:1228 spyderlib/spyder.py:660
-msgid "Debug toolbar"
-msgstr "Barra de depuração"
+#: spyder/plugins/console.py:232 spyder/plugins/externalconsole.py:918
+msgid "Run Python script"
+msgstr "Executar script Python"
 
-#: spyderlib/plugins/editor.py:1229 spyderlib/spyder.py:640
-msgid "Edit toolbar"
-msgstr "Barra de edição"
+#: spyder/plugins/console.py:233 spyder/plugins/externalconsole.py:146
+#: spyder/plugins/externalconsole.py:919 spyder/widgets/explorer.py:715
+msgid "Python scripts"
+msgstr "Scripts Python"
 
-#: spyderlib/plugins/editor.py:1232 spyderlib/spyder.py:633
-msgid "&File"
-msgstr "&Arquivo"
+#: spyder/plugins/console.py:278
+msgid "Buffer"
+msgstr "Buffer"
 
-#: spyderlib/plugins/editor.py:1233 spyderlib/spyder.py:639
-msgid "&Edit"
-msgstr "&Editar"
-
-#: spyderlib/plugins/editor.py:1234 spyderlib/spyder.py:644
-msgid "&Search"
-msgstr "&Pesquisar"
+#: spyder/plugins/console.py:279
+msgid "Maximum line count"
+msgstr "Número máximo de linhas"
 
-#: spyderlib/plugins/editor.py:1235 spyderlib/spyder.py:649
-msgid "Sour&ce"
-msgstr "Códi&go"
+#: spyder/plugins/console.py:289
+msgid "External editor"
+msgstr "Editor externo"
 
-#: spyderlib/plugins/editor.py:1237 spyderlib/spyder.py:667
-msgid "&Tools"
-msgstr "&Ferramentas"
+#: spyder/plugins/console.py:290
+msgid "External editor executable path:"
+msgstr "Caminho do executável do editor externo:"
 
-#: spyderlib/plugins/editor.py:1238
-msgid "?"
-msgstr "?"
+#: spyder/plugins/editor.py:104
+msgid "Edit template for new modules"
+msgstr "Editar template para novos módulos"
 
-#: spyderlib/plugins/editor.py:1458
-msgid "Spyder Editor"
-msgstr "Spyder Editor"
+#: spyder/plugins/editor.py:109
+msgid "Sort files according to full path"
+msgstr "Ordenar arquivos seguindo seu caminho completo"
 
-#: spyderlib/plugins/editor.py:1459
-msgid "This is a temporary script file."
-msgstr "Este é um arquivo de script temporário."
+#: spyder/plugins/editor.py:111
+msgid "Show tab bar"
+msgstr "Mostrar barra de abas"
 
-#: spyderlib/plugins/editor.py:1527
-msgid "untitled"
-msgstr "Sem título"
+#: spyder/plugins/editor.py:118 spyder/plugins/editor.py:189
+#: spyder/plugins/externalconsole.py:71 spyder/plugins/externalconsole.py:114
+#: spyder/plugins/help.py:156 spyder/plugins/history.py:45
+#: spyder/plugins/ipythonconsole.py:317
+msgid "Source code"
+msgstr "Código fonte"
 
-#: spyderlib/plugins/editor.py:1601
-msgid "Maximum number of recent files"
-msgstr "Número máximo de arquivos recentes"
+#: spyder/plugins/editor.py:119
+msgid "Show line numbers"
+msgstr "Mostrar número de linhas"
 
-#: spyderlib/plugins/editor.py:1726
-msgid "Printing..."
-msgstr "Imprimindo..."
+#: spyder/plugins/editor.py:120 spyder/plugins/editor.py:937
+msgid "Show blank spaces"
+msgstr "Mostrar espaços em branco"
 
-#: spyderlib/plugins/explorer.py:55
-msgid "File explorer"
-msgstr "Explorador de arquivos"
+#: spyder/plugins/editor.py:121
+msgid "Show vertical line after"
+msgstr "Mostrar uma linha vertical depois de"
 
-#: spyderlib/plugins/explorer.py:68 spyderlib/plugins/inspector.py:389
-#: spyderlib/plugins/projectexplorer.py:69
-msgid "Set font style"
-msgstr "Definir estilo da fonte"
+#: spyder/plugins/editor.py:122
+msgid "characters"
+msgstr "caracteres"
 
-#: spyderlib/plugins/externalconsole.py:49
-msgid "Interactive data plotting in the consoles"
-msgstr "Mostrar dados interativos no console"
-
-#: spyderlib/plugins/externalconsole.py:57
-#: spyderlib/plugins/externalconsole.py:1005
-#: spyderlib/plugins/inspector.py:419 spyderlib/plugins/runconfig.py:185
-#: spyderlib/plugins/runconfig.py:455
-#: spyderlib/widgets/externalshell/baseshell.py:107
-#: spyderlib/widgets/ipython.py:521
-msgid "Console"
-msgstr "Console"
+#: spyder/plugins/editor.py:127
+msgid "Highlight current line"
+msgstr "Realçar linha atual"
 
-#: spyderlib/plugins/externalconsole.py:71
-msgid "One tab per script"
-msgstr "Uma aba por script"
+#: spyder/plugins/editor.py:129
+msgid "Highlight current cell"
+msgstr "Realçar célula atual"
 
-#: spyderlib/plugins/externalconsole.py:72
-#: spyderlib/widgets/externalshell/baseshell.py:173
-msgid "Show elapsed time"
-msgstr "Mostrar tempo de execução"
+#: spyder/plugins/editor.py:131
+msgid "Highlight occurrences after"
+msgstr "Realçar ocorrências depois de"
 
-#: spyderlib/plugins/externalconsole.py:73 spyderlib/widgets/explorer.py:1016
-msgid "Show icons and text"
-msgstr "Mostrar ícones e texto"
+#: spyder/plugins/editor.py:159
+msgid "Save all files before running script"
+msgstr "Salvar tudo antes de executar um script"
 
-#: spyderlib/plugins/externalconsole.py:85
-msgid "Buffer: "
-msgstr "Buffer:"
+#: spyder/plugins/editor.py:162
+msgid "Run selection"
+msgstr "Executar seleção"
 
-#: spyderlib/plugins/externalconsole.py:85
-#: spyderlib/plugins/ipythonconsole.py:208
-msgid " lines"
-msgstr "linhas"
+#: spyder/plugins/editor.py:163
+msgid "Maintain focus in the Editor after running cells or selections"
+msgstr "Manter o foco no editor depois de executar células ou seleções"
 
-#: spyderlib/plugins/externalconsole.py:90
-msgid "Merge process standard output/error channels"
-msgstr "Combinar os canais de saída/erro do processo"
+#: spyder/plugins/editor.py:166 spyder/plugins/externalconsole.py:252
+msgid "Introspection"
+msgstr "Introspecção"
 
-#: spyderlib/plugins/externalconsole.py:92
-msgid ""
-"Merging the output channels of the process means that\n"
-"the standard error won't be written in red anymore,\n"
-"but this has the effect of speeding up display."
-msgstr ""
-"Combinar os canais de saída do processo significa que\n"
-"o erro padrão não será escrito em vermelho, mas isso ajuda a\n"
-"melhorar a velocidade em que aparece o texto no console."
+#: spyder/plugins/editor.py:171 spyder/plugins/externalconsole.py:117
+msgid "Case sensitive code completion"
+msgstr "Diferenciar entre maiúsculas e minusculas ao completar código"
 
-#: spyderlib/plugins/externalconsole.py:96
-msgid "Colorize standard error channel using ANSI escape codes"
-msgstr "Colorir o canal de error padrão utilizando códigos de escape ANSI "
+#: spyder/plugins/editor.py:176
+msgid "Link to object definition"
+msgstr "Link para a definição do objeto"
 
-#: spyderlib/plugins/externalconsole.py:98
+#: spyder/plugins/editor.py:178
 msgid ""
-"This method is the only way to have colorized standard\n"
-"error channel when the output channels have been merged."
+"If this option is enabled, clicking on an object\n"
+"name (left-click + Ctrl key) will go this object\n"
+"definition (if resolved)."
 msgstr ""
-"Este método é a única forma de ter cor no canal de erro\n"
-"padrão quando os canais de saída forem combinados."
-
-#: spyderlib/plugins/externalconsole.py:114
-#: spyderlib/plugins/ipythonconsole.py:195
-#: spyderlib/widgets/arrayeditor.py:461
-#: spyderlib/widgets/dataframeeditor.py:516
-msgid "Background color"
-msgstr "Cor de fundo"
+"Se esta opção estiver ativada, clicando no nome\n"
+"de um objeto (clique-esquerdo + Ctrl) o editor irá\n"
+"mostrar a definição do mesmo."
 
-#: spyderlib/plugins/externalconsole.py:115
+#: spyder/plugins/editor.py:182
 msgid ""
-"This option will be applied the next time a Python console or a terminal is "
-"opened."
+"<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 ""
-"Esta opção será ativada na próxima vez que um console Python ou um terminal "
-"for aberto."
-
-#: spyderlib/plugins/externalconsole.py:118
-msgid "Light background (white color)"
-msgstr "Fundo claro (cor branca)"
+"<b>Aviso:</b><br>O módulo <i>rope</i> não está instalado neste computador: "
+"Por tanto a completação de código, balões de dicas e o método ir para função "
+"não estão disponíveis."
 
-#: spyderlib/plugins/externalconsole.py:143
-msgid "User Module Reloader (UMR)"
-msgstr "Recarregador de Módulos do Usuário (RMU)"
+#: spyder/plugins/editor.py:190
+msgid "Automatic insertion of parentheses, braces and brackets"
+msgstr "Inserção automática de parênteses, chaves e colchetes"
 
-#: spyderlib/plugins/externalconsole.py:144
-msgid ""
-"UMR forces Python to reload modules which were imported when executing a \n"
-"script in the external console with the 'runfile' function."
-msgstr ""
-"O RMU força o Python a recarregar os módulos que foram importados\n"
-"durante a execução de um arquivo no console com a função 'runfile'."
+#: spyder/plugins/editor.py:193
+msgid "Automatic insertion of closing quotes"
+msgstr "Inserção automática de aspas"
 
-#: spyderlib/plugins/externalconsole.py:147
-msgid "Enable UMR"
-msgstr "Ativar RMU"
+#: spyder/plugins/editor.py:195
+msgid "Automatic insertion of colons after 'for', 'if', 'def', etc"
+msgstr "Inserção automática de \":\" depois de 'for', 'if', 'def', etc"
 
-#: spyderlib/plugins/externalconsole.py:148
-msgid ""
-"This option will enable the User Module Reloader (UMR) in Python/IPython "
-"consoles. UMR forces Python to reload deeply modules during import when "
-"running a Python script using the Spyder's builtin function <b>runfile</b>."
-"<br><br><b>1.</b> UMR may require to restart the console in which it will be "
-"called (otherwise only newly imported modules will be reloaded when "
-"executing scripts).<br><br><b>2.</b> If errors occur when re-running a PyQt-"
-"based program, please check that the Qt objects are properly destroyed (e.g. "
-"you may have to use the attribute <b>Qt.WA_DeleteOnClose</b> on your main "
-"window, using the <b>setAttribute</b> method)"
-msgstr ""
-"Esta opção ativará o Recarregador de Módulos do Usuário (RMU) nos consoles "
-"do Python/IPython. O RMU força o Python a recarregar profundamente os "
-"módulos que foram importados ao executar um arquivo do Python, usando a "
-"função incorporada do Spyder chamada <b>runfile</b>.<br><br><b>1.</b> O RMU "
-"pode necessitar que se reinicie o terminal em o qual será utilizado (de "
-"outra forma, só os módulos que foram importados em último lugar serão "
-"recarregados ao executar um arquivo).<br><br><b>2.</b> Se ocorrer algum erro "
-"ao re-executar programas baseados no PyQt ou PySide, por favor verifique se "
-"os objetos do Qt foram destruídos apropriadamente (por exemplo, você pode "
-"ter que utilizar o atributo <b>Qt.WA_DeleteOnClose</b> em sua janela "
-"principal, utilizando o método <b>setAttribute</b>)."
-
-#: spyderlib/plugins/externalconsole.py:164
-msgid "Show reloaded modules list"
-msgstr "Mostrar lista de módulos que foram recarregados"
+#: spyder/plugins/editor.py:198
+msgid "Automatic indentation after 'else', 'elif', etc."
+msgstr "Indentação automática depois do 'else', 'elif', etc."
 
-#: spyderlib/plugins/externalconsole.py:165
-msgid "Please note that these changes will be applied only to new consoles"
-msgstr ""
-"Por favor tenha em nota que as mudanças só serão aplicadas em novos consoles"
+#: spyder/plugins/editor.py:200
+msgid "Indentation characters: "
+msgstr "Caracteres de indentação:"
 
-#: spyderlib/plugins/externalconsole.py:169
-msgid "Set UMR excluded (not reloaded) modules"
-msgstr "Definir lista de módulos excluídos pelo RMU"
+#: spyder/plugins/editor.py:201
+msgid "2 spaces"
+msgstr "2 espaços"
 
-#: spyderlib/plugins/externalconsole.py:180
-msgid "Python executable"
-msgstr "Executável Python"
+#: spyder/plugins/editor.py:202
+msgid "3 spaces"
+msgstr "3 espaços"
 
-#: spyderlib/plugins/externalconsole.py:182
-msgid ""
-"Select the Python interpreter executable binary in which Spyder will run "
-"scripts:"
-msgstr "Selecione o caminho do interpretador Python que deseja utilizar:"
+#: spyder/plugins/editor.py:203
+msgid "4 spaces"
+msgstr "4 espaços"
 
-#: spyderlib/plugins/externalconsole.py:185
-msgid "Default (i.e. the same as Spyder's)"
-msgstr "Padrão (o mesmo do Spyder)"
+#: spyder/plugins/editor.py:204
+msgid "5 spaces"
+msgstr "5 espaços"
 
-#: spyderlib/plugins/externalconsole.py:189
-msgid "Use the following Python interpreter:"
-msgstr "Usar o seguinte interpretador:"
+#: spyder/plugins/editor.py:205
+msgid "6 spaces"
+msgstr "6 espaços"
 
-#: spyderlib/plugins/externalconsole.py:193
-msgid "Executables"
-msgstr "Executáveis "
+#: spyder/plugins/editor.py:206
+msgid "7 spaces"
+msgstr "7 espaços"
 
-#: spyderlib/plugins/externalconsole.py:211
-msgid "PYTHONSTARTUP replacement"
-msgstr "Substituto do PYTHONSTARTUP"
+#: spyder/plugins/editor.py:207
+msgid "8 spaces"
+msgstr "8 espaços"
 
-#: spyderlib/plugins/externalconsole.py:213
-msgid ""
-"This option will override the PYTHONSTARTUP environment variable which\n"
-"defines the script to be executed during the Python console startup."
-msgstr ""
-"Esta opção modificará a variável de ambiente PYTHONSTARTUP, a qual\n"
-"define o script que é executado durante a inicialização do console\n"
-"Python."
+#: spyder/plugins/editor.py:208
+msgid "Tabulations"
+msgstr "Tabulações"
 
-#: spyderlib/plugins/externalconsole.py:218
-msgid "Default PYTHONSTARTUP script"
-msgstr "Script PYTHONSTARTUP padrão"
+#: spyder/plugins/editor.py:209
+msgid "Tab stop width:"
+msgstr "Largura da tabulação:"
 
-#: spyderlib/plugins/externalconsole.py:222
-msgid "Use the following startup script:"
-msgstr "Usar o seguinte script de inicialização:"
+#: spyder/plugins/editor.py:209
+msgid "pixels"
+msgstr "pixels"
 
-#: spyderlib/plugins/externalconsole.py:239
-msgid "Monitor"
-msgstr "Monitor"
+#: spyder/plugins/editor.py:211
+msgid "Tab always indent"
+msgstr "Sempre indentar com a tecla Tab"
 
-#: spyderlib/plugins/externalconsole.py:240
+#: spyder/plugins/editor.py:213
 msgid ""
-"The monitor provides introspection features to console: code completion, "
-"calltips and variable explorer. Because it relies on several modules, "
-"disabling the monitor may be useful to accelerate console startup."
+"If enabled, pressing Tab will always indent,\n"
+"even when the cursor is not at the beginning\n"
+"of a line (when this option is enabled, code\n"
+"completion may be triggered using the alternate\n"
+"shortcut: Ctrl+Space)"
 msgstr ""
-"O monitor fornece características de introspecção para o console: "
-"completador de código, sugestões e o explorador de variáveis. Porque ele "
-"depende de vários módulos adicionais, desativando o monitor é possível "
-"acelerar a inicialização do console."
-
-#: spyderlib/plugins/externalconsole.py:247
-msgid "Enable monitor"
-msgstr "Ativar monitor"
+"Se ativada, pressionando Tab o código\n"
+"será indentado, mesmo se o cursor não estiver\n"
+"no inicio da linha (se essa opção for ativada a\n"
+"completação de código poderá ser usada\n"
+"pressionando Ctrl+Espaço)"
 
-#: spyderlib/plugins/externalconsole.py:260
-msgid "Default library"
-msgstr "Biblioteca padrão"
+#: spyder/plugins/editor.py:218
+msgid "Intelligent backspace"
+msgstr "Tecla de retorno (\"backspace\") inteligente"
 
-#: spyderlib/plugins/externalconsole.py:265
-#, fuzzy
-msgid "Qt-Python Bindings"
-msgstr "Seleção da biblioteca de ligação entre o Qt e Python:"
+#: spyder/plugins/editor.py:220
+msgid "Automatically remove trailing spaces when saving files"
+msgstr "Remover automaticamente espaços em branco ao salvar arquivos"
 
-#: spyderlib/plugins/externalconsole.py:267
-msgid "Library:"
-msgstr ""
+#: spyder/plugins/editor.py:224
+msgid "Analysis"
+msgstr "Análise"
 
-#: spyderlib/plugins/externalconsole.py:269
-msgid ""
-"This option will act on<br> libraries such as Matplotlib, guidata or ETS"
-msgstr ""
-"Esta opção trará efeitos <br> em bibliotecas como Matplotlib, guidata ou ETS"
+#: spyder/plugins/editor.py:226
+msgid "<i>(Refer to the {} page)</i>"
+msgstr "<i>(Guia de estilo {})</i>"
 
-#: spyderlib/plugins/externalconsole.py:278
-#: spyderlib/plugins/ipythonconsole.py:465
-msgid "Graphics"
-msgstr "Gráficos"
+#: spyder/plugins/editor.py:230
+msgid "Real-time code analysis"
+msgstr "Análise de código em tempo real"
 
-#: spyderlib/plugins/externalconsole.py:279
+#: spyder/plugins/editor.py:232
 msgid ""
-"Decide which backend to use to display graphics. If unsure, please select "
-"the <b>Automatic</b> backend.<br><br><b>Note:</b> We support a very limited "
-"number of backends in our Python consoles. If you prefer to work with a "
-"different one, please use an IPython console."
+"<p>If enabled, Python source code will be analyzed using pyflakes, lines "
+"containing errors or warnings will be highlighted.</p><p><u>Note</u>: add "
+"<b>analysis:ignore</b> in a comment to ignore code analysis warnings.</p>"
 msgstr ""
+"<p>Se ativado, o  código fonte será analisado utilizando o pyflakes, linhas "
+"contendo erros ou avisos serão destacadas.</p><p><u>Nota</u>: add "
+"<b>analysis:ignore</b> em um comentário para ignorar avisos da analise de "
+"estilo.</p>"
 
-#: spyderlib/plugins/externalconsole.py:295
-#: spyderlib/plugins/ipythonconsole.py:270
-msgid "Backend:"
-msgstr "Saída:"
-
-#: spyderlib/plugins/externalconsole.py:297
-#: spyderlib/plugins/ipythonconsole.py:272
-msgid "This option will be applied the next time a console is opened."
-msgstr "Esta opção será aplicada na próxima vez que um console for aberto."
+#: spyder/plugins/editor.py:240
+msgid "Code analysis requires pyflakes %s+"
+msgstr "A análise de código requer pyflakes %s+"
 
-#: spyderlib/plugins/externalconsole.py:308
-msgid "Enthought Tool Suite"
-msgstr "Enthought Tool Suite"
+#: spyder/plugins/editor.py:242
+msgid "Real-time code style analysis"
+msgstr "Análise do estilo de código em tempo real"
 
-#: spyderlib/plugins/externalconsole.py:309
+#: spyder/plugins/editor.py:244
 msgid ""
-"Enthought Tool Suite (ETS) supports PyQt4 (qt4) and wxPython (wx) graphical "
-"user interfaces."
+"<p>If enabled, Python source code will be analyzedusing pep8, lines that are "
+"not following PEP8 style guide will be highlighted.</p><p><u>Note</u>: add "
+"<b>analysis:ignore</b> in a comment to ignore style analysis warnings.</p>"
 msgstr ""
-"Enthought Tool Suite (ETS) suporta as bibliotecas gráficas PyQt4 (qt4) e \n"
-"wxPython (wx)."
+"<p>Se ativado, o  código fonte será analisado utilizando o pep8, linhas que "
+"não seguem o guia de estilo PEP8 serão destacadas.</p><p><u>Nota</u>: add "
+"<b>analysis:ignore</b> em um comentário para ignorar avisos da analise de "
+"estilo.</p>"
 
-#: spyderlib/plugins/externalconsole.py:313
-msgid "ETS_TOOLKIT:"
-msgstr "ETS_TOOLKIT:"
+#: spyder/plugins/editor.py:251
+msgid "Code annotations (TODO, FIXME, XXX, HINT, TIP, @todo)"
+msgstr "Anotações (TODO, FIXME, XXX, HINT, TIP, @todo)"
 
-#: spyderlib/plugins/externalconsole.py:338
-msgid "External modules"
-msgstr "Módulos externos"
+#: spyder/plugins/editor.py:254
+msgid "Perform analysis when saving file and every"
+msgstr "Fazer análise de código ao guardar arquivo e a cada"
 
-#: spyderlib/plugins/externalconsole.py:374
-#: spyderlib/plugins/externalconsole.py:617
-#: spyderlib/plugins/ipythonconsole.py:114
-#: spyderlib/plugins/ipythonconsole.py:832 spyderlib/spyder.py:1803
-#: spyderlib/spyder.py:1825 spyderlib/spyder.py:1888 spyderlib/spyder.py:2774
-#: spyderlib/utils/environ.py:95 spyderlib/utils/environ.py:108
-#: spyderlib/widgets/dicteditor.py:452
-msgid "Warning"
-msgstr "Aviso"
+#: spyder/plugins/editor.py:258
+msgid "Perform analysis only when saving file"
+msgstr "Fazer análise só quando o arquivo for salvo"
 
-#: spyderlib/plugins/externalconsole.py:375
+#: spyder/plugins/editor.py:317
+msgid "End-of-line characters"
+msgstr "Caracteres de fim de linha"
+
+#: spyder/plugins/editor.py:318
 msgid ""
-"You selected a <b>Python %d</b> interpreter for the console but Spyder is "
-"running on <b>Python %d</b>!.<br><br>Although this is possible, we recommend "
-"you to install and run Spyder directly with your selected interpreter, to "
-"avoid seeing false warnings and errors due to the incompatible syntax "
-"between these two Python versions."
+"When opening a text file containing mixed end-of-line characters (this may "
+"raise syntax errors in the consoles on Windows platforms), Spyder may fix "
+"the file automatically."
 msgstr ""
-"Você selecionou um interpretador <b>Python %d</b> para o console, mas o "
-"Spyder está sendo executado em <b>Python %d</b>!.<br><br>Embora isso seja "
-"possível, nós recomendamos instalar e executar o Spyder diretamente com o "
-"interpretador selecionado, para evitar ver falsos erros e avisos no Editor "
-"devido a sintaxe incompatível entre estas duas versões do Python."
+"Quando for aberto um arquivo de texto que contenha vários tipos de "
+"caracteres de fim de linha (o qual pode dar erros no Windows). O Spyder pode "
+"consertar o arquivo automaticamente."
 
-#: spyderlib/plugins/externalconsole.py:538
-msgid "Trying to kill a kernel?"
-msgstr "Tentando matar um kernel?"
+#: spyder/plugins/editor.py:324
+msgid "Fix automatically and show warning message box"
+msgstr "Corrigir automaticamente e exibir uma mensagem de aviso"
 
-#: spyderlib/plugins/externalconsole.py:539
-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 "
-"the second button from right to left."
-msgstr ""
-"Você não pode fechar este kernel porque tem um ou mais consoles conectados a "
-"ele.<br><br>Você deve fechá-lo previamente ou pode terminar o processo "
-"usando o segundo botão da direita para esquerda."
+#: spyder/plugins/editor.py:335 spyder/plugins/externalconsole.py:250
+#: spyder/plugins/ipythonconsole.py:558 spyder/plugins/variableexplorer.py:43
+msgid "Display"
+msgstr "Visualização"
 
-#: spyderlib/plugins/externalconsole.py:618
-msgid ""
-"No Python console is currently selected to run <b>%s</b>.<br><br>Please "
-"select or open a new Python console and try again."
-msgstr ""
-"Nenhum console Python foi selecionado para executar <b>%s</b>.<br><br>Por "
-"favor selecione ou abra um novo console Python e tente novamente."
+#: spyder/plugins/editor.py:337
+msgid "Code Introspection/Analysis"
+msgstr "Análise e introspecção de código"
 
-#: spyderlib/plugins/externalconsole.py:698
-msgid ""
-"%s is already running in a separate process.\n"
-"Do you want to kill the process before starting a new one?"
-msgstr ""
-"%s já está sendo executado em um processo separado.\n"
-"Você deseja matar o processo antes de iniciar um novo?"
+#: spyder/plugins/editor.py:340 spyder/plugins/externalconsole.py:253
+msgid "Advanced settings"
+msgstr "Configurações avançadas"
 
-#: spyderlib/plugins/externalconsole.py:858
-msgid "Kernel"
-msgstr "Kernel"
+#: spyder/plugins/editor.py:613 spyder/widgets/editortools.py:510
+msgid "Show/hide outline explorer"
+msgstr "Mostrar/esconder o explorador de código"
 
-#: spyderlib/plugins/externalconsole.py:868
-msgid ""
-"Either:<ol><li>Your IPython frontend and kernel versions are "
-"<b>incompatible</b> or</li><li>You <b>don't have</b> IPython installed in "
-"your external interpreter.</li></ol>In any case, we're sorry but we can't "
-"create a console for you."
-msgstr ""
-"Ou:<ol><li>Suas versões de kernel e da interface gráfica do IPython são "
-"<b>incompatíveis</b> ou</li><li>Você <b>não possui</b> o IPython instalado "
-"em seu interpretador externo.</li></ol>Nós lamentamos, mas não podemos criar "
-"um console do IPython para você."
+#: spyder/plugins/editor.py:619
+msgid "Show/hide project explorer"
+msgstr "Mostrar/esconder o explorador de projetos"
 
-#: spyderlib/plugins/externalconsole.py:892
-msgid "Command Window"
-msgstr "Janela de comando"
+#: spyder/plugins/editor.py:627
+msgid "&New file..."
+msgstr "&Novo arquivo..."
 
-#: spyderlib/plugins/externalconsole.py:894
-msgid "Terminal"
-msgstr "Terminal"
+#: spyder/plugins/editor.py:628 spyder/plugins/workingdirectory.py:83
+#: spyder/widgets/explorer.py:692 spyder/widgets/explorer.py:699
+msgid "New file"
+msgstr "Novo arquivo"
 
-#: spyderlib/plugins/externalconsole.py:947
-#, fuzzy
-msgid "Kernel %s"
-msgstr "Kernel"
+#: spyder/plugins/editor.py:634
+msgid "&Open..."
+msgstr "&Abrir..."
 
-#: spyderlib/plugins/externalconsole.py:1027
-msgid "Open a &Python console"
-msgstr "Abrir um console &Python"
+#: spyder/plugins/editor.py:635 spyder/plugins/editor.py:1767
+#: spyder/plugins/workingdirectory.py:70
+msgid "Open file"
+msgstr "Abrir arquivo"
 
-#: spyderlib/plugins/externalconsole.py:1031
-msgid "Open &command prompt"
-msgstr "Abrir &prompt de comando"
+#: spyder/plugins/editor.py:641 spyder/widgets/editor.py:345
+msgid "File switcher..."
+msgstr "Seletor de arquivo..."
 
-#: spyderlib/plugins/externalconsole.py:1032
-msgid "Open a Windows command prompt"
-msgstr "Abrir o prompt de comando do Windows"
+#: spyder/plugins/editor.py:643
+msgid "Fast switch between files"
+msgstr "Troca rápida de seleção entre arquivos"
 
-#: spyderlib/plugins/externalconsole.py:1034
-msgid "Open a &terminal"
-msgstr "Abrir um &terminal"
+#: spyder/plugins/editor.py:649
+msgid "&Revert"
+msgstr "Resta&urar"
 
-#: spyderlib/plugins/externalconsole.py:1035
-msgid "Open a terminal window"
-msgstr "Abrir uma janela de terminal"
+#: spyder/plugins/editor.py:650
+msgid "Revert file from disk"
+msgstr "Reverter arquivo do disco"
 
-#: spyderlib/plugins/externalconsole.py:1196
-msgid "Open an IPython console"
-msgstr "Abrir um console IPython"
+#: spyder/plugins/editor.py:653
+msgid "&Save"
+msgstr "&Salvar"
 
-#: spyderlib/plugins/externalconsole.py:1197
-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 ""
-"O monitor está desativado, por tanto será criado um kernel do IPython, mas "
-"você deverá conectar manualmente um interpretador ao mesmo."
+#: spyder/plugins/editor.py:654 spyder/widgets/editor.py:1304
+msgid "Save file"
+msgstr "Salvar arquivo"
 
-#: spyderlib/plugins/externalconsole.py:1229
-#: spyderlib/plugins/externalconsole.py:1242
-#: spyderlib/plugins/externalconsole.py:1246
-msgid "UMR"
-msgstr "RMU"
+#: spyder/plugins/editor.py:660
+msgid "Sav&e all"
+msgstr "Sal&var tudo"
 
-#: spyderlib/plugins/externalconsole.py:1230
-msgid ""
-"UMR excluded modules:\n"
-"(example: guidata, guiqwt)"
-msgstr ""
-"Módulos excluídos pelo RMU:\n"
-"(Exemplo: guidata, guiqwt)"
+#: spyder/plugins/editor.py:661
+msgid "Save all files"
+msgstr "Salvar todos os arquivos"
 
-#: spyderlib/plugins/externalconsole.py:1243
-msgid ""
-"The following modules are not installed on your machine:\n"
-"%s"
-msgstr ""
-"Os seguintes módulos não estão instalados no seu computador:\n"
-"%s"
+#: spyder/plugins/editor.py:667
+msgid "Save &as..."
+msgstr "Salvar c&omo..."
 
-#: spyderlib/plugins/externalconsole.py:1247
-msgid ""
-"Please note that these changes will be applied only to new Python/IPython "
-"consoles"
-msgstr ""
-"Por favor, note que estas mudanças só serão aplicadas apenas aos novos "
-"consoles do Python/IPython"
+#: spyder/plugins/editor.py:668
+msgid "Save current file as..."
+msgstr "Salvar arquivo atual como..."
 
-#: spyderlib/plugins/findinfiles.py:96 spyderlib/widgets/findinfiles.py:690
-msgid "Find in files"
-msgstr "Procurar em arquivos"
+#: spyder/plugins/editor.py:673 spyder/plugins/editor.py:674
+msgid "Print preview..."
+msgstr "Pré-visualizar impressão..."
 
-#: spyderlib/plugins/findinfiles.py:117
-msgid "&Find in files"
-msgstr "Procurar em arqui&vos"
+#: spyder/plugins/editor.py:675
+msgid "&Print..."
+msgstr "&Imprimir..."
 
-#: spyderlib/plugins/findinfiles.py:120
-msgid "Search text in multiple files"
-msgstr "Buscar em vários arquivos"
+#: spyder/plugins/editor.py:676
+msgid "Print current file..."
+msgstr "Imprimir o arquivo atual..."
 
-#: spyderlib/plugins/history.py:37
-msgid "Settings"
-msgstr "Configurações"
+#: spyder/plugins/editor.py:679
+msgid "&Close"
+msgstr "&Fechar"
 
-#: spyderlib/plugins/history.py:39
-msgid " entries"
-msgstr "entradas"
+#: spyder/plugins/editor.py:680
+msgid "Close current file"
+msgstr "Fechar arquivo atual"
 
-#: spyderlib/plugins/history.py:39
-msgid "History depth: "
-msgstr "Profundidade do histórico: "
+#: spyder/plugins/editor.py:683
+msgid "C&lose all"
+msgstr "Fechar &tudo"
 
-#: spyderlib/plugins/history.py:46
-msgid "Scroll automatically to last entry"
-msgstr "Ir automaticamente para a última entrada"
+#: spyder/plugins/editor.py:684
+msgid "Close all opened files"
+msgstr "Fechar todos os arquivos abertos"
 
-#: spyderlib/plugins/history.py:118 spyderlib/plugins/inspector.py:472
-#: spyderlib/widgets/editor.py:459 spyderlib/widgets/explorer.py:1027
-#: spyderlib/widgets/externalshell/baseshell.py:153
-#: spyderlib/widgets/externalshell/namespacebrowser.py:139
-#: spyderlib/widgets/ipython.py:568
-msgid "Options"
-msgstr "Opções"
+#: spyder/plugins/editor.py:691
+msgid "&Find text"
+msgstr "&Procurar"
 
-#: spyderlib/plugins/history.py:138
-msgid "History log"
-msgstr "Log do histórico "
+#: spyder/plugins/editor.py:697
+msgid "Find &next"
+msgstr "P&rocurar próximo"
 
-#: spyderlib/plugins/history.py:165
-msgid "History..."
-msgstr "Histórico..."
+#: spyder/plugins/editor.py:703
+msgid "Find &previous"
+msgstr "Procurar &anterior"
 
-#: spyderlib/plugins/history.py:167
-msgid "Set history maximum entries"
-msgstr "Definir número máximo de entradas para armazenar"
+#: spyder/plugins/editor.py:709
+msgid "&Replace text"
+msgstr "&Substituir"
 
-#: spyderlib/plugins/history.py:274
-msgid "History"
-msgstr "Histórico"
+#: spyder/plugins/editor.py:718
+msgid "Set/Clear breakpoint"
+msgstr "Adicionar ou limpar um ponto de interrupção"
 
-#: spyderlib/plugins/history.py:275
-msgid "Maximum entries"
-msgstr "Número máximo de entradas"
+#: spyder/plugins/editor.py:725
+msgid "Set/Edit conditional breakpoint"
+msgstr "Adicionar ou editar um ponto de interrupção condicional"
 
-#: spyderlib/plugins/inspector.py:58
-msgid "Rich text help on the Object Inspector"
-msgstr "Ajuda em texto formatado no Explorador de Objetos"
+#: spyder/plugins/editor.py:732
+msgid "Clear breakpoints in all files"
+msgstr "Limpar pontos de interrupção em todos os arquivos"
 
-#: spyderlib/plugins/inspector.py:125
-msgid "Plain text font style"
-msgstr "Estilo de fonte para o texto normal"
+#: spyder/plugins/editor.py:734
+msgid "Debug with winpdb"
+msgstr "Depurar com winpdb"
 
-#: spyderlib/plugins/inspector.py:128
-msgid "Rich text font style"
-msgstr "Estilo de fonte para o texto formatado"
+#: spyder/plugins/editor.py:741
+msgid "Debug file"
+msgstr "Depurar arquivo"
 
-#: spyderlib/plugins/inspector.py:131
-msgid "Automatic connections"
-msgstr "Conexões automáticas "
+#: spyder/plugins/editor.py:746
+msgid "Step"
+msgstr "Executar linha"
 
-#: spyderlib/plugins/inspector.py:132
-msgid ""
-"The Object Inspector can automatically show an object's help information "
-"after a left parenthesis is written next to it. Below you can decide to "
-"which plugin you want to connect it to turn on this feature."
-msgstr ""
-"O Inspetor de Objetos pode mostrar automaticamente a ajuda de um objeto "
-"depois de escrever um parênteses no mesmo. A seguir você pode decidir a que "
-"painel/componente você deseja conectar para ativar esta característica."
+#: spyder/plugins/editor.py:747
+msgid "Run current line"
+msgstr "Executar linha selecionada"
 
-#: spyderlib/plugins/inspector.py:144
-#, fuzzy
-msgid ""
-"This feature requires the Rope or Jedi libraries.\n"
-"It seems you don't have either installed."
-msgstr ""
-"Esta funcionalidade requer a biblioteca Rope.\n"
-"Parece que ela não está instalada."
+#: spyder/plugins/editor.py:752
+msgid "Continue"
+msgstr "Continuar"
 
-#: spyderlib/plugins/inspector.py:147
-msgid "Python Console"
-msgstr "Console Python"
+#: spyder/plugins/editor.py:754
+msgid "Continue execution until next breakpoint"
+msgstr "Continuar a execução até o próximo ponto de interrupção"
 
-#: spyderlib/plugins/inspector.py:149
-msgid "IPython Console"
-msgstr "Console IPython"
+#: spyder/plugins/editor.py:759
+msgid "Step Into"
+msgstr "Ingressar na função/método"
 
-#: spyderlib/plugins/inspector.py:161
-msgid "Additional features"
-msgstr "Funcionalidades adicionais"
+#: spyder/plugins/editor.py:761
+msgid "Step into function or method of current line"
+msgstr "Ingressar na função ou método da linha atual"
 
-#: spyderlib/plugins/inspector.py:162
-msgid "Render mathematical equations"
-msgstr "Renderizar equações matemáticas"
+#: spyder/plugins/editor.py:766
+msgid "Step Return"
+msgstr "Sair da função/método"
 
-#: spyderlib/plugins/inspector.py:168
-msgid "This feature requires Sphinx 1.1 or superior."
-msgstr "Esta funcionalidade requer Sphinx 1.1 ou superior."
+#: spyder/plugins/editor.py:768
+msgid "Run until current function or method returns"
+msgstr "Executar até que a função ou método atual terminem"
 
-#: spyderlib/plugins/inspector.py:170
-msgid "Sphinx %s is currently installed."
-msgstr "Sphinx %s está instalado atualmente."
+#: spyder/plugins/editor.py:773 spyder/widgets/findinfiles.py:333
+#: spyder/widgets/ipythonconsole/client.py:236
+msgid "Stop"
+msgstr "Parar"
 
-#: spyderlib/plugins/inspector.py:373
-#, fuzzy
-msgid "No further documentation available"
-msgstr "Não existe documentação disponível"
+#: spyder/plugins/editor.py:774
+msgid "Stop debugging"
+msgstr "Parar depuração"
 
-#: spyderlib/plugins/inspector.py:412
-msgid "Source"
-msgstr "Origem"
+#: spyder/plugins/editor.py:781
+msgid "Run file"
+msgstr "Executar arquivo"
 
-#: spyderlib/plugins/inspector.py:427 spyderlib/widgets/dicteditor.py:173
-msgid "Object"
-msgstr "Objeto"
+#: spyder/plugins/editor.py:786
+msgid "&Configure..."
+msgstr "&Configurar..."
 
-#: spyderlib/plugins/inspector.py:442
-msgid "Plain Text"
-msgstr "Texto Normal"
+#: spyder/plugins/editor.py:788 spyder/widgets/externalshell/pythonshell.py:304
+msgid "Run settings"
+msgstr "Executar configurações"
 
-#: spyderlib/plugins/inspector.py:446
-msgid "Show Source"
-msgstr "Mostrar código fonte"
+#: spyder/plugins/editor.py:794
+msgid "Re-run &last script"
+msgstr "Executar &novamente o último script"
 
-#: spyderlib/plugins/inspector.py:450
-msgid "Rich Text"
-msgstr "Texto Formatado "
+#: spyder/plugins/editor.py:796
+msgid "Run again last file"
+msgstr "Executar novamente o mesmo arquivo"
 
-#: spyderlib/plugins/inspector.py:460
-msgid "Automatic import"
-msgstr "Importar automaticamente"
+#: spyder/plugins/editor.py:802 spyder/widgets/sourcecode/codeeditor.py:2507
+msgid "Run &selection or current line"
+msgstr "Executar &seleção ou linha atual"
+
+#: spyder/plugins/editor.py:805
+msgid "Run selection or current line"
+msgstr "Executar seleção ou linha atual"
 
-#: spyderlib/plugins/inspector.py:520 spyderlib/plugins/inspector.py:983
-msgid "Object inspector"
-msgstr "Inspetor de objetos"
+#: spyder/plugins/editor.py:813 spyder/widgets/sourcecode/codeeditor.py:2499
+msgid "Run cell"
+msgstr "Executar célula"
 
-#: spyderlib/plugins/inspector.py:740
+#: spyder/plugins/editor.py:816
 msgid ""
-"Here you can get help of any object by pressing %s in front of it, either on "
-"the Editor or the Console.%sHelp can also be shown automatically after "
-"writing a left parenthesis next to an object. You can activate this behavior "
-"in %s."
+"Run current cell (Ctrl+Enter)\n"
+"[Use #%% to create cells]"
 msgstr ""
-"Neste painel é possível obter a ajuda de qualquer objeto ao pressionar %s "
-"estando na frente do mesmo, tanto no Editor quanto no Console.%sEssa ajuda "
-"também pode ser mostrada automaticamente depois de escrever um parênteses "
-"junto a um objeto. Você pode ativar este comportamento em %s."
-
-#: spyderlib/plugins/inspector.py:746
-msgid "Preferences > Object Inspector"
-msgstr "Preferências > Inspetor de objetos"
+"Executar a célula atual (Ctrl+Enter)\n"
+"[Usar #%% para criar células]"
 
-#: spyderlib/plugins/inspector.py:753
-msgid "Usage"
-msgstr "Uso"
+#: spyder/plugins/editor.py:822 spyder/widgets/sourcecode/codeeditor.py:2503
+msgid "Run cell and advance"
+msgstr "Executar célula e avançar"
 
-#: spyderlib/plugins/inspector.py:754
-msgid "New to Spyder? Read our"
-msgstr "Novo no Spyder? Leia nosso"
+#: spyder/plugins/editor.py:825
+msgid "Run current cell and go to the next one (Shift+Enter)"
+msgstr "Executar célula atual e ir para a próxima (Shift+Enter)"
 
-#: spyderlib/plugins/inspector.py:755
-msgid "tutorial"
-msgstr "tutorial"
+#: spyder/plugins/editor.py:832
+msgid "Show todo list"
+msgstr "Mostrar lista de tarefas"
 
-#: spyderlib/plugins/inspector.py:762
-msgid ""
-"Please consider installing Sphinx to get documentation rendered in rich text."
+#: spyder/plugins/editor.py:833
+msgid "Show TODO/FIXME/XXX/HINT/TIP/@todo comments list"
 msgstr ""
-"Por favor considere instalar o Sphinx para obter a documentação em texto "
-"formatado."
+"Mostrar a lista de comentários dos\n"
+"TODO/FIXME/XXX/HINT/TIP/@todo"
 
-#: spyderlib/plugins/inspector.py:939
-msgid "Lock"
-msgstr "Trancar"
+#: spyder/plugins/editor.py:840
+msgid "Show warning/error list"
+msgstr "Mostrar lista de erros e avisos"
 
-#: spyderlib/plugins/inspector.py:939
-msgid "Unlock"
-msgstr "Destrancar"
+#: spyder/plugins/editor.py:841
+msgid "Show code analysis warnings/errors"
+msgstr "Mostrar erros e avisos da análise de código"
 
-#: spyderlib/plugins/inspector.py:984
-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 ""
-"Ocorreu o seguinte erro quando o <b>Sphinx %s</b> tentou ser utilizado. "
-"<br>Isso se deve a uma versão incompatível do Sphinx ou não foi possível ler "
-"a documentação solicitada.<br><br>Mensagem de erro:<br>%s"
+#: spyder/plugins/editor.py:847
+msgid "Previous warning/error"
+msgstr "Aviso ou erro anterior"
 
-#: spyderlib/plugins/inspector.py:1028
-msgid "No source code available."
-msgstr "O código fonte não está disponível"
+#: spyder/plugins/editor.py:848
+msgid "Go to previous code analysis warning/error"
+msgstr "Ir para linha anterior de aviso ou erro"
 
-#: spyderlib/plugins/ipythonconsole.py:62
-msgid "Symbolic mathematics in the IPython Console"
-msgstr "Matemática simbólica no console IPython"
+#: spyder/plugins/editor.py:851
+msgid "Next warning/error"
+msgstr "Próximo aviso ou erro"
 
-#: spyderlib/plugins/ipythonconsole.py:111
-msgid ""
-"The authenticity of host <b>%s</b> can't be established. Are you sure you "
-"want to continue connecting?"
-msgstr ""
-"A autenticidade do servidor <b>%s</b> não pode ser estabelecida. Você tem "
-"certeza que deseja continuar conectando?"
+#: spyder/plugins/editor.py:852
+msgid "Go to next code analysis warning/error"
+msgstr "Ir para próxima linha de aviso ou erro"
 
-#: spyderlib/plugins/ipythonconsole.py:123
-msgid "The authenticity of the host can't be established"
-msgstr "A autenticidade do servidor não pode ser estabelecida"
+#: spyder/plugins/editor.py:856
+msgid "Last edit location"
+msgstr "Última posição da edição"
 
-#: spyderlib/plugins/ipythonconsole.py:130
-msgid "Tunnel '%s' failed to start"
-msgstr "O túnel '%s' falhou ao ser iniciado"
+#: spyder/plugins/editor.py:857
+msgid "Go to last edit location"
+msgstr "Ir para posição anterior da edição"
 
-#: spyderlib/plugins/ipythonconsole.py:135
-msgid "Could not connect to remote host"
-msgstr "Não foi possível conectar ao servidor remoto"
+#: spyder/plugins/editor.py:865
+msgid "Previous cursor position"
+msgstr "Posição anterior do cursor"
 
-#: spyderlib/plugins/ipythonconsole.py:151
-#: spyderlib/plugins/ipythonconsole.py:689
-msgid "IPython console"
-msgstr "Console IPython"
+#: spyder/plugins/editor.py:866
+msgid "Go to previous cursor position"
+msgstr "Ir a posição anterior do cursor"
 
-#: spyderlib/plugins/ipythonconsole.py:163
-msgid "Display initial banner"
-msgstr "Mostrar o banner inicial"
+#: spyder/plugins/editor.py:874
+msgid "Next cursor position"
+msgstr "Próxima posição do cursor"
 
-#: spyderlib/plugins/ipythonconsole.py:164
-msgid ""
-"This option lets you hide the message shown at\n"
-"the top of the console when it's opened."
-msgstr ""
-"Esta opção permite ocultar a mensagem que \n"
-"aparece no topo do console quando se abre\n"
-"ele pela primeira vez."
+#: spyder/plugins/editor.py:875
+msgid "Go to next cursor position"
+msgstr "Ir para a próxima posição do cursor"
 
-#: spyderlib/plugins/ipythonconsole.py:166
-msgid "Use a pager to display additional text inside the console"
-msgstr "Usar um paginador para mostrar textos dentro do console"
+#: spyder/plugins/editor.py:885 spyder/widgets/sourcecode/codeeditor.py:2483
+msgid "Comment"
+msgstr "Comentar"
 
-#: spyderlib/plugins/ipythonconsole.py:168
-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 ""
-"Isso é útil se não deseja preencher o console com grandes textos de ajuda.\n"
-"Nota: Use a tecla Q para sair do paginador."
+#: spyder/plugins/editor.py:885 spyder/widgets/sourcecode/codeeditor.py:2483
+msgid "Uncomment"
+msgstr "Descomentar"
 
-#: spyderlib/plugins/ipythonconsole.py:173
-msgid "Ask for confirmation before closing"
-msgstr "Mostrar janela de confirmação antes de fechar"
+#: spyder/plugins/editor.py:886
+msgid "Comment current line or selection"
+msgstr "Comentar linha ou seleção atual"
 
-#: spyderlib/plugins/ipythonconsole.py:183
-msgid "Completion Type"
-msgstr ""
+#: spyder/plugins/editor.py:890
+msgid "Add &block comment"
+msgstr "Adicionar &bloco de comentário "
 
-#: spyderlib/plugins/ipythonconsole.py:184
-msgid "Decide what type of completion to use"
-msgstr ""
+#: spyder/plugins/editor.py:891
+msgid "Add block comment around current line or selection"
+msgstr "Adicionar bloco de comentário ao redor da linha ou seleção atual"
 
-#: spyderlib/plugins/ipythonconsole.py:187
-#, fuzzy
-msgid "Completion:"
-msgstr "Condição:"
+#: spyder/plugins/editor.py:897
+msgid "R&emove block comment"
+msgstr "R&emover bloco de comentário"
 
-#: spyderlib/plugins/ipythonconsole.py:196
-msgid "Light background"
-msgstr "Fundo claro"
+#: spyder/plugins/editor.py:898
+msgid "Remove comment block around current line or selection"
+msgstr "Remover bloco de comentário ao redor da linha ou seleção atual"
 
-#: spyderlib/plugins/ipythonconsole.py:198
-msgid "Dark background"
-msgstr "Fundo escuro"
+#: spyder/plugins/editor.py:909
+msgid "Indent"
+msgstr "Indentar"
 
-#: spyderlib/plugins/ipythonconsole.py:208
-msgid "Buffer:  "
-msgstr "Buffer: "
+#: spyder/plugins/editor.py:910
+msgid "Indent current line or selection"
+msgstr "Indentar a linha ou seleção atual"
 
-#: spyderlib/plugins/ipythonconsole.py:210
-msgid ""
-"Set the maximum number of lines of text shown in the\n"
-"console before truncation. Specifying -1 disables it\n"
-"(not recommended!)"
-msgstr ""
-"Define o número máximo de linhas que serão mostradas\n"
-"no console em qualquer momento. Especificando -1 serão\n"
-"mostradas todas as linhas (não é recomendável!)"
+#: spyder/plugins/editor.py:913
+msgid "Unindent"
+msgstr "Desfazer indentação"
 
-#: spyderlib/plugins/ipythonconsole.py:219
-msgid "Support for graphics (Matplotlib)"
-msgstr "Suporte para criação de gráficos (Matplotlib)"
+#: spyder/plugins/editor.py:914
+msgid "Unindent current line or selection"
+msgstr "Desfazer indentação da linha ou seleção atual"
 
-#: spyderlib/plugins/ipythonconsole.py:220
-msgid "Activate support"
-msgstr "Ativar suporte"
+#: spyder/plugins/editor.py:919
+msgid "Carriage return and line feed (Windows)"
+msgstr "Carriage return e salto de linha (Windows)"
 
-#: spyderlib/plugins/ipythonconsole.py:221
-msgid "Automatically load Pylab and NumPy modules"
-msgstr "Carregar automaticamente os módulos do Pylab e do NumPy"
+#: spyder/plugins/editor.py:922
+msgid "Line feed (UNIX)"
+msgstr "Salto de linha (UNIX)"
 
-#: spyderlib/plugins/ipythonconsole.py:224
-msgid ""
-"This lets you load graphics support without importing \n"
-"the commands to do plots. Useful to work with other\n"
-"plotting libraries different to Matplotlib or to develop \n"
-"GUIs with Spyder."
-msgstr ""
-"Isso lhe permite carregar o suporte gráfico sem importar\n"
-"os comandos para criar imagens. É útil para trabalhar com\n"
-"outras bibliotecas gráficas diferentes da Matplotlib ou para\n"
-"desenvolver interfaces gráficas com o Spyder."
+#: spyder/plugins/editor.py:925
+msgid "Carriage return (Mac)"
+msgstr "Carriage return (Mac)"
 
-#: spyderlib/plugins/ipythonconsole.py:242
-msgid ""
-"This feature requires the Matplotlib library.\n"
-"It seems you don't have it installed."
-msgstr ""
-"Esta funcionalidade requer a biblioteca Matplotlb.\n"
-"parece que você não tem ela instalada."
+#: spyder/plugins/editor.py:931
+msgid "Convert end-of-line characters"
+msgstr "Converter caracteres de fim de linha"
 
-#: spyderlib/plugins/ipythonconsole.py:247
-msgid "Inline"
-msgstr "Em linha"
+#: spyder/plugins/editor.py:935
+msgid "Remove trailing spaces"
+msgstr "Remover espaços em branco"
 
-#: spyderlib/plugins/ipythonconsole.py:248
-msgid "Automatic"
-msgstr "Automático"
+#: spyder/plugins/editor.py:939
+msgid "Fix indentation"
+msgstr "Consertar indentação"
 
-#: spyderlib/plugins/ipythonconsole.py:249
-msgid "Graphics backend"
-msgstr "Saída gráfica"
+#: spyder/plugins/editor.py:940
+msgid "Replace tab characters by space characters"
+msgstr "Substituir caracteres de tabulação por espaços"
+
+#: spyder/plugins/editor.py:943
+msgid "Go to line..."
+msgstr "Ir para linha..."
+
+#: spyder/plugins/editor.py:951
+msgid "Set console working directory"
+msgstr "Definir diretório de trabalho"
 
-#: spyderlib/plugins/ipythonconsole.py:250
+#: spyder/plugins/editor.py:953
 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."
+"Set current console (and file explorer) working directory to current script "
+"directory"
 msgstr ""
-"Decidir como serão mostrados os gráficos no console. Se está inseguro, por "
-"favor selecione <b>%s</b> para colocar os gráficos no console ou <b>%s</b> "
-"para interagir com eles (através de zoom) em uma janela separada."
+"Definir o diretório de trabalho do console (e do explorador de arquivos) "
+"para o diretório do script atual."
 
-#: spyderlib/plugins/ipythonconsole.py:283
-msgid "Inline backend"
-msgstr "Saída em linha"
+#: spyder/plugins/editor.py:958
+msgid "Maximum number of recent files..."
+msgstr "Número máximo de arquivos recentes..."
 
-#: spyderlib/plugins/ipythonconsole.py:284
-msgid "Decide how to render the figures created by this backend"
-msgstr ""
-"Decida como renderizar as imagens criados por este tipo de saída gráfica"
+#: spyder/plugins/editor.py:961
+msgid "Clear recent files list"
+msgstr "Limpar lista de arquivos recentes"
 
-#: spyderlib/plugins/ipythonconsole.py:288
-msgid "Format:"
-msgstr "Formato:"
+#: spyder/plugins/editor.py:961 spyder/plugins/projects.py:97
+msgid "Clear this list"
+msgstr "Limpar esta lista"
 
-#: spyderlib/plugins/ipythonconsole.py:291
-msgid "Resolution:"
-msgstr "Resolução:"
+#: spyder/plugins/editor.py:965
+msgid "Open &recent"
+msgstr "Abrir &recente"
 
-#: spyderlib/plugins/ipythonconsole.py:291
-msgid "dpi"
-msgstr "dpi"
+#: spyder/plugins/editor.py:1348
+msgid "?"
+msgstr "?"
 
-#: spyderlib/plugins/ipythonconsole.py:293
-msgid "Only used when the format is PNG. Default is 72"
-msgstr "Só se usa quando o formato for PNG. O padrão é 72"
+#: spyder/plugins/editor.py:1575
+msgid "Spyder Editor"
+msgstr "Spyder Editor"
 
-#: spyderlib/plugins/ipythonconsole.py:296
-msgid "Width:"
-msgstr "Largura:"
+#: spyder/plugins/editor.py:1576
+msgid "This is a temporary script file."
+msgstr "Este é um arquivo de script temporário."
 
-#: spyderlib/plugins/ipythonconsole.py:296
-#: spyderlib/plugins/ipythonconsole.py:300
-msgid "inches"
-msgstr "polegadas"
+#: spyder/plugins/editor.py:1645
+msgid "untitled"
+msgstr "Sem título"
 
-#: spyderlib/plugins/ipythonconsole.py:298
-msgid "Default is 6"
-msgstr "O padrão é 6"
+#: spyder/plugins/editor.py:1719
+msgid "Maximum number of recent files"
+msgstr "Número máximo de arquivos recentes"
 
-#: spyderlib/plugins/ipythonconsole.py:300
-msgid "Height:"
-msgstr "Altura:"
+#: spyder/plugins/editor.py:1852
+msgid "Printing..."
+msgstr "Imprimindo..."
 
-#: spyderlib/plugins/ipythonconsole.py:302
-msgid "Default is 4"
-msgstr "O padrão é 4"
+#: spyder/plugins/explorer.py:53
+msgid "File explorer"
+msgstr "Explorador de arquivos"
 
-#: spyderlib/plugins/ipythonconsole.py:328 spyderlib/tour.py:552
-msgid "Run code"
-msgstr "Executar código"
+#: spyder/plugins/externalconsole.py:46
+msgid "Interactive data plotting in the consoles"
+msgstr "Mostra dados interativos no console"
 
-#: spyderlib/plugins/ipythonconsole.py:329
-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 ""
-"Você pode executar várias linhas de código ao abrir um terminal. Por favor "
-"introduza cada uma separada por vírgulas, por exemplo:<br><i>import os, "
-"import sys</i>"
+#: spyder/plugins/externalconsole.py:54 spyder/plugins/externalconsole.py:709
+msgid "Python console"
+msgstr "Console Python"
 
-#: spyderlib/plugins/ipythonconsole.py:335
-msgid "Lines:"
-msgstr "Linhas:"
+#: spyder/plugins/externalconsole.py:59
+msgid "One tab per script"
+msgstr "Uma aba por script"
 
-#: spyderlib/plugins/ipythonconsole.py:344
-msgid "Run a file"
-msgstr "Executar arquivo"
+#: spyder/plugins/externalconsole.py:60
+#: spyder/widgets/externalshell/baseshell.py:160
+msgid "Show elapsed time"
+msgstr "Mostrar tempo de execução"
 
-#: spyderlib/plugins/ipythonconsole.py:345
-msgid ""
-"You can also run a whole file at startup instead of just some lines (This is "
-"similar to have a PYTHONSTARTUP file)."
-msgstr ""
-"Você também pode executar um arquivo por inteiro ao inicializar, em vez de "
-"poucas linhas (Isso é similar a ter um arquivo PYTHONSTARTUP)."
+#: spyder/plugins/externalconsole.py:61 spyder/widgets/explorer.py:1074
+msgid "Show icons and text"
+msgstr "Mostrar ícones e texto"
 
-#: spyderlib/plugins/ipythonconsole.py:349
-msgid "Use the following file:"
-msgstr "Use o seguinte arquivo:"
+#: spyder/plugins/externalconsole.py:73
+msgid "Buffer: "
+msgstr "Buffer:"
 
-#: spyderlib/plugins/ipythonconsole.py:363
-msgid "Greedy completion"
-msgstr "Completação gulosa"
+#: spyder/plugins/externalconsole.py:73 spyder/plugins/ipythonconsole.py:319
+msgid " lines"
+msgstr "linhas"
 
-#: spyderlib/plugins/ipythonconsole.py:364
+#: spyder/plugins/externalconsole.py:78
+msgid "Merge process standard output/error channels"
+msgstr "Combinar os canais de saída/erro do processo"
+
+#: spyder/plugins/externalconsole.py:80
 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>"
+"Merging the output channels of the process means that\n"
+"the standard error won't be written in red anymore,\n"
+"but this has the effect of speeding up display."
 msgstr ""
-"Habilita o completador usando a tecla <tt>Tab</tt> em elementos de listas, "
-"resultados de chamadas de funções, etc, <i>sem</i> atribuí-los a uma "
-"variável.<br>Dessa forma pode-se obter sugestões de completação em coisas "
-"como <tt>li[0].<Tab></tt> ou <tt>ins.meth().<Tab></tt>"
-
-#: spyderlib/plugins/ipythonconsole.py:372
-msgid "Use the greedy completer"
-msgstr "Usar o completador guloso"
+"Combinar os canais de saída do processo significa que\n"
+"o erro padrão não será escrito em vermelho, mas isso ajuda a\n"
+"melhorar a velocidade em que aparece o texto no console."
 
-#: spyderlib/plugins/ipythonconsole.py:383
-msgid "Autocall"
-msgstr "Autocall"
+#: spyder/plugins/externalconsole.py:84
+msgid "Colorize standard error channel using ANSI escape codes"
+msgstr "Colorir o canal de error padrão utilizando códigos de escape ANSI "
 
-#: spyderlib/plugins/ipythonconsole.py:384
+#: spyder/plugins/externalconsole.py:86
 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."
+"This method is the only way to have colorized standard\n"
+"error channel when the output channels have been merged."
 msgstr ""
-"Esta opção faz com que o Python chame automaticamente qualquer objeto mesmo "
-"se você não tenha digitado os parenteses ao seu redor.<br>Por exemplo, ao "
-"escrever <i>str 43</i>, irá virar automaticamente <i>str(43)</i>."
+"Este método é a única forma de ter cor no canal de erro\n"
+"padrão quando os canais de saída forem combinados."
 
-#: spyderlib/plugins/ipythonconsole.py:391
-msgid "Smart"
-msgstr "Inteligente"
+#: spyder/plugins/externalconsole.py:102 spyder/plugins/ipythonconsole.py:306
+#: spyder/widgets/variableexplorer/arrayeditor.py:540
+#: spyder/widgets/variableexplorer/dataframeeditor.py:552
+msgid "Background color"
+msgstr "Cor de fundo"
 
-#: spyderlib/plugins/ipythonconsole.py:392
-msgid "Full"
-msgstr "Total"
+#: spyder/plugins/externalconsole.py:103
+msgid ""
+"This option will be applied the next time a Python console or a terminal is "
+"opened."
+msgstr ""
+"Esta opção será ativada na próxima vez que um console Python ou um terminal "
+"for aberto."
 
-#: spyderlib/plugins/ipythonconsole.py:393
-msgid "Off"
-msgstr "Desativado"
+#: spyder/plugins/externalconsole.py:106
+msgid "Light background (white color)"
+msgstr "Fundo claro (cor branca)"
 
-#: spyderlib/plugins/ipythonconsole.py:395
-msgid "Autocall:  "
-msgstr "Autocall: "
+#: spyder/plugins/externalconsole.py:131
+msgid "PYTHONSTARTUP replacement"
+msgstr "Substituto do PYTHONSTARTUP"
 
-#: spyderlib/plugins/ipythonconsole.py:396
+#: spyder/plugins/externalconsole.py:133
 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)."
+"This option will override the PYTHONSTARTUP environment variable which\n"
+"defines the script to be executed during the Python console startup."
 msgstr ""
-"No modo <b>%s</b>, Auto-chamada não é aplicada se não houver argumentos "
-"depois do objeto clamável. No modo <b>%s</b>, todos os objetos chamáveis são "
-"chamados automaticamente (mesmo se não houver argumentos presentes)."
+"Esta opção modificará a variável de ambiente PYTHONSTARTUP, a qual\n"
+"define o script que é executado durante a inicialização do console\n"
+"Python."
 
-#: spyderlib/plugins/ipythonconsole.py:408
-msgid "Symbolic Mathematics"
-msgstr "Matemática simbólica"
+#: spyder/plugins/externalconsole.py:138
+msgid "Default PYTHONSTARTUP script"
+msgstr "Script PYTHONSTARTUP padrão"
 
-#: spyderlib/plugins/ipythonconsole.py:409
-msgid ""
-"Perfom symbolic operations in the console (e.g. integrals, derivatives, "
-"vector calculus, etc) and get the outputs in a beautifully printed style."
-msgstr ""
-"Realiza operações simbólicas no console (integrais, derivadas, cálculo "
-"vetorial) e tenha os resultados em um belo estilo impresso."
+#: spyder/plugins/externalconsole.py:142
+msgid "Use the following startup script:"
+msgstr "Usar o seguinte script de inicialização:"
 
-#: spyderlib/plugins/ipythonconsole.py:414
-msgid "Use symbolic math"
-msgstr "Usar matemática simbólica"
+#: spyder/plugins/externalconsole.py:159
+msgid "Monitor"
+msgstr "Monitor"
 
-#: spyderlib/plugins/ipythonconsole.py:415
+#: spyder/plugins/externalconsole.py:160
 msgid ""
-"This option loads the Sympy library to work with.<br>Please refer to its "
-"documentation to learn how to use it."
+"The monitor provides introspection features to console: code completion, "
+"calltips and variable explorer. Because it relies on several modules, "
+"disabling the monitor may be useful to accelerate console startup."
 msgstr ""
-"Esta opção carrega a biblioteca Sympy para trabalhar<br>com ela. Por favor "
-"leia sua documentação para aprender a usá-la. "
+"O monitor fornece características de introspecção para o console: "
+"completador de código, sugestões e o explorador de variáveis. Porque ele "
+"depende de vários módulos adicionais, desativando o monitor é possível "
+"acelerar a inicialização do console."
 
-#: spyderlib/plugins/ipythonconsole.py:428
-msgid ""
-"This feature requires the Sympy library.\n"
-"It seems you don't have it installed."
-msgstr ""
-"Esta funcionalidade requer a biblioteca Sympy .\n"
-"Parece que você não tem ela instalada."
+#: spyder/plugins/externalconsole.py:167
+msgid "Enable monitor"
+msgstr "Ativar monitor"
 
-#: spyderlib/plugins/ipythonconsole.py:433
-msgid "Prompts"
-msgstr "Prompts"
+#: spyder/plugins/externalconsole.py:180
+msgid "Default library"
+msgstr "Biblioteca padrão"
 
-#: spyderlib/plugins/ipythonconsole.py:434
-msgid "Modify how Input and Output prompts are shown in the console."
-msgstr "Modifique como são mostradas as saídas e entradas no console."
+#: spyder/plugins/externalconsole.py:185
+msgid "Qt-Python Bindings"
+msgstr "Integração Qt-Python"
 
-#: spyderlib/plugins/ipythonconsole.py:437
-msgid "Input prompt:"
-msgstr "Prompt de entrada:"
+#: spyder/plugins/externalconsole.py:187
+msgid "Library:"
+msgstr "Biblioteca:"
 
-#: spyderlib/plugins/ipythonconsole.py:439
+#: spyder/plugins/externalconsole.py:189
 msgid ""
-"Default is<br>In [<span class=\"in-prompt-number\">%i</span>]:"
+"This option will act on<br> libraries such as Matplotlib, guidata or ETS"
 msgstr ""
-"O Padrão é<br>In [<span class=\"in-prompt-number\">%i</span>]:"
+"Esta opção trará efeitos <br> em bibliotecas como Matplotlib, guidata ou ETS"
 
-#: spyderlib/plugins/ipythonconsole.py:443
-msgid "Output prompt:"
-msgstr "Prompt de saída:"
+#: spyder/plugins/externalconsole.py:198 spyder/plugins/ipythonconsole.py:560
+msgid "Graphics"
+msgstr "Gráficos"
 
-#: spyderlib/plugins/ipythonconsole.py:445
+#: spyder/plugins/externalconsole.py:199
 msgid ""
-"Default is<br>Out[<span class=\"out-prompt-number\">%i</span>]:"
+"Decide which backend to use to display graphics. If unsure, please select "
+"the <b>Automatic</b> backend.<br><br><b>Note:</b> We support a very limited "
+"number of backends in our Python consoles. If you prefer to work with a "
+"different one, please use an IPython console."
 msgstr ""
-"O Padrão é<br>Out[<span class=\"out-prompt-number\">%i</span>]: "
+"Decidir qual saída usar para mostrar gráficos. Se não possui certeza, por "
+"favor selecione a saída <b>Automática</b>.<br><br><b>Nota:</b> Suportamos um "
+"número muito limitado de saídas nos consoles Python. Se você preferir "
+"preferir trabalhar com uma diferente utilize um console IPython."
 
-#: spyderlib/plugins/ipythonconsole.py:467
-#: spyderlib/plugins/workingdirectory.py:44
-msgid "Startup"
-msgstr "Inicialização"
+#: spyder/plugins/externalconsole.py:208
+msgid "None"
+msgstr "Nenhum"
 
-#: spyderlib/plugins/ipythonconsole.py:469
-msgid "Advanced Settings"
-msgstr "Configurações avançadas"
+#: spyder/plugins/externalconsole.py:213 spyder/plugins/ipythonconsole.py:373
+msgid "Backend:"
+msgstr "Saída:"
 
-#: spyderlib/plugins/ipythonconsole.py:481
-#: spyderlib/plugins/ipythonconsole.py:749
-msgid "Connect to an existing kernel"
-msgstr "Conectando a um kernel já existente"
+#: spyder/plugins/externalconsole.py:215 spyder/plugins/ipythonconsole.py:375
+msgid "This option will be applied the next time a console is opened."
+msgstr "Esta opção será aplicada na próxima vez que um console for aberto."
+
+#: spyder/plugins/externalconsole.py:226
+msgid "Enthought Tool Suite"
+msgstr "Enthought Tool Suite"
 
-#: spyderlib/plugins/ipythonconsole.py:483
+#: spyder/plugins/externalconsole.py:227
 msgid ""
-"Please enter the connection info of the kernel you want to connect to. For "
-"that you can either select its JSON connection file using the <tt>Browse</"
-"tt> button, or write directly its id, in case it's a local kernel (for "
-"example <tt>kernel-3764.json</tt> or just <tt>3764</tt>)."
-msgstr ""
-"Por favor introduza a informação de conexão do kernel ao qual deseja se "
-"conectar. Para isso você pode selecionar seu arquivo de conexão JSON, usando "
-"o botão <tt>Selecionar</tt>, ou escrever diretamente seu id, em caso de que "
-"seja um kernel local (por exemplo, <tt>kernel-3764.json</tt> ou só <tt>3764</"
-"tt>)."
+"Enthought Tool Suite (ETS) supports PyQt4 (qt4) and wxPython (wx) graphical "
+"user interfaces."
+msgstr ""
+"Enthought Tool Suite (ETS) suporta as bibliotecas gráficas PyQt4 (qt4) e \n"
+"wxPython (wx)."
 
-#: spyderlib/plugins/ipythonconsole.py:494
-msgid "Connection info:"
-msgstr "Informação da conexão:"
+#: spyder/plugins/externalconsole.py:231
+msgid "ETS_TOOLKIT:"
+msgstr "ETS_TOOLKIT:"
 
-#: spyderlib/plugins/ipythonconsole.py:496
-msgid "Path to connection file or kernel id"
-msgstr "Caminho para arquivo de conexão ou id do kernel"
+#: spyder/plugins/externalconsole.py:255
+msgid "External modules"
+msgstr "Módulos externos"
 
-#: spyderlib/plugins/ipythonconsole.py:498
-#: spyderlib/plugins/ipythonconsole.py:515
-msgid "Browse"
-msgstr "Navegar"
+#: spyder/plugins/externalconsole.py:447
+msgid ""
+"No Python console is currently selected to run <b>%s</b>.<br><br>Please "
+"select or open a new Python console and try again."
+msgstr ""
+"Nenhum console Python foi selecionado para executar <b>%s</b>.<br><br>Por "
+"favor selecione ou abra um novo console Python e tente novamente."
 
-#: spyderlib/plugins/ipythonconsole.py:507
-msgid "This is a remote kernel"
-msgstr "Este é um kernel remoto"
+#: spyder/plugins/externalconsole.py:518
+msgid ""
+"%s is already running in a separate process.\n"
+"Do you want to kill the process before starting a new one?"
+msgstr ""
+"%s já está sendo executado em um processo separado.\n"
+"Você deseja matar o processo antes de iniciar um novo?"
 
-#: spyderlib/plugins/ipythonconsole.py:511
-msgid "username at hostname:port"
-msgstr "usuário at servidor:porta"
+#: spyder/plugins/externalconsole.py:647
+msgid "Command Window"
+msgstr "Janela de comando"
 
-#: spyderlib/plugins/ipythonconsole.py:514
-msgid "Path to ssh key file"
-msgstr "Caminho do arquivo de chave ssh"
+#: spyder/plugins/externalconsole.py:649
+msgid "Terminal"
+msgstr "Terminal"
 
-#: spyderlib/plugins/ipythonconsole.py:523
-msgid "Password or ssh key passphrase"
-msgstr "Senha"
+#: spyder/plugins/externalconsole.py:731
+msgid "Open a &Python console"
+msgstr "Abrir um console &Python"
 
-#: spyderlib/plugins/ipythonconsole.py:527
-msgid "Host name"
-msgstr "Nome do host "
+#: spyder/plugins/externalconsole.py:735
+msgid "Open &command prompt"
+msgstr "Abrir &prompt de comando"
 
-#: spyderlib/plugins/ipythonconsole.py:528
-msgid "Ssh key"
-msgstr "Chave ssh"
+#: spyder/plugins/externalconsole.py:736
+msgid "Open a Windows command prompt"
+msgstr "Abrir o prompt de comando do Windows"
 
-#: spyderlib/plugins/ipythonconsole.py:529
-msgid "Password"
-msgstr "Senha"
+#: spyder/plugins/externalconsole.py:738
+msgid "Open a &terminal"
+msgstr "Abrir um &terminal"
 
-#: spyderlib/plugins/ipythonconsole.py:558
-msgid "Open IPython connection file"
-msgstr "Abrir arquivo de conexão do IPython"
+#: spyder/plugins/externalconsole.py:739
+msgid "Open a terminal window"
+msgstr "Abrir uma janela de terminal"
 
-#: spyderlib/plugins/ipythonconsole.py:564
-msgid "Select ssh key"
-msgstr "Selecionar chave ssh"
+#: spyder/plugins/findinfiles.py:127 spyder/widgets/findinfiles.py:689
+msgid "Find in files"
+msgstr "Procurar em arquivos"
 
-#: spyderlib/plugins/ipythonconsole.py:737
-msgid "Open an &IPython console"
-msgstr "Abrir um console &IPython "
+#: spyder/plugins/findinfiles.py:148
+msgid "&Find in files"
+msgstr "Procurar em arqui&vos"
 
-#: spyderlib/plugins/ipythonconsole.py:740
-msgid "Use %s+T when the console is selected to open a new one"
-msgstr ""
+#: spyder/plugins/findinfiles.py:151
+msgid "Search text in multiple files"
+msgstr "Buscar em vários arquivos"
 
-#: spyderlib/plugins/ipythonconsole.py:743
-#, fuzzy
-msgid "Open a new console"
-msgstr "Abrir um console &Python"
+#: spyder/plugins/help.py:44
+msgid "Show help for objects in the Editor and Consoles in a dedicated pane"
+msgstr "Mostra ajuda para objetos do Editor e Consoles em um painel dedicado"
 
-#: spyderlib/plugins/ipythonconsole.py:750
-msgid "Open a new IPython console connected to an existing kernel"
-msgstr "Abrir um novo console do IPython conectado a um kernel existente."
+#: spyder/plugins/help.py:110
+msgid "Automatic connections"
+msgstr "Conexões automáticas "
 
-#: spyderlib/plugins/ipythonconsole.py:833
+#: spyder/plugins/help.py:111
 msgid ""
-"No IPython console is currently available to run <b>%s</b>.<br><br>Please "
-"open a new one and try again."
+"This pane can automatically show an object's help information after a left "
+"parenthesis is written next to it. Below you can decide to which plugin you "
+"want to connect it to turn on this feature."
 msgstr ""
-"Não existe um console IPython para ser executado <b>%s</b>.<br><br>Por favor "
-"abra um novo e tente novamente."
+"Este painel pode mostrar automaticamente a ajuda de um objeto depois de "
+"escrever um parênteses no mesmo. A seguir você pode decidir a que painel/"
+"componente você deseja conectar para ativar esta característica."
 
-#: spyderlib/plugins/ipythonconsole.py:968
+#: spyder/plugins/help.py:123
 msgid ""
-"Do you want to close all other consoles connected to the same kernel as this "
-"one?"
+"This feature requires the Rope or Jedi libraries.\n"
+"It seems you don't have either installed."
 msgstr ""
+"Esta funcionalidade requer as bibliotecas Rope ou Jedi.\n"
+"Parece que você não possui elas instalada."
 
-#: spyderlib/plugins/ipythonconsole.py:1050
-msgid "Connection error"
-msgstr "Erro de conexão"
+#: spyder/plugins/help.py:126
+msgid "Python Console"
+msgstr "Console Python"
 
-#: spyderlib/plugins/ipythonconsole.py:1051
-msgid ""
-"Could not open ssh tunnel. The error was:\n"
-"\n"
-msgstr ""
-"Não foi possível criar um túnel ssh. O erro foi:\n"
-"\n"
+#: spyder/plugins/help.py:128
+msgid "IPython Console"
+msgstr "Console IPython"
 
-#: spyderlib/plugins/ipythonconsole.py:1088
-msgid "IPython"
-msgstr "IPython"
+#: spyder/plugins/help.py:140
+msgid "Additional features"
+msgstr "Funcionalidades adicionais"
 
-#: spyderlib/plugins/ipythonconsole.py:1089
-msgid "Unable to connect to IPython <b>%s"
-msgstr "Não foi possível conectar ao IPython <b>%s"
+#: spyder/plugins/help.py:141
+msgid "Render mathematical equations"
+msgstr "Renderizar equações matemáticas"
 
-#: spyderlib/plugins/ipythonconsole.py:1140
-msgid "Are you sure you want to restart the kernel?"
-msgstr "Deseja mesmo reiniciar o kernel?"
+#: spyder/plugins/help.py:147
+msgid "This feature requires Sphinx 1.1 or superior."
+msgstr "Esta funcionalidade requer Sphinx 1.1 ou superior."
 
-#: spyderlib/plugins/ipythonconsole.py:1142
-msgid "Restart kernel?"
-msgstr "Reiniciar kernel?"
+#: spyder/plugins/help.py:148
+msgid "Sphinx %s is currently installed."
+msgstr "Sphinx %s está instalado atualmente."
 
-#: spyderlib/plugins/layoutdialog.py:174
-#, fuzzy
-msgid "Move Up"
-msgstr "Mover para cima"
+#: spyder/plugins/help.py:309
+msgid "No further documentation available"
+msgstr "Nenhuma documentação adicional disponível"
 
-#: spyderlib/plugins/layoutdialog.py:175
-#, fuzzy
-msgid "Move Down"
-msgstr "Mover para baixo"
+#: spyder/plugins/help.py:347
+msgid "No documentation available"
+msgstr "Nenhuma documentação disponível"
 
-#: spyderlib/plugins/layoutdialog.py:176
-#, fuzzy
-msgid "Delete Layout"
-msgstr "Deletar"
+#: spyder/plugins/help.py:378
+msgid "Source"
+msgstr "Origem"
 
-#: spyderlib/plugins/layoutdialog.py:180
-msgid "Layout Dispay and Order"
-msgstr ""
+#: spyder/plugins/help.py:385 spyder/plugins/runconfig.py:186
+#: spyder/plugins/runconfig.py:456 spyder/widgets/externalshell/baseshell.py:94
+#: spyder/widgets/ipythonconsole/client.py:200
+msgid "Console"
+msgstr "Console"
 
-#: spyderlib/plugins/onlinehelp.py:68
-msgid "Online help"
-msgstr "Ajuda online"
+#: spyder/plugins/help.py:393
+#: spyder/widgets/variableexplorer/collectionseditor.py:133
+msgid "Object"
+msgstr "Objeto"
 
-#: spyderlib/plugins/outlineexplorer.py:48
-#: spyderlib/widgets/editortools.py:195
-msgid "Outline"
-msgstr "Explorador de código"
+#: spyder/plugins/help.py:407
+msgid "Plain Text"
+msgstr "Texto Normal"
 
-#: spyderlib/plugins/projectexplorer.py:53
-#: spyderlib/widgets/projectexplorer.py:1150
-#: spyderlib/widgets/projectexplorer.py:1164
-msgid "Project explorer"
-msgstr "Explorador de projetos"
+#: spyder/plugins/help.py:411
+msgid "Show Source"
+msgstr "Mostrar código fonte"
 
-#: spyderlib/plugins/projectexplorer.py:64
-#: spyderlib/widgets/projectexplorer.py:549
-msgid "New project..."
-msgstr "Novo projeto..."
+#: spyder/plugins/help.py:415
+msgid "Rich Text"
+msgstr "Texto Formatado"
 
-#: spyderlib/plugins/runconfig.py:28
-msgid "Execute in current Python or IPython console"
-msgstr "Executar no console atual do Python ou IPython"
+#: spyder/plugins/help.py:425
+msgid "Automatic import"
+msgstr "Importar automaticamente"
 
-#: spyderlib/plugins/runconfig.py:29
-msgid "Execute in a new dedicated Python console"
-msgstr "Executar em um novo console dedicado do Python"
+#: spyder/plugins/help.py:437 spyder/plugins/history.py:106
+#: spyder/widgets/editor.py:502 spyder/widgets/explorer.py:1085
+#: spyder/widgets/externalshell/baseshell.py:140
+#: spyder/widgets/ipythonconsole/client.py:249
+#: spyder/widgets/variableexplorer/namespacebrowser.py:162
+msgid "Options"
+msgstr "Opções"
 
-#: spyderlib/plugins/runconfig.py:30
-msgid "Execute in an external System terminal"
-msgstr "Executar em um terminal externo do Sistema"
+#: spyder/plugins/help.py:695
+msgid ""
+"Here you can get help of any object by pressing %s in front of it, either on "
+"the Editor or the Console.%sHelp can also be shown automatically after "
+"writing a left parenthesis next to an object. You can activate this behavior "
+"in %s."
+msgstr ""
+"Neste painel é possível obter a ajuda de qualquer objeto ao pressionar %s "
+"estando na frente do mesmo, tanto no Editor quanto no Console.%sEssa ajuda "
+"também pode ser mostrada automaticamente depois de escrever um parênteses "
+"junto a um objeto. Você pode ativar este comportamento em %s."
 
-#: spyderlib/plugins/runconfig.py:40
-msgid "Always show %s on a first file run"
-msgstr "Sempre mostrar %s na primeira execução"
+#: spyder/plugins/help.py:701
+msgid "Preferences > Help"
+msgstr "Preferências > Ajuda"
 
-#: spyderlib/plugins/runconfig.py:159
-msgid "General settings"
-msgstr "Configurações gerais"
+#: spyder/plugins/help.py:708
+msgid "Usage"
+msgstr "Uso"
 
-#: spyderlib/plugins/runconfig.py:162 spyderlib/plugins/runconfig.py:208
-msgid "Command line options:"
-msgstr "Opções de linha de comando: "
+#: spyder/plugins/help.py:709
+msgid "New to Spyder? Read our"
+msgstr "Novo no Spyder? Leia nosso"
 
-#: spyderlib/plugins/runconfig.py:168
-msgid "Working directory:"
-msgstr "Diretório de trabalho:"
+#: spyder/plugins/help.py:710
+msgid "tutorial"
+msgstr "tutorial"
 
-#: spyderlib/plugins/runconfig.py:180 spyderlib/plugins/runconfig.py:491
-msgid "Enter debugging mode when errors appear during execution"
+#: spyder/plugins/help.py:717
+msgid ""
+"Please consider installing Sphinx to get documentation rendered in rich text."
 msgstr ""
+"Por favor considere instalar o Sphinx para obter a documentação em texto "
+"formatado."
 
-#: spyderlib/plugins/runconfig.py:196 spyderlib/plugins/runconfig.py:501
-msgid "Dedicated Python console"
-msgstr "Console do Python dedicado"
-
-#: spyderlib/plugins/runconfig.py:200 spyderlib/plugins/runconfig.py:503
-msgid "Interact with the Python console after execution"
-msgstr "Interagir com o console depois da execução"
-
-#: spyderlib/plugins/runconfig.py:204
-msgid "Show warning when killing running process"
-msgstr "Mostrar um aviso quando matar o processo"
+#: spyder/plugins/help.py:886
+msgid "Lock"
+msgstr "Trancar"
 
-#: spyderlib/plugins/runconfig.py:213
-msgid "<b>-u</b> is added to the other options you set here"
-msgstr "A opção <b>-u</b> foi adicionada a essas opções"
+#: spyder/plugins/help.py:886
+msgid "Unlock"
+msgstr "Destrancar"
 
-#: spyderlib/plugins/runconfig.py:223
-msgid "this dialog"
-msgstr "este dialogo "
+#: spyder/plugins/help.py:930
+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 ""
+"Ocorreu o seguinte erro quando o <b>Sphinx %s</b> tentou ser utilizado. "
+"<br>Isso se deve a uma versão incompatível do Sphinx ou não foi possível ler "
+"a documentação solicitada.<br><br>Mensagem de erro:<br>%s"
 
-#: spyderlib/plugins/runconfig.py:282
-msgid "Run configuration"
-msgstr "Opções de execução"
+#: spyder/plugins/help.py:974
+msgid "No source code available."
+msgstr "O código fonte não está disponível"
 
-#: spyderlib/plugins/runconfig.py:283
-msgid "The following working directory is not valid:<br><b>%s</b>"
-msgstr "O seguinte diretório de trabalho não é válido:<br><b>%s</b>"
+#: spyder/plugins/history.py:39
+msgid "Settings"
+msgstr "Configurações"
 
-#: spyderlib/plugins/runconfig.py:361
-msgid "Run settings for %s"
-msgstr "Ajustar configuração para %s"
+#: spyder/plugins/history.py:41
+msgid " entries"
+msgstr "entradas"
 
-#: spyderlib/plugins/runconfig.py:393
-msgid "Select a run configuration:"
-msgstr "Selecionar um arquivo de execução:"
+#: spyder/plugins/history.py:41
+msgid "History depth: "
+msgstr "Profundidade do histórico: "
 
-#: spyderlib/plugins/runconfig.py:422 spyderlib/plugins/runconfig.py:447
-msgid "Run Settings"
-msgstr "Opções de execução"
+#: spyder/plugins/history.py:48
+msgid "Scroll automatically to last entry"
+msgstr "Ir automaticamente para a última entrada"
 
-#: spyderlib/plugins/runconfig.py:449
-msgid ""
-"The following are the default <i>%s</i>. These options may be overriden "
-"using the <b>%s</b> dialog box (see the <b>%s</b> menu)"
-msgstr ""
-"As seguintes <i>%s</i> são padrões. Estas opções podem ser modificadas "
-"usando o diálogo <b>%s</b> (ver o menu <b>%s</b>)"
+#: spyder/plugins/history.py:126
+msgid "History log"
+msgstr "Log do histórico "
 
-#: spyderlib/plugins/runconfig.py:475
-msgid "Default working directory is:"
-msgstr "O diretório de trabalho padrão é:"
+#: spyder/plugins/history.py:153
+msgid "History..."
+msgstr "Histórico..."
 
-#: spyderlib/plugins/runconfig.py:477
-msgid "the script directory"
-msgstr "Diretório do script atual"
+#: spyder/plugins/history.py:155
+msgid "Set history maximum entries"
+msgstr "Definir número máximo de entradas para armazenar"
 
-#: spyderlib/plugins/runconfig.py:480 spyderlib/plugins/workingdirectory.py:56
-msgid "the following directory:"
-msgstr "O seguinte diretório:"
+#: spyder/plugins/history.py:260
+msgid "History"
+msgstr "Histórico"
 
-#: spyderlib/plugins/runconfig.py:506
-#, fuzzy
-msgid "Show warning when killing running processes"
-msgstr "Mostrar um aviso quando matar o processo"
+#: spyder/plugins/history.py:261
+msgid "Maximum entries"
+msgstr "Número máximo de entradas"
 
-#: spyderlib/plugins/runconfig.py:515
-msgid "Run Settings dialog"
-msgstr "Configurações de execução"
+#: spyder/plugins/ipythonconsole.py:64
+msgid "Symbolic mathematics in the IPython Console"
+msgstr "Matemática simbólica no console IPython"
 
-#: spyderlib/plugins/shortcuts.py:134
+#: spyder/plugins/ipythonconsole.py:116
 msgid ""
-"Press the new shortcut and select 'Ok': \n"
-"(Press 'Tab' once to switch focus between the shortcut entry \n"
-"and the buttons below it)"
+"The authenticity of host <b>%s</b> can't be established. Are you sure you "
+"want to continue connecting?"
 msgstr ""
+"A autenticidade do servidor <b>%s</b> não pode ser estabelecida. Você tem "
+"certeza que deseja continuar conectando?"
 
-#: spyderlib/plugins/shortcuts.py:137
-#, fuzzy
-msgid "Current shortcut:"
-msgstr "Célula selecionada:"
+#: spyder/plugins/ipythonconsole.py:128
+msgid "The authenticity of the host can't be established"
+msgstr "A autenticidade do servidor não pode ser estabelecida"
+
+#: spyder/plugins/ipythonconsole.py:135
+msgid "Tunnel '%s' failed to start"
+msgstr "O túnel '%s' falhou ao ser iniciado"
+
+#: spyder/plugins/ipythonconsole.py:140
+msgid "Could not connect to remote host"
+msgstr "Não foi possível conectar ao servidor remoto"
 
-#: spyderlib/plugins/shortcuts.py:139
-#, fuzzy
-msgid "New shortcut:"
-msgstr "Teclas de atalho"
+#: spyder/plugins/ipythonconsole.py:157 spyder/plugins/ipythonconsole.py:747
+msgid "Connect to an existing kernel"
+msgstr "Conectar a um kernel já existente"
 
-#: spyderlib/plugins/shortcuts.py:152
-msgid "Shortcut: {0}"
+#: spyder/plugins/ipythonconsole.py:159
+msgid ""
+"Please enter the connection info of the kernel you want to connect to. For "
+"that you can either select its JSON connection file using the <tt>Browse</"
+"tt> button, or write directly its id, in case it's a local kernel (for "
+"example <tt>kernel-3764.json</tt> or just <tt>3764</tt>)."
 msgstr ""
+"Por favor introduza a informação de conexão do kernel ao qual deseja se "
+"conectar. Para isso você pode selecionar seu arquivo de conexão JSON, usando "
+"o botão <tt>Selecionar</tt>, ou escrever diretamente seu id, em caso de que "
+"seja um kernel local (por exemplo, <tt>kernel-3764.json</tt> ou só <tt>3764</"
+"tt>)."
 
-#: spyderlib/plugins/shortcuts.py:273
-msgid "Please introduce a different shortcut"
-msgstr ""
+#: spyder/plugins/ipythonconsole.py:170
+msgid "Connection info:"
+msgstr "Informação da conexão:"
 
-#: spyderlib/plugins/shortcuts.py:310
-msgid "The new shorcut conflicts with:"
-msgstr ""
+#: spyder/plugins/ipythonconsole.py:172
+msgid "Path to connection file or kernel id"
+msgstr "Caminho para arquivo de conexão ou id do kernel"
 
-#: spyderlib/plugins/shortcuts.py:321
-msgid ""
-"A compound sequence can have {break} a maximum of 4 subsequences.{break}"
-msgstr ""
+#: spyder/plugins/ipythonconsole.py:174 spyder/plugins/ipythonconsole.py:191
+msgid "Browse"
+msgstr "Navegar"
 
-#: spyderlib/plugins/shortcuts.py:326
-#, fuzzy
-msgid "Invalid key entered"
-msgstr "Caminho de arquivo inválido "
+#: spyder/plugins/ipythonconsole.py:183
+msgid "This is a remote kernel"
+msgstr "Este é um kernel remoto"
 
-#: spyderlib/plugins/shortcuts.py:515
-msgid "Context"
-msgstr "Contexto"
+#: spyder/plugins/ipythonconsole.py:187
+msgid "username at hostname:port"
+msgstr "usuário at servidor:porta"
 
-#: spyderlib/plugins/shortcuts.py:517 spyderlib/widgets/dicteditor.py:158
-msgid "Name"
-msgstr "Nome"
+#: spyder/plugins/ipythonconsole.py:190
+msgid "Path to ssh key file"
+msgstr "Caminho do arquivo de chave ssh"
 
-#: spyderlib/plugins/shortcuts.py:519
-msgid "Shortcut"
-msgstr ""
+#: spyder/plugins/ipythonconsole.py:199
+msgid "Password or ssh key passphrase"
+msgstr "Senha"
 
-#: spyderlib/plugins/shortcuts.py:521
-msgid "Score"
-msgstr ""
+#: spyder/plugins/ipythonconsole.py:203
+msgid "Host name"
+msgstr "Nome do host "
 
-#: spyderlib/plugins/shortcuts.py:681
-msgid "Conflicts"
-msgstr "Conflitos"
+#: spyder/plugins/ipythonconsole.py:204
+msgid "Ssh key"
+msgstr "Chave ssh"
 
-#: spyderlib/plugins/shortcuts.py:682
-msgid "The following conflicts have been detected:"
-msgstr "Os seguintes conflitos foram detectados:"
+#: spyder/plugins/ipythonconsole.py:205
+msgid "Password"
+msgstr "Senha"
 
-#: spyderlib/plugins/shortcuts.py:767
-msgid "Keyboard shortcuts"
-msgstr "Teclas de atalho"
+#: spyder/plugins/ipythonconsole.py:234
+msgid "Open connection file"
+msgstr "Abrir arquivo de conexão"
 
-#: spyderlib/plugins/shortcuts.py:775
-#, fuzzy
-msgid "Search: "
-msgstr "Procurar"
+#: spyder/plugins/ipythonconsole.py:239
+msgid "Select ssh key"
+msgstr "Selecionar chave ssh"
 
-#: spyderlib/plugins/variableexplorer.py:24
-msgid "Autorefresh"
-msgstr "Atualizar automaticamente"
+#: spyder/plugins/ipythonconsole.py:267 spyder/plugins/ipythonconsole.py:686
+msgid "IPython console"
+msgstr "Console IPython"
 
-#: spyderlib/plugins/variableexplorer.py:25
-msgid "Enable autorefresh"
-msgstr "Ativar atualização automatica"
+#: spyder/plugins/ipythonconsole.py:274
+msgid "Display initial banner"
+msgstr "Mostrar o banner inicial"
 
-#: spyderlib/plugins/variableexplorer.py:27
-msgid "Refresh interval: "
-msgstr "Intervalo de atualização"
+#: spyder/plugins/ipythonconsole.py:275
+msgid ""
+"This option lets you hide the message shown at\n"
+"the top of the console when it's opened."
+msgstr ""
+"Esta opção permite ocultar a mensagem que \n"
+"aparece no topo do console quando se abre\n"
+"ele pela primeira vez."
 
-#: spyderlib/plugins/variableexplorer.py:28
-msgid " ms"
-msgstr "ms"
+#: spyder/plugins/ipythonconsole.py:277
+msgid "Use a pager to display additional text inside the console"
+msgstr "Usar um paginador para mostrar textos dentro do console"
 
-#: spyderlib/plugins/variableexplorer.py:31
-msgid "Filter"
-msgstr "Filtro"
+#: spyder/plugins/ipythonconsole.py:279
+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 ""
+"Isso é útil se não deseja preencher o console com grandes textos de ajuda.\n"
+"Nota: Use a tecla Q para sair do paginador."
 
-#: spyderlib/plugins/variableexplorer.py:33
-#: spyderlib/widgets/externalshell/namespacebrowser.py:214
-msgid "Exclude private references"
-msgstr "Excluir variáveis privadas"
+#: spyder/plugins/ipythonconsole.py:284
+msgid "Ask for confirmation before closing"
+msgstr "Mostrar janela de confirmação antes de fechar"
 
-#: spyderlib/plugins/variableexplorer.py:34
-#: spyderlib/widgets/externalshell/namespacebrowser.py:229
-msgid "Exclude capitalized references"
-msgstr "Excluir variáveis que começam em maiúsculas"
+#: spyder/plugins/ipythonconsole.py:294
+msgid "Completion Type"
+msgstr "Tipo de completação"
 
-#: spyderlib/plugins/variableexplorer.py:35
-#: spyderlib/widgets/externalshell/namespacebrowser.py:222
-msgid "Exclude all-uppercase references"
-msgstr "Excluir variáveis em maiúscula "
+#: spyder/plugins/ipythonconsole.py:295
+msgid "Decide what type of completion to use"
+msgstr "Decidir qual tipo de completação usar"
 
-#: spyderlib/plugins/variableexplorer.py:36
-#: spyderlib/widgets/externalshell/namespacebrowser.py:237
-msgid "Exclude unsupported data types"
-msgstr "Excluir tipos de dados não suportados"
+#: spyder/plugins/ipythonconsole.py:297
+msgid "Graphical"
+msgstr "Gráfico"
 
-#: spyderlib/plugins/variableexplorer.py:42
-#: spyderlib/widgets/dicteditor.py:708
-msgid "Truncate values"
-msgstr "Abreviar valores"
+#: spyder/plugins/ipythonconsole.py:297
+msgid "Plain"
+msgstr "Simples"
 
-#: spyderlib/plugins/variableexplorer.py:44
-#: spyderlib/widgets/dicteditor.py:712
-msgid "Show arrays min/max"
-msgstr "Mostrar o minimo e máximo de matrizes"
+#: spyder/plugins/ipythonconsole.py:298
+msgid "Completion:"
+msgstr "Completação:"
 
-#: spyderlib/plugins/variableexplorer.py:46
-msgid "Edit data in the remote process"
-msgstr "Editar dados em um processo remoto"
+#: spyder/plugins/ipythonconsole.py:307
+msgid "Light background"
+msgstr "Fundo claro"
 
-#: spyderlib/plugins/variableexplorer.py:47
-msgid ""
-"Editors are opened in the remote process for NumPy arrays, PIL images, "
-"lists, tuples and dictionaries.\n"
-"This avoids transfering large amount of data between the remote process and "
-"Spyder (through the socket)."
-msgstr ""
-"Esta opção permite modificar matrizes do NumPY, imagens do PIL, listas, "
-"tuplas e\n"
-"dicionários em um processo remoto. Isto impede a transferência de grandes "
-"quantidades de dados\n"
-"entre o processo remoto e o Spyder."
+#: spyder/plugins/ipythonconsole.py:309
+msgid "Dark background"
+msgstr "Fundo escuro"
 
-#: spyderlib/plugins/variableexplorer.py:183
-msgid "Variable explorer"
-msgstr "Explorador de variáveis"
+#: spyder/plugins/ipythonconsole.py:319
+msgid "Buffer:  "
+msgstr "Buffer: "
 
-#: spyderlib/plugins/workingdirectory.py:37
+#: spyder/plugins/ipythonconsole.py:321
 msgid ""
-"The <b>global working directory</b> is the working directory for newly "
-"opened <i>consoles</i> (Python/IPython consoles and terminals), for the "
-"<i>file explorer</i>, for the <i>find in files</i> plugin and for new files "
-"created in the <i>editor</i>."
+"Set the maximum number of lines of text shown in the\n"
+"console before truncation. Specifying -1 disables it\n"
+"(not recommended!)"
 msgstr ""
-"O <b>diretório de trabalho global</b> é o diretório de trabalho para os "
-"<i>consoles</i> recém abertos (do IPython/Python e dos terminais), para o "
-"<i>Explorador de arquivos</i>, <i>Buscar em arquivos</i> e para os novos "
-"arquivos criados no <i>Editor</i>."
+"Define o número máximo de linhas que serão mostradas\n"
+"no console em qualquer momento. Especificando -1 serão\n"
+"mostradas todas as linhas (não é recomendável!)"
 
-#: spyderlib/plugins/workingdirectory.py:46
-msgid "At startup, the global working directory is:"
-msgstr "Ao iniciar, o diretório de trabalho global é:"
+#: spyder/plugins/ipythonconsole.py:330
+msgid "Support for graphics (Matplotlib)"
+msgstr "Suporte para criação de gráficos (Matplotlib)"
 
-#: spyderlib/plugins/workingdirectory.py:50
-msgid "the same as in last session"
-msgstr "O mesmo da última sessão"
+#: spyder/plugins/ipythonconsole.py:331
+msgid "Activate support"
+msgstr "Ativar suporte"
 
-#: spyderlib/plugins/workingdirectory.py:52
-msgid "At startup, Spyder will restore the global directory from last session"
-msgstr "Ao iniciar o Spyder irá restaurar o diretório global da última sessão"
+#: spyder/plugins/ipythonconsole.py:332
+msgid "Automatically load Pylab and NumPy modules"
+msgstr "Carregar automaticamente os módulos do Pylab e do NumPy"
 
-#: spyderlib/plugins/workingdirectory.py:58
-msgid "At startup, the global working directory will be the specified path"
-msgstr "Ao iniciar o diretório de trabalho será o seguinte"
+#: spyder/plugins/ipythonconsole.py:335
+msgid ""
+"This lets you load graphics support without importing \n"
+"the commands to do plots. Useful to work with other\n"
+"plotting libraries different to Matplotlib or to develop \n"
+"GUIs with Spyder."
+msgstr ""
+"Isso lhe permite carregar o suporte gráfico sem importar\n"
+"os comandos para criar imagens. É útil para trabalhar com\n"
+"outras bibliotecas gráficas diferentes da Matplotlib ou para\n"
+"desenvolver interfaces gráficas com o Spyder."
 
-#: spyderlib/plugins/workingdirectory.py:70
-msgid "Files are opened from:"
-msgstr "Os arquivos são abertos de:"
+#: spyder/plugins/ipythonconsole.py:350
+msgid "Inline"
+msgstr "Em linha"
 
-#: spyderlib/plugins/workingdirectory.py:74
-#: spyderlib/plugins/workingdirectory.py:87
-msgid "the current file directory"
-msgstr "O diretório do arquivo atual"
+#: spyder/plugins/ipythonconsole.py:351
+msgid "Automatic"
+msgstr "Automático"
 
-#: spyderlib/plugins/workingdirectory.py:78
-#: spyderlib/plugins/workingdirectory.py:91
-msgid "the global working directory"
-msgstr "O diretório de trabalho global"
+#: spyder/plugins/ipythonconsole.py:352
+msgid "Graphics backend"
+msgstr "Saída gráfica"
 
-#: spyderlib/plugins/workingdirectory.py:83
-msgid "Files are created in:"
-msgstr "Os arquivos são criados em:"
+#: spyder/plugins/ipythonconsole.py:353
+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 ""
+"Decidir como serão mostrados os gráficos no console. Se está inseguro, por "
+"favor selecione <b>%s</b> para colocar os gráficos no console ou <b>%s</b> "
+"para interagir com eles (através de zoom) em uma janela separada."
 
-#: spyderlib/plugins/workingdirectory.py:97
-msgid "Change to file base directory"
-msgstr "Mudar para diretório base do arquivo"
+#: spyder/plugins/ipythonconsole.py:386
+msgid "Inline backend"
+msgstr "Saída em linha"
 
-#: spyderlib/plugins/workingdirectory.py:99
-msgid "When opening a file"
-msgstr "Ao abrir um arquivo"
+#: spyder/plugins/ipythonconsole.py:387
+msgid "Decide how to render the figures created by this backend"
+msgstr ""
+"Decida como renderizar as imagens criados por este tipo de saída gráfica"
 
-#: spyderlib/plugins/workingdirectory.py:101
-msgid "When saving a file"
-msgstr "Ao salvar um arquivo"
+#: spyder/plugins/ipythonconsole.py:391
+msgid "Format:"
+msgstr "Formato:"
 
-#: spyderlib/plugins/workingdirectory.py:171
-msgid "Back"
-msgstr "Anterior"
+#: spyder/plugins/ipythonconsole.py:394
+msgid "Resolution:"
+msgstr "Resolução:"
 
-#: spyderlib/plugins/workingdirectory.py:179
-#: spyderlib/widgets/explorer.py:1021 spyderlib/widgets/importwizard.py:529
-msgid "Next"
-msgstr "Próximo"
+#: spyder/plugins/ipythonconsole.py:394
+msgid "dpi"
+msgstr "dpi"
 
-#: spyderlib/plugins/workingdirectory.py:190
-msgid ""
-"This is the working directory for newly\n"
-"opened consoles (Python/IPython consoles and\n"
-"terminals), for the file explorer, for the\n"
-"find in files plugin and for new files\n"
-"created in the editor"
-msgstr ""
-"Este é o diretório de trabalho para os\n"
-"consoles recém abertos \n"
-"(do IPython/Python e terminais), \n"
-"para o Explorador de arquivos,\n"
-"Buscar em arquivos e para os novos\n"
-"arquivos criados no Editor"
+#: spyder/plugins/ipythonconsole.py:396
+msgid "Only used when the format is PNG. Default is 72"
+msgstr "Só se usa quando o formato for PNG. O padrão é 72"
 
-#: spyderlib/plugins/workingdirectory.py:216
-msgid "Browse a working directory"
-msgstr "Selecionar um diretório de trabalho"
+#: spyder/plugins/ipythonconsole.py:399
+msgid "Width:"
+msgstr "Largura:"
 
-#: spyderlib/plugins/workingdirectory.py:222
-msgid "Set as current console's working directory"
-msgstr "Definir como diretório de trabalho para o console atual"
+#: spyder/plugins/ipythonconsole.py:399 spyder/plugins/ipythonconsole.py:403
+msgid "inches"
+msgstr "polegadas"
 
-#: spyderlib/plugins/workingdirectory.py:230
-msgid "Change to parent directory"
-msgstr "Mudar para diretório superior"
+#: spyder/plugins/ipythonconsole.py:401
+msgid "Default is 6"
+msgstr "O padrão é 6"
 
-#: spyderlib/plugins/workingdirectory.py:237
-msgid "Global working directory"
-msgstr "Diretório de trabalho global"
+#: spyder/plugins/ipythonconsole.py:403
+msgid "Height:"
+msgstr "Altura:"
 
-#: spyderlib/restart_app.py:129
-msgid ""
-"It was not possible to close the previous Spyder instance.\n"
-"Restart aborted."
-msgstr ""
+#: spyder/plugins/ipythonconsole.py:405
+msgid "Default is 4"
+msgstr "O padrão é 4"
 
-#: spyderlib/restart_app.py:131
+#: spyder/plugins/ipythonconsole.py:432
 msgid ""
-"Spyder could not reset to factory defaults.\n"
-"Restart aborted."
+"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 ""
+"Você pode executar várias linhas de código ao abrir um terminal. Por favor "
+"introduza cada uma separada por vírgulas, por exemplo:<br><i>import os, "
+"import sys</i>"
+
+#: spyder/plugins/ipythonconsole.py:438
+msgid "Lines:"
+msgstr "Linhas:"
+
+#: spyder/plugins/ipythonconsole.py:447
+msgid "Run a file"
+msgstr "Executar arquivo"
 
-#: spyderlib/restart_app.py:133
+#: spyder/plugins/ipythonconsole.py:448
 msgid ""
-"It was not possible to restart Spyder.\n"
-"Operation aborted."
+"You can also run a whole file at startup instead of just some lines (This is "
+"similar to have a PYTHONSTARTUP file)."
 msgstr ""
+"Você também pode executar um arquivo por inteiro ao inicializar, em vez de "
+"poucas linhas (Isso é similar a ter um arquivo PYTHONSTARTUP)."
 
-#: spyderlib/restart_app.py:135
-#, fuzzy
-msgid "Spyder exit error"
-msgstr "Spyder Editor"
-
-#: spyderlib/restart_app.py:136
-#, fuzzy
-msgid "Spyder reset error"
-msgstr "Spyder Editor"
+#: spyder/plugins/ipythonconsole.py:452
+msgid "Use the following file:"
+msgstr "Use o seguinte arquivo:"
 
-#: spyderlib/restart_app.py:137
-#, fuzzy
-msgid "Spyder restart error"
-msgstr "Tutorial do Spyder"
+#: spyder/plugins/ipythonconsole.py:466
+msgid "Greedy completion"
+msgstr "Completação gulosa"
 
-#: spyderlib/restart_app.py:161
-msgid "Closing Spyder"
+#: spyder/plugins/ipythonconsole.py:467
+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 ""
+"Habilita o completador usando a tecla <tt>Tab</tt> em elementos de listas, "
+"resultados de chamadas de funções, etc, <i>sem</i> atribuí-los a uma "
+"variável.<br>Dessa forma pode-se obter sugestões de completação em coisas "
+"como <tt>li[0].<Tab></tt> ou <tt>ins.meth().<Tab></tt>"
 
-#: spyderlib/restart_app.py:234
-#, fuzzy
-msgid "Resetting Spyder to defaults"
-msgstr "Restaurar os valores padrões."
+#: spyder/plugins/ipythonconsole.py:475
+msgid "Use the greedy completer"
+msgstr "Usar o completador guloso"
 
-#: spyderlib/restart_app.py:266
-#, fuzzy
-msgid "Restarting"
-msgstr "Restaurar"
+#: spyder/plugins/ipythonconsole.py:486
+msgid "Autocall"
+msgstr "Autocall"
 
-#: spyderlib/spyder.py:124
-msgid "Initializing..."
-msgstr "Inicializando..."
+#: spyder/plugins/ipythonconsole.py:487
+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 ""
+"Esta opção faz com que o Python chame automaticamente qualquer objeto mesmo "
+"se você não tenha digitado os parenteses ao seu redor.<br>Por exemplo, ao "
+"escrever <i>str 43</i>, irá virar automaticamente <i>str(43)</i>."
 
-#: spyderlib/spyder.py:247
-msgid "Numpy and Scipy documentation"
-msgstr "Documentação do Numpy e Scipy"
+#: spyder/plugins/ipythonconsole.py:494
+msgid "Smart"
+msgstr "Inteligente"
 
-#: spyderlib/spyder.py:249 spyderlib/spyder.py:1084
-msgid "Matplotlib documentation"
-msgstr "Documentação do Matplotlib"
+#: spyder/plugins/ipythonconsole.py:495
+msgid "Full"
+msgstr "Total"
 
-#: spyderlib/spyder.py:252
-msgid "PyQt4 Reference Guide"
-msgstr "Guia de referência do PyQt4"
+#: spyder/plugins/ipythonconsole.py:496
+msgid "Off"
+msgstr "Desativado"
 
-#: spyderlib/spyder.py:255
-msgid "PyQt4 API Reference"
-msgstr "Referência da API do PyQt4"
+#: spyder/plugins/ipythonconsole.py:498
+msgid "Autocall:  "
+msgstr "Autocall: "
 
-#: spyderlib/spyder.py:257
-msgid "Python(x,y)"
-msgstr "Python(x,y)"
+#: spyder/plugins/ipythonconsole.py:499
+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 ""
+"No modo <b>%s</b>, Auto-chamada não é aplicada se não houver argumentos "
+"depois do objeto clamável. No modo <b>%s</b>, todos os objetos chamáveis são "
+"chamados automaticamente (mesmo se não houver argumentos presentes)."
 
-#: spyderlib/spyder.py:259
-msgid "WinPython"
-msgstr "WinPython"
+#: spyder/plugins/ipythonconsole.py:511
+msgid "Symbolic Mathematics"
+msgstr "Matemática simbólica"
 
-#: spyderlib/spyder.py:305
-msgid "Reload last session"
-msgstr "Recarregar última sessão"
+#: spyder/plugins/ipythonconsole.py:512
+msgid ""
+"Perfom symbolic operations in the console (e.g. integrals, derivatives, "
+"vector calculus, etc) and get the outputs in a beautifully printed style (it "
+"requires the Sympy module)."
+msgstr ""
+"Realiza operações simbólicas no console (integrais, derivadas, cálculo "
+"vetoria e etcl) tendo os resultados em um belo estilo impresso (requer o "
+"módulo Sympy)."
 
-#: spyderlib/spyder.py:309
-msgid "Load session..."
-msgstr "Carregar sessão..."
+#: spyder/plugins/ipythonconsole.py:517
+msgid "Use symbolic math"
+msgstr "Usar matemática simbólica"
 
-#: spyderlib/spyder.py:312
-msgid "Load Spyder session"
-msgstr "Carregar sessão do Spyder"
+#: spyder/plugins/ipythonconsole.py:518
+msgid ""
+"This option loads the Sympy library to work with.<br>Please refer to its "
+"documentation to learn how to use it."
+msgstr ""
+"Esta opção carrega a biblioteca Sympy para trabalhar<br>com ela. Por favor "
+"leia sua documentação para aprender a usá-la. "
 
-#: spyderlib/spyder.py:314
-msgid "Save session and quit..."
-msgstr "Salvar sessão e sair..."
+#: spyder/plugins/ipythonconsole.py:528
+msgid "Prompts"
+msgstr "Prompts"
 
-#: spyderlib/spyder.py:317
-msgid "Save current session and quit application"
-msgstr "Salvar sessão atual e sair do aplicativo"
+#: spyder/plugins/ipythonconsole.py:529
+msgid "Modify how Input and Output prompts are shown in the console."
+msgstr "Modifique como são mostradas as saídas e entradas no console."
 
-#: spyderlib/spyder.py:530
-msgid "Close current pane"
-msgstr "Fechar painel atual"
+#: spyder/plugins/ipythonconsole.py:532
+msgid "Input prompt:"
+msgstr "Prompt de entrada:"
 
-#: spyderlib/spyder.py:535
-msgid "Lock panes"
+#: spyder/plugins/ipythonconsole.py:534
+msgid ""
+"Default is<br>In [<span class=\"in-prompt-number\">%i</span>]:"
 msgstr ""
+"O Padrão é<br>In [<span class=\"in-prompt-number\">%i</span>]:"
 
-#: spyderlib/spyder.py:542
-#, fuzzy
-msgid "Use next layout"
-msgstr "Reiniciar esquema dos componentes"
+#: spyder/plugins/ipythonconsole.py:538
+msgid "Output prompt:"
+msgstr "Prompt de saída:"
 
-#: spyderlib/spyder.py:546
-#, fuzzy
-msgid "Use previous layout"
-msgstr "Reiniciar esquema dos componentes"
+#: spyder/plugins/ipythonconsole.py:540
+msgid ""
+"Default is<br>Out[<span class=\"out-prompt-number\">%i</span>]:"
+msgstr ""
+"O Padrão é<br>Out[<span class=\"out-prompt-number\">%i</span>]: "
 
-#: spyderlib/spyder.py:555
-msgid "&Find text"
-msgstr "&Procurar"
+#: spyder/plugins/ipythonconsole.py:562 spyder/plugins/workingdirectory.py:45
+msgid "Startup"
+msgstr "Inicialização"
 
-#: spyderlib/spyder.py:560
-msgid "Find &next"
-msgstr "P&rocurar próximo"
+#: spyder/plugins/ipythonconsole.py:734
+msgid "Open an &IPython console"
+msgstr "Abrir um console &IPython "
 
-#: spyderlib/spyder.py:567
-msgid "Find &previous"
-msgstr "Procurar &anterior"
+#: spyder/plugins/ipythonconsole.py:737
+msgid "Use %s+T when the console is selected to open a new one"
+msgstr "Utilize %s+T quando o console estiver selecionado para abrir um novo"
 
-#: spyderlib/spyder.py:573
-msgid "&Replace text"
-msgstr "&Substituir"
+#: spyder/plugins/ipythonconsole.py:740
+msgid "Open a new console"
+msgstr "Abrir um novo console"
 
-#: spyderlib/spyder.py:580 spyderlib/widgets/editor.py:339
-#, fuzzy
-msgid "File switcher..."
-msgstr "Arquivo..."
+#: spyder/plugins/ipythonconsole.py:748
+msgid "Open a new IPython console connected to an existing kernel"
+msgstr "Abrir um novo console do IPython conectado a um kernel existente."
 
-#: spyderlib/spyder.py:582
-msgid "Fast switch between files"
+#: spyder/plugins/ipythonconsole.py:836
+msgid ""
+"No IPython console is currently available to run <b>%s</b>.<br><br>Please "
+"open a new one and try again."
 msgstr ""
+"Não existe um console IPython para ser executado <b>%s</b>.<br><br>Por favor "
+"abra um novo e tente novamente."
 
-#: spyderlib/spyder.py:600 spyderlib/widgets/sourcecode/codeeditor.py:2425
-msgid "Undo"
-msgstr "Desfazer"
-
-#: spyderlib/spyder.py:602 spyderlib/widgets/sourcecode/codeeditor.py:2428
-msgid "Redo"
-msgstr "Refazer"
-
-#: spyderlib/spyder.py:604 spyderlib/widgets/arrayeditor.py:392
-#: spyderlib/widgets/dataframeeditor.py:418
-#: spyderlib/widgets/dicteditor.py:680 spyderlib/widgets/shell.py:126
-#: spyderlib/widgets/sourcecode/codeeditor.py:2434
-msgid "Copy"
-msgstr "Copiar"
-
-#: spyderlib/spyder.py:606 spyderlib/widgets/shell.py:122
-#: spyderlib/widgets/sourcecode/codeeditor.py:2431
-msgid "Cut"
-msgstr "Recortar"
+#: spyder/plugins/ipythonconsole.py:873
+msgid ""
+"Your Python environment or installation doesn't have the <tt>ipykernel</tt> "
+"module installed on it. Without this module is not possible for Spyder to "
+"create a console for you.<br><br>You can install <tt>ipykernel</tt> by "
+"running in a terminal:<br><br><tt>pip install ipykernel</"
+"tt><br><br>or<br><br><tt>conda install ipykernel</tt>"
+msgstr ""
+"Sua instalação do Python não possui o módulo <tt>ipykernel</tt> instalado. "
+"Sem esse módulo não é possível que o Spyder crie um console.<br><br>Você "
+"pode instalar o  <tt>ipykernel</tt> executando no terminal tal comando:"
+"<br><br><tt>pip install ipykernel</tt><br><br>ou<br><br><tt>conda install "
+"ipykernel</tt>"
+
+#: spyder/plugins/ipythonconsole.py:1098
+msgid "Do you want to close this console?"
+msgstr "Tem certeza que deseja fechar esse console?"
+
+#: spyder/plugins/ipythonconsole.py:1104
+msgid ""
+"Do you want to close all other consoles connected to the same kernel as this "
+"one?"
+msgstr ""
+"Você deseja fechar todos os outros consoles conectados ao mesmo kernel como "
+"esse?"
 
-#: spyderlib/spyder.py:608 spyderlib/widgets/dicteditor.py:677
-#: spyderlib/widgets/shell.py:130
-#: spyderlib/widgets/sourcecode/codeeditor.py:2437
-msgid "Paste"
-msgstr "Colar"
+#: spyder/plugins/ipythonconsole.py:1357
+msgid "IPython"
+msgstr "IPython"
 
-#: spyderlib/spyder.py:610 spyderlib/widgets/explorer.py:470
-#: spyderlib/widgets/projectexplorer.py:1015 spyderlib/widgets/shell.py:139
-#: spyderlib/widgets/sourcecode/codeeditor.py:2440
-msgid "Delete"
-msgstr "Deletar"
+#: spyder/plugins/ipythonconsole.py:1358
+msgid "Unable to connect to <b>%s</b>"
+msgstr "Não foi possível conectar a <b>%s</b>"
 
-#: spyderlib/spyder.py:614 spyderlib/widgets/shell.py:143
-#: spyderlib/widgets/sourcecode/codeeditor.py:2444
-msgid "Select All"
-msgstr "Selecionar tudo"
+#: spyder/plugins/ipythonconsole.py:1415
+msgid "Connection error"
+msgstr "Erro de conexão"
 
-#: spyderlib/spyder.py:664
-msgid "C&onsoles"
-msgstr "C&onsoles"
+#: spyder/plugins/ipythonconsole.py:1416
+msgid ""
+"Could not open ssh tunnel. The error was:\n"
+"\n"
+msgstr ""
+"Não foi possível criar um túnel ssh. O erro foi:\n"
+"\n"
 
-#: spyderlib/spyder.py:670
-msgid "&View"
-msgstr "&Ver"
+#: spyder/plugins/layoutdialog.py:177
+msgid "Move Up"
+msgstr "Mover para Cima"
 
-#: spyderlib/spyder.py:673
-msgid "&Help"
-msgstr "A&juda"
+#: spyder/plugins/layoutdialog.py:178
+msgid "Move Down"
+msgstr "Mover para baixo"
 
-#: spyderlib/spyder.py:678
-msgid "Welcome to Spyder!"
-msgstr "Bem-vindo ao Spyder!"
+#: spyder/plugins/layoutdialog.py:179
+msgid "Delete Layout"
+msgstr "Deletar Layout"
 
-#: spyderlib/spyder.py:683
-msgid "Pre&ferences"
-msgstr "Pre&ferências"
+#: spyder/plugins/layoutdialog.py:183
+msgid "Layout Display and Order"
+msgstr "Ordem dos layouts"
 
-#: spyderlib/spyder.py:690 spyderlib/widgets/pathmanager.py:48
-#: spyderlib/widgets/projectexplorer.py:598
-msgid "PYTHONPATH manager"
-msgstr "Gerenciar PYTHONPATH"
+#: spyder/plugins/maininterpreter.py:31 spyder/plugins/maininterpreter.py:66
+msgid "Python interpreter"
+msgstr "Interpretador Python"
 
-#: spyderlib/spyder.py:693
-msgid "Python Path Manager"
-msgstr "Gerenciador de caminhos do Python"
+#: spyder/plugins/maininterpreter.py:68
+msgid "Select the Python interpreter for all Spyder consoles"
+msgstr "Selecione o interpretador Python para todos os consoles do Spyder"
 
-#: spyderlib/spyder.py:696
-msgid "Update module names list"
-msgstr "Atualizar a lista de nomes dos módulos"
+#: spyder/plugins/maininterpreter.py:71
+msgid "Default (i.e. the same as Spyder's)"
+msgstr "Padrão (o mesmo do Spyder)"
 
-#: spyderlib/spyder.py:699
-msgid "Refresh list of module names available in PYTHONPATH"
-msgstr "Atualizar a lista de nomes dos módulos disponíveis no PYTHONPATH"
+#: spyder/plugins/maininterpreter.py:74
+msgid "Use the following Python interpreter:"
+msgstr "Usar o seguinte interpretador:"
 
-#: spyderlib/spyder.py:702
-#, fuzzy
-msgid "Reset Spyder to factory defaults"
-msgstr "Restaurar os valores padrões."
+#: spyder/plugins/maininterpreter.py:77
+msgid "Executables"
+msgstr "Executáveis "
 
-#: spyderlib/spyder.py:707
-msgid "Current user environment variables..."
-msgstr "Variáveis de ambiente do usuário atual..."
+#: spyder/plugins/maininterpreter.py:94
+msgid "User Module Reloader (UMR)"
+msgstr "Recarregador de Módulos do Usuário (RMU)"
 
-#: spyderlib/spyder.py:709
+#: spyder/plugins/maininterpreter.py:95
 msgid ""
-"Show and edit current user environment variables in Windows registry (i.e. "
-"for all sessions)"
+"UMR forces Python to reload modules which were imported when executing a "
+"file in a Python or IPython console with the <i>runfile</i> function."
 msgstr ""
-"Mostrar e editar as variáveis de\n"
-"ambiente do usuário atual no\n"
-"registro do Windows (para todas\n"
-"as sessões)"
-
-#: spyderlib/spyder.py:718 spyderlib/spyder.py:1178
-msgid "External Tools"
-msgstr "Ferramentas externas"
-
-#: spyderlib/spyder.py:722
-msgid "Python(x,y) launcher"
-msgstr "Lançador do Python(x,y)"
-
-#: spyderlib/spyder.py:729
-msgid "WinPython control panel"
-msgstr "Painel de controle WinPython"
+"O RMU força o Python a recarregar os módulos que foram importados durante a "
+"execução de um arquivo no console com a função <i>runfile</i>."
 
-#: spyderlib/spyder.py:738
-msgid "Qt Designer"
-msgstr "Qt Designer"
-
-#: spyderlib/spyder.py:743
-msgid "Qt Linguist"
-msgstr "Qt Linguist"
-
-#: spyderlib/spyder.py:749
-msgid "Qt examples"
-msgstr "Exemplos do Qt"
+#: spyder/plugins/maininterpreter.py:100
+msgid "Enable UMR"
+msgstr "Ativar RMU"
 
-#: spyderlib/spyder.py:770
-msgid "guidata examples"
-msgstr "Exemplos do guidata"
+#: spyder/plugins/maininterpreter.py:101
+msgid ""
+"This option will enable the User Module Reloader (UMR) in Python/IPython "
+"consoles. UMR forces Python to reload deeply modules during import when "
+"running a Python script using the Spyder's builtin function <b>runfile</b>."
+"<br><br><b>1.</b> UMR may require to restart the console in which it will be "
+"called (otherwise only newly imported modules will be reloaded when "
+"executing files).<br><br><b>2.</b> If errors occur when re-running a PyQt-"
+"based program, please check that the Qt objects are properly destroyed (e.g. "
+"you may have to use the attribute <b>Qt.WA_DeleteOnClose</b> on your main "
+"window, using the <b>setAttribute</b> method)"
+msgstr ""
+"Esta opção ativará o Recarregador de Módulos do Usuário (RMU) nos consoles "
+"Python/IPython. O RMU força o Python a recarregar profundamente os módulos "
+"que foram importados ao executar um arquivo do Python, usando a função "
+"incorporada do Spyder chamada <b>runfile</b>.<br><br><b>1.</b> O RMU pode "
+"necessitar que se reinicie o console em o qual será utilizado (de outra "
+"forma, só os módulos que foram importados em último lugar serão recarregados "
+"ao executar um arquivo).<br><br><b>2.</b> Se ocorrer algum erro ao re-"
+"executar um programa baseado no PyQt, por favor verifique se os objetos do "
+"Qt foram destruídos apropriadamente (por exemplo, você pode ter que utilizar "
+"o atributo <b>Qt.WA_DeleteOnClose</b> em sua janela principal, utilizando o "
+"método <b>setAttribute</b>)"
+
+#: spyder/plugins/maininterpreter.py:117
+msgid "Show reloaded modules list"
+msgstr "Mostrar lista de módulos que foram recarregados"
 
-#: spyderlib/spyder.py:781
-msgid "guiqwt examples"
-msgstr "Exemplos do guiqwt"
+#: spyder/plugins/maininterpreter.py:118
+msgid "Please note that these changes will be applied only to new consoles"
+msgstr ""
+"Por favor tenha em nota que as mudanças só serão aplicadas em novos consoles"
 
-#: spyderlib/spyder.py:786
-msgid "Sift"
-msgstr "Sift"
+#: spyder/plugins/maininterpreter.py:122
+msgid "Set UMR excluded (not reloaded) modules"
+msgstr "Definir lista de módulos excluídos pelo RMU"
 
-#: spyderlib/spyder.py:796
-msgid "ViTables"
-msgstr "ViTables"
+#: spyder/plugins/maininterpreter.py:168
+msgid ""
+"You selected a <b>Python %d</b> interpreter for the console but Spyder is "
+"running on <b>Python %d</b>!.<br><br>Although this is possible, we recommend "
+"you to install and run Spyder directly with your selected interpreter, to "
+"avoid seeing false warnings and errors due to the incompatible syntax "
+"between these two Python versions."
+msgstr ""
+"Você selecionou um interpretador <b>Python %d</b> para o console, mas o "
+"Spyder está sendo executado em <b>Python %d</b>!.<br><br>Embora isso seja "
+"possível, nós recomendamos instalar e executar o Spyder diretamente com o "
+"interpretador selecionado, para evitar ver falsos erros e avisos no Editor "
+"devido a sintaxe incompatível entre estas duas versões do Python."
 
-#: spyderlib/spyder.py:810
-msgid "Fullscreen mode"
-msgstr "Modo tela cheia"
+#: spyder/plugins/maininterpreter.py:178 spyder/plugins/maininterpreter.py:191
+#: spyder/plugins/maininterpreter.py:195
+msgid "UMR"
+msgstr "RMU"
 
-#: spyderlib/spyder.py:822
-msgid "Main toolbar"
-msgstr "Barra principal"
+#: spyder/plugins/maininterpreter.py:179
+msgid "Set the list of excluded modules as this: <i>numpy, scipy</i>"
+msgstr "Defina a lista de módulos excluídos desta forma: <i>numpy, scipy</i>"
 
-#: spyderlib/spyder.py:831
+#: spyder/plugins/maininterpreter.py:192
 msgid ""
-"Spyder Internal Console\n"
-"\n"
-"This console is used to report application\n"
-"internal errors and to inspect Spyder\n"
-"internals with the following commands:\n"
-"  spy.app, spy.window, dir(spy)\n"
-"\n"
-"Please don't use it to run your code\n"
-"\n"
+"The following modules are not installed on your machine:\n"
+"%s"
 msgstr ""
-"Console interno do Spyder!\n"
-"\n"
-"Este console é usado para reportar erros\n"
-"internos do aplicativo e para inspecionar\n"
-"as características internas do Spyder com\n"
-"os seguintes comandos:\n"
-"  spy.app, spy.window, dir(spy)\n"
-"\n"
-"Por favor não execute seu código neste console\n"
+"Os seguintes módulos não estão instalados no seu computador:\n"
+"%s"
 
-#: spyderlib/spyder.py:848
-msgid "Loading object inspector..."
-msgstr "Carregando inspetor de objetos..."
+#: spyder/plugins/maininterpreter.py:196
+msgid ""
+"Please note that these changes will be applied only to new Python/IPython "
+"consoles"
+msgstr ""
+"Por favor, note que estas mudanças só serão aplicadas apenas aos novos "
+"consoles do Python/IPython"
 
-#: spyderlib/spyder.py:855
-msgid "Loading outline explorer..."
-msgstr "Carregando o explorador de código..."
+#: spyder/plugins/onlinehelp.py:70
+msgid "Online help"
+msgstr "Ajuda online"
 
-#: spyderlib/spyder.py:863
-msgid "Loading editor..."
-msgstr "Carregando editor..."
+#: spyder/plugins/outlineexplorer.py:49 spyder/widgets/editortools.py:195
+msgid "Outline"
+msgstr "Explorador de código"
 
-#: spyderlib/spyder.py:874
-#, fuzzy
-msgid "&Restart"
-msgstr "Restaurar"
+#: spyder/plugins/projects.py:76 spyder/widgets/projects/explorer.py:111
+#: spyder/widgets/projects/explorer.py:125
+msgid "Project explorer"
+msgstr "Explorador de projetos"
 
-#: spyderlib/spyder.py:876
-#, fuzzy
-msgid "Restart"
-msgstr "Restaurar"
+#: spyder/plugins/projects.py:88
+msgid "New Project..."
+msgstr "Novo Projeto..."
 
-#: spyderlib/spyder.py:895
-msgid "Loading file explorer..."
-msgstr "Carregando explorador de arquivos..."
+#: spyder/plugins/projects.py:91
+msgid "Open Project..."
+msgstr "Abrir Projeto..."
 
-#: spyderlib/spyder.py:902
-msgid "Loading history plugin..."
-msgstr "Carregando histórico..."
+#: spyder/plugins/projects.py:94
+msgid "Close Project"
+msgstr "Fechar Projeto"
 
-#: spyderlib/spyder.py:913
-msgid "Loading online help..."
-msgstr "Carregando ajuda online..."
+#: spyder/plugins/projects.py:100
+msgid "Project Preferences"
+msgstr "Preferências do Projeto"
 
-#: spyderlib/spyder.py:919
-msgid "Loading project explorer..."
-msgstr "Carregando explorador de projetos..."
+#: spyder/plugins/projects.py:102
+msgid "Recent Projects"
+msgstr "Projetos Recentes"
 
-#: spyderlib/spyder.py:930
-msgid "Loading external console..."
-msgstr "Carregando console externo..."
+#: spyder/plugins/projects.py:234
+msgid "Open project"
+msgstr "Abrir projeto"
 
-#: spyderlib/spyder.py:939
-msgid "Loading namespace browser..."
-msgstr "Carregando explorador de variáveis..."
+#: spyder/plugins/projects.py:239
+msgid "<b>%s</b> is not a Spyder project!"
+msgstr "<b>%s</b> não é um projeto do Spyder!"
 
-#: spyderlib/spyder.py:946
-msgid "Loading IPython console..."
-msgstr "Carregando console IPython..."
+#: spyder/plugins/runconfig.py:29
+msgid "Execute in current Python or IPython console"
+msgstr "Executar no console atual do Python ou IPython"
 
-#: spyderlib/spyder.py:956
-msgid "Setting up main window..."
-msgstr "Configurando tela principal..."
+#: spyder/plugins/runconfig.py:30
+msgid "Execute in a new dedicated Python console"
+msgstr "Executar em um novo console dedicado do Python"
 
-#: spyderlib/spyder.py:959
-msgid "Optional dependencies..."
-msgstr "Dependências opcionais... "
+#: spyder/plugins/runconfig.py:31
+msgid "Execute in an external System terminal"
+msgstr "Executar em um terminal externo do Sistema"
 
-#: spyderlib/spyder.py:963
-msgid "Report issue..."
-msgstr "Reportar problema..."
+#: spyder/plugins/runconfig.py:41
+msgid "Always show %s on a first file run"
+msgstr "Sempre mostrar %s na primeira execução"
 
-#: spyderlib/spyder.py:967
-msgid "Spyder support..."
-msgstr "Suporte do Spyder..."
+#: spyder/plugins/runconfig.py:160
+msgid "General settings"
+msgstr "Configurações gerais"
 
-#: spyderlib/spyder.py:970
-msgid "Check for updates..."
-msgstr ""
+#: spyder/plugins/runconfig.py:163 spyder/plugins/runconfig.py:209
+msgid "Command line options:"
+msgstr "Opções de linha de comando: "
 
-#: spyderlib/spyder.py:993
-msgid "Spyder documentation"
-msgstr "Documentação do Spyder"
+#: spyder/plugins/runconfig.py:169
+msgid "Working directory:"
+msgstr "Diretório de trabalho:"
 
-#: spyderlib/spyder.py:997
-msgid "Spyder tutorial"
-msgstr "Tutorial do Spyder"
+#: spyder/plugins/runconfig.py:181 spyder/plugins/runconfig.py:492
+msgid "Enter debugging mode when errors appear during execution"
+msgstr "Entrar no modo de depuração quando erros aparecerem durante a execução"
 
-#: spyderlib/spyder.py:1002
-#, fuzzy
-msgid "Interactive tours"
-msgstr "Introspecção"
+#: spyder/plugins/runconfig.py:197 spyder/plugins/runconfig.py:502
+msgid "Dedicated Python console"
+msgstr "Console do Python dedicado"
 
-#: spyderlib/spyder.py:1031
-msgid "Python documentation"
-msgstr "Documentação do Python"
+#: spyder/plugins/runconfig.py:201 spyder/plugins/runconfig.py:504
+msgid "Interact with the Python console after execution"
+msgstr "Interagir com o console depois da execução"
 
-#: spyderlib/spyder.py:1037 spyderlib/spyder.py:1076
-msgid "IPython documentation"
-msgstr "Documentação do IPython"
+#: spyder/plugins/runconfig.py:205
+msgid "Show warning when killing running process"
+msgstr "Mostrar um aviso quando matar o processo"
 
-#: spyderlib/spyder.py:1038
-msgid "Intro to IPython"
-msgstr "Introdução ao IPython"
+#: spyder/plugins/runconfig.py:214
+msgid "<b>-u</b> is added to the other options you set here"
+msgstr "A opção <b>-u</b> foi adicionada a essas opções"
 
-#: spyderlib/spyder.py:1040
-msgid "Quick reference"
-msgstr "Referência rápida"
+#: spyder/plugins/runconfig.py:224
+msgid "this dialog"
+msgstr "este dialogo "
 
-#: spyderlib/spyder.py:1042
-msgid "Console help"
-msgstr "Ajuda do console"
+#: spyder/plugins/runconfig.py:283
+msgid "Run configuration"
+msgstr "Opções de execução"
 
-#: spyderlib/spyder.py:1074
-msgid "Python(x,y) documentation folder"
-msgstr "Pasta de documentação do Python(x,y)"
+#: spyder/plugins/runconfig.py:284
+msgid "The following working directory is not valid:<br><b>%s</b>"
+msgstr "O seguinte diretório de trabalho não é válido:<br><b>%s</b>"
 
-#: spyderlib/spyder.py:1078
-msgid "guidata documentation"
-msgstr "Documentação do guidata "
+#: spyder/plugins/runconfig.py:362
+msgid "Run settings for %s"
+msgstr "Ajustar configuração para %s"
 
-#: spyderlib/spyder.py:1081
-msgid "guiqwt documentation"
-msgstr "Documentação do guiqwt"
+#: spyder/plugins/runconfig.py:394
+msgid "Select a run configuration:"
+msgstr "Selecionar um arquivo de execução:"
 
-#: spyderlib/spyder.py:1087
-msgid "NumPy documentation"
-msgstr "Documentação do NumPy"
+#: spyder/plugins/runconfig.py:423 spyder/plugins/runconfig.py:448
+msgid "Run Settings"
+msgstr "Opções de execução"
 
-#: spyderlib/spyder.py:1089
-msgid "NumPy reference guide"
-msgstr "Guia de referência do NumPy"
+#: spyder/plugins/runconfig.py:450
+msgid ""
+"The following are the default <i>%s</i>. These options may be overriden "
+"using the <b>%s</b> dialog box (see the <b>%s</b> menu)"
+msgstr ""
+"As seguintes <i>%s</i> são padrões. Estas opções podem ser modificadas "
+"usando o diálogo <b>%s</b> (ver o menu <b>%s</b>)"
 
-#: spyderlib/spyder.py:1091
-msgid "NumPy user guide"
-msgstr "Guia do usuário do NumPy"
+#: spyder/plugins/runconfig.py:476
+msgid "Default working directory is:"
+msgstr "O diretório de trabalho padrão é:"
 
-#: spyderlib/spyder.py:1093
-msgid "SciPy documentation"
-msgstr "Documentação do SciPy"
+#: spyder/plugins/runconfig.py:478
+msgid "the script directory"
+msgstr "Diretório do script atual"
 
-#: spyderlib/spyder.py:1100
-msgid "Installed Python modules"
-msgstr "Módulos instalados do Python"
+#: spyder/plugins/runconfig.py:481 spyder/plugins/workingdirectory.py:57
+msgid "the following directory:"
+msgstr "O seguinte diretório:"
 
-#: spyderlib/spyder.py:1104
-msgid "Online documentation"
-msgstr "Documentação online"
+#: spyder/plugins/runconfig.py:507
+msgid "Show warning when killing running processes"
+msgstr "Mostrar aviso quando um processo em execução for morto"
 
-#: spyderlib/spyder.py:1116
-msgid "Qt documentation"
-msgstr "Documentação do Qt"
+#: spyder/plugins/runconfig.py:516
+msgid "Run Settings dialog"
+msgstr "Configurações de execução"
 
-#: spyderlib/spyder.py:1122
-msgid "About %s..."
-msgstr "Sobre o %s..."
+#: spyder/plugins/shortcuts.py:137
+msgid ""
+"Press the new shortcut and select 'Ok': \n"
+"(Press 'Tab' once to switch focus between the shortcut entry \n"
+"and the buttons below it)"
+msgstr ""
+"Pressione o novo atalho e selecione 'Ok': \n"
+"(Pressione 'Tab' uma vez para mudar o foco entre a entrada do atalho \n"
+"e os botões abaixo dele)"
 
-#: spyderlib/spyder.py:1146
-msgid "Panes"
-msgstr "Painéis"
+#: spyder/plugins/shortcuts.py:140
+msgid "Current shortcut:"
+msgstr "Atalho atual:"
 
-#: spyderlib/spyder.py:1147
-msgid "Toolbars"
-msgstr "Barra de ferramentas"
+#: spyder/plugins/shortcuts.py:142
+msgid "New shortcut:"
+msgstr "Novo atalho:"
 
-#: spyderlib/spyder.py:1148
-#, fuzzy
-msgid "Window layouts"
-msgstr "Esquema personalizado dos componentes"
+#: spyder/plugins/shortcuts.py:155
+msgid "Shortcut: {0}"
+msgstr "Atalho: {0}"
 
-#: spyderlib/spyder.py:1157 spyderlib/spyder.py:1910 spyderlib/spyder.py:1911
-#, fuzzy
-msgid "Show toolbars"
-msgstr "Mostrar barra de ferramentas"
+#: spyder/plugins/shortcuts.py:276
+msgid "Please introduce a different shortcut"
+msgstr "Por favor escolha um atalho diferente"
 
-#: spyderlib/spyder.py:1171
-msgid "Attached console window (debugging)"
-msgstr "Janela do console anexada (depuração)"
+#: spyder/plugins/shortcuts.py:313
+msgid "The new shorcut conflicts with:"
+msgstr "O novo atalho conflita com:"
 
-#: spyderlib/spyder.py:1756
-msgid "Spyder Default Layout"
+#: spyder/plugins/shortcuts.py:324
+msgid ""
+"A compound sequence can have {break} a maximum of 4 subsequences.{break}"
 msgstr ""
+"Uma sequência composta pode ter {break} um máximo de 4 subsequências.{break}"
 
-#: spyderlib/spyder.py:1774 spyderlib/spyder.py:1785
-#, fuzzy
-msgid "Save current layout"
-msgstr "Salvar arquivo atual como..."
+#: spyder/plugins/shortcuts.py:329
+msgid "Invalid key entered"
+msgstr "Chave inválida inserida"
 
-#: spyderlib/spyder.py:1778 spyderlib/spyder.py:1787
-#, fuzzy
-msgid "Layout preferences"
-msgstr "Preferências"
+#: spyder/plugins/shortcuts.py:531
+msgid "Context"
+msgstr "Contexto"
 
-#: spyderlib/spyder.py:1782
-#, fuzzy
-msgid "Reset to spyder default"
-msgstr "Restaurar os valores padrões."
+#: spyder/plugins/shortcuts.py:533
+#: spyder/widgets/variableexplorer/collectionseditor.py:118
+msgid "Name"
+msgstr "Nome"
 
-#: spyderlib/spyder.py:1804
-msgid ""
-"Window layout will be reset to default settings: this affects window "
-"position, size and dockwidgets.\n"
-"Do you want to continue?"
-msgstr ""
-"O esquema das janelas será reiniciado para as configurações padrões: isso "
-"afeta a posição, tamanho e componentes da janela.\n"
-"Deseja continuar?"
+#: spyder/plugins/shortcuts.py:535
+msgid "Shortcut"
+msgstr "Atalho"
 
-#: spyderlib/spyder.py:1826
-msgid ""
-"Layout <b>%s</b> will be                                                "
-"overwritten. Do you want to                                                "
-"continue?"
-msgstr ""
+#: spyder/plugins/shortcuts.py:537
+msgid "Score"
+msgstr "Valor"
 
-#: spyderlib/spyder.py:1889
-#, fuzzy
-msgid "Quick switch layout #%s has not yet been defined."
-msgstr "Ainda não foi definido o esquema do componente #%d."
+#: spyder/plugins/shortcuts.py:697
+msgid "Conflicts"
+msgstr "Conflitos"
 
-#: spyderlib/spyder.py:1907 spyderlib/spyder.py:1908
-#, fuzzy
-msgid "Hide toolbars"
-msgstr "Barra de arquivo"
+#: spyder/plugins/shortcuts.py:698
+msgid "The following conflicts have been detected:"
+msgstr "Os seguintes conflitos foram detectados:"
 
-#: spyderlib/spyder.py:2229 spyderlib/spyder.py:2230
-msgid "Maximize current pane"
-msgstr "Maximizar painel atual"
+#: spyder/plugins/shortcuts.py:783
+msgid "Keyboard shortcuts"
+msgstr "Teclas de atalho"
 
-#: spyderlib/spyder.py:2233
-msgid "Restore current pane"
-msgstr "Restaurar painel atual"
+#: spyder/plugins/shortcuts.py:791
+msgid "Search: "
+msgstr "Procurar: "
 
-#: spyderlib/spyder.py:2234
-msgid "Restore pane to its original size"
-msgstr "Restaurar painel ao seu tamanho original"
+#: spyder/plugins/shortcuts.py:792
+msgid "Reset to default values"
+msgstr "Restaurar os valores padrões."
 
-#: spyderlib/spyder.py:2318
-msgid "About %s"
-msgstr "Sobre o %s"
+#: spyder/plugins/variableexplorer.py:26
+msgid "Autorefresh"
+msgstr "Atualizar automaticamente"
 
-#: spyderlib/spyder.py:2502
-msgid "Running an external system terminal is not supported on platform %s."
-msgstr "Executar um terminal externo não é suportado na plataforma %s."
+#: spyder/plugins/variableexplorer.py:27
+msgid "Enable autorefresh"
+msgstr "Ativar atualização automatica"
+
+#: spyder/plugins/variableexplorer.py:29
+msgid "Refresh interval: "
+msgstr "Intervalo de atualização"
 
-#: spyderlib/spyder.py:2721
-msgid "Open session"
-msgstr "Abrir sessão"
+#: spyder/plugins/variableexplorer.py:30
+msgid " ms"
+msgstr "ms"
 
-#: spyderlib/spyder.py:2722 spyderlib/spyder.py:2734
-msgid "Spyder sessions"
-msgstr "Sessões do Spyder"
+#: spyder/plugins/variableexplorer.py:33
+msgid "Filter"
+msgstr "Filtro"
 
-#: spyderlib/spyder.py:2733
-msgid "Save session"
-msgstr "Salvar sessão"
+#: spyder/plugins/variableexplorer.py:35
+#: spyder/widgets/variableexplorer/namespacebrowser.py:229
+msgid "Exclude private references"
+msgstr "Excluir variáveis privadas"
 
-#: spyderlib/spyder.py:2775
-#, fuzzy
-msgid ""
-"Spyder will restart and reset to default settings: <br><br>Do you want to "
-"continue?"
-msgstr ""
-"O seguinte diretório não está vazio:<br><b>%s</b><br><br>Deseja continuar?"
+#: spyder/plugins/variableexplorer.py:36
+#: spyder/widgets/variableexplorer/namespacebrowser.py:244
+msgid "Exclude capitalized references"
+msgstr "Excluir variáveis que começam em maiúsculas"
 
-#: spyderlib/spyder.py:2871 spyderlib/widgets/helperwidgets.py:144
-#, fuzzy
-msgid "Spyder updates"
-msgstr "Arquivos data do Spyder"
+#: spyder/plugins/variableexplorer.py:37
+#: spyder/widgets/variableexplorer/namespacebrowser.py:237
+msgid "Exclude all-uppercase references"
+msgstr "Excluir variáveis em maiúscula "
 
-#: spyderlib/spyder.py:2890
-msgid ""
-"<b>Spyder %s is available!</b> <br><br>Please use your package manager to "
-"update Spyder or go to our <a href=\"%s\">Releases</a> page to download this "
-"new version. <br><br>If you are not sure how to proceed to update Spyder "
-"please refer to our  <a href=\"%s\">Installation</a> instructions."
-msgstr ""
+#: spyder/plugins/variableexplorer.py:38
+#: spyder/widgets/variableexplorer/namespacebrowser.py:252
+msgid "Exclude unsupported data types"
+msgstr "Excluir tipos de dados não suportados"
 
-#: spyderlib/spyder.py:2902
-#, fuzzy
-msgid "Spyder is up to date."
-msgstr "Suporte do Spyder..."
+#: spyder/plugins/variableexplorer.py:44
+#: spyder/widgets/variableexplorer/collectionseditor.py:675
+msgid "Truncate values"
+msgstr "Abreviar valores"
 
-#: spyderlib/tour.py:121
-#, fuzzy
-msgid "Welcome to the Introduction tour"
-msgstr "Bem-vindo ao Spyder!"
+#: spyder/plugins/variableexplorer.py:46
+#: spyder/widgets/variableexplorer/collectionseditor.py:679
+msgid "Show arrays min/max"
+msgstr "Mostrar o minimo e máximo de matrizes"
+
+#: spyder/plugins/variableexplorer.py:48
+msgid "Edit data in the remote process"
+msgstr "Editar dados em um processo remoto"
 
-#: spyderlib/tour.py:122
+#: spyder/plugins/variableexplorer.py:49
 msgid ""
-"<b>Spyder</b> is a powerful Interactive Development Environment (or IDE) for "
-"the Python programming language.<br><br>Here we are going to guide you "
-"through its most important features.<br><br>Please use the arrow keys or "
-"click on the buttons below to move along the tour."
+"Editors are opened in the remote process for NumPy arrays, PIL images, "
+"lists, tuples and dictionaries.\n"
+"This avoids transfering large amount of data between the remote process and "
+"Spyder (through the socket)."
 msgstr ""
+"Esta opção permite modificar matrizes do NumPY, imagens do PIL, listas, "
+"tuplas e\n"
+"dicionários em um processo remoto. Isto impede a transferência de grandes "
+"quantidades de dados\n"
+"entre o processo remoto e o Spyder."
 
-#: spyderlib/tour.py:131
-#, fuzzy
-msgid "The Editor"
-msgstr "Editor de texto"
+#: spyder/plugins/variableexplorer.py:185
+msgid "Variable explorer"
+msgstr "Explorador de variáveis"
 
-#: spyderlib/tour.py:132
+#: spyder/plugins/workingdirectory.py:38
 msgid ""
-"This is the pane where you write Python code before evaluating it. You can "
-"get automatic suggestions and completions while writing, by pressing the "
-"<b>Tab</b> key next to a given text.<br><br>The Editor comes with a line "
-"number area (highlighted here in red), where Spyder shows warnings and "
-"syntax errors. They can help you to detect potential problems before running "
-"the code.<br><br>You can also set debug breakpoints in the line number area, "
-"by doing a double click next to a non-empty line."
+"The <b>global working directory</b> is the working directory for newly "
+"opened <i>consoles</i> (Python/IPython consoles and terminals), for the "
+"<i>file explorer</i>, for the <i>find in files</i> plugin and for new files "
+"created in the <i>editor</i>."
 msgstr ""
+"O <b>diretório de trabalho global</b> é o diretório de trabalho para os "
+"<i>consoles</i> recém abertos (do IPython/Python e dos terminais), para o "
+"<i>Explorador de arquivos</i>, <i>Buscar em arquivos</i> e para os novos "
+"arquivos criados no <i>Editor</i>."
 
-#: spyderlib/tour.py:147
-#, fuzzy
-msgid "The IPython console"
-msgstr "Console IPython"
+#: spyder/plugins/workingdirectory.py:47
+msgid "At startup, the global working directory is:"
+msgstr "Ao iniciar, o diretório de trabalho global é:"
 
-#: spyderlib/tour.py:164
-#, fuzzy
-msgid "The Variable Explorer"
-msgstr "Explorador de variáveis"
+#: spyder/plugins/workingdirectory.py:51
+msgid "the same as in last session"
+msgstr "O mesmo da última sessão"
 
-#: spyderlib/tour.py:165
-msgid ""
-"In this pane you can view and edit the variables generated during the "
-"execution of a program, or those entered directly in one of Spyder consoles."
-"<br><br>As you can see, the Variable Explorer is showing the variables "
-"generated during the last step of this tour. By doing a double-click on any "
-"of them, a new window will be opened, where you can inspect and modify their "
-"contents."
-msgstr ""
+#: spyder/plugins/workingdirectory.py:53
+msgid "At startup, Spyder will restore the global directory from last session"
+msgstr "Ao iniciar o Spyder irá restaurar o diretório global da última sessão"
 
-#: spyderlib/tour.py:177
-#, fuzzy
-msgid "The Python console"
-msgstr "Console IPython"
+#: spyder/plugins/workingdirectory.py:59
+msgid "At startup, the global working directory will be the specified path"
+msgstr "Ao iniciar o diretório de trabalho será o seguinte"
 
-#: spyderlib/tour.py:178
-msgid ""
-"You can also run your code on a Python console. These consoles are useful "
-"because they let you run a file in a console dedicated only to it.To select "
-"this behavior, please press the <b>F6</b> key.<br><br>By pressing the button "
-"below and then focusing the Variable Explorer, you will notice that Python "
-"consoles are also connected to that pane, and that the Variable Explorer "
-"only shows the variables of the currently focused console."
-msgstr ""
+#: spyder/plugins/workingdirectory.py:71
+msgid "Files are opened from:"
+msgstr "Os arquivos são abertos de:"
 
-#: spyderlib/tour.py:192
-#, fuzzy
-msgid "The Object Inspector"
-msgstr "Inspetor de objetos"
+#: spyder/plugins/workingdirectory.py:75 spyder/plugins/workingdirectory.py:88
+msgid "the current file directory"
+msgstr "O diretório do arquivo atual"
 
-#: spyderlib/tour.py:193
-msgid ""
-"This pane displays documentation of the functions, classes, methods or "
-"modules you are currently using in the Editor or the Consoles.<br><br>To use "
-"it, you need to press <b>Ctrl+I</b> in front of an object. If that object "
-"has some documentation associated with it, it will be displayed here."
-msgstr ""
+#: spyder/plugins/workingdirectory.py:79 spyder/plugins/workingdirectory.py:92
+msgid "the global working directory"
+msgstr "O diretório de trabalho global"
 
-#: spyderlib/tour.py:203
-#, fuzzy
-msgid "The File Explorer"
-msgstr "Explorador de arquivos"
+#: spyder/plugins/workingdirectory.py:84
+msgid "Files are created in:"
+msgstr "Os arquivos são criados em:"
 
-#: spyderlib/tour.py:204
-msgid ""
-"This pane lets you navigate through the directories and files present in "
-"your computer.<br><br>You can also open any of these files with its "
-"corresponding application, by doing a double click on it.<br><br>There is "
-"one exception to this rule: plain-text files will always be opened in the "
-"Spyder Editor."
-msgstr ""
+#: spyder/plugins/workingdirectory.py:98
+msgid "Change to file base directory"
+msgstr "Mudar para diretório base do arquivo"
 
-#: spyderlib/tour.py:214
-#, fuzzy
-msgid "The History Log"
-msgstr "Log do histórico "
+#: spyder/plugins/workingdirectory.py:100
+msgid "When opening a file"
+msgstr "Ao abrir um arquivo"
 
-#: spyderlib/tour.py:215
-msgid ""
-"This pane records all commands introduced in the Python and IPython consoles."
-msgstr ""
+#: spyder/plugins/workingdirectory.py:102
+msgid "When saving a file"
+msgstr "Ao salvar um arquivo"
 
-#: spyderlib/tour.py:263
-msgid "<b>Spyder</b> is an interactive development environment based on bla"
-msgstr ""
+#: spyder/plugins/workingdirectory.py:172
+msgid "Back"
+msgstr "Anterior"
 
-#: spyderlib/tour.py:267
-#, fuzzy
-msgid "Welcome to Spyder introduction tour"
-msgstr "Bem-vindo ao Spyder!"
+#: spyder/plugins/workingdirectory.py:180 spyder/widgets/explorer.py:1079
+#: spyder/widgets/variableexplorer/importwizard.py:529
+msgid "Next"
+msgstr "Próximo"
 
-#: spyderlib/tour.py:268
-msgid "Spyder is an interactive development environment based on bla"
+#: spyder/plugins/workingdirectory.py:191
+msgid ""
+"This is the working directory for newly\n"
+"opened consoles (Python/IPython consoles and\n"
+"terminals), for the file explorer, for the\n"
+"find in files plugin and for new files\n"
+"created in the editor"
 msgstr ""
+"Este é o diretório de trabalho para os\n"
+"consoles recém abertos \n"
+"(do IPython/Python e terminais), \n"
+"para o Explorador de arquivos,\n"
+"Buscar em arquivos e para os novos\n"
+"arquivos criados no Editor"
 
-#: spyderlib/tour.py:273
-#, fuzzy
-msgid "Introduction tour"
-msgstr "Introspecção"
+#: spyder/plugins/workingdirectory.py:219
+msgid "Browse a working directory"
+msgstr "Selecionar um diretório de trabalho"
 
-#: spyderlib/tour.py:274
-msgid "New features in version 3.0"
-msgstr ""
+#: spyder/plugins/workingdirectory.py:226
+msgid "Change to parent directory"
+msgstr "Mudar para diretório superior"
 
-#: spyderlib/tour.py:821
-#, fuzzy
-msgid "Go to step: "
-msgstr "Ir para a linha:"
+#: spyder/plugins/workingdirectory.py:233
+msgid "Global working directory"
+msgstr "Diretório de trabalho global"
 
-#: spyderlib/utils/codeanalysis.py:92
+#: spyder/utils/codeanalysis.py:91
 msgid "Real-time code analysis on the Editor"
 msgstr "Análise de código em tempo real no editor"
 
-#: spyderlib/utils/codeanalysis.py:96
+#: spyder/utils/codeanalysis.py:95
 msgid "Real-time code style analysis on the Editor"
 msgstr "Análise de estilo em tempo real no editor."
 
-#: spyderlib/utils/environ.py:96
+#: spyder/utils/environ.py:101
 msgid ""
 "Module <b>pywin32 was not found</b>.<br>Please restart this Windows "
 "<i>session</i> (not the computer) for changes to take effect."
@@ -3407,7 +3377,7 @@ msgstr ""
 "<i>sessão</i> do Windows (não do computador) para que as mudanças tenham "
 "efeito."
 
-#: spyderlib/utils/environ.py:109
+#: spyder/utils/environ.py:114
 msgid ""
 "If you accept changes, this will modify the current user environment "
 "variables directly <b>in Windows registry</b>. Use it with precautions, at "
@@ -3424,8 +3394,7 @@ msgstr ""
 "você executou ele de um atalho, caso contrário reinicie qualquer aplicativo "
 "pelo qual você você executou ele, como o <i>Python(x,y) Home</i>)"
 
-#: spyderlib/utils/inspector/sphinxify.py:212
-#: spyderlib/utils/inspector/sphinxify.py:222
+#: spyder/utils/help/sphinxify.py:217 spyder/utils/help/sphinxify.py:227
 msgid ""
 "It was not possible to generate rich text help for this object.</br>Please "
 "see it in plain text."
@@ -3433,550 +3402,325 @@ msgstr ""
 "Não foi possível gerar ajuda em texto formatado para este objeto.</br>Por "
 "favor veja em texto normal."
 
-#: spyderlib/utils/introspection/jedi_plugin.py:32
-#, fuzzy
-msgid "(Experimental) Editor's code completion, go-to-definition and help"
-msgstr "Completador de código e ajuda no Editor"
-
-#: spyderlib/utils/introspection/rope_plugin.py:37
+#: spyder/utils/introspection/manager.py:33
+#: spyder/utils/introspection/manager.py:38
 msgid "Editor's code completion, go-to-definition and help"
 msgstr "Completador de código e ajuda no Editor"
 
-#: spyderlib/utils/iofuncs.py:482
+#: spyder/utils/iofuncs.py:408
 msgid "Supported files"
 msgstr "Arquivos suportados"
 
-#: spyderlib/utils/iofuncs.py:484
+#: spyder/utils/iofuncs.py:410
 msgid "All files (*.*)"
 msgstr "Todos os arquivos (*.*)"
 
-#: spyderlib/utils/iofuncs.py:494
+#: spyder/utils/iofuncs.py:420
 msgid "Spyder data files"
 msgstr "Arquivos data do Spyder"
 
-#: spyderlib/utils/iofuncs.py:496 spyderlib/widgets/dicteditor.py:1056
+#: spyder/utils/iofuncs.py:422
+#: spyder/widgets/variableexplorer/collectionseditor.py:1029
 msgid "NumPy arrays"
 msgstr "Matrizes do NumPy"
 
-#: spyderlib/utils/iofuncs.py:497
+#: spyder/utils/iofuncs.py:423
 msgid "NumPy zip arrays"
 msgstr "Matrizes comprimidas do NumPy"
 
-#: spyderlib/utils/iofuncs.py:498
+#: spyder/utils/iofuncs.py:424
 msgid "Matlab files"
 msgstr "Arquivos do Matlab"
 
-#: spyderlib/utils/iofuncs.py:499
+#: spyder/utils/iofuncs.py:425
 msgid "CSV text files"
 msgstr "Arquivos de texto CSV"
 
-#: spyderlib/utils/iofuncs.py:501
+#: spyder/utils/iofuncs.py:427
 msgid "JPEG images"
 msgstr "Imagens JPEG"
 
-#: spyderlib/utils/iofuncs.py:502
+#: spyder/utils/iofuncs.py:428
 msgid "PNG images"
 msgstr "Imagens PNG"
 
-#: spyderlib/utils/iofuncs.py:503
+#: spyder/utils/iofuncs.py:429
 msgid "GIF images"
 msgstr "Imagens GIF"
 
-#: spyderlib/utils/iofuncs.py:504
+#: spyder/utils/iofuncs.py:430
 msgid "TIFF images"
 msgstr "Imagens TIFF"
 
-#: spyderlib/utils/iofuncs.py:505 spyderlib/utils/iofuncs.py:506
+#: spyder/utils/iofuncs.py:431 spyder/utils/iofuncs.py:432
 msgid "Pickle files"
 msgstr "Arquivos Pickle"
 
-#: spyderlib/utils/iofuncs.py:507
+#: spyder/utils/iofuncs.py:433
 msgid "JSON files"
 msgstr "Arquivos JSON"
 
-#: spyderlib/utils/iofuncs.py:526 spyderlib/utils/iofuncs.py:533
+#: spyder/utils/iofuncs.py:452 spyder/utils/iofuncs.py:459
 msgid "<b>Unsupported file type '%s'</b>"
 msgstr "<b>Tipo de arquivo não suportado '%s'</b>"
 
-#: spyderlib/utils/programs.py:176
+#: spyder/utils/programs.py:286
 msgid "It was not possible to run this file in an external terminal"
-msgstr ""
-
-#: spyderlib/widgets/arraybuilder.py:162
-msgid ""
-"\n"
-"           <b>Numpy Array/Matrix Helper</b><br>\n"
-"           Type an array in Matlab    : <code>[1 2;3 4]</code><br>\n"
-"           or Spyder simplified syntax : <code>1 2;3 4</code>\n"
-"           <br><br>\n"
-"           Hit 'Enter' for array or 'Ctrl+Enter' for matrix.\n"
-"           <br><br>\n"
-"           <b>Hint:</b><br>\n"
-"           Use two spaces or two tabs to generate a ';'.\n"
-"           "
-msgstr ""
-
-#: spyderlib/widgets/arraybuilder.py:173
-msgid ""
-"\n"
-"           <b>Numpy Array/Matrix Helper</b><br>\n"
-"           Enter an array in the table. <br>\n"
-"           Use Tab to move between cells.\n"
-"           <br><br>\n"
-"           Hit 'Enter' for array or 'Ctrl+Enter' for matrix.\n"
-"           <br><br>\n"
-"           <b>Hint:</b><br>\n"
-"           Use two tabs at the end of a row to move to the next row.\n"
-"           "
-msgstr ""
-
-#: spyderlib/widgets/arraybuilder.py:337
-msgid "Array dimensions not valid"
-msgstr ""
-
-#: spyderlib/widgets/arrayeditor.py:453 spyderlib/widgets/arrayeditor.py:486
-#: spyderlib/widgets/dataframeeditor.py:508
-#: spyderlib/widgets/dataframeeditor.py:548
-msgid "Format"
-msgstr "Formato"
-
-#: spyderlib/widgets/arrayeditor.py:458
-#: spyderlib/widgets/dataframeeditor.py:512
-msgid "Resize"
-msgstr "Redimensionar"
+msgstr "Não foi possível executar este arquivo em um terminal externo"
 
-#: spyderlib/widgets/arrayeditor.py:487
-#: spyderlib/widgets/dataframeeditor.py:549
-msgid "Float formatting"
-msgstr "Formatação de ponto flutuante"
-
-#: spyderlib/widgets/arrayeditor.py:494
-#: spyderlib/widgets/dataframeeditor.py:557 spyderlib/widgets/explorer.py:587
-#: spyderlib/widgets/explorer.py:689
-#: spyderlib/widgets/externalshell/pythonshell.py:553
-#: spyderlib/widgets/externalshell/systemshell.py:99
-msgid "Error"
-msgstr "Error"
+#: spyder/utils/syntaxhighlighters.py:33
+msgid "Syntax highlighting for Matlab, Julia and other file types"
+msgstr "Sintaxe colorida para arquivos do tipo Matlab, Julia e outros tipos"
 
-#: spyderlib/widgets/arrayeditor.py:495
-#: spyderlib/widgets/dataframeeditor.py:558
-msgid "Format (%s) is incorrect"
-msgstr "O formato (%s) está incorreto"
+#: spyder/utils/syntaxhighlighters.py:42
+msgid "Background:"
+msgstr "Fundo:"
 
-#: spyderlib/widgets/arrayeditor.py:529
-msgid "Array is empty"
-msgstr "A matriz está vazia"
+#: spyder/utils/syntaxhighlighters.py:43
+#: spyder/widgets/sourcecode/codeeditor.py:106
+msgid "Current line:"
+msgstr "Linha atual:"
 
-#: spyderlib/widgets/arrayeditor.py:532
-msgid "Arrays with more than 3 dimensions are not supported"
-msgstr "Matrizes com mais de 3 dimensões não são suportadas"
+#: spyder/utils/syntaxhighlighters.py:44
+msgid "Current cell:"
+msgstr "Célula selecionada:"
 
-#: spyderlib/widgets/arrayeditor.py:535
-msgid "The 'xlabels' argument length do no match array column number"
-msgstr ""
-"O argumento de comprimento 'xlabels' não corresponde com o número de colunas "
-"da matriz"
+#: spyder/utils/syntaxhighlighters.py:45
+msgid "Occurrence:"
+msgstr "Ocorrência:"
 
-#: spyderlib/widgets/arrayeditor.py:539
-msgid "The 'ylabels' argument length do no match array row number"
-msgstr ""
-"O argumento de comprimento 'ylabels' não corresponde com o número de linhas "
-"da matriz"
+#: spyder/utils/syntaxhighlighters.py:46
+msgid "Link:"
+msgstr "Link:"
 
-#: spyderlib/widgets/arrayeditor.py:546
-msgid "%s arrays"
-msgstr "%s matrizes"
+#: spyder/utils/syntaxhighlighters.py:47
+msgid "Side areas:"
+msgstr "Áreas laterais:"
 
-#: spyderlib/widgets/arrayeditor.py:547
-msgid "%s are currently not supported"
-msgstr "%s não é suportado no momento"
+#: spyder/utils/syntaxhighlighters.py:48
+msgid "Matched <br>parens:"
+msgstr "Parênteses fechados:"
 
-#: spyderlib/widgets/arrayeditor.py:554
-#, fuzzy
-msgid "NumPy array"
-msgstr "Matrizes do NumPy"
+#: spyder/utils/syntaxhighlighters.py:49
+msgid "Unmatched <br>parens:"
+msgstr "Parênteses abertos:"
 
-#: spyderlib/widgets/arrayeditor.py:556 spyderlib/widgets/arrayeditor.py:710
-msgid "Array editor"
-msgstr "Editor de matrizes"
+#: spyder/utils/syntaxhighlighters.py:50
+msgid "Normal text:"
+msgstr "Texto normal:"
 
-#: spyderlib/widgets/arrayeditor.py:558
-msgid "read only"
-msgstr "somente leitura"
+#: spyder/utils/syntaxhighlighters.py:51
+msgid "Keyword:"
+msgstr "Palavra chave:"
 
-#: spyderlib/widgets/arrayeditor.py:588
-msgid "Record array fields:"
-msgstr "Campos de matrizes registradas:"
+#: spyder/utils/syntaxhighlighters.py:52
+msgid "Builtin:"
+msgstr "Objeto integrado:"
 
-#: spyderlib/widgets/arrayeditor.py:600
-msgid "Data"
-msgstr "Dados"
+#: spyder/utils/syntaxhighlighters.py:53
+msgid "Definition:"
+msgstr "Definição:"
 
-#: spyderlib/widgets/arrayeditor.py:600
-msgid "Mask"
-msgstr "Máscara"
+#: spyder/utils/syntaxhighlighters.py:54
+msgid "Comment:"
+msgstr "Comentário:"
 
-#: spyderlib/widgets/arrayeditor.py:600
-msgid "Masked data"
-msgstr "Dados mascarados"
+#: spyder/utils/syntaxhighlighters.py:55
+msgid "String:"
+msgstr "String:"
 
-#: spyderlib/widgets/arrayeditor.py:611
-msgid "Axis:"
-msgstr "Eixo:"
+#: spyder/utils/syntaxhighlighters.py:56
+msgid "Number:"
+msgstr "Número:"
 
-#: spyderlib/widgets/arrayeditor.py:616
-msgid "Index:"
-msgstr "Índice:"
+#: spyder/utils/syntaxhighlighters.py:57
+msgid "Instance:"
+msgstr "Instância:"
 
-#: spyderlib/widgets/arrayeditor.py:629
-msgid "<u>Warning</u>: changes are applied separately"
-msgstr "<u>Aviso</u>: mudanças são aplicadas de forma separada"
+#: spyder/widgets/arraybuilder.py:179
+msgid ""
+"\n"
+"           <b>Numpy Array/Matrix Helper</b><br>\n"
+"           Type an array in Matlab    : <code>[1 2;3 4]</code><br>\n"
+"           or Spyder simplified syntax : <code>1 2;3 4</code>\n"
+"           <br><br>\n"
+"           Hit 'Enter' for array or 'Ctrl+Enter' for matrix.\n"
+"           <br><br>\n"
+"           <b>Hint:</b><br>\n"
+"           Use two spaces or two tabs to generate a ';'.\n"
+"           "
+msgstr ""
+"\n"
+"           <b>Ajuda no Numpy Array/Matriz</b><br>\n"
+"           Definir uma matriz no Matlab    : <code>[1 2;3 4]</code><br>\n"
+"           ou na sintaxe simplificada do Spyder : <code>1 2;3 4</code>\n"
+"           <br><br>\n"
+"           Aperte 'Enter' para array ou 'Ctrl+Enter' para matriz.\n"
+"           <br><br>\n"
+"           <b>Dica:</b><br>\n"
+"           Use dois espaços ou dois tabs para gerar um ';'.\n"
+"           "
 
-#: spyderlib/widgets/arrayeditor.py:630
+#: spyder/widgets/arraybuilder.py:190
 msgid ""
-"For performance reasons, changes applied to masked array won't be reflected "
-"in array's data (and vice-versa)."
+"\n"
+"           <b>Numpy Array/Matrix Helper</b><br>\n"
+"           Enter an array in the table. <br>\n"
+"           Use Tab to move between cells.\n"
+"           <br><br>\n"
+"           Hit 'Enter' for array or 'Ctrl+Enter' for matrix.\n"
+"           <br><br>\n"
+"           <b>Hint:</b><br>\n"
+"           Use two tabs at the end of a row to move to the next row.\n"
+"           "
 msgstr ""
-"Por motivos de desempenho, as mudanças\n"
-"aplicadas a matrizes mascaradas não serão\n"
-"refletidas nos dados da matriz\n"
-"(e vice-versa)."
+"\n"
+"           <b>Ajuda no Numpy Array/Matriz</b><br>\n"
+"           Digite um array na tabela. <br>\n"
+"           Use Tab para se mover entre as células.\n"
+"           <br><br>\n"
+"           Aperte 'Enter' para array ou 'Ctrl+Enter' para matriz.\n"
+"           <br><br>\n"
+"           <b>Dica:</b><br>\n"
+"           Use dois Tabs no fim de uma coluna para se mover até a próxima "
+"coluna.\n"
+"          "
+
+#: spyder/widgets/arraybuilder.py:365
+msgid "Array dimensions not valid"
+msgstr "Dimensões da matriz não é válida"
 
-#: spyderlib/widgets/browser.py:31
-#: spyderlib/widgets/sourcecode/codeeditor.py:2468
+#: spyder/widgets/browser.py:54 spyder/widgets/sourcecode/codeeditor.py:2518
 msgid "Zoom out"
 msgstr "Menos zoom"
 
-#: spyderlib/widgets/browser.py:34
-#: spyderlib/widgets/sourcecode/codeeditor.py:2465
+#: spyder/widgets/browser.py:57 spyder/widgets/sourcecode/codeeditor.py:2514
 msgid "Zoom in"
 msgstr "Mais zoom"
 
-#: spyderlib/widgets/browser.py:131
+#: spyder/widgets/browser.py:162
 msgid "Home"
 msgstr "Página inicial"
 
-#: spyderlib/widgets/browser.py:166
+#: spyder/widgets/browser.py:198
 msgid "Find text"
 msgstr "Buscar texto"
 
-#: spyderlib/widgets/browser.py:184
+#: spyder/widgets/browser.py:216
 msgid "Address:"
 msgstr "Endereço:"
 
-#: spyderlib/widgets/browser.py:220
+#: spyder/widgets/browser.py:252
 msgid "Unable to load page"
 msgstr "Não foi possível carregar a página"
 
-#: spyderlib/widgets/comboboxes.py:118
+#: spyder/widgets/comboboxes.py:165
 msgid "Press enter to validate this entry"
 msgstr "Aperte enter para validar esta entrada"
 
-#: spyderlib/widgets/comboboxes.py:119
+#: spyder/widgets/comboboxes.py:166
 msgid "This entry is incorrect"
 msgstr "Esta entrada é incorreta"
 
-#: spyderlib/widgets/comboboxes.py:174
+#: spyder/widgets/comboboxes.py:209
 msgid "Press enter to validate this path"
 msgstr "Aperte enter para validar esse caminho"
 
-#: spyderlib/widgets/comboboxes.py:175
-msgid ""
-"This path is incorrect.\n"
-"Enter a correct directory path,\n"
-"then press enter to validate"
-msgstr ""
-"Este caminho está incorreto.\n"
-"Digite um caminho correto,\n"
-"depois aperte enter para validar"
-
-#: spyderlib/widgets/dataframeeditor.py:423
-msgid "To bool"
-msgstr "Para booleano"
-
-#: spyderlib/widgets/dataframeeditor.py:423
-msgid "To complex"
-msgstr "Para complexo"
-
-#: spyderlib/widgets/dataframeeditor.py:424
-msgid "To float"
-msgstr "Para flutuante"
-
-#: spyderlib/widgets/dataframeeditor.py:424
-msgid "To int"
-msgstr "Para inteiro"
-
-#: spyderlib/widgets/dataframeeditor.py:425
-msgid "To str"
-msgstr "Para string"
-
-#: spyderlib/widgets/dataframeeditor.py:490
-msgid "%s editor"
-msgstr "Editor de %s"
-
-#: spyderlib/widgets/dataframeeditor.py:522
-msgid "Column min/max"
-msgstr "Min/max de coluna"
-
-#: spyderlib/widgets/dependencies.py:59
+#: spyder/widgets/dependencies.py:63
 msgid " Required "
 msgstr "Requerido"
 
-#: spyderlib/widgets/dependencies.py:59
+#: spyder/widgets/dependencies.py:63
 msgid "Module"
 msgstr "Módulo "
 
-#: spyderlib/widgets/dependencies.py:60
+#: spyder/widgets/dependencies.py:64
 msgid " Installed "
 msgstr "Instalado"
 
-#: spyderlib/widgets/dependencies.py:60
+#: spyder/widgets/dependencies.py:64
 msgid "Provided features"
 msgstr "Características proporcionadas"
 
-#: spyderlib/widgets/dependencies.py:130
-msgid "Optional Dependencies"
-msgstr "Dependências Opcionais"
+#: spyder/widgets/dependencies.py:134
+msgid "Dependencies"
+msgstr "Dependências"
 
-#: spyderlib/widgets/dependencies.py:137
+#: spyder/widgets/dependencies.py:141
 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 ""
-"O Spyder depende de vários módulos do Python para oferecer funcionalidade "
-"adicional para seus componentes. A tabela que apareçe abaixo mostra as "
-"versões requeridas e instaladas (se existir) de todos eles.<br><br>Embora o "
-"Spyder possa funcionar sem nenhum destes módulos, é recomendado ao menos "
-"instalar <b>%s</b> e <b>%s</b> para ter uma melhor experiência."
-
-#: spyderlib/widgets/dependencies.py:152
+"Spyder depends on several Python modules to provide the right functionality "
+"for all its panes. The table below shows the required and installed versions "
+"(if any) of all of them.<br><br><b>Note</b>: You can safely use Spyder "
+"without the following modules installed: <b>%s</b> and <b>%s</b>"
+msgstr ""
+"O Spyder depende de vários módulos do Python para fornecer suas "
+"funcionalidades corretamente em todos os painéis. A tabela abaixo mostra as "
+"versões requeridas e instaladas (se houver) de todos eles.<br><br><b>Nota</"
+"b>: Você pode usar o Spyder normalmente sem os seguintes módulos instalados: "
+"<b>%s</b>e <b>%s</b>"
+
+#: spyder/widgets/dependencies.py:154
 msgid "Copy to clipboard"
 msgstr "Copiar para área transferência "
 
-#: spyderlib/widgets/dicteditor.py:156
-msgid "Index"
-msgstr "Índice"
-
-#: spyderlib/widgets/dicteditor.py:161
-msgid "Tuple"
-msgstr "Tupla"
-
-#: spyderlib/widgets/dicteditor.py:164
-msgid "List"
-msgstr "Lista"
-
-#: spyderlib/widgets/dicteditor.py:167
-msgid "Dictionary"
-msgstr "Dicionário "
-
-#: spyderlib/widgets/dicteditor.py:169
-msgid "Key"
-msgstr "Chave"
-
-#: spyderlib/widgets/dicteditor.py:175
-msgid "Attribute"
-msgstr "Atributo"
-
-#: spyderlib/widgets/dicteditor.py:177
-msgid "elements"
-msgstr "elementos"
-
-#: spyderlib/widgets/dicteditor.py:356
-msgid "Size"
-msgstr "Tamanho"
-
-#: spyderlib/widgets/dicteditor.py:356
-msgid "Type"
-msgstr "Tipo"
-
-#: spyderlib/widgets/dicteditor.py:356
-msgid "Value"
-msgstr "Valor"
-
-#: spyderlib/widgets/dicteditor.py:453
-#, fuzzy
-msgid ""
-"Opening this variable can be slow\n"
-"\n"
-"Do you want to continue anyway?"
-msgstr ""
-"Abrir e inspecionar esse %s pode ser lento\n"
-"\n"
-"Deseja continuar mesmo assim?"
-
-#: spyderlib/widgets/dicteditor.py:461 spyderlib/widgets/dicteditor.py:612
-msgid "Edit item"
-msgstr "Editar item"
-
-#: spyderlib/widgets/dicteditor.py:462
-msgid "<b>Unable to retrieve data.</b><br><br>Error message:<br>%s"
-msgstr "<b>Não foi possível obter os dados.</b><br><br>Mensagem de erro:<br>%s"
-
-#: spyderlib/widgets/dicteditor.py:613
-msgid "<b>Unable to assign data to item.</b><br><br>Error message:<br>%s"
-msgstr ""
-"<b>Não foi possível atribuir dados ao item.</b><br><br>Mensagem de erro:<br>"
-"%s"
-
-#: spyderlib/widgets/dicteditor.py:675
-msgid "Resize rows to contents"
-msgstr "Redimensionar linhas para o conteúdo "
-
-#: spyderlib/widgets/dicteditor.py:683 spyderlib/widgets/explorer.py:242
-msgid "Edit"
-msgstr "Editar"
-
-#: spyderlib/widgets/dicteditor.py:686 spyderlib/widgets/dicteditor.py:1025
-#: spyderlib/widgets/dicteditor.py:1042
-msgid "Plot"
-msgstr "Gráfico"
-
-#: spyderlib/widgets/dicteditor.py:690
-msgid "Histogram"
-msgstr "Histograma"
-
-#: spyderlib/widgets/dicteditor.py:694
-msgid "Show image"
-msgstr "Mostrar imagem"
-
-#: spyderlib/widgets/dicteditor.py:698 spyderlib/widgets/dicteditor.py:1050
-msgid "Save array"
-msgstr "Salvar matriz"
-
-#: spyderlib/widgets/dicteditor.py:702 spyderlib/widgets/dicteditor.py:989
-#: spyderlib/widgets/dicteditor.py:997
-msgid "Insert"
-msgstr "Inserir"
-
-#: spyderlib/widgets/dicteditor.py:705 spyderlib/widgets/dicteditor.py:939
-msgid "Remove"
-msgstr "Remover"
-
-#: spyderlib/widgets/dicteditor.py:716 spyderlib/widgets/dicteditor.py:956
-#: spyderlib/widgets/explorer.py:532 spyderlib/widgets/explorer.py:540
-#: spyderlib/widgets/explorer.py:551
-msgid "Rename"
-msgstr "Renomear"
-
-#: spyderlib/widgets/dicteditor.py:719
-msgid "Duplicate"
-msgstr "Duplicar"
-
-#: spyderlib/widgets/dicteditor.py:937
-msgid "Do you want to remove selected item?"
-msgstr "Você deseja remover o item selecionado?"
-
-#: spyderlib/widgets/dicteditor.py:938
-msgid "Do you want to remove all selected items?"
-msgstr "Você deseja remover todos os itens selecionados?"
-
-#: spyderlib/widgets/dicteditor.py:956 spyderlib/widgets/dicteditor.py:989
-msgid "Key:"
-msgstr "Chave:"
-
-#: spyderlib/widgets/dicteditor.py:997
-msgid "Value:"
-msgstr "Valor:"
-
-#: spyderlib/widgets/dicteditor.py:1013
-msgid "Import error"
-msgstr "Erro de importação"
-
-#: spyderlib/widgets/dicteditor.py:1014
-msgid "Please install <b>matplotlib</b> or <b>guiqwt</b>."
-msgstr "Por favor instale <b>matplotlib</b> ou <b>guiqwt</b>."
-
-#: spyderlib/widgets/dicteditor.py:1026
-msgid "<b>Unable to plot data.</b><br><br>Error message:<br>%s"
-msgstr ""
-"<b>Não foi possível mostrar os dados.</b><br><br>Mensagem de erro:<br>%s"
-
-#: spyderlib/widgets/dicteditor.py:1043
-msgid "<b>Unable to show image.</b><br><br>Error message:<br>%s"
-msgstr ""
-"<b>Não foi possível mostrar o gráfico.</b><br><br>Mensagem de erro:<br>%s"
-
-#: spyderlib/widgets/dicteditor.py:1066
-msgid "<b>Unable to save array</b><br><br>Error message:<br>%s"
-msgstr "<b>Não foi possível salvar matriz</b><br><br>Mensagem de erro:<br>%s"
-
-#: spyderlib/widgets/dicteditor.py:1085
-msgid "Clipboard contents"
-msgstr "Conteúdo da área de transferência "
-
-#: spyderlib/widgets/dicteditor.py:1100
-msgid "Import from clipboard"
-msgstr "Importar da área de transferência "
-
-#: spyderlib/widgets/dicteditor.py:1102
-msgid "Empty clipboard"
-msgstr "Área de transferência vazia"
-
-#: spyderlib/widgets/dicteditor.py:1103
-msgid "Nothing to be imported from clipboard."
-msgstr "Não há nada para ser importado da área de transferência."
-
-#: spyderlib/widgets/dicteditorutils.py:60
-msgid "View and edit DataFrames and Series in the Variable Explorer"
-msgstr "Ver e editar DataFrames e Series no Explorador de Variáveis"
-
-#: spyderlib/widgets/editor.py:342
+#: spyder/widgets/editor.py:348
 msgid "Copy path to clipboard"
 msgstr "Copiar caminho para área de transferência"
 
-#: spyderlib/widgets/editor.py:906
+#: spyder/widgets/editor.py:352
+msgid "Close all to the right"
+msgstr "Fechar todos à direita"
+
+#: spyder/widgets/editor.py:354
+msgid "Close all but this"
+msgstr "Fechar todos, menos este"
+
+#: spyder/widgets/editor.py:957
 msgid "Temporary file"
 msgstr "Arquivo temporário "
 
-#: spyderlib/widgets/editor.py:1003
+#: spyder/widgets/editor.py:1052
 msgid "New window"
 msgstr "Nova janela"
 
-#: spyderlib/widgets/editor.py:1004
+#: spyder/widgets/editor.py:1053
 msgid "Create a new editor window"
 msgstr "Criar uma nova janela de edição"
 
-#: spyderlib/widgets/editor.py:1007
+#: spyder/widgets/editor.py:1056
 msgid "Split vertically"
 msgstr "Dividir verticalmente"
 
-#: spyderlib/widgets/editor.py:1009
+#: spyder/widgets/editor.py:1058
 msgid "Split vertically this editor window"
 msgstr "Dividir verticalmente esta janela de edição"
 
-#: spyderlib/widgets/editor.py:1011
+#: spyder/widgets/editor.py:1060
 msgid "Split horizontally"
 msgstr "Dividir horizontalmente"
 
-#: spyderlib/widgets/editor.py:1013
+#: spyder/widgets/editor.py:1062
 msgid "Split horizontally this editor window"
 msgstr "Dividir horizontalmente esta janela de edição"
 
-#: spyderlib/widgets/editor.py:1015
+#: spyder/widgets/editor.py:1064
 msgid "Close this panel"
 msgstr "Fechar este painel"
 
-#: spyderlib/widgets/editor.py:1153
+#: spyder/widgets/editor.py:1221
 msgid "<b>%s</b> has been modified.<br>Do you want to save changes?"
 msgstr "<b>%s</b> foi modificado.<br>Deseja salvar as mudanças?"
 
-#: spyderlib/widgets/editor.py:1215
+#: spyder/widgets/editor.py:1283
 msgid "Save"
 msgstr "Salvar"
 
-#: spyderlib/widgets/editor.py:1216
+#: spyder/widgets/editor.py:1284
 msgid "<b>Unable to save script '%s'</b><br><br>Error message:<br>%s"
 msgstr ""
 "<b>Não foi possível salvar o script '%s'</b><br><br>Mensagem de erro:<br>%s"
 
-#: spyderlib/widgets/editor.py:1238
-msgid "Save Python script"
-msgstr "Salvar script Python"
-
-#: spyderlib/widgets/editor.py:1452
+#: spyder/widgets/editor.py:1518
 msgid ""
 "<b>%s</b> is unavailable (this file may have been removed, moved or renamed "
 "outside Spyder).<br>Do you want to close it?"
@@ -3984,7 +3728,7 @@ msgstr ""
 "<b>%s</b> está indisponível (o arquivo pode ter sido removido, movido ou "
 "renomeado fora do Spyder).<br>Deseja fechar?"
 
-#: spyderlib/widgets/editor.py:1472
+#: spyder/widgets/editor.py:1538
 msgid ""
 "<b>%s</b> has been modified outside Spyder.<br>Do you want to reload it and "
 "lose all your changes?"
@@ -3992,7 +3736,7 @@ msgstr ""
 "<b>%s</b> foi modificado fora do Spyder.<br>Você deseja recarregar ele e "
 "perder todas as modificações?"
 
-#: spyderlib/widgets/editor.py:1568
+#: spyder/widgets/editor.py:1634
 msgid ""
 "All changes to <b>%s</b> will be lost.<br>Do you want to revert file from "
 "disk?"
@@ -4000,11 +3744,11 @@ msgstr ""
 "Todas as modificações do <b>%s</b> foram perdidas.<br>Você deseja reverter o "
 "arquivo do disco?"
 
-#: spyderlib/widgets/editor.py:1708
+#: spyder/widgets/editor.py:1774
 msgid "Loading %s..."
 msgstr "Carregando %s..."
 
-#: spyderlib/widgets/editor.py:1718
+#: spyder/widgets/editor.py:1784
 msgid ""
 "<b>%s</b> contains mixed end-of-line characters.<br>Spyder will fix this "
 "automatically."
@@ -4012,165 +3756,171 @@ msgstr ""
 "<b>%s</b> contém vários tipos de caracteres de fim de linha.<br>O Spyder irá "
 "corrigir automaticamente."
 
-#: spyderlib/widgets/editor.py:2083
+#: spyder/widgets/editor.py:2166
 msgid "Close window"
 msgstr "Fechar janela"
 
-#: spyderlib/widgets/editor.py:2085
+#: spyder/widgets/editor.py:2168
 msgid "Close this window"
 msgstr "Fechar esta janela"
 
-#: spyderlib/widgets/editortools.py:94 spyderlib/widgets/editortools.py:130
+#: spyder/widgets/editortools.py:94 spyder/widgets/editortools.py:130
 msgid "Line %s"
 msgstr "Linha %s"
 
-#: spyderlib/widgets/editortools.py:99
+#: spyder/widgets/editortools.py:99
 msgid "Class defined at line %s"
 msgstr "Classe definida na linha %s"
 
-#: spyderlib/widgets/editortools.py:107
+#: spyder/widgets/editortools.py:107
 msgid "Method defined at line %s"
 msgstr "Método definido na linha %s"
 
-#: spyderlib/widgets/editortools.py:117
+#: spyder/widgets/editortools.py:117
 msgid "Function defined at line %s"
 msgstr "Função definida na linha %s"
 
-#: spyderlib/widgets/editortools.py:149
+#: spyder/widgets/editortools.py:149
 msgid "Cell starts at line %s"
 msgstr "A célula inicia na linha %s"
 
-#: spyderlib/widgets/editortools.py:202 spyderlib/widgets/editortools.py:539
+#: spyder/widgets/editortools.py:202 spyder/widgets/editortools.py:539
 msgid "Go to cursor position"
 msgstr "Ir para a posição do cursor "
 
-#: spyderlib/widgets/editortools.py:205
+#: spyder/widgets/editortools.py:205
 msgid "Show absolute path"
 msgstr "Mostrar o caminho completo"
 
-#: spyderlib/widgets/editortools.py:208 spyderlib/widgets/explorer.py:179
+#: spyder/widgets/editortools.py:208 spyder/widgets/explorer.py:208
 msgid "Show all files"
 msgstr "Mostrar todos os arquivos"
 
-#: spyderlib/widgets/editortools.py:211
+#: spyder/widgets/editortools.py:211
 msgid "Show special comments"
 msgstr "Mostrar comentários especiais"
 
-#: spyderlib/widgets/explorer.py:175
+#: spyder/widgets/explorer.py:204
 msgid "Edit filename filters..."
 msgstr "Editar filtros para nomes de arquivos..."
 
-#: spyderlib/widgets/explorer.py:189
+#: spyder/widgets/explorer.py:218
 msgid "Edit filename filters"
 msgstr "Editar filtros para nomes de arquivos"
 
-#: spyderlib/widgets/explorer.py:190
+#: spyder/widgets/explorer.py:219
 msgid "Name filters:"
 msgstr "Nome dos filtros:"
 
-#: spyderlib/widgets/explorer.py:209
+#: spyder/widgets/explorer.py:238
 msgid "File..."
 msgstr "Arquivo..."
 
-#: spyderlib/widgets/explorer.py:213
+#: spyder/widgets/explorer.py:242
 msgid "Module..."
 msgstr "Módulo..."
 
-#: spyderlib/widgets/explorer.py:217
+#: spyder/widgets/explorer.py:246
 msgid "Folder..."
 msgstr "Pasta..."
 
-#: spyderlib/widgets/explorer.py:221
+#: spyder/widgets/explorer.py:250
 msgid "Package..."
 msgstr "Pacote..."
 
-#: spyderlib/widgets/explorer.py:244
+#: spyder/widgets/explorer.py:271
+#: spyder/widgets/variableexplorer/collectionseditor.py:650
+msgid "Edit"
+msgstr "Editar"
+
+#: spyder/widgets/explorer.py:273
 msgid "Move..."
 msgstr "Mover..."
 
-#: spyderlib/widgets/explorer.py:247
+#: spyder/widgets/explorer.py:276
 msgid "Delete..."
 msgstr "Deletar..."
 
-#: spyderlib/widgets/explorer.py:250
+#: spyder/widgets/explorer.py:279
 msgid "Rename..."
 msgstr "Renomear..."
 
-#: spyderlib/widgets/explorer.py:253
+#: spyder/widgets/explorer.py:282
 msgid "Open"
 msgstr "Abrir"
 
-#: spyderlib/widgets/explorer.py:254
-#: spyderlib/widgets/sourcecode/codeeditor.py:2456
+#: spyder/widgets/explorer.py:283 spyder/widgets/sourcecode/codeeditor.py:2490
 msgid "Convert to Python script"
 msgstr "Converter para um script Python"
 
-#: spyderlib/widgets/explorer.py:277
+#: spyder/widgets/explorer.py:317
 msgid "Commit"
 msgstr "Enviar"
 
-#: spyderlib/widgets/explorer.py:281
+#: spyder/widgets/explorer.py:320
 msgid "Browse repository"
 msgstr "Explorar repositório "
 
-#: spyderlib/widgets/explorer.py:293
+#: spyder/widgets/explorer.py:331
 msgid "Open command prompt here"
 msgstr "Abrir prompt de comando aqui"
 
-#: spyderlib/widgets/explorer.py:295
+#: spyder/widgets/explorer.py:333
 msgid "Open terminal here"
 msgstr "Abrir terminal aqui"
 
-#: spyderlib/widgets/explorer.py:300
+#: spyder/widgets/explorer.py:338
 msgid "Open Python console here"
 msgstr "Abrir console Python aqui"
 
-#: spyderlib/widgets/explorer.py:314
+#: spyder/widgets/explorer.py:352
 msgid "New"
 msgstr "Novo"
 
-#: spyderlib/widgets/explorer.py:322
+#: spyder/widgets/explorer.py:360
 msgid "Import"
 msgstr "Importar"
 
-#: spyderlib/widgets/explorer.py:471
+#: spyder/widgets/explorer.py:511
 msgid "Do you really want to delete <b>%s</b>?"
 msgstr "Deseja mesmo deletar <b>%s</b>?"
 
-#: spyderlib/widgets/explorer.py:489
+#: spyder/widgets/explorer.py:529
 msgid "delete"
 msgstr "deletar"
 
-#: spyderlib/widgets/explorer.py:490 spyderlib/widgets/projectexplorer.py:823
-#: spyderlib/widgets/projectexplorer.py:830
-#: spyderlib/widgets/projectexplorer.py:1101
-#: spyderlib/widgets/projectexplorer.py:1186
+#: spyder/widgets/explorer.py:530 spyder/widgets/projects/explorer.py:147
 msgid "Project Explorer"
 msgstr "Explorador de projetos"
 
-#: spyderlib/widgets/explorer.py:491 spyderlib/widgets/projectexplorer.py:770
-#: spyderlib/widgets/projectexplorer.py:1187
+#: spyder/widgets/explorer.py:531 spyder/widgets/projects/explorer.py:148
 msgid "<b>Unable to %s <i>%s</i></b><br><br>Error message:<br>%s"
 msgstr "<b>Não foi possível %s <i>%s</i></b><br><br>Mensagem de erro:<br>%s"
 
-#: spyderlib/widgets/explorer.py:514
-#: spyderlib/widgets/sourcecode/codeeditor.py:1987
-#, fuzzy
+#: spyder/widgets/explorer.py:554 spyder/widgets/sourcecode/codeeditor.py:2007
 msgid "Conversion error"
-msgstr "Erro de conexão"
+msgstr "Erro de conversão"
 
-#: spyderlib/widgets/explorer.py:515
-#: spyderlib/widgets/sourcecode/codeeditor.py:1988
+#: spyder/widgets/explorer.py:555 spyder/widgets/sourcecode/codeeditor.py:2008
 msgid ""
 "It was not possible to convert this notebook. The error is:\n"
 "\n"
 msgstr ""
+"Não foi possível converter esse notebook. O erro é:\n"
+"\n"
+
+#: spyder/widgets/explorer.py:572 spyder/widgets/explorer.py:580
+#: spyder/widgets/explorer.py:591
+#: spyder/widgets/variableexplorer/collectionseditor.py:683
+#: spyder/widgets/variableexplorer/collectionseditor.py:924
+msgid "Rename"
+msgstr "Renomear"
 
-#: spyderlib/widgets/explorer.py:533
+#: spyder/widgets/explorer.py:573
 msgid "New name:"
 msgstr "Novo nome:"
 
-#: spyderlib/widgets/explorer.py:541
+#: spyder/widgets/explorer.py:581
 msgid ""
 "Do you really want to rename <b>%s</b> and overwrite the existing file <b>"
 "%s</b>?"
@@ -4178,189 +3928,117 @@ msgstr ""
 "Você deseja mesmo renomear <b>%s</b> e sobrescrever o arquivo já existente "
 "<b>%s</b>? "
 
-#: spyderlib/widgets/explorer.py:552
+#: spyder/widgets/explorer.py:592
 msgid "<b>Unable to rename file <i>%s</i></b><br><br>Error message:<br>%s"
 msgstr ""
 "<b>Não foi possível renomear arquivo <i>%s</i></b><br><br>Mensagem de erro:"
 "<br>%s"
 
-#: spyderlib/widgets/explorer.py:588
+#: spyder/widgets/explorer.py:628
 msgid "<b>Unable to move <i>%s</i></b><br><br>Error message:<br>%s"
 msgstr "<b>Não foi possível mover <i>%s</i></b><br><br>Mensagem de erro:<br>%s"
 
-#: spyderlib/widgets/explorer.py:606
+#: spyder/widgets/explorer.py:646
 msgid "<b>Unable to create folder <i>%s</i></b><br><br>Error message:<br>%s"
 msgstr ""
 "<b>Não foi possível criar pasta <i>%s</i></b><br><br>Mensagem de erro:<br>%s"
 
-#: spyderlib/widgets/explorer.py:619 spyderlib/widgets/explorer.py:653
+#: spyder/widgets/explorer.py:659 spyder/widgets/explorer.py:693
 msgid "<b>Unable to create file <i>%s</i></b><br><br>Error message:<br>%s"
 msgstr ""
 "<b>Não foi possível criar arquivo <i>%s</i></b><br><br>Mensagem de erro:<br>"
 "%s"
 
-#: spyderlib/widgets/explorer.py:627
+#: spyder/widgets/explorer.py:667
 msgid "New folder"
 msgstr "Nova pasta"
 
-#: spyderlib/widgets/explorer.py:628
+#: spyder/widgets/explorer.py:668
 msgid "Folder name:"
 msgstr "Nome da pasta:"
 
-#: spyderlib/widgets/explorer.py:633
+#: spyder/widgets/explorer.py:673
 msgid "New package"
 msgstr "Novo pacote"
 
-#: spyderlib/widgets/explorer.py:634
+#: spyder/widgets/explorer.py:674
 msgid "Package name:"
 msgstr "Nome do pacote:"
 
-#: spyderlib/widgets/explorer.py:674
+#: spyder/widgets/explorer.py:714
 msgid "New module"
 msgstr "Novo módulo "
 
-#: spyderlib/widgets/explorer.py:686
+#: spyder/widgets/explorer.py:729
 msgid ""
 "For %s support, please install one of the<br/> following tools:<br/><br/>  %s"
 msgstr ""
 "Para ter suporte ao %s, por favor instale as<br/> seguintes ferramentas:<br/"
 "><br/>  %s"
 
-#: spyderlib/widgets/explorer.py:690
+#: spyder/widgets/explorer.py:733
 msgid "<b>Unable to find external program.</b><br><br>%s"
 msgstr "<b>Não foi possível encontrar o programa externo.</b><br><br>%s"
 
-#: spyderlib/widgets/explorer.py:893
+#: spyder/widgets/explorer.py:948
 msgid "Show current directory only"
 msgstr "Mostrar somente o diretório atual"
 
-#: spyderlib/widgets/explorer.py:989
+#: spyder/widgets/explorer.py:1046
 msgid "You don't have the right permissions to open this directory"
-msgstr ""
+msgstr "Você não tem permissão para abrir esse diretório"
 
-#: spyderlib/widgets/explorer.py:1018 spyderlib/widgets/importwizard.py:525
+#: spyder/widgets/explorer.py:1076
+#: spyder/widgets/variableexplorer/importwizard.py:525
 msgid "Previous"
 msgstr "Anterior"
 
-#: spyderlib/widgets/explorer.py:1024
+#: spyder/widgets/explorer.py:1082
 msgid "Parent"
 msgstr "Superior"
 
-#: spyderlib/widgets/externalshell/baseshell.py:142
+#: spyder/widgets/externalshell/baseshell.py:129
 msgid "Run again this program"
 msgstr "Executar novamente este programa"
 
-#: spyderlib/widgets/externalshell/baseshell.py:145
+#: spyder/widgets/externalshell/baseshell.py:132
 msgid "Kill"
 msgstr "Matar"
 
-#: spyderlib/widgets/externalshell/baseshell.py:147
+#: spyder/widgets/externalshell/baseshell.py:134
 msgid "Kills the current process, causing it to exit immediately"
 msgstr "Matar o processo atual, fazendo ele fechar imediatamente"
 
-#: spyderlib/widgets/externalshell/baseshell.py:219
+#: spyder/widgets/externalshell/baseshell.py:206
 msgid "<span style='color: #44AA44'><b>Running...</b></span>"
 msgstr "<span style='color: #44AA44'><b>Executando...</b></span>"
 
-#: spyderlib/widgets/externalshell/baseshell.py:226
+#: spyder/widgets/externalshell/baseshell.py:213
 msgid "Terminated."
 msgstr "Finalizado."
 
-#: spyderlib/widgets/externalshell/baseshell.py:251
-#: spyderlib/widgets/ipython.py:351 spyderlib/widgets/ipython.py:368
-#: spyderlib/widgets/mixins.py:656
-msgid "Arguments"
-msgstr "Argumentos"
-
-#: spyderlib/widgets/externalshell/baseshell.py:252
-msgid "Command line arguments:"
-msgstr "Argumentos da linha de comando:"
-
-#: spyderlib/widgets/externalshell/namespacebrowser.py:191
-msgid "Refresh"
-msgstr "Atualizar"
-
-#: spyderlib/widgets/externalshell/namespacebrowser.py:195
-msgid "Refresh periodically"
-msgstr "Atualizar periodicamente"
-
-#: spyderlib/widgets/externalshell/namespacebrowser.py:199
-#: spyderlib/widgets/externalshell/namespacebrowser.py:453
-msgid "Import data"
-msgstr "Importar data"
-
-#: spyderlib/widgets/externalshell/namespacebrowser.py:202
-#: spyderlib/widgets/externalshell/namespacebrowser.py:541
-#: spyderlib/widgets/externalshell/namespacebrowser.py:562
-msgid "Save data"
-msgstr "Salvar data"
-
-#: spyderlib/widgets/externalshell/namespacebrowser.py:207
-msgid "Save data as..."
-msgstr "Salvar data como..."
-
-#: spyderlib/widgets/externalshell/namespacebrowser.py:215
-msgid "Exclude references which name starts with an underscore"
-msgstr "Excluir variáveis cujo nomes comecem com sublinhado"
-
-#: spyderlib/widgets/externalshell/namespacebrowser.py:223
-msgid "Exclude references which name is uppercase"
-msgstr ""
-"Excluir variáveis cujo nome esteja\n"
-"completamente em maiúsculas"
-
-#: spyderlib/widgets/externalshell/namespacebrowser.py:230
-msgid "Exclude references which name starts with an uppercase character"
-msgstr "Excluir variáveis cujo nome comece com maiúsculas. "
-
-#: spyderlib/widgets/externalshell/namespacebrowser.py:238
-msgid ""
-"Exclude references to unsupported data types (i.e. which won't be handled/"
-"saved correctly)"
-msgstr ""
-"Excluir variáveis que guardam tipos de dados não suportados\n"
-"(aqueles que não podem ser manipulados e armazenados\n"
-" corretamente)"
-
-#: spyderlib/widgets/externalshell/namespacebrowser.py:347
-msgid "Object <b>%s</b> is not picklable"
-msgstr "O objeto <b>%s</b> não é picklable"
-
-#: spyderlib/widgets/externalshell/namespacebrowser.py:473
-msgid ""
-"<b>Unsupported file extension '%s'</b><br><br>Would you like to import it "
-"anyway (by selecting a known file format)?"
-msgstr ""
-"<b>Tipo de arquivo não suportado '%s'</b><br><br>Deseja importar mesmo assim "
-"(selecionando um formato conhecido)?"
-
-#: spyderlib/widgets/externalshell/namespacebrowser.py:481
-msgid "Open file as:"
-msgstr "Abrir arquivo como:"
-
-#: spyderlib/widgets/externalshell/namespacebrowser.py:529
-msgid "<b>Unable to load '%s'</b><br><br>Error message:<br>%s"
-msgstr "<b>Não foi possível carregar '%s'</b><br><br>Mensagem de erro:<br>%s"
+#: spyder/widgets/externalshell/baseshell.py:238
+#: spyder/widgets/ipythonconsole/help.py:125 spyder/widgets/mixins.py:661
+msgid "Arguments"
+msgstr "Argumentos"
 
-#: spyderlib/widgets/externalshell/namespacebrowser.py:563
-msgid "<b>Unable to save current workspace</b><br><br>Error message:<br>%s"
-msgstr ""
-"<b>Não foi possível salvar o espaço de trabalho atual</b><br><br>Mensagem de "
-"erro:<br>%s"
+#: spyder/widgets/externalshell/baseshell.py:239
+msgid "Command line arguments:"
+msgstr "Argumentos da linha de comando:"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:284
+#: spyder/widgets/externalshell/pythonshell.py:277
 msgid "Variables"
 msgstr "Variáveis"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:285
+#: spyder/widgets/externalshell/pythonshell.py:278
 msgid "Show/hide global variables explorer"
 msgstr "Mostrar/esconder o explorador de variáveis "
 
-#: spyderlib/widgets/externalshell/pythonshell.py:289
+#: spyder/widgets/externalshell/pythonshell.py:282
 msgid "Terminate"
 msgstr "Finalizar"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:290
+#: spyder/widgets/externalshell/pythonshell.py:283
 msgid ""
 "Attempts to stop the process. The process\n"
 "may not exit as a result of clicking this\n"
@@ -4372,69 +4050,60 @@ msgstr ""
 "(pode ser possível que se peça ao usuário\n"
 "para guardar arquivos ainda não salvos, etc)."
 
-#: spyderlib/widgets/externalshell/pythonshell.py:303
+#: spyder/widgets/externalshell/pythonshell.py:296
 msgid "Interact"
 msgstr "Interagir"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:305
+#: spyder/widgets/externalshell/pythonshell.py:298
 msgid "Debug"
 msgstr "Depurar"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:307
-#: spyderlib/widgets/externalshell/pythonshell.py:373
+#: spyder/widgets/externalshell/pythonshell.py:300
+#: spyder/widgets/externalshell/pythonshell.py:366
 msgid "Arguments..."
 msgstr "Argumentos..."
 
-#: spyderlib/widgets/externalshell/pythonshell.py:309
+#: spyder/widgets/externalshell/pythonshell.py:302
 msgid "Post Mortem Debug"
-msgstr ""
+msgstr "Post Mortem Debug"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:315
+#: spyder/widgets/externalshell/pythonshell.py:308
 msgid "Working directory"
 msgstr "Diretório de trabalho"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:317
+#: spyder/widgets/externalshell/pythonshell.py:310
 msgid "Set current working directory"
 msgstr "Definir diretório de trabalho"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:319
+#: spyder/widgets/externalshell/pythonshell.py:312
 msgid "Environment variables"
 msgstr "Variáveis de ambiente"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:323
+#: spyder/widgets/externalshell/pythonshell.py:316
 msgid "Show sys.path contents"
 msgstr "Mostrar conteúdo do sys.path"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:369
+#: spyder/widgets/externalshell/pythonshell.py:362
 msgid "Arguments: %s"
 msgstr "Argumentos: %s"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:371
+#: spyder/widgets/externalshell/pythonshell.py:364
 msgid "No argument"
 msgstr "Sem argumento"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:550
-msgid ""
-"The kernel failed to start!! That's all we know... Please close this console "
-"and open a new one."
-msgstr ""
-"O kernel falhou ao iniciar!! Isso é tudo que sabemos... Por favor feche este "
-"console e abra um novo."
-
-#: spyderlib/widgets/externalshell/pythonshell.py:554
+#: spyder/widgets/externalshell/pythonshell.py:534
 msgid "A Python console failed to start!"
 msgstr "Não foi possível iniciar um console Python!"
 
-#: spyderlib/widgets/externalshell/systemshell.py:100
+#: spyder/widgets/externalshell/systemshell.py:106
 msgid "Process failed to start"
 msgstr "O processo falhou ao iniciar."
 
-#: spyderlib/widgets/file_switcher.py:109
-#, fuzzy
+#: spyder/widgets/fileswitcher.py:109
 msgid "unsaved file"
-msgstr "Salvar arquivo"
+msgstr "arquivo não salvo"
 
-#: spyderlib/widgets/file_switcher.py:229
+#: spyder/widgets/fileswitcher.py:230
 msgid ""
 "Press <b>Enter</b> to switch files or <b>Esc</b> to cancel.<br><br>Type to "
 "filter filenames.<br><br>Use <b>:number</b> to go to a line, e.g. "
@@ -4442,75 +4111,75 @@ msgid ""
 "g. <b><code>@init</code></b><br><br> Press <b>Ctrl+W</b> to close current "
 "tab.<br>"
 msgstr ""
+"Pressione <b>Enter</b> para trocar de arquivo ou <b>Esc</b> para cancelar."
+"<br><br>Type to filter filenames.<br><br>Utilize <b>:número</b> para ir numa "
+"linha, ex: <b><code>main:42</code></b><br>Use <b>@texto_do_simbolo</b> para "
+"ir em um simbolo, ex: <b><code>@init</code></b><br><br> Pressione <b>Ctrl+W</"
+"b> para fechar a aba atual.<br>"
 
-#: spyderlib/widgets/file_switcher.py:481
-#, fuzzy
+#: spyder/widgets/fileswitcher.py:508
 msgid "lines"
 msgstr "linhas"
 
-#: spyderlib/widgets/findinfiles.py:158
+#: spyder/widgets/findinfiles.py:158
 msgid "Unexpected error: see internal console"
 msgstr "Erro inesperado: veja o console interno"
 
-#: spyderlib/widgets/findinfiles.py:210 spyderlib/widgets/findinfiles.py:234
-#: spyderlib/widgets/findinfiles.py:281
+#: spyder/widgets/findinfiles.py:209 spyder/widgets/findinfiles.py:233
+#: spyder/widgets/findinfiles.py:280
 msgid "invalid regular expression"
 msgstr "expressão regular inválida"
 
-#: spyderlib/widgets/findinfiles.py:279
+#: spyder/widgets/findinfiles.py:278
 msgid "permission denied errors were encountered"
 msgstr "permissão negada, foram encontrados erros"
 
-#: spyderlib/widgets/findinfiles.py:316
+#: spyder/widgets/findinfiles.py:315
 msgid "Search pattern"
 msgstr "Padrão de pesquisa "
 
-#: spyderlib/widgets/findinfiles.py:319 spyderlib/widgets/findinfiles.py:353
-#: spyderlib/widgets/findinfiles.py:365 spyderlib/widgets/findreplace.py:77
+#: spyder/widgets/findinfiles.py:318 spyder/widgets/findinfiles.py:352
+#: spyder/widgets/findinfiles.py:364 spyder/widgets/findreplace.py:81
 msgid "Regular expression"
 msgstr "Expressão regular"
 
-#: spyderlib/widgets/findinfiles.py:328
+#: spyder/widgets/findinfiles.py:327
 msgid "Search"
 msgstr "Procurar"
 
-#: spyderlib/widgets/findinfiles.py:331
+#: spyder/widgets/findinfiles.py:330
 msgid "Start search"
 msgstr "Iniciar busca"
 
-#: spyderlib/widgets/findinfiles.py:334 spyderlib/widgets/ipython.py:555
-msgid "Stop"
-msgstr "Parar"
-
-#: spyderlib/widgets/findinfiles.py:337
+#: spyder/widgets/findinfiles.py:336
 msgid "Stop search"
 msgstr "Parar busca"
 
-#: spyderlib/widgets/findinfiles.py:347
+#: spyder/widgets/findinfiles.py:346
 msgid "Included filenames pattern"
 msgstr ""
 "Incluir padrões de nomes\n"
 "do arquivo"
 
-#: spyderlib/widgets/findinfiles.py:356
+#: spyder/widgets/findinfiles.py:355
 msgid "Include:"
 msgstr "Incluir:"
 
-#: spyderlib/widgets/findinfiles.py:359
+#: spyder/widgets/findinfiles.py:358
 msgid "Excluded filenames pattern"
 msgstr ""
 "Excluir padrões de nomes\n"
 "do arquivo"
 
-#: spyderlib/widgets/findinfiles.py:368
+#: spyder/widgets/findinfiles.py:367
 msgid "Exclude:"
 msgstr "Excluir:"
 
-#: spyderlib/widgets/findinfiles.py:378
+#: spyder/widgets/findinfiles.py:377
 msgid "PYTHONPATH"
 msgstr "PYTHONPATH"
 
-#: spyderlib/widgets/findinfiles.py:380
+#: spyder/widgets/findinfiles.py:379
 msgid ""
 "Search in all directories listed in sys.path which are outside the Python "
 "installation directory"
@@ -4518,1003 +4187,1053 @@ msgstr ""
 "Procurar em todos diretórios listados na sys.path\n"
 "que estão fora do diretório de instalação do Python"
 
-#: spyderlib/widgets/findinfiles.py:383
+#: spyder/widgets/findinfiles.py:382
 msgid "Hg repository"
 msgstr "Repositório Hg"
 
-#: spyderlib/widgets/findinfiles.py:386
+#: spyder/widgets/findinfiles.py:385
 msgid "Search in current directory hg repository"
 msgstr "Buscar no repositório"
 
-#: spyderlib/widgets/findinfiles.py:387
+#: spyder/widgets/findinfiles.py:386
 msgid "Here:"
 msgstr "Aqui:"
 
-#: spyderlib/widgets/findinfiles.py:391
+#: spyder/widgets/findinfiles.py:390
 msgid "Search recursively in this directory"
 msgstr "Buscar recursivamente neste diretório"
 
-#: spyderlib/widgets/findinfiles.py:396
+#: spyder/widgets/findinfiles.py:395
 msgid "Browse a search directory"
 msgstr "Selecionar um diretório de busca"
 
-#: spyderlib/widgets/findinfiles.py:426
+#: spyder/widgets/findinfiles.py:425
 msgid "Hide advanced options"
 msgstr "Esconder opções avançadas"
 
-#: spyderlib/widgets/findinfiles.py:429
+#: spyder/widgets/findinfiles.py:428
 msgid "Show advanced options"
 msgstr "Mostrar opções avançadas "
 
-#: spyderlib/widgets/findinfiles.py:570
+#: spyder/widgets/findinfiles.py:569
 msgid "Search canceled"
 msgstr "Busca cancelada"
 
-#: spyderlib/widgets/findinfiles.py:574
+#: spyder/widgets/findinfiles.py:573
 msgid "String not found"
 msgstr "String não encontrada"
 
-#: spyderlib/widgets/findinfiles.py:576
+#: spyder/widgets/findinfiles.py:575
 msgid "matches in"
 msgstr "correspondências em"
 
-#: spyderlib/widgets/findinfiles.py:577
+#: spyder/widgets/findinfiles.py:576
 msgid "file"
 msgstr "arquivo"
 
-#: spyderlib/widgets/findinfiles.py:585
+#: spyder/widgets/findinfiles.py:584
 msgid "interrupted"
 msgstr "interrompido"
 
-#: spyderlib/widgets/findreplace.py:59
+#: spyder/widgets/findreplace.py:63
 msgid "Search string"
 msgstr "Procurar string"
 
-#: spyderlib/widgets/findreplace.py:83
+#: spyder/widgets/findreplace.py:87
 msgid "Case Sensitive"
 msgstr ""
 "Diferenciar maiúsculas\n"
 "de minúsculas"
 
-#: spyderlib/widgets/findreplace.py:89
+#: spyder/widgets/findreplace.py:93
 msgid "Whole words"
 msgstr "Palavras inteiras"
 
-#: spyderlib/widgets/findreplace.py:95
+#: spyder/widgets/findreplace.py:99
 msgid "Highlight matches"
 msgstr "Destacar correspondências "
 
-#: spyderlib/widgets/findreplace.py:109
+#: spyder/widgets/findreplace.py:113
 msgid "Replace with:"
 msgstr "Substituir com:"
 
-#: spyderlib/widgets/findreplace.py:111
+#: spyder/widgets/findreplace.py:115
 msgid "Replace string"
 msgstr "Substituir string"
 
-#: spyderlib/widgets/findreplace.py:114
+#: spyder/widgets/findreplace.py:118
 msgid "Replace/find"
 msgstr "Substituir/buscar"
 
-#: spyderlib/widgets/findreplace.py:121
+#: spyder/widgets/findreplace.py:125
 msgid "Replace all"
 msgstr "Substituir tudo"
 
-#: spyderlib/widgets/importwizard.py:116 spyderlib/widgets/importwizard.py:431
-msgid "Import as"
-msgstr "Importar como"
+#: spyder/widgets/internalshell.py:262
+msgid "Help..."
+msgstr "Ajuda..."
 
-#: spyderlib/widgets/importwizard.py:118
-msgid "data"
-msgstr "dados"
+#: spyder/widgets/internalshell.py:279
+msgid "Shell special commands:"
+msgstr "Comando especiais: "
 
-#: spyderlib/widgets/importwizard.py:122
-msgid "code"
-msgstr "código"
+#: spyder/widgets/internalshell.py:280
+msgid "Internal editor:"
+msgstr "Editor interno:"
 
-#: spyderlib/widgets/importwizard.py:125 spyderlib/widgets/importwizard.py:504
-msgid "text"
-msgstr "texto"
+#: spyder/widgets/internalshell.py:281
+msgid "External editor:"
+msgstr "Editor externo:"
 
-#: spyderlib/widgets/importwizard.py:138
-msgid "Column separator:"
-msgstr "Separador de colunas:"
+#: spyder/widgets/internalshell.py:282
+msgid "Run script:"
+msgstr "Executar script:"
 
-#: spyderlib/widgets/importwizard.py:142
-msgid "Tab"
-msgstr "Tabulação"
+#: spyder/widgets/internalshell.py:283
+msgid "Remove references:"
+msgstr "Remover referências:"
 
-#: spyderlib/widgets/importwizard.py:145 spyderlib/widgets/importwizard.py:163
-msgid "other"
-msgstr "outro"
+#: spyder/widgets/internalshell.py:284
+msgid "System commands:"
+msgstr "Comandos do sistema:"
 
-#: spyderlib/widgets/importwizard.py:156
-msgid "Row separator:"
-msgstr "Separador de linha:"
+#: spyder/widgets/internalshell.py:285
+msgid "Python help:"
+msgstr "Ajuda do Python:"
 
-#: spyderlib/widgets/importwizard.py:160
-msgid "EOL"
-msgstr "Fim de linha"
+#: spyder/widgets/internalshell.py:286
+msgid "GUI-based editor:"
+msgstr "Editor gráfico:"
 
-#: spyderlib/widgets/importwizard.py:175
-msgid "Additional options"
-msgstr "Opções adicionais"
+#: spyder/widgets/ipythonconsole/client.py:187
+msgid "An error ocurred while starting the kernel"
+msgstr "Um erro ocorreu enquanto o kernel era inicializado"
 
-#: spyderlib/widgets/importwizard.py:179
-msgid "Skip rows:"
-msgstr "Pular linhas:"
+#: spyder/widgets/ipythonconsole/client.py:218
+msgid "Restart kernel"
+msgstr "Reiniciar kernel"
 
-#: spyderlib/widgets/importwizard.py:190
-msgid "Comments:"
-msgstr "Comentários:"
+#: spyder/widgets/ipythonconsole/client.py:238
+msgid "Stop the current command"
+msgstr "Parar o comando atual"
 
-#: spyderlib/widgets/importwizard.py:196
-msgid "Transpose"
-msgstr "Transpor"
+#: spyder/widgets/ipythonconsole/client.py:261
+msgid "Inspect current object"
+msgstr "Inspecionar objeto"
 
-#: spyderlib/widgets/importwizard.py:434
-msgid "array"
-msgstr "matriz"
+#: spyder/widgets/ipythonconsole/client.py:266
+msgid "Clear line or block"
+msgstr "Limpar linha ou bloco"
 
-#: spyderlib/widgets/importwizard.py:439
-msgid "list"
-msgstr "lista"
+#: spyder/widgets/ipythonconsole/client.py:270
+msgid "Reset namespace"
+msgstr "Resetar namespace"
+
+#: spyder/widgets/ipythonconsole/client.py:273
+msgid "Clear console"
+msgstr "Limpar console"
+
+#: spyder/widgets/ipythonconsole/client.py:314
+msgid "Are you sure you want to restart the kernel?"
+msgstr "Deseja mesmo reiniciar o kernel?"
+
+#: spyder/widgets/ipythonconsole/client.py:316
+msgid "Restart kernel?"
+msgstr "Reiniciar kernel?"
+
+#: spyder/widgets/ipythonconsole/client.py:325
+msgid "Error restarting kernel: %s\n"
+msgstr "Erro ao reiniciar kernel: %s\n"
+
+#: spyder/widgets/ipythonconsole/client.py:329
+msgid ""
+"<br>Restarting kernel...\n"
+"<hr><br>"
+msgstr ""
+"<br>Reiniciando kernel..\n"
+"<hr><br>"
+
+#: spyder/widgets/ipythonconsole/client.py:334
+msgid "Cannot restart a kernel not started by Spyder\n"
+msgstr "Não é possível reiniciar um kernel que não foi iniciado pelo Spyder\n"
+
+#: spyder/widgets/ipythonconsole/client.py:374
+msgid "Changing backend to Qt for Mayavi"
+msgstr "Mudando a saída gráfica do Qt para Mayavi"
+
+#: spyder/widgets/ipythonconsole/client.py:385
+msgid "Connecting to kernel..."
+msgstr "Conectando ao kernel..."
+
+#: spyder/widgets/ipythonconsole/namespacebrowser.py:76
+msgid ""
+"Inspecting and setting values while debugging in IPython consoles is not "
+"supported yet by Spyder."
+msgstr ""
+"Inspecionar e introduzir valores enquanto se estar debugando em consoles "
+"IPython ainda não é suportado pelo Spyder."
+
+#: spyder/widgets/ipythonconsole/shell.py:135
+msgid "Reset IPython namespace"
+msgstr "Resetar IPython namespace"
+
+#: spyder/widgets/ipythonconsole/shell.py:136
+msgid ""
+"All user-defined variables will be removed.<br>Are you sure you want to "
+"reset the namespace?"
+msgstr ""
+"Todas as variáveis definidas pelo usuário serão removidas.<br>Você tem "
+"certeza que deseja resetar o namespace?"
+
+#: spyder/widgets/onecolumntree.py:52
+msgid "Collapse all"
+msgstr "Reduzir tudo"
+
+#: spyder/widgets/onecolumntree.py:56
+msgid "Expand all"
+msgstr "Expandir tudo"
+
+#: spyder/widgets/onecolumntree.py:60
+msgid "Restore"
+msgstr "Restaurar"
+
+#: spyder/widgets/onecolumntree.py:61
+msgid "Restore original tree layout"
+msgstr "Restaurar a disposição original"
+
+#: spyder/widgets/onecolumntree.py:65
+msgid "Collapse selection"
+msgstr "Reduzir seleção"
+
+#: spyder/widgets/onecolumntree.py:69
+msgid "Expand selection"
+msgstr "Expandir seleção"
+
+#: spyder/widgets/pathmanager.py:87
+msgid "Move to top"
+msgstr "Mover para o inicio"
+
+#: spyder/widgets/pathmanager.py:93
+msgid "Move up"
+msgstr "Mover para cima"
+
+#: spyder/widgets/pathmanager.py:99
+msgid "Move down"
+msgstr "Mover para baixo"
+
+#: spyder/widgets/pathmanager.py:105
+msgid "Move to bottom"
+msgstr "Mover para o final"
+
+#: spyder/widgets/pathmanager.py:116 spyder/widgets/pathmanager.py:231
+msgid "Add path"
+msgstr "Adicionar caminho"
+
+#: spyder/widgets/pathmanager.py:121 spyder/widgets/pathmanager.py:214
+msgid "Remove path"
+msgstr "Remover caminho"
+
+#: spyder/widgets/pathmanager.py:131
+msgid "Synchronize..."
+msgstr "Sincronizar..."
+
+#: spyder/widgets/pathmanager.py:133
+msgid "Synchronize Spyder's path list with PYTHONPATH environment variable"
+msgstr ""
+"Sincronizar a lista de caminhos do Spyder com a variável\n"
+"de ambiente PYTHONPATH"
+
+#: spyder/widgets/pathmanager.py:145
+msgid "Synchronize"
+msgstr "Sincronizar"
+
+#: spyder/widgets/pathmanager.py:146
+msgid ""
+"This will synchronize Spyder's path list with <b>PYTHONPATH</b> environment "
+"variable for current user, allowing you to run your Python modules outside "
+"Spyder without having to configure sys.path. <br>Do you want to clear "
+"contents of PYTHONPATH before adding Spyder's path list?"
+msgstr ""
+"Isso irá sincronizar a lista de caminhos do Spyder com a variável de "
+"ambiente <b>PYTHONPATH</b>para o usuário atual, permitindo executar seus "
+"módulos de Python fora do Spyder sem precisar configurar o sys.path. "
+"<br>Deseja limpar o conteúdo da PYTHONPATH antes de adicionar a lista de "
+"caminhos do Spyder?"
+
+#: spyder/widgets/pathmanager.py:215
+msgid "Do you really want to remove selected path?"
+msgstr "Você deseja mesmo remover o caminho selecionado?"
+
+#: spyder/widgets/pathmanager.py:232
+msgid ""
+"This directory is already included in Spyder path list.<br>Do you want to "
+"move it to the top of the list?"
+msgstr ""
+"Este diretório já está incluído na lista de caminhos do Spyder.<br>Deseja "
+"mover ele para o topo da lista?"
+
+#: spyder/widgets/projects/configdialog.py:30
+msgid "Project preferences"
+msgstr "Preferências do projeto"
+
+#: spyder/widgets/projects/configdialog.py:82
+#: spyder/widgets/projects/configdialog.py:119
+msgid "Restore data on startup"
+msgstr "Restaurar data na inicialização"
+
+#: spyder/widgets/projects/configdialog.py:84
+#: spyder/widgets/projects/configdialog.py:121
+msgid "Save data on exit"
+msgstr "Salvar data ao sair"
+
+#: spyder/widgets/projects/configdialog.py:86
+#: spyder/widgets/projects/configdialog.py:123
+msgid "Save history"
+msgstr "Salvar histórico"
+
+#: spyder/widgets/projects/configdialog.py:88
+#: spyder/widgets/projects/configdialog.py:125
+msgid "Save non project files opened"
+msgstr "Salvar arquivos que não são de projetos, atualmente abertos"
+
+#: spyder/widgets/projects/configdialog.py:111
+msgid "Code"
+msgstr "Código"
+
+#: spyder/widgets/projects/configdialog.py:118
+msgid "Workspace"
+msgstr "Espaço de trabalho"
+
+#: spyder/widgets/projects/configdialog.py:148
+msgid "Version control"
+msgstr "Controlador de versão"
+
+#: spyder/widgets/projects/configdialog.py:156
+msgid "Use version control"
+msgstr "Usar controlador de versão"
+
+#: spyder/widgets/projects/configdialog.py:161
+msgid "Version control system"
+msgstr "Sistema de Controle de Versão"
+
+#: spyder/widgets/projects/explorer.py:50
+msgid "Show horizontal scrollbar"
+msgstr "Mostrar barra de rolagem horizontal"
+
+#: spyder/widgets/projects/explorer.py:112
+msgid "File <b>%s</b> already exists.<br>Do you want to overwrite it?"
+msgstr "O arquivo <b>%s</b> já existe<br>Deseja sobrescrever ele?"
+
+#: spyder/widgets/projects/explorer.py:126
+msgid "Folder <b>%s</b> already exists."
+msgstr "A Pasta <b>%s</b> já existe."
+
+#: spyder/widgets/projects/explorer.py:144
+msgid "copy"
+msgstr "copiar"
+
+#: spyder/widgets/projects/explorer.py:146
+msgid "move"
+msgstr "mover"
+
+#: spyder/widgets/projects/projectdialog.py:69
+msgid "New directory"
+msgstr "Novo diretório"
+
+#: spyder/widgets/projects/projectdialog.py:70
+msgid "Existing directory"
+msgstr "Diretório existente"
+
+#: spyder/widgets/projects/projectdialog.py:72
+msgid "Project name"
+msgstr "Nome do projeto"
+
+#: spyder/widgets/projects/projectdialog.py:73
+msgid "Location"
+msgstr "Localização"
+
+#: spyder/widgets/projects/projectdialog.py:74
+msgid "Project type"
+msgstr "Tipo do projeto"
+
+#: spyder/widgets/projects/projectdialog.py:75
+msgid "Python version"
+msgstr "Versão do Python"
+
+#: spyder/widgets/projects/projectdialog.py:83
+#: spyder/widgets/variableexplorer/importwizard.py:519
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: spyder/widgets/projects/projectdialog.py:84
+msgid "Create"
+msgstr "Criar"
+
+#: spyder/widgets/projects/projectdialog.py:102
+msgid "Create new project"
+msgstr "Criar um novo projeto"
+
+#: spyder/widgets/projects/type/__init__.py:215
+msgid "Empty project"
+msgstr "Projeto vazio"
+
+#: spyder/widgets/projects/type/python.py:20
+msgid "Python project"
+msgstr "Projeto Python"
+
+#: spyder/widgets/projects/type/python.py:76
+msgid "Python package"
+msgstr "Pacote Python"
+
+#: spyder/widgets/pydocgui.py:110
+msgid "Module or package:"
+msgstr "Módulo ou pacote:"
+
+#: spyder/widgets/shell.py:129
+msgid "Save history log..."
+msgstr "Salvar histórico..."
+
+#: spyder/widgets/shell.py:131
+msgid "Save current history log (i.e. all inputs and outputs) in a text file"
+msgstr ""
+"Salvar o histórico atual (todas entradas e saídas) em um arquivo de texto"
+
+#: spyder/widgets/shell.py:257
+msgid "Save history log"
+msgstr "Salvar histórico"
+
+#: spyder/widgets/shell.py:260
+msgid "History logs"
+msgstr "Histórico de comandos"
+
+#: spyder/widgets/shell.py:271
+msgid "<b>Unable to save file '%s'</b><br><br>Error message:<br>%s"
+msgstr ""
+"<b>Não foi possível salvar arquivo '%s'</b><br><br>Mensagem de erro:<br>%s"
+
+#: spyder/widgets/shell.py:713
+msgid "Copy without prompts"
+msgstr "Copiar sem os prompts"
+
+#: spyder/widgets/shell.py:716 spyder/widgets/shell.py:720
+msgid "Clear line"
+msgstr "Limpar linha"
+
+#: spyder/widgets/shell.py:722
+msgid "Clear shell"
+msgstr "Limpar shell"
+
+#: spyder/widgets/shell.py:726
+msgid "Clear shell contents ('cls' command)"
+msgstr "Limpar conteúdo do shell (comando 'cls')"
+
+#: spyder/widgets/sourcecode/codeeditor.py:100
+msgid "Go to line:"
+msgstr "Ir para a linha:"
+
+#: spyder/widgets/sourcecode/codeeditor.py:108
+msgid "Line count:"
+msgstr "Número de linhas:"
+
+#: spyder/widgets/sourcecode/codeeditor.py:1296
+msgid "Breakpoint"
+msgstr "Ponto de interrupção"
 
-#: spyderlib/widgets/importwizard.py:444
-msgid "DataFrame"
-msgstr "DataFrame"
+#: spyder/widgets/sourcecode/codeeditor.py:1297
+msgid "Condition:"
+msgstr "Condição:"
 
-#: spyderlib/widgets/importwizard.py:487 spyderlib/widgets/importwizard.py:569
-msgid "Import wizard"
-msgstr "Assistente de importação"
+#: spyder/widgets/sourcecode/codeeditor.py:1703
+msgid "Code analysis"
+msgstr "Análise de código"
 
-#: spyderlib/widgets/importwizard.py:492
-msgid "Raw text"
-msgstr "Texto sem formatação"
+#: spyder/widgets/sourcecode/codeeditor.py:1757
+msgid "To do"
+msgstr "To do"
 
-#: spyderlib/widgets/importwizard.py:495
-msgid "variable_name"
-msgstr "nome_da_variável"
+#: spyder/widgets/sourcecode/codeeditor.py:1994
+msgid "Removal error"
+msgstr "Erro de remoção"
 
-#: spyderlib/widgets/importwizard.py:506
-msgid "table"
-msgstr "tabela"
+#: spyder/widgets/sourcecode/codeeditor.py:1995
+msgid ""
+"It was not possible to remove outputs from this notebook. The error is:\n"
+"\n"
+msgstr ""
+"Não foi possível remover as saídas deste notebook. O erro é:\n"
+"\n"
 
-#: spyderlib/widgets/importwizard.py:507
-msgid "Preview"
-msgstr "Pré-Visualização"
+#: spyder/widgets/sourcecode/codeeditor.py:2487
+msgid "Clear all ouput"
+msgstr "Limpar todas as saídas "
 
-#: spyderlib/widgets/importwizard.py:511
-msgid "Variable Name"
-msgstr "Nome da variável"
+#: spyder/widgets/sourcecode/codeeditor.py:2493
+msgid "Go to definition"
+msgstr "Ver definição"
 
-#: spyderlib/widgets/importwizard.py:519
-msgid "Cancel"
-msgstr "Cancelar"
+#: spyder/widgets/sourcecode/codeeditor.py:2522
+msgid "Zoom reset"
+msgstr "Resetar Zoom"
 
-#: spyderlib/widgets/importwizard.py:532
-msgid "Done"
-msgstr "Feito"
+#: spyder/widgets/status.py:25
+msgid "CPU and memory usage info in the status bar"
+msgstr "Uso de CPU e memória na barra de status"
+
+#: spyder/widgets/status.py:94
+msgid "Memory:"
+msgstr "Memória:"
 
-#: spyderlib/widgets/importwizard.py:570
+#: spyder/widgets/status.py:95
 msgid ""
-"<b>Unable to proceed to next step</b><br><br>Please check your entries."
-"<br><br>Error message:<br>%s"
+"Memory usage status: requires the `psutil` (>=v0.3) library on non-Windows "
+"platforms"
 msgstr ""
-"<b>Não foi possível prosseguir para o próximo passo</b><br><br>Por favor "
-"revise seus dados<br><br>Mensagem de erro:<br>%s"
+"Status de uso da memória: requer a biblioteca `psutil` (>=v0.3) em outras "
+"plataformas"
 
-#: spyderlib/widgets/internalshell.py:258
-msgid "Help..."
-msgstr "Ajuda..."
+#: spyder/widgets/status.py:107
+msgid "CPU:"
+msgstr "CPU:"
 
-#: spyderlib/widgets/internalshell.py:266
-msgid "Help"
-msgstr "Ajuda"
+#: spyder/widgets/status.py:108
+msgid "CPU usage status: requires the `psutil` (>=v0.3) library"
+msgstr "Status de uso da CPU: requer a biblioteca `psutil` (>=v0.3)"
 
-#: spyderlib/widgets/internalshell.py:275
-msgid "Shell special commands:"
-msgstr "Comando especiais: "
+#: spyder/widgets/status.py:130
+msgid "Permissions:"
+msgstr "Permissões:"
 
-#: spyderlib/widgets/internalshell.py:276
-msgid "Internal editor:"
-msgstr "Editor interno:"
+#: spyder/widgets/status.py:144
+msgid "End-of-lines:"
+msgstr "Fim de linha:"
 
-#: spyderlib/widgets/internalshell.py:277
-msgid "External editor:"
-msgstr "Editor externo:"
+#: spyder/widgets/status.py:158
+msgid "Encoding:"
+msgstr "Codificação:"
 
-#: spyderlib/widgets/internalshell.py:278
-msgid "Run script:"
-msgstr "Executar script:"
+#: spyder/widgets/status.py:171
+msgid "Line:"
+msgstr "Linha:"
 
-#: spyderlib/widgets/internalshell.py:279
-msgid "Remove references:"
-msgstr "Remover referências:"
+#: spyder/widgets/status.py:175
+msgid "Column:"
+msgstr "Coluna:"
 
-#: spyderlib/widgets/internalshell.py:280
-msgid "System commands:"
-msgstr "Comandos do sistema:"
+#: spyder/widgets/tabs.py:146
+msgid "Browse tabs"
+msgstr "Navegar pelas abas"
 
-#: spyderlib/widgets/internalshell.py:281
-msgid "Python help:"
-msgstr "Ajuda do Python:"
+#: spyder/widgets/tabs.py:275
+msgid "Close current tab"
+msgstr "Fechar aba atual"
 
-#: spyderlib/widgets/internalshell.py:282
-msgid "GUI-based editor:"
-msgstr "Editor gráfico:"
+#: spyder/widgets/variableexplorer/arrayeditor.py:497
+msgid "It was not possible to copy values for this array"
+msgstr "Não foi possível copiar os valores dessa matriz"
 
-#: spyderlib/widgets/ipython.py:506
-msgid "An error ocurred while starting the kernel"
-msgstr "Um erro ocorreu enquanto o kernel era inicializado"
+#: spyder/widgets/variableexplorer/arrayeditor.py:532
+#: spyder/widgets/variableexplorer/arrayeditor.py:565
+#: spyder/widgets/variableexplorer/dataframeeditor.py:544
+#: spyder/widgets/variableexplorer/dataframeeditor.py:584
+msgid "Format"
+msgstr "Formato"
 
-#: spyderlib/widgets/ipython.py:535
-msgid "Restart kernel"
-msgstr "Reiniciar kernel"
+#: spyder/widgets/variableexplorer/arrayeditor.py:537
+#: spyder/widgets/variableexplorer/dataframeeditor.py:548
+msgid "Resize"
+msgstr "Redimensionar"
 
-#: spyderlib/widgets/ipython.py:557
-msgid "Stop the current command"
-msgstr "Parar o comando atual"
+#: spyder/widgets/variableexplorer/arrayeditor.py:566
+#: spyder/widgets/variableexplorer/dataframeeditor.py:585
+msgid "Float formatting"
+msgstr "Formatação de ponto flutuante"
 
-#: spyderlib/widgets/ipython.py:581
-msgid "Inspect current object"
-msgstr "Inspecionar objeto"
+#: spyder/widgets/variableexplorer/arrayeditor.py:574
+#: spyder/widgets/variableexplorer/dataframeeditor.py:594
+msgid "Format (%s) is incorrect"
+msgstr "O formato (%s) está incorreto"
 
-#: spyderlib/widgets/ipython.py:586
-msgid "Clear line or block"
-msgstr "Limpar linha ou bloco"
+#: spyder/widgets/variableexplorer/arrayeditor.py:609
+msgid "Array is empty"
+msgstr "A matriz está vazia"
 
-#: spyderlib/widgets/ipython.py:590
-msgid "Clear console"
-msgstr "Limpar console"
+#: spyder/widgets/variableexplorer/arrayeditor.py:612
+msgid "Arrays with more than 3 dimensions are not supported"
+msgstr "Matrizes com mais de 3 dimensões não são suportadas"
 
-#: spyderlib/widgets/ipython.py:640
-msgid ""
-"It seems the kernel died unexpectedly. Use 'Restart kernel' to continue "
-"using this console."
+#: spyder/widgets/variableexplorer/arrayeditor.py:615
+msgid "The 'xlabels' argument length do no match array column number"
 msgstr ""
-"Parece que o kernel morreu inesperadamente. Use 'Reiniciar kernel\" para "
-"continuar usando o console."
+"O argumento de comprimento 'xlabels' não corresponde com o número de colunas "
+"da matriz"
 
-#: spyderlib/widgets/ipython.py:660
-msgid "Changing backend to Qt for Mayavi"
-msgstr "Mudando a saída gráfica do Qt para Mayavi"
+#: spyder/widgets/variableexplorer/arrayeditor.py:619
+msgid "The 'ylabels' argument length do no match array row number"
+msgstr ""
+"O argumento de comprimento 'ylabels' não corresponde com o número de linhas "
+"da matriz"
 
-#: spyderlib/widgets/ipython.py:669
-msgid "Kernel process is either remote or unspecified. Cannot interrupt"
-msgstr "O kernel é remoto ou não está especificado. Não é possível interromper"
+#: spyder/widgets/variableexplorer/arrayeditor.py:626
+msgid "%s arrays"
+msgstr "%s matrizes"
 
-#: spyderlib/widgets/ipython.py:678
-msgid "Kernel process is either remote or unspecified. Cannot restart."
-msgstr "O kernel é remoto ou não está especificado. Não é possível reiniciar."
+#: spyder/widgets/variableexplorer/arrayeditor.py:627
+msgid "%s are currently not supported"
+msgstr "%s não é suportado no momento"
 
-#: spyderlib/widgets/ipython.py:757
-msgid "Connecting to kernel..."
-msgstr "Conectando ao kernel..."
+#: spyder/widgets/variableexplorer/arrayeditor.py:634
+msgid "NumPy array"
+msgstr "Matriz NumPy"
 
-#: spyderlib/widgets/onecolumntree.py:60
-msgid "Collapse all"
-msgstr "Reduzir tudo"
+#: spyder/widgets/variableexplorer/arrayeditor.py:636
+#: spyder/widgets/variableexplorer/arrayeditor.py:790
+msgid "Array editor"
+msgstr "Editor de matrizes"
 
-#: spyderlib/widgets/onecolumntree.py:64
-msgid "Expand all"
-msgstr "Expandir tudo"
+#: spyder/widgets/variableexplorer/arrayeditor.py:638
+msgid "read only"
+msgstr "somente leitura"
 
-#: spyderlib/widgets/onecolumntree.py:68
-msgid "Restore"
-msgstr "Restaurar"
+#: spyder/widgets/variableexplorer/arrayeditor.py:668
+msgid "Record array fields:"
+msgstr "Campos de matrizes registradas:"
 
-#: spyderlib/widgets/onecolumntree.py:69
-msgid "Restore original tree layout"
-msgstr "Restaurar a disposição original"
+#: spyder/widgets/variableexplorer/arrayeditor.py:680
+msgid "Data"
+msgstr "Dados"
 
-#: spyderlib/widgets/onecolumntree.py:73
-msgid "Collapse selection"
-msgstr "Reduzir seleção"
+#: spyder/widgets/variableexplorer/arrayeditor.py:680
+msgid "Mask"
+msgstr "Máscara"
 
-#: spyderlib/widgets/onecolumntree.py:77
-msgid "Expand selection"
-msgstr "Expandir seleção"
+#: spyder/widgets/variableexplorer/arrayeditor.py:680
+msgid "Masked data"
+msgstr "Dados mascarados"
 
-#: spyderlib/widgets/pathmanager.py:86
-msgid "Move to top"
-msgstr "Mover para o inicio"
+#: spyder/widgets/variableexplorer/arrayeditor.py:691
+msgid "Axis:"
+msgstr "Eixo:"
 
-#: spyderlib/widgets/pathmanager.py:92
-msgid "Move up"
-msgstr "Mover para cima"
+#: spyder/widgets/variableexplorer/arrayeditor.py:696
+msgid "Index:"
+msgstr "Índice:"
 
-#: spyderlib/widgets/pathmanager.py:98
-msgid "Move down"
-msgstr "Mover para baixo"
+#: spyder/widgets/variableexplorer/arrayeditor.py:709
+msgid "<u>Warning</u>: changes are applied separately"
+msgstr "<u>Aviso</u>: mudanças são aplicadas de forma separada"
 
-#: spyderlib/widgets/pathmanager.py:104
-msgid "Move to bottom"
-msgstr "Mover para o final"
+#: spyder/widgets/variableexplorer/arrayeditor.py:710
+msgid ""
+"For performance reasons, changes applied to masked array won't be reflected "
+"in array's data (and vice-versa)."
+msgstr ""
+"Por motivos de desempenho, as mudanças\n"
+"aplicadas a matrizes mascaradas não serão\n"
+"refletidas nos dados da matriz\n"
+"(e vice-versa)."
 
-#: spyderlib/widgets/pathmanager.py:115 spyderlib/widgets/pathmanager.py:230
-msgid "Add path"
-msgstr "Adicionar caminho"
+#: spyder/widgets/variableexplorer/collectionseditor.py:116
+msgid "Index"
+msgstr "Índice"
 
-#: spyderlib/widgets/pathmanager.py:120 spyderlib/widgets/pathmanager.py:213
-msgid "Remove path"
-msgstr "Remover caminho"
+#: spyder/widgets/variableexplorer/collectionseditor.py:121
+msgid "Tuple"
+msgstr "Tupla"
 
-#: spyderlib/widgets/pathmanager.py:130
-msgid "Synchronize..."
-msgstr "Sincronizar"
+#: spyder/widgets/variableexplorer/collectionseditor.py:124
+msgid "List"
+msgstr "Lista"
 
-#: spyderlib/widgets/pathmanager.py:132
-msgid "Synchronize Spyder's path list with PYTHONPATH environment variable"
-msgstr ""
-"Sincronizar a lista de caminhos do Spyder com a variável\n"
-"de ambiente PYTHONPATH"
+#: spyder/widgets/variableexplorer/collectionseditor.py:127
+msgid "Dictionary"
+msgstr "Dicionário "
 
-#: spyderlib/widgets/pathmanager.py:144
-msgid "Synchronize"
-msgstr "Sincronizar"
+#: spyder/widgets/variableexplorer/collectionseditor.py:129
+msgid "Key"
+msgstr "Chave"
 
-#: spyderlib/widgets/pathmanager.py:145
-msgid ""
-"This will synchronize Spyder's path list with <b>PYTHONPATH</b> environment "
-"variable for current user, allowing you to run your Python modules outside "
-"Spyder without having to configure sys.path. <br>Do you want to clear "
-"contents of PYTHONPATH before adding Spyder's path list?"
-msgstr ""
-"Isso irá sincronizar a lista de caminhos do Spyder com a variável de "
-"ambiente <b>PYTHONPATH</b>para o usuário atual, permitindo executar seus "
-"módulos de Python fora do Spyder sem precisar configurar o sys.path. "
-"<br>Deseja limpar o conteúdo da PYTHONPATH antes de adicionar a lista de "
-"caminhos do Spyder?"
+#: spyder/widgets/variableexplorer/collectionseditor.py:135
+msgid "Attribute"
+msgstr "Atributo"
 
-#: spyderlib/widgets/pathmanager.py:214
-msgid "Do you really want to remove selected path?"
-msgstr "Você deseja mesmo remover o caminho selecionado?"
+#: spyder/widgets/variableexplorer/collectionseditor.py:137
+msgid "elements"
+msgstr "elementos"
 
-#: spyderlib/widgets/pathmanager.py:231
-msgid ""
-"This directory is already included in Spyder path list.<br>Do you want to "
-"move it to the top of the list?"
-msgstr ""
-"Este diretório já está incluído na lista de caminhos do Spyder.<br>Deseja "
-"mover ele para o topo da lista?"
+#: spyder/widgets/variableexplorer/collectionseditor.py:313
+msgid "Size"
+msgstr "Tamanho"
 
-#: spyderlib/widgets/projectexplorer.py:335
-msgid "its own configuration file"
-msgstr "seu próprio arquivo de configuração"
+#: spyder/widgets/variableexplorer/collectionseditor.py:313
+msgid "Type"
+msgstr "Tipo"
+
+#: spyder/widgets/variableexplorer/collectionseditor.py:313
+msgid "Value"
+msgstr "Valor"
 
-#: spyderlib/widgets/projectexplorer.py:337
-msgid " and "
-msgstr " e"
+#: spyder/widgets/variableexplorer/collectionseditor.py:411
+msgid ""
+"Opening this variable can be slow\n"
+"\n"
+"Do you want to continue anyway?"
+msgstr ""
+"Abrir essa variável pode ser um processo lento\n"
+"\n"
+"Deseja continuar mesmo assim?"
 
-#: spyderlib/widgets/projectexplorer.py:341
-msgid "the following projects:<br>%s"
-msgstr "Os seguintes projetos:<br>%s"
+#: spyder/widgets/variableexplorer/collectionseditor.py:420
+msgid ""
+"Spyder was unable to retrieve the value of this variable from the console."
+"<br><br>The error mesage was:<br><i>%s</i>"
+msgstr ""
+"O Spyder não foi capaz de receber o valor desta variável do console."
+"<br><br>A mensagem de erro foi:<br><i>%s</i>"
 
-#: spyderlib/widgets/projectexplorer.py:545
-msgid "Project..."
-msgstr "Projeto..."
+#: spyder/widgets/variableexplorer/collectionseditor.py:579
+msgid "Edit item"
+msgstr "Editar item"
 
-#: spyderlib/widgets/projectexplorer.py:558
-msgid "Existing directory"
-msgstr "Diretório existente"
+#: spyder/widgets/variableexplorer/collectionseditor.py:580
+msgid "<b>Unable to assign data to item.</b><br><br>Error message:<br>%s"
+msgstr ""
+"<b>Não foi possível atribuir dados ao item.</b><br><br>Mensagem de erro:<br>"
+"%s"
 
-#: spyderlib/widgets/projectexplorer.py:562
-msgid "Existing Spyder project"
-msgstr "Projeto existente do Spyder"
+#: spyder/widgets/variableexplorer/collectionseditor.py:642
+msgid "Resize rows to contents"
+msgstr "Redimensionar linhas para o conteúdo "
 
-#: spyderlib/widgets/projectexplorer.py:566
-msgid "Existing Pydev project"
-msgstr "Projeto existente do Pydev"
+#: spyder/widgets/variableexplorer/collectionseditor.py:653
+#: spyder/widgets/variableexplorer/collectionseditor.py:998
+#: spyder/widgets/variableexplorer/collectionseditor.py:1015
+msgid "Plot"
+msgstr "Gráfico"
 
-#: spyderlib/widgets/projectexplorer.py:583
-msgid "Open project"
-msgstr "Abrir projeto"
+#: spyder/widgets/variableexplorer/collectionseditor.py:657
+msgid "Histogram"
+msgstr "Histograma"
 
-#: spyderlib/widgets/projectexplorer.py:588
-msgid "Close project"
-msgstr "Fechar projeto"
+#: spyder/widgets/variableexplorer/collectionseditor.py:661
+msgid "Show image"
+msgstr "Mostrar imagem"
 
-#: spyderlib/widgets/projectexplorer.py:593
-msgid "Close unrelated projects"
-msgstr "Fechar projetos não relacionados"
+#: spyder/widgets/variableexplorer/collectionseditor.py:665
+#: spyder/widgets/variableexplorer/collectionseditor.py:1023
+msgid "Save array"
+msgstr "Salvar matriz"
 
-#: spyderlib/widgets/projectexplorer.py:602
-msgid "Edit related projects"
-msgstr "Editar projetos relacionados"
+#: spyder/widgets/variableexplorer/collectionseditor.py:669
+#: spyder/widgets/variableexplorer/collectionseditor.py:962
+#: spyder/widgets/variableexplorer/collectionseditor.py:970
+msgid "Insert"
+msgstr "Inserir"
 
-#: spyderlib/widgets/projectexplorer.py:610
-msgid "Add to PYTHONPATH"
-msgstr "Adicionar para a PYTHONPATH"
+#: spyder/widgets/variableexplorer/collectionseditor.py:672
+#: spyder/widgets/variableexplorer/collectionseditor.py:906
+msgid "Remove"
+msgstr "Remover"
 
-#: spyderlib/widgets/projectexplorer.py:615
-msgid "Remove from PYTHONPATH"
-msgstr "Remover da PYTHONPATH"
+#: spyder/widgets/variableexplorer/collectionseditor.py:686
+#: spyder/widgets/variableexplorer/collectionseditor.py:927
+msgid "Duplicate"
+msgstr "Duplicar"
 
-#: spyderlib/widgets/projectexplorer.py:620
-msgid "Properties"
-msgstr "Propriedades"
+#: spyder/widgets/variableexplorer/collectionseditor.py:904
+msgid "Do you want to remove the selected item?"
+msgstr "Você deseja remover o item selecionado?"
 
-#: spyderlib/widgets/projectexplorer.py:655
-msgid "Show horizontal scrollbar"
-msgstr "Mostrar barra de rolagem horizontal"
+#: spyder/widgets/variableexplorer/collectionseditor.py:905
+msgid "Do you want to remove all selected items?"
+msgstr "Você deseja remover todos os itens selecionados?"
 
-#: spyderlib/widgets/projectexplorer.py:692
-msgid "Workspace"
-msgstr "Espaço de trabalho"
+#: spyder/widgets/variableexplorer/collectionseditor.py:925
+msgid "New variable name:"
+msgstr "Novo nome da variável:"
 
-#: spyderlib/widgets/projectexplorer.py:693
-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."
-msgstr ""
-"Não foi possível carregar ou salvar o espaço de trabalho %s<br><br>Verifique "
-"se você tem permissão para escrever os arquivos de configuração."
+#: spyder/widgets/variableexplorer/collectionseditor.py:928
+msgid "Variable name:"
+msgstr "Nome da variável:"
 
-#: spyderlib/widgets/projectexplorer.py:752
-msgid "Import directory"
-msgstr "Importar diretório"
+#: spyder/widgets/variableexplorer/collectionseditor.py:962
+msgid "Key:"
+msgstr "Chave:"
 
-#: spyderlib/widgets/projectexplorer.py:754
-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)?"
-msgstr ""
-"O seguinte diretório não está em um espaço de trabalho:<br><b>%s</"
-"b><br><br>Deseja continuar (e copiar o diretório para o espaço de trabalho)?"
+#: spyder/widgets/variableexplorer/collectionseditor.py:970
+msgid "Value:"
+msgstr "Valor:"
 
-#: spyderlib/widgets/projectexplorer.py:772
-#: spyderlib/widgets/projectexplorer.py:1183
-msgid "copy"
-msgstr "copiar"
+#: spyder/widgets/variableexplorer/collectionseditor.py:986
+msgid "Import error"
+msgstr "Erro de importação"
 
-#: spyderlib/widgets/projectexplorer.py:824
-msgid "The project <b>%s</b> is already opened!"
-msgstr "O projeto <b>%s</b> já está aberto!"
+#: spyder/widgets/variableexplorer/collectionseditor.py:987
+msgid "Please install <b>matplotlib</b> or <b>guiqwt</b>."
+msgstr "Por favor instale <b>matplotlib</b> ou <b>guiqwt</b>."
 
-#: spyderlib/widgets/projectexplorer.py:831
-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>"
+#: spyder/widgets/variableexplorer/collectionseditor.py:999
+msgid "<b>Unable to plot data.</b><br><br>Error message:<br>%s"
 msgstr ""
-"O caminho do diretório do projeto está dentro do espaço de trabalho porém "
-"não em um nível de profundidade esperado, pois é um subdiretório do espaço "
-"de trabalho:<br><b>%s</b>"
+"<b>Não foi possível mostrar os dados.</b><br><br>Mensagem de erro:<br>%s"
 
-#: spyderlib/widgets/projectexplorer.py:842
-msgid "Project name:"
-msgstr "Nome do projeto:"
+#: spyder/widgets/variableexplorer/collectionseditor.py:1016
+msgid "<b>Unable to show image.</b><br><br>Error message:<br>%s"
+msgstr ""
+"<b>Não foi possível mostrar o gráfico.</b><br><br>Mensagem de erro:<br>%s"
 
-#: spyderlib/widgets/projectexplorer.py:851
-msgid "A project named <b>%s</b> already exists"
-msgstr "Um projeto chamado <b>%s</b> já existe"
+#: spyder/widgets/variableexplorer/collectionseditor.py:1039
+msgid "<b>Unable to save array</b><br><br>Error message:<br>%s"
+msgstr "<b>Não foi possível salvar matriz</b><br><br>Mensagem de erro:<br>%s"
 
-#: spyderlib/widgets/projectexplorer.py:856
-msgid ""
-"Invalid project name.<br><br>Name must match the following regular "
-"expression:<br><b>%s</b>"
-msgstr ""
-"Nome de projeto inválido.<br><br>O nome deve coincidir com a seguinte "
-"expressão:<br><b>%s</b>"
+#: spyder/widgets/variableexplorer/collectionseditor.py:1064
+msgid "It was not possible to copy this array"
+msgstr "Não foi possível copiar essa matriz"
 
-#: spyderlib/widgets/projectexplorer.py:863
-msgid ""
-"The following directory is not empty:<br><b>%s</b><br><br>Do you want to "
-"continue?"
-msgstr ""
-"O seguinte diretório não está vazio:<br><b>%s</b><br><br>Deseja continuar?"
+#: spyder/widgets/variableexplorer/collectionseditor.py:1089
+msgid "Clipboard contents"
+msgstr "Conteúdo da área de transferência "
 
-#: spyderlib/widgets/projectexplorer.py:876
-msgid "New project"
-msgstr "Novo projeto"
+#: spyder/widgets/variableexplorer/collectionseditor.py:1104
+msgid "Import from clipboard"
+msgstr "Importar da área de transferência "
 
-#: spyderlib/widgets/projectexplorer.py:884
-msgid ""
-"The current workspace has not been configured yet.\n"
-"Do you want to do this now?"
-msgstr ""
-"O espaço de trabalho atual ainda não foi configurado.\n"
-"Deseja fazer agora?"
+#: spyder/widgets/variableexplorer/collectionseditor.py:1106
+msgid "Empty clipboard"
+msgstr "Área de transferência vazia"
 
-#: spyderlib/widgets/projectexplorer.py:922
-msgid "Import existing project"
-msgstr "Importar um projeto existente"
+#: spyder/widgets/variableexplorer/collectionseditor.py:1107
+msgid "Nothing to be imported from clipboard."
+msgstr "Não há nada para ser importado da área de transferência."
 
-#: spyderlib/widgets/projectexplorer.py:935
-msgid "Select projects to import"
-msgstr "Selecione projetos para importar"
+#: spyder/widgets/variableexplorer/dataframeeditor.py:450
+msgid "To bool"
+msgstr "Para booleano"
 
-#: spyderlib/widgets/projectexplorer.py:947
-msgid "The folder <i>%s</i> does not contain a valid %s project"
-msgstr "A pasta <i>%s</i> não possui um projeto de %s válido"
+#: spyder/widgets/variableexplorer/dataframeeditor.py:450
+msgid "To complex"
+msgstr "Para complexo"
 
-#: spyderlib/widgets/projectexplorer.py:977
-msgid "Import existing Pydev project"
-msgstr "Importar projeto existente do Pydev"
+#: spyder/widgets/variableexplorer/dataframeeditor.py:451
+msgid "To float"
+msgstr "Para flutuante"
 
-#: spyderlib/widgets/projectexplorer.py:978
-msgid ""
-"<b>Unable to read Pydev project <i>%s</i></b><br><br>Error message:<br>%s"
-msgstr ""
-"<b>Não foi possível ler o projeto <i>%s</i> do Pydev</b><br><br>Mensagem de "
-"erro:<br>%s"
+#: spyder/widgets/variableexplorer/dataframeeditor.py:451
+msgid "To int"
+msgstr "Para inteiro"
 
-#: spyderlib/widgets/projectexplorer.py:1016
-msgid ""
-"Do you really want to delete project <b>%s</b>?<br><br>Note: project files "
-"won't be deleted from disk."
-msgstr ""
-"Você deseja deletar o projeto <b>%s</b>?<br><br>Nota: Os arquivos do projeto "
-"não serão eliminados do disco."
+#: spyder/widgets/variableexplorer/dataframeeditor.py:452
+msgid "To str"
+msgstr "Para string"
 
-#: spyderlib/widgets/projectexplorer.py:1069
-msgid "Related projects"
-msgstr "Projetos relacionados"
+#: spyder/widgets/variableexplorer/dataframeeditor.py:526
+msgid "%s editor"
+msgstr "Editor de %s"
 
-#: spyderlib/widgets/projectexplorer.py:1077
-msgid "Select projects which are related to <b>%s</b>"
-msgstr "Selecionar os projetos que estão relacionados a <b>%s</b>"
+#: spyder/widgets/variableexplorer/dataframeeditor.py:558
+msgid "Column min/max"
+msgstr "Min/max de coluna"
 
-#: spyderlib/widgets/projectexplorer.py:1102
-#, fuzzy
-msgid ""
-"Statistics on source files only:<br>(Python, Cython, IPython, Enaml,C/C++, "
-"Fortran)<br><br><b>%s</b> files.<br><b>%s</b> lines of code."
-msgstr ""
-"Estatísticas para os arquivos de código:<br>(Python, C/C++, "
-"Fortran)<br><br><b>%s</b> arquivos.<br><b>%s</b> linhas de código."
+#: spyder/widgets/variableexplorer/importwizard.py:116
+#: spyder/widgets/variableexplorer/importwizard.py:431
+msgid "Import as"
+msgstr "Importar como"
 
-#: spyderlib/widgets/projectexplorer.py:1151
-msgid "File <b>%s</b> already exists.<br>Do you want to overwrite it?"
-msgstr "O arquivo <b>%s</b> já existe<br>Deseja sobrescrever ele?"
+#: spyder/widgets/variableexplorer/importwizard.py:118
+msgid "data"
+msgstr "dados"
 
-#: spyderlib/widgets/projectexplorer.py:1165
-msgid "Folder <b>%s</b> already exists."
-msgstr "A Pasta <b>%s</b> já existe."
+#: spyder/widgets/variableexplorer/importwizard.py:122
+msgid "code"
+msgstr "código"
 
-#: spyderlib/widgets/projectexplorer.py:1185
-msgid "move"
-msgstr "mover"
+#: spyder/widgets/variableexplorer/importwizard.py:125
+#: spyder/widgets/variableexplorer/importwizard.py:504
+msgid "text"
+msgstr "texto"
 
-#: spyderlib/widgets/projectexplorer.py:1195
-msgid "Select an existing workspace directory, or create a new one"
-msgstr "Selecione um espaço de trabalho existente, ou crie um novo"
+#: spyder/widgets/variableexplorer/importwizard.py:138
+msgid "Column separator:"
+msgstr "Separador de colunas:"
 
-#: spyderlib/widgets/projectexplorer.py:1196
-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>."
-"spyderworkspace</b> configuration file.<br><br>A <b>Spyder project</b> is a "
-"directory with source code (and other related files) and a configuration "
-"file (named <b>.spyderproject</b>) with project settings (PYTHONPATH, linked "
-"projects, ...).<br>"
-msgstr ""
-"<u><b>O que é um espaço de trabalho?</b></u><br><br>Um <b>espaço de trabalho "
-"do Spyder</b> é um diretório no seu sistema de arquivos que contem projetos "
-"do Spyder e um arquivo de configuração </b>.spyderworkspace.<br><br>Um "
-"<b>projeto do Spyder</b> é um diretório com código fonte (e outros arquivos "
-"relacionados) e um arquivo de configuração (chamado <b>.spyderproject</b>) "
-"com configurações do projeto (PYTHONPATH, projetos vinculados).<br>"
-
-#: spyderlib/widgets/projectexplorer.py:1225
-msgid "This is the current workspace directory"
-msgstr "Este é o diretório atual do espaço de trabalho"
-
-#: spyderlib/widgets/projectexplorer.py:1255
-msgid ""
-"The following directory is not a Spyder workspace:<br>%s<br><br>Do you want "
-"to create a new workspace in this directory?"
-msgstr ""
-"O seguinte diretório não é um espaço de trabalho do Spyder:<br>"
-"%s<br><br>Você deseja criar um novo espaço de trabalho neste diretório?"
+#: spyder/widgets/variableexplorer/importwizard.py:142
+msgid "Tab"
+msgstr "Tabulação"
 
-#: spyderlib/widgets/pydocgui.py:107
-msgid "Module or package:"
-msgstr "Módulo ou pacote:"
+#: spyder/widgets/variableexplorer/importwizard.py:145
+#: spyder/widgets/variableexplorer/importwizard.py:163
+msgid "other"
+msgstr "outro"
 
-#: spyderlib/widgets/shell.py:134
-msgid "Save history log..."
-msgstr "Salvar histórico..."
+#: spyder/widgets/variableexplorer/importwizard.py:156
+msgid "Row separator:"
+msgstr "Separador de linha:"
 
-#: spyderlib/widgets/shell.py:136
-msgid "Save current history log (i.e. all inputs and outputs) in a text file"
-msgstr ""
-"Salvar o histórico atual (todas entradas e saídas) em um arquivo de texto"
+#: spyder/widgets/variableexplorer/importwizard.py:160
+msgid "EOL"
+msgstr "Fim de linha"
 
-#: spyderlib/widgets/shell.py:262
-msgid "Save history log"
-msgstr "Salvar histórico"
+#: spyder/widgets/variableexplorer/importwizard.py:175
+msgid "Additional options"
+msgstr "Opções adicionais"
 
-#: spyderlib/widgets/shell.py:265
-msgid "History logs"
-msgstr "Histórico de comandos"
+#: spyder/widgets/variableexplorer/importwizard.py:179
+msgid "Skip rows:"
+msgstr "Pular linhas:"
 
-#: spyderlib/widgets/shell.py:276
-msgid "<b>Unable to save file '%s'</b><br><br>Error message:<br>%s"
-msgstr ""
-"<b>Não foi possível salvar arquivo '%s'</b><br><br>Mensagem de erro:<br>%s"
+#: spyder/widgets/variableexplorer/importwizard.py:190
+msgid "Comments:"
+msgstr "Comentários:"
 
-#: spyderlib/widgets/shell.py:718
-msgid "Copy without prompts"
-msgstr "Copiar sem os prompts"
+#: spyder/widgets/variableexplorer/importwizard.py:196
+msgid "Transpose"
+msgstr "Transpor"
 
-#: spyderlib/widgets/shell.py:721 spyderlib/widgets/shell.py:725
-msgid "Clear line"
-msgstr "Limpar linha"
+#: spyder/widgets/variableexplorer/importwizard.py:434
+msgid "array"
+msgstr "matriz"
 
-#: spyderlib/widgets/shell.py:727
-msgid "Clear shell"
-msgstr "Limpar shell"
+#: spyder/widgets/variableexplorer/importwizard.py:439
+msgid "list"
+msgstr "lista"
 
-#: spyderlib/widgets/shell.py:731
-msgid "Clear shell contents ('cls' command)"
-msgstr "Limpar conteúdo do shell (comando 'cls')"
+#: spyder/widgets/variableexplorer/importwizard.py:444
+msgid "DataFrame"
+msgstr "DataFrame"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:98
-msgid "Go to line:"
-msgstr "Ir para a linha:"
+#: spyder/widgets/variableexplorer/importwizard.py:487
+#: spyder/widgets/variableexplorer/importwizard.py:571
+msgid "Import wizard"
+msgstr "Assistente de importação"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:106
-msgid "Line count:"
-msgstr "Número de linhas:"
+#: spyder/widgets/variableexplorer/importwizard.py:492
+msgid "Raw text"
+msgstr "Texto sem formatação"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:1270
-msgid "Breakpoint"
-msgstr "Ponto de interrupção"
+#: spyder/widgets/variableexplorer/importwizard.py:495
+msgid "variable_name"
+msgstr "nome_da_variável"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:1271
-msgid "Condition:"
-msgstr "Condição:"
+#: spyder/widgets/variableexplorer/importwizard.py:506
+msgid "table"
+msgstr "tabela"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:1679
-msgid "Code analysis"
-msgstr "Análise de código"
+#: spyder/widgets/variableexplorer/importwizard.py:507
+msgid "Preview"
+msgstr "Pré-Visualização"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:1733
-msgid "To do"
-msgstr "To do"
+#: spyder/widgets/variableexplorer/importwizard.py:511
+msgid "Variable Name"
+msgstr "Nome da variável"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:1974
-#, fuzzy
-msgid "Removal error"
-msgstr "Erro de importação"
+#: spyder/widgets/variableexplorer/importwizard.py:534
+msgid "Done"
+msgstr "Feito"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:1975
+#: spyder/widgets/variableexplorer/importwizard.py:572
 msgid ""
-"It was not possible to remove outputs from this notebook. The error is:\n"
-"\n"
+"<b>Unable to proceed to next step</b><br><br>Please check your entries."
+"<br><br>Error message:<br>%s"
 msgstr ""
+"<b>Não foi possível prosseguir para o próximo passo</b><br><br>Por favor "
+"revise seus dados<br><br>Mensagem de erro:<br>%s"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:2453
-msgid "Clear all ouput"
-msgstr "Limpar todas as saídas "
+#: spyder/widgets/variableexplorer/namespacebrowser.py:199
+msgid "Refresh"
+msgstr "Atualizar"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:2459
-msgid "Go to definition"
-msgstr "Ver definição"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:203
+msgid "Refresh periodically"
+msgstr "Atualizar periodicamente"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:2471
-#, fuzzy
-msgid "Zoom reset"
-msgstr "Menos zoom"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:210
+#: spyder/widgets/variableexplorer/namespacebrowser.py:490
+msgid "Import data"
+msgstr "Importar data"
 
-#: spyderlib/widgets/sourcecode/syntaxhighlighters.py:32
-msgid "Syntax highlighting for Matlab, Julia and other file types"
-msgstr "Sintaxe colorida para arquivos do tipo Matlab, Julia e outros tipos"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:213
+#: spyder/widgets/variableexplorer/namespacebrowser.py:568
+#: spyder/widgets/variableexplorer/namespacebrowser.py:587
+msgid "Save data"
+msgstr "Salvar data"
 
-#: spyderlib/widgets/status.py:23
-msgid "CPU and memory usage info in the status bar"
-msgstr "Uso de CPU e memória na barra de status"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:218
+msgid "Save data as..."
+msgstr "Salvar data como..."
 
-#: spyderlib/widgets/status.py:92
-msgid "Memory:"
-msgstr "Memória:"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:230
+msgid "Exclude references which name starts with an underscore"
+msgstr "Excluir variáveis cujo nomes comecem com sublinhado"
 
-#: spyderlib/widgets/status.py:93
-msgid ""
-"Memory usage status: requires the `psutil` (>=v0.3) library on non-Windows "
-"platforms"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:238
+msgid "Exclude references which name is uppercase"
 msgstr ""
-"Status de uso da memória: requer a biblioteca `psutil` (>=v0.3) em outras "
-"plataformas"
-
-#: spyderlib/widgets/status.py:105
-msgid "CPU:"
-msgstr "CPU:"
-
-#: spyderlib/widgets/status.py:106
-msgid "CPU usage status: requires the `psutil` (>=v0.3) library"
-msgstr "Status de uso da CPU: requer a biblioteca `psutil` (>=v0.3)"
+"Excluir variáveis cujo nome esteja\n"
+"completamente em maiúsculas"
 
-#: spyderlib/widgets/status.py:128
-msgid "Permissions:"
-msgstr "Permissões:"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:245
+msgid "Exclude references which name starts with an uppercase character"
+msgstr "Excluir variáveis cujo nome comece com maiúsculas. "
 
-#: spyderlib/widgets/status.py:142
-msgid "End-of-lines:"
-msgstr "Fim de linha:"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:253
+msgid ""
+"Exclude references to unsupported data types (i.e. which won't be handled/"
+"saved correctly)"
+msgstr ""
+"Excluir variáveis que guardam tipos de dados não suportados\n"
+"(aqueles que não podem ser manipulados e armazenados\n"
+" corretamente)"
 
-#: spyderlib/widgets/status.py:156
-msgid "Encoding:"
-msgstr "Codificação:"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:348
+msgid "Object <b>%s</b> is not picklable"
+msgstr "O objeto <b>%s</b> não é picklable"
 
-#: spyderlib/widgets/status.py:169
-msgid "Line:"
-msgstr "Linha:"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:510
+msgid ""
+"<b>Unsupported file extension '%s'</b><br><br>Would you like to import it "
+"anyway (by selecting a known file format)?"
+msgstr ""
+"<b>Tipo de arquivo não suportado '%s'</b><br><br>Deseja importar mesmo assim "
+"(selecionando um formato conhecido)?"
 
-#: spyderlib/widgets/status.py:173
-msgid "Column:"
-msgstr "Coluna:"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:518
+msgid "Open file as:"
+msgstr "Abrir arquivo como:"
 
-#: spyderlib/widgets/tabs.py:142
-msgid "Browse tabs"
-msgstr "Navegar pelas abas"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:556
+msgid "<b>Unable to load '%s'</b><br><br>Error message:<br>%s"
+msgstr "<b>Não foi possível carregar '%s'</b><br><br>Mensagem de erro:<br>%s"
 
-#: spyderlib/widgets/tabs.py:270
-msgid "Close current tab"
-msgstr "Fechar aba atual"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:588
+msgid "<b>Unable to save current workspace</b><br><br>Error message:<br>%s"
+msgstr ""
+"<b>Não foi possível salvar o espaço de trabalho atual</b><br><br>Mensagem de "
+"erro:<br>%s"
 
-#: spyderlib/widgets/texteditor.py:72
+#: spyder/widgets/variableexplorer/texteditor.py:74
 msgid "Text editor"
 msgstr "Editor de texto"
 
-#: spyderlib/workers/updates.py:79 spyderlib/workers/updates.py:81
-msgid "Unable to retrieve information."
+#: spyder/widgets/variableexplorer/utils.py:29
+msgid "View and edit DataFrames and Series in the Variable Explorer"
+msgstr "Ver e editar DataFrames e Series no Explorador de Variáveis"
+
+#: spyder/widgets/variableexplorer/utils.py:34
+msgid "View and edit two and three dimensional arrays in the Variable Explorer"
 msgstr ""
+"Ver e editar duas e três matrizes dimensionais no Explorador de Variáveis"
+
+#: spyder/workers/updates.py:89 spyder/workers/updates.py:91
+msgid "Unable to retrieve information."
+msgstr "Não foi possível receber a informação."
 
-#: spyderlib/workers/updates.py:83
+#: spyder/workers/updates.py:93
 msgid ""
 "Unable to connect to the internet. <br><br>Make sure the connection is "
 "working properly."
 msgstr ""
+"Não foi possível conectar a internet. <br><br>Tenha certeza se a conexão "
+"está realmente funcionando."
 
-#: spyderlib/workers/updates.py:86
-#, fuzzy
+#: spyder/workers/updates.py:96
 msgid "Unable to check for updates."
-msgstr "Não foi possível carregar a página"
-
-#~ msgid "PyQt"
-#~ msgstr "PyQt"
-
-#~ msgid "API selection for QString and QVariant objects:"
-#~ msgstr "Seleção da API para objetos QString e QVariant:"
-
-#~ msgid "API #1"
-#~ msgstr "API #1"
-
-#~ msgid "API #2"
-#~ msgstr "API #1"
-
-#~ msgid "Default API"
-#~ msgstr "API Padrão"
-
-#~ msgid ""
-#~ "PyQt API #1 is the default <br>API for Python 2. PyQt API #2 is the "
-#~ "default API for Python 3 and is compatible with PySide."
-#~ msgstr ""
-#~ "A API #1 de PyQt é a API padrão <br>para o Python 2. A API #2 do PyQt é a "
-#~ "API padrão para o Python 3 e é compatível com o PySide."
-
-#~ msgid "Ignore API change errors (sip.setapi)"
-#~ msgstr "Ignorar erros de mudança de API (sip.setapi)"
-
-#~ 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 feature wisely, e.g. for debugging purpose."
-#~ msgstr ""
-#~ "Ativando esta opção serão ignorados <br>os erros gerados ao mudar a API "
-#~ "do PyQt. Dado que o PyQt não suporta mudanças dinâmicas da API, é "
-#~ "recomendável usar essa funcionalidade com certo cuidado, por exemplo, "
-#~ "para propósitos de depuração."
-
-#~ msgid "Matplotlib"
-#~ msgstr "Matplotlib"
-
-#~ msgid "GUI backend:"
-#~ msgstr "Saída gráfica:"
-
-#~ msgid ""
-#~ "Set the GUI toolkit used by <br>Matplotlib to show figures (default: "
-#~ "Qt4Agg)"
-#~ msgstr ""
-#~ "Definir interface gráfica usada pelo <br>Matplotlib para mostrar imagens "
-#~ "(padrão: Qt4Agg)"
-
-#~ msgid "Mod1"
-#~ msgstr "Mod1"
-
-#~ msgid "Mod2"
-#~ msgstr "Mod2"
-
-#~ msgid "Mod3"
-#~ msgstr "Mod3"
-
-#, fuzzy
-#~ msgid "The Internal Console"
-#~ msgstr "Console interno"
-
-#~ msgid "File list management"
-#~ msgstr "Gerenciador da lista de arquivos"
-
-#~ msgid "Filter:"
-#~ msgstr "Filtro:"
-
-#~ msgid "(press <b>Enter</b> to edit file)"
-#~ msgstr "(Aperte <b>Enter</b> para editar)"
-
-#~ msgid "&Edit file"
-#~ msgstr "&Editar arrquivo"
-
-#~ msgid "&Close file"
-#~ msgstr "&Fechar arquivo"
-
-#~ msgid "Hint: press <b>Alt</b> to show accelerators"
-#~ msgstr "Sugestão: aperte <b>Alt</b> para mostrar aceleradores"
-
-#~ msgid "Vertical dockwidget tabs"
-#~ msgstr "Componentes em abas verticais"
-
-#~ msgid "Custom dockwidget margin:"
-#~ msgstr "Margem de componente personalizada:"
-
-#~ 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 ""
-#~ "<u>Nota</u>: Adicione <b>analysis:ignore</b> a um comentário para ignorar "
-#~ "avisos de análise de código ou estilo. Para mais informações sobre um "
-#~ "guia de estilo para escrever código em Python, por favor visite a página "
-#~ "%s (em inglês).<br>"
-
-#~ msgid "Style analysis"
-#~ msgstr "Análise de estilo"
-
-#~ msgid "Qt (PyQt/PySide)"
-#~ msgstr "Qt (PyQt/PySide)"
-
-#~ msgid "Install Spyder's input hook for Qt"
-#~ msgstr "Instalar o \"input hook\" do Spyder para o Qt"
-
-#~ msgid ""
-#~ "PyQt installs an input hook that allows<br> creating and interacting with "
-#~ "Qt widgets in an interactive console without blocking it. On Windows "
-#~ "platforms, it is strongly recommended to replace it by Spyder's. "
-#~ "Regarding PySide, note that it does not install an input hook, so it is "
-#~ "required to enable this feature in order to be able to manipulate PySide/"
-#~ "Qtobjects interactively."
-#~ msgstr ""
-#~ "PyQt instala um mecanismo de \"input hook\"<br> que permite criar e "
-#~ "interagir com widgets do Qt em um console sem bloqueá-lo. No Windows é "
-#~ "altamente recomendável substituir este mecanismo pelo do Spyder. A "
-#~ "respeito do PySide, ele não instala um \"inputhook\", Então é necessário "
-#~ "ativar esta característica para poder manipular objetos do PySide/Qt "
-#~ "interativamente."
-
-#~ msgid "Use a completion widget"
-#~ msgstr "Usar um widget para completar texto"
-
-#~ msgid "Use a widget instead of plain text output for tab completion"
-#~ msgstr ""
-#~ "Usar um widget no lugar da saída de texto plano para \n"
-#~ "mostrar as possibilidades do completador usando a tecla\n"
-#~ "Tab."
-
-#~ msgid ""
-#~ "%s will be closed.\n"
-#~ "Do you want to kill the associated kernel and all of its clients?"
-#~ msgstr ""
-#~ "%s será fechado.\n"
-#~ "Deseja matar o kernel associado e todos seus clientes?"
-
-#~ msgid "Could not open ssh tunnel\n"
-#~ msgstr "não foi possível criar um túnel ssh\n"
-
-#~ msgid "Mismatch between kernel and frontend"
-#~ msgstr "Incompatibilidade entre o kernel e a interface gráfica"
-
-#~ 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 ""
-#~ "Suas versões do kernel e da interface gráfica do IPython são "
-#~ "<b>incompativeis!!</b><br><br>Desculpe mas não podemos criar um console "
-#~ "IPython para você."
-
-#~ msgid "Always edit in-place"
-#~ msgstr "Sempre editar em linha"
-
-#~ msgid "Show collection contents"
-#~ msgstr "Mostrar conteúdo de listas"
-
-#~ msgid "Switch to/from layout %d"
-#~ msgstr "Mudar para esquema %d"
-
-#~ msgid "Set layout %d"
-#~ msgstr "Definir esquema %d"
-
-#~ msgid "User Module Deleter (UMD)"
-#~ msgstr "Eliminador de Módulos do Usuário (EMU)"
-
-#~ msgid ""
-#~ "UMD forces Python to reload modules which were imported when executing "
-#~ "a \n"
-#~ "script in the external console with the 'runfile' function."
-#~ msgstr ""
-#~ "O EMU obriga o Python a recarregar os módulos que foram importados\n"
-#~ "durante a execução de um arquivo no console com a função 'runfile'."
-
-#~ msgid "Enable UMD"
-#~ msgstr "Ativar UMD"
-
-#~ msgid ""
-#~ "This option will enable the User Module Deleter (UMD) in Python/IPython "
-#~ "consoles. UMD forces Python to reload deeply modules during import when "
-#~ "running a Python script using the Spyder's builtin function <b>runfile</"
-#~ "b>.<br><br><b>1.</b> UMD may require to restart the console in which it "
-#~ "will be called (otherwise only newly imported modules will be reloaded "
-#~ "when executing scripts).<br><br><b>2.</b> If errors occur when re-running "
-#~ "a PyQt-based program, please check that the Qt objects are properly "
-#~ "destroyed (e.g. you may have to use the attribute <b>Qt.WA_DeleteOnClose</"
-#~ "b> on your main window, using the <b>setAttribute</b> method)"
-#~ msgstr ""
-#~ "Essa opção irá ativar o Eliminador de módulos do usuário (EMU) nos "
-#~ "consoles do Python e IPython. O EMU obriga o Python a recarregar "
-#~ "profundamente os módulos que foram importados durante a execução de um "
-#~ "script, usando a função incorporada do Spyder chamada <b>runfile</b>."
-#~ "<br><br><b>1.</b> O EMU pode precisar que o console no qual será "
-#~ "utilizado (de outra forma, só os módulos que foram importados em último "
-#~ "lugar serão recarregados ao executar um arquivo).<br><br><b>2.</b> se "
-#~ "ocorrer algum erro ao executar novamente programas baseados no PyQt ou "
-#~ "PySide, por favor verifique se os objetos do Qt foram  apropriadamente "
-#~ "destruídos (por exemplo, talvez você precise usar o atributo <b>Qt."
-#~ "WA_DeleteOnClose</b> na sua janela principal, usando o método "
-#~ "<b>setAttribute</b>)."
-
-#~ msgid "Set UMD excluded (not reloaded) modules"
-#~ msgstr "Definir lista de módulos excluídos pelo EMU"
-
-#~ 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 the button far to the right."
-#~ msgstr ""
-#~ "Você não pode fechar esse kernel porque existem um ou mais consoles "
-#~ "conectados a ele.<br><br>Você precisa fechá-lo ou matar o processo usando "
-#~ "o botão direito."
-
-#~ msgid "UMD"
-#~ msgstr "UMD"
-
-#~ msgid ""
-#~ "UMD excluded modules:\n"
-#~ "(example: guidata, guiqwt)"
-#~ msgstr ""
-#~ "Módulos excluídos do EMU:\n"
-#~ "(Exemplo: guidata, guiqwt)"
-
-#~ msgid ""
-#~ "Resizing cells of a table of such size could take a long time.\n"
-#~ "Do you want to continue anyway?"
-#~ msgstr ""
-#~ "Redimensionar as células de uma tabela desse tamanho pode\n"
-#~ " demorar muito tempo.\n"
-#~ "\n"
-#~ "Deseja continuar mesmo assim?"
-
-#~ 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 ""
-#~ "Intenta interrumpir este proceso, pero éste\n"
-#~ "puede no concluir tras oprimir este botón\n"
-#~ "(pues es posible que se le pida al usuario\n"
-#~ "guardar archivos sin salvar, etc)."
-
-#~ msgid "Additionnal options"
-#~ msgstr "Opções adcionais"
-
-#~ msgid "Interrupt kernel"
-#~ msgstr "Interromper kernel "
+msgstr "Não foi possível verificar por atualizações."
diff --git a/spyder/locale/ru/LC_MESSAGES/spyder.mo b/spyder/locale/ru/LC_MESSAGES/spyder.mo
new file mode 100644
index 0000000..f655c03
Binary files /dev/null and b/spyder/locale/ru/LC_MESSAGES/spyder.mo differ
diff --git a/spyderlib/locale/ru/LC_MESSAGES/spyderlib.po b/spyder/locale/ru/LC_MESSAGES/spyder.po
similarity index 64%
rename from spyderlib/locale/ru/LC_MESSAGES/spyderlib.po
rename to spyder/locale/ru/LC_MESSAGES/spyder.po
index 7cb449e..800dabd 100644
--- a/spyderlib/locale/ru/LC_MESSAGES/spyderlib.po
+++ b/spyder/locale/ru/LC_MESSAGES/spyder.po
@@ -6,10 +6,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.3\n"
+"Project-Id-Version: 3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-19 17:58+0300\n"
-"PO-Revision-Date: 2016-04-18 19:36+0300\n"
+"POT-Creation-Date: 2016-09-24 04:45+COT\n"
+"PO-Revision-Date: 2016-09-21 14:48+0300\n"
 "Last-Translator: Roman Kulagin <Roman.Qlogin at gmail.com>\n"
 "Language-Team: русский <LL at li.org>\n"
 "Language: ru_RU\n"
@@ -21,334 +21,240 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: spyderlib/app/restart.py:129
-msgid ""
-"It was not possible to close the previous Spyder instance.\n"
-"Restart aborted."
-msgstr ""
-"Не удалось закрыть предыдущий экземпляр Spyder.\n"
-"Перезапуск прерван."
-
-#: spyderlib/app/restart.py:131
-msgid ""
-"Spyder could not reset to factory defaults.\n"
-"Restart aborted."
-msgstr ""
-"Невозможно сбросить настройки Spyder в значения по умолчанию.\n"
-"Операция прервана."
-
-#: spyderlib/app/restart.py:133
-msgid ""
-"It was not possible to restart Spyder.\n"
-"Operation aborted."
-msgstr ""
-"Невозможно перезапустить Spyder.\n"
-"Операция прервана."
-
-#: spyderlib/app/restart.py:135
-msgid "Spyder exit error"
-msgstr "Ошибка выхода из Spyder"
-
-#: spyderlib/app/restart.py:136
-msgid "Spyder reset error"
-msgstr "Ошибка сброса настроек Spyder"
-
-#: spyderlib/app/restart.py:137
-msgid "Spyder restart error"
-msgstr "Ошибка перезапуска Spyder"
-
-#: spyderlib/app/restart.py:141
-#, python-brace-format
-msgid ""
-"\n"
-"\n"
-"{0}"
-msgstr ""
-"\n"
-"\n"
-"{0}"
-
-#: spyderlib/app/restart.py:161
-msgid "Closing Spyder"
-msgstr "Закрытие Spyder"
-
-#: spyderlib/app/restart.py:235
-msgid "Resetting Spyder to defaults"
-msgstr "Восстановить настройки по умолчанию"
-
-#: spyderlib/app/restart.py:267
-msgid "Restarting"
-msgstr "Перезапуск"
-
-#: spyderlib/app/spyder.py:112
+#: spyder/app/mainwindow.py:120
 msgid "Initializing..."
 msgstr "Инициализация..."
 
-#: spyderlib/app/spyder.py:237
+#: spyder/app/mainwindow.py:236
 msgid "Numpy and Scipy documentation"
 msgstr "Документация Numpy и Scipy"
 
-#: spyderlib/app/spyder.py:239 spyderlib/app/spyder.py:1073
+#: spyder/app/mainwindow.py:238 spyder/app/mainwindow.py:1022
 msgid "Matplotlib documentation"
 msgstr "Документация Matplotlib"
 
-#: spyderlib/app/spyder.py:242
+#: spyder/app/mainwindow.py:241
 msgid "PyQt4 Reference Guide"
 msgstr "Справочное руководство по PyQt4"
 
-#: spyderlib/app/spyder.py:245
+#: spyder/app/mainwindow.py:244
 msgid "PyQt4 API Reference"
 msgstr "Справка по API PyQt4"
 
-#: spyderlib/app/spyder.py:247
+#: spyder/app/mainwindow.py:246
 msgid "Python(x,y)"
 msgstr "Python(x,y)"
 
-#: spyderlib/app/spyder.py:249
+#: spyder/app/mainwindow.py:248
 msgid "WinPython"
 msgstr "WinPython"
 
-#: spyderlib/app/spyder.py:311
-msgid "Reload last session"
-msgstr "Перезапустить последнюю сессию"
-
-#: spyderlib/app/spyder.py:315
-msgid "Load session..."
-msgstr "Загрузить сессию..."
-
-#: spyderlib/app/spyder.py:318
-msgid "Load Spyder session"
-msgstr "Загрузить сессию Spyder"
-
-#: spyderlib/app/spyder.py:320
-msgid "Save session and quit..."
-msgstr "Сохранить сессию и выйти..."
-
-#: spyderlib/app/spyder.py:323
-msgid "Save current session and quit application"
-msgstr "Сохранить текущую сессию и закрыть приложение"
-
-#: spyderlib/app/spyder.py:533
+#: spyder/app/mainwindow.py:519
 msgid "Close current pane"
 msgstr "Закрыть текущую панель"
 
-#: spyderlib/app/spyder.py:538
+#: spyder/app/mainwindow.py:524
 msgid "Lock panes"
 msgstr "Закрепить панели"
 
-#: spyderlib/app/spyder.py:545
+#: spyder/app/mainwindow.py:531
 msgid "Use next layout"
 msgstr "Исп. следующую компоновку"
 
-#: spyderlib/app/spyder.py:549
+#: spyder/app/mainwindow.py:535
 msgid "Use previous layout"
 msgstr "Исп. предыдущую компоновку"
 
-#: spyderlib/app/spyder.py:558
-msgid "&Find text"
-msgstr "&Найти текст"
-
-#: spyderlib/app/spyder.py:563
-msgid "Find &next"
-msgstr "Найти &следующий"
-
-#: spyderlib/app/spyder.py:570
-msgid "Find &previous"
-msgstr "Найти &предыдущий"
-
-#: spyderlib/app/spyder.py:576
-msgid "&Replace text"
-msgstr "&Заменить текст"
-
-#: spyderlib/app/spyder.py:596 spyderlib/widgets/sourcecode/codeeditor.py:2418
+#: spyder/app/mainwindow.py:554 spyder/widgets/sourcecode/codeeditor.py:2464
 msgid "Undo"
 msgstr "Отменить"
 
-#: spyderlib/app/spyder.py:598 spyderlib/widgets/sourcecode/codeeditor.py:2421
+#: spyder/app/mainwindow.py:556 spyder/widgets/sourcecode/codeeditor.py:2467
 msgid "Redo"
 msgstr "Вернуть"
 
-#: spyderlib/app/spyder.py:600
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:638
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:452
-#: spyderlib/widgets/variableexplorer/dataframeeditor.py:425
-#: spyderlib/widgets/shell.py:120
-#: spyderlib/widgets/sourcecode/codeeditor.py:2427
+#: spyder/app/mainwindow.py:558 spyder/widgets/shell.py:121
+#: spyder/widgets/sourcecode/codeeditor.py:2473
+#: spyder/widgets/variableexplorer/arrayeditor.py:453
+#: spyder/widgets/variableexplorer/collectionseditor.py:647
+#: spyder/widgets/variableexplorer/dataframeeditor.py:445
 msgid "Copy"
 msgstr "Копировать"
 
-#: spyderlib/app/spyder.py:602 spyderlib/widgets/shell.py:116
-#: spyderlib/widgets/sourcecode/codeeditor.py:2424
+#: spyder/app/mainwindow.py:560 spyder/widgets/shell.py:117
+#: spyder/widgets/sourcecode/codeeditor.py:2470
 msgid "Cut"
 msgstr "Вырезать"
 
-#: spyderlib/app/spyder.py:604
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:635
-#: spyderlib/widgets/shell.py:124
-#: spyderlib/widgets/sourcecode/codeeditor.py:2430
+#: spyder/app/mainwindow.py:562 spyder/widgets/shell.py:125
+#: spyder/widgets/sourcecode/codeeditor.py:2476
+#: spyder/widgets/variableexplorer/collectionseditor.py:644
 msgid "Paste"
 msgstr "Вставить"
 
-#: spyderlib/app/spyder.py:607 spyderlib/widgets/shell.py:137
-#: spyderlib/widgets/sourcecode/codeeditor.py:2433
+#: spyder/app/mainwindow.py:565 spyder/widgets/shell.py:138
+#: spyder/widgets/sourcecode/codeeditor.py:2479
 msgid "Select All"
 msgstr "Выделить всё"
 
-#: spyderlib/app/spyder.py:624 spyderlib/plugins/editor.py:1257
+#: spyder/app/mainwindow.py:575 spyder/plugins/editor.py:1342
 msgid "&File"
 msgstr "&Файл"
 
-#: spyderlib/app/spyder.py:626 spyderlib/plugins/editor.py:1249
+#: spyder/app/mainwindow.py:576 spyder/plugins/editor.py:1334
 msgid "File toolbar"
 msgstr "Панель файлов"
 
-#: spyderlib/app/spyder.py:630 spyderlib/plugins/editor.py:1258
+#: spyder/app/mainwindow.py:580 spyder/plugins/editor.py:1343
 msgid "&Edit"
 msgstr "&Правка"
 
-#: spyderlib/app/spyder.py:631 spyderlib/plugins/editor.py:1254
+#: spyder/app/mainwindow.py:581 spyder/plugins/editor.py:1339
 msgid "Edit toolbar"
 msgstr "Панель правки"
 
-#: spyderlib/app/spyder.py:635 spyderlib/plugins/editor.py:1259
+#: spyder/app/mainwindow.py:585 spyder/plugins/editor.py:1344
 msgid "&Search"
 msgstr "П&оиск"
 
-#: spyderlib/app/spyder.py:636 spyderlib/plugins/editor.py:1250
+#: spyder/app/mainwindow.py:586 spyder/plugins/editor.py:1335
 msgid "Search toolbar"
 msgstr "Панель поиска"
 
-#: spyderlib/app/spyder.py:640 spyderlib/plugins/editor.py:1260
+#: spyder/app/mainwindow.py:590 spyder/plugins/editor.py:1345
 msgid "Sour&ce"
 msgstr "&Документ"
 
-#: spyderlib/app/spyder.py:641 spyderlib/plugins/editor.py:1251
+#: spyder/app/mainwindow.py:591 spyder/plugins/editor.py:1336
 msgid "Source toolbar"
 msgstr "Панель кода"
 
-#: spyderlib/app/spyder.py:645 spyderlib/plugins/editor.py:775
-#: spyderlib/plugins/editor.py:1261
+#: spyder/app/mainwindow.py:595 spyder/plugins/editor.py:780
+#: spyder/plugins/editor.py:1346
 msgid "&Run"
 msgstr "&Запуск"
 
-#: spyderlib/app/spyder.py:646 spyderlib/plugins/editor.py:1252
+#: spyder/app/mainwindow.py:596 spyder/plugins/editor.py:1337
 msgid "Run toolbar"
 msgstr "Панель запуска"
 
-#: spyderlib/app/spyder.py:650 spyderlib/plugins/editor.py:723
+#: spyder/app/mainwindow.py:600 spyder/plugins/editor.py:739
 msgid "&Debug"
 msgstr "&Отладка"
 
-#: spyderlib/app/spyder.py:651 spyderlib/plugins/editor.py:1253
+#: spyder/app/mainwindow.py:601 spyder/plugins/editor.py:1338
 msgid "Debug toolbar"
 msgstr "Панель отладки"
 
-#: spyderlib/app/spyder.py:655
+#: spyder/app/mainwindow.py:605
 msgid "C&onsoles"
 msgstr "&Консоли"
 
-#: spyderlib/app/spyder.py:658 spyderlib/plugins/editor.py:1262
+#: spyder/app/mainwindow.py:608
+msgid "&Projects"
+msgstr "&Проекты"
+
+#: spyder/app/mainwindow.py:611 spyder/plugins/editor.py:1347
 msgid "&Tools"
 msgstr "&Инструменты"
 
-#: spyderlib/app/spyder.py:661
+#: spyder/app/mainwindow.py:614
 msgid "&View"
 msgstr "&Вид"
 
-#: spyderlib/app/spyder.py:664
+#: spyder/app/mainwindow.py:617
 msgid "&Help"
 msgstr "Спр&авка"
 
-#: spyderlib/app/spyder.py:669
+#: spyder/app/mainwindow.py:622
 msgid "Welcome to Spyder!"
 msgstr "Добро пожаловать в Spyder!"
 
-#: spyderlib/app/spyder.py:674
+#: spyder/app/mainwindow.py:627
 msgid "Pre&ferences"
 msgstr "&Параметры"
 
-#: spyderlib/app/spyder.py:681 spyderlib/widgets/pathmanager.py:48
-#: spyderlib/widgets/projectexplorer.py:598
+#: spyder/app/mainwindow.py:634 spyder/widgets/pathmanager.py:49
 msgid "PYTHONPATH manager"
 msgstr "Менеджер PYTHONPATH"
 
-#: spyderlib/app/spyder.py:684
+#: spyder/app/mainwindow.py:637
 msgid "Python Path Manager"
 msgstr "Менеджер путей Python"
 
-#: spyderlib/app/spyder.py:687
+#: spyder/app/mainwindow.py:640
 msgid "Update module names list"
 msgstr "Обновить список модулей"
 
-#: spyderlib/app/spyder.py:690
+#: spyder/app/mainwindow.py:643
 msgid "Refresh list of module names available in PYTHONPATH"
 msgstr "Обновить список имён модулей, доступных в PYTHONPATH"
 
-#: spyderlib/app/spyder.py:693
+#: spyder/app/mainwindow.py:646
 msgid "Reset Spyder to factory defaults"
 msgstr "Вернуть Spyder к заводским настройкам"
 
-#: spyderlib/app/spyder.py:698
+#: spyder/app/mainwindow.py:651
 msgid "Current user environment variables..."
-msgstr "Переменные окружения текущего пользователя..."
+msgstr "Переменные cреды текущего пользователя..."
 
-#: spyderlib/app/spyder.py:700
+#: spyder/app/mainwindow.py:653
 msgid ""
 "Show and edit current user environment variables in Windows registry (i.e. "
 "for all sessions)"
 msgstr ""
-"Показывать и редактировать переменные окружения в реестре Windows (т.е. для "
-"всех сессий)"
+"Показывать и редактировать переменные среды в реестре Windows (т.е. для всех "
+"сессий)"
 
-#: spyderlib/app/spyder.py:709 spyderlib/app/spyder.py:1167
+#: spyder/app/mainwindow.py:662 spyder/app/mainwindow.py:1118
 msgid "External Tools"
 msgstr "Внешние инструменты"
 
-#: spyderlib/app/spyder.py:713
+#: spyder/app/mainwindow.py:666
 msgid "Python(x,y) launcher"
 msgstr "Загрузчик Python(x,y)"
 
-#: spyderlib/app/spyder.py:720
+#: spyder/app/mainwindow.py:673
 msgid "WinPython control panel"
 msgstr "контрольная панель WinPython"
 
-#: spyderlib/app/spyder.py:729
+#: spyder/app/mainwindow.py:682
 msgid "Qt Designer"
 msgstr "Qt дизайнер"
 
-#: spyderlib/app/spyder.py:734
+#: spyder/app/mainwindow.py:687
 msgid "Qt Linguist"
 msgstr "Qt Linguist"
 
-#: spyderlib/app/spyder.py:740
+#: spyder/app/mainwindow.py:693
 msgid "Qt examples"
 msgstr "Примеры Qt"
 
-#: spyderlib/app/spyder.py:761
+#: spyder/app/mainwindow.py:714
 msgid "guidata examples"
 msgstr "примеры guidata"
 
-#: spyderlib/app/spyder.py:772
+#: spyder/app/mainwindow.py:725
 msgid "guiqwt examples"
 msgstr "примеры guiqwt"
 
-#: spyderlib/app/spyder.py:777
+#: spyder/app/mainwindow.py:730
 msgid "Sift"
 msgstr "Sift"
 
-#: spyderlib/app/spyder.py:787
+#: spyder/app/mainwindow.py:740
 msgid "ViTables"
 msgstr "ViTables"
 
-#: spyderlib/app/spyder.py:801
+#: spyder/app/mainwindow.py:754
 msgid "Fullscreen mode"
 msgstr "Полноэкранный режим"
 
-#: spyderlib/app/spyder.py:813
+#: spyder/app/mainwindow.py:766
 msgid "Main toolbar"
 msgstr "Главная панель"
 
-#: spyderlib/app/spyder.py:822
+#: spyder/app/mainwindow.py:775
 msgid ""
 "Spyder Internal Console\n"
 "\n"
@@ -370,241 +276,239 @@ msgstr ""
 "Пожалуйста, не используйте её для\n"
 "запуска своего кода\n"
 
-#: spyderlib/app/spyder.py:839
+#: spyder/app/mainwindow.py:792
 msgid "Loading help..."
 msgstr "Загрузка справки..."
 
-#: spyderlib/app/spyder.py:846
+#: spyder/app/mainwindow.py:799
 msgid "Loading outline explorer..."
 msgstr "Загузка менеджера структуры..."
 
-#: spyderlib/app/spyder.py:854
+#: spyder/app/mainwindow.py:807
 msgid "Loading editor..."
 msgstr "Загрузка редактора..."
 
-#: spyderlib/app/spyder.py:860 spyderlib/widgets/ipython.py:610
-#: spyderlib/plugins/console.py:133
+#: spyder/app/mainwindow.py:813 spyder/plugins/console.py:134
+#: spyder/widgets/ipythonconsole/client.py:278
 msgid "&Quit"
 msgstr "В&ыход"
 
-#: spyderlib/app/spyder.py:862 spyderlib/plugins/console.py:135
+#: spyder/app/mainwindow.py:815 spyder/plugins/console.py:136
 msgid "Quit"
 msgstr "Выход"
 
-#: spyderlib/app/spyder.py:865
+#: spyder/app/mainwindow.py:819
 msgid "&Restart"
 msgstr "Пе&резапуск"
 
-#: spyderlib/app/spyder.py:867
+#: spyder/app/mainwindow.py:821
 msgid "Restart"
 msgstr "Перезапуск"
 
-#: spyderlib/app/spyder.py:886
+#: spyder/app/mainwindow.py:838
 msgid "Loading file explorer..."
 msgstr "Загрузка файлового менеджера..."
 
-#: spyderlib/app/spyder.py:893
+#: spyder/app/mainwindow.py:845
 msgid "Loading history plugin..."
 msgstr "Загрузка модуля истории..."
 
-#: spyderlib/app/spyder.py:904
+#: spyder/app/mainwindow.py:856
 msgid "Loading online help..."
 msgstr "Загрузка онлайн-помощи..."
 
-#: spyderlib/app/spyder.py:910
+#: spyder/app/mainwindow.py:862
 msgid "Loading project explorer..."
 msgstr "Загрузка менеджера проектов..."
 
-#: spyderlib/app/spyder.py:916
+#: spyder/app/mainwindow.py:869
 msgid "Loading external console..."
 msgstr "Загрузка внешней консоли..."
 
-#: spyderlib/app/spyder.py:922
+#: spyder/app/mainwindow.py:875
 msgid "Loading namespace browser..."
 msgstr "Загрузка менеджера пространств имён..."
 
-#: spyderlib/app/spyder.py:929
+#: spyder/app/mainwindow.py:882
 msgid "Loading IPython console..."
 msgstr "Загрузка консоли IPython..."
 
-#: spyderlib/app/spyder.py:938
+#: spyder/app/mainwindow.py:887
 msgid "Setting up main window..."
 msgstr "Создание главного окна..."
 
-#: spyderlib/app/spyder.py:941
+#: spyder/app/mainwindow.py:890
 msgid "Dependencies..."
 msgstr "Зависимости..."
 
-#: spyderlib/app/spyder.py:945
+#: spyder/app/mainwindow.py:894
 msgid "Report issue..."
 msgstr "Отправить отчёт о проблеме..."
 
-#: spyderlib/app/spyder.py:949
+#: spyder/app/mainwindow.py:898
 msgid "Spyder support..."
 msgstr "Поддержка Spyder..."
 
-#: spyderlib/app/spyder.py:952
+#: spyder/app/mainwindow.py:901
 msgid "Check for updates..."
 msgstr "Проверить обновления..."
 
-#: spyderlib/app/spyder.py:975
+#: spyder/app/mainwindow.py:924
 msgid "Spyder documentation"
 msgstr "Документация Spyder"
 
-#: spyderlib/app/spyder.py:980
+#: spyder/app/mainwindow.py:929
 msgid "Spyder tutorial"
 msgstr "Руководство Spyder"
 
-#: spyderlib/app/spyder.py:987
+#: spyder/app/mainwindow.py:936
 msgid "Interactive tours"
 msgstr "Интерактивные туры"
 
-#: spyderlib/app/spyder.py:1015
+#: spyder/app/mainwindow.py:964
 msgid "Python documentation"
 msgstr "Документация Python"
 
-#: spyderlib/app/spyder.py:1021 spyderlib/app/spyder.py:1065
+#: spyder/app/mainwindow.py:970 spyder/app/mainwindow.py:1014
 msgid "IPython documentation"
 msgstr "Документация IPython"
 
-#: spyderlib/app/spyder.py:1022
+#: spyder/app/mainwindow.py:971
 msgid "Intro to IPython"
 msgstr "Введение в IPython"
 
-#: spyderlib/app/spyder.py:1024
+#: spyder/app/mainwindow.py:973
 msgid "Quick reference"
 msgstr "Краткий справочник"
 
-#: spyderlib/app/spyder.py:1026
+#: spyder/app/mainwindow.py:975
 msgid "Console help"
 msgstr "Консольная справка"
 
-#: spyderlib/app/spyder.py:1063
+#: spyder/app/mainwindow.py:1012
 msgid "Python(x,y) documentation folder"
 msgstr "Каталог с документацией Python(x,y)"
 
-#: spyderlib/app/spyder.py:1067
+#: spyder/app/mainwindow.py:1016
 msgid "guidata documentation"
 msgstr "Документация guidata"
 
-#: spyderlib/app/spyder.py:1070
+#: spyder/app/mainwindow.py:1019
 msgid "guiqwt documentation"
 msgstr "Документация guiqwt"
 
-#: spyderlib/app/spyder.py:1076
+#: spyder/app/mainwindow.py:1025
 msgid "NumPy documentation"
 msgstr "Документация NumPy"
 
-#: spyderlib/app/spyder.py:1078
+#: spyder/app/mainwindow.py:1027
 msgid "NumPy reference guide"
 msgstr "Справочное руководство NumPy"
 
-#: spyderlib/app/spyder.py:1080
+#: spyder/app/mainwindow.py:1029
 msgid "NumPy user guide"
 msgstr "Руководство пользователя NumPy"
 
-#: spyderlib/app/spyder.py:1082
+#: spyder/app/mainwindow.py:1031
 msgid "SciPy documentation"
 msgstr "Документация SciPy"
 
-#: spyderlib/app/spyder.py:1089
+#: spyder/app/mainwindow.py:1038
 msgid "Installed Python modules"
 msgstr "Установленные модули Python"
 
-#: spyderlib/app/spyder.py:1093
+#: spyder/app/mainwindow.py:1042
 msgid "Online documentation"
 msgstr "Онлайн документация"
 
-#: spyderlib/app/spyder.py:1105
+#: spyder/app/mainwindow.py:1054
 msgid "Qt documentation"
 msgstr "Документация Qt"
 
-#: spyderlib/app/spyder.py:1111
-#, python-format
+#: spyder/app/mainwindow.py:1060
 msgid "About %s..."
 msgstr "О %s..."
 
-#: spyderlib/app/spyder.py:1135
+#: spyder/app/mainwindow.py:1084
 msgid "Panes"
 msgstr "Плавающие окна"
 
-#: spyderlib/app/spyder.py:1136
+#: spyder/app/mainwindow.py:1086
 msgid "Toolbars"
 msgstr "Панели инструментов"
 
-#: spyderlib/app/spyder.py:1137
+#: spyder/app/mainwindow.py:1087
 msgid "Window layouts"
 msgstr "Компоновка окон"
 
-#: spyderlib/app/spyder.py:1146 spyderlib/app/spyder.py:1919
-#: spyderlib/app/spyder.py:1920
+#: spyder/app/mainwindow.py:1096 spyder/app/mainwindow.py:1893
+#: spyder/app/mainwindow.py:1894
 msgid "Show toolbars"
 msgstr "Показывать панели инструментов"
 
-#: spyderlib/app/spyder.py:1160
+#: spyder/app/mainwindow.py:1111
 msgid "Attached console window (debugging)"
 msgstr "Прикреплённая консоль (отладка)"
 
-#: spyderlib/app/spyder.py:1324
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:572
-#: spyderlib/widgets/variableexplorer/dataframeeditor.py:573
-#: spyderlib/widgets/externalshell/pythonshell.py:553
-#: spyderlib/widgets/externalshell/systemshell.py:104
-#: spyderlib/widgets/explorer.py:597 spyderlib/widgets/explorer.py:699
+#: spyder/app/mainwindow.py:1294 spyder/plugins/projects.py:238
+#: spyder/widgets/explorer.py:627 spyder/widgets/explorer.py:732
+#: spyder/widgets/externalshell/pythonshell.py:533
+#: spyder/widgets/externalshell/systemshell.py:105
+#: spyder/widgets/variableexplorer/arrayeditor.py:573
+#: spyder/widgets/variableexplorer/collectionseditor.py:419
+#: spyder/widgets/variableexplorer/dataframeeditor.py:593
 msgid "Error"
 msgstr "Ошибка"
 
-#: spyderlib/app/spyder.py:1325
-#, python-format
+#: spyder/app/mainwindow.py:1295
 msgid ""
 "<b>You have missing dependencies!</b><br><br><tt>%s</tt><br><br><b>Please "
 "install them to avoid this message.</b><br><br><i>Note</i>: Spyder could "
 "work without some of these dependencies, however to have a smooth experience "
 "when using Spyder we <i>strongly</i> recommend you to install all the listed "
-"missing dependencies.<br>Failing to install these dependencies might result "
-"in bugs. Please be sure that any found bugs are not the direct result of "
-"missing dependencies, prior to reporting a new issue."
+"missing dependencies.<br><br>Failing to install these dependencies might "
+"result in bugs. Please be sure that any found bugs are not the direct result "
+"of missing dependencies, prior to reporting a new issue."
 msgstr ""
 "<b>У Вас есть недостающие зависимости!</b><br><br><tt>%s</"
-"tt><br><br><b>Пожалуйста, установите их, чтобы сообщение исчезло.</"
+"tt><br><br><b>Пожалуйста, установите их, чтобы это сообщение исчезло.</"
 "b><br><br><i>Примечание</i>: Возможно, Spyder сможет работать без некоторых "
 "из них, однако для беспроблемного использования Spyder мы <i>настоятельно</"
 "i> рекомендуем установить все приведённые недостающие зависимости."
-"<br>Неудачная установка этих зависимостей могла привести к ошибкам. "
-"Пожалуйста, убедитесь, что любые найденные ошибки не являются прямым "
-"результатот недостающих зависимостей, прежде чем сообщать о новой проблеме."
+"<br><br>Неудачная установка этих зависимостей могла привести к ошибкам. "
+"Пожалуйста, прежде чем сообщать о новой проблеме, убедитесь, что любые "
+"найденные ошибки не являются прямым результатот отсутствия некоторых "
+"зависимостей."
 
-#: spyderlib/app/spyder.py:1766
+#: spyder/app/mainwindow.py:1740
 msgid "Spyder Default Layout"
 msgstr "Стандартная компоновка Spyder"
 
-#: spyderlib/app/spyder.py:1784
+#: spyder/app/mainwindow.py:1758
 msgid "Save current layout"
 msgstr "Сохранить текущую компоновку"
 
-#: spyderlib/app/spyder.py:1788
+#: spyder/app/mainwindow.py:1762
 msgid "Layout preferences"
 msgstr "Параметры компоновки"
 
-#: spyderlib/app/spyder.py:1792
+#: spyder/app/mainwindow.py:1766
 msgid "Reset to spyder default"
 msgstr "Вернуть компоновку по умолчанию"
 
-#: spyderlib/app/spyder.py:1812 spyderlib/app/spyder.py:1834
-#: spyderlib/app/spyder.py:1897 spyderlib/app/spyder.py:2775
-#: spyderlib/utils/environ.py:97 spyderlib/utils/environ.py:110
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:407
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:1048
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:495
-#: spyderlib/plugins/configdialog.py:1229
-#: spyderlib/plugins/ipythonconsole.py:114
-#: spyderlib/plugins/ipythonconsole.py:834
-#: spyderlib/plugins/externalconsole.py:368
-#: spyderlib/plugins/externalconsole.py:611
+#: spyder/app/mainwindow.py:1786 spyder/app/mainwindow.py:1808
+#: spyder/app/mainwindow.py:1871 spyder/app/mainwindow.py:2655
+#: spyder/plugins/configdialog.py:1250 spyder/plugins/externalconsole.py:446
+#: spyder/plugins/ipythonconsole.py:119 spyder/plugins/ipythonconsole.py:835
+#: spyder/plugins/maininterpreter.py:167 spyder/utils/environ.py:100
+#: spyder/utils/environ.py:113
+#: spyder/widgets/variableexplorer/arrayeditor.py:496
+#: spyder/widgets/variableexplorer/collectionseditor.py:410
+#: spyder/widgets/variableexplorer/collectionseditor.py:1063
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: spyderlib/app/spyder.py:1813
+#: spyder/app/mainwindow.py:1787
 msgid ""
 "Window layout will be reset to default settings: this affects window "
 "position, size and dockwidgets.\n"
@@ -614,67 +518,50 @@ msgstr ""
 "размере и объединении окон.\n"
 "Хотите продолжить?"
 
-#: spyderlib/app/spyder.py:1835
-#, python-format
+#: spyder/app/mainwindow.py:1809
 msgid ""
 "Layout <b>%s</b> will be                                                "
 "overwritten. Do you want to                                                "
 "continue?"
 msgstr "Компоновка <b>%s</b> будет перезаписана. Хотите продолжить?"
 
-#: spyderlib/app/spyder.py:1898
-#, python-format
+#: spyder/app/mainwindow.py:1872
 msgid "Quick switch layout #%s has not yet been defined."
 msgstr "Быстрое переключение компоновки #%s не было определено."
 
-#: spyderlib/app/spyder.py:1916 spyderlib/app/spyder.py:1917
+#: spyder/app/mainwindow.py:1890 spyder/app/mainwindow.py:1891
 msgid "Hide toolbars"
-msgstr "Скрыть ранели инструментов"
+msgstr "Скрыть панели инструментов"
 
-#: spyderlib/app/spyder.py:2231 spyderlib/app/spyder.py:2232
+#: spyder/app/mainwindow.py:2184 spyder/app/mainwindow.py:2185
 msgid "Maximize current pane"
 msgstr "Развернуть текущую панель"
 
-#: spyderlib/app/spyder.py:2235
+#: spyder/app/mainwindow.py:2188
 msgid "Restore current pane"
 msgstr "Восстановить текущую панель"
 
-#: spyderlib/app/spyder.py:2236
+#: spyder/app/mainwindow.py:2189
 msgid "Restore pane to its original size"
 msgstr "Вернуть панель к первоначальному размеру"
 
-#: spyderlib/app/spyder.py:2320
-#, python-format
+#: spyder/app/mainwindow.py:2273
 msgid "About %s"
 msgstr "О %s"
 
-#: spyderlib/app/spyder.py:2496 spyderlib/utils/programs.py:281
-#: spyderlib/widgets/externalshell/baseshell.py:139
-#: spyderlib/widgets/explorer.py:239 spyderlib/plugins/editor.py:156
-#: spyderlib/plugins/runconfig.py:321 spyderlib/plugins/runconfig.py:443
-#: spyderlib/plugins/runconfig.py:448
+#: spyder/app/mainwindow.py:2400 spyder/plugins/editor.py:158
+#: spyder/plugins/runconfig.py:322 spyder/plugins/runconfig.py:444
+#: spyder/plugins/runconfig.py:449 spyder/utils/programs.py:285
+#: spyder/widgets/explorer.py:269 spyder/widgets/externalshell/baseshell.py:127
 msgid "Run"
 msgstr "Запуск"
 
-#: spyderlib/app/spyder.py:2497
-#, python-format
+#: spyder/app/mainwindow.py:2401
 msgid "Running an external system terminal is not supported on platform %s."
 msgstr ""
 "Запуск внешнего системного терминала не поддерживается на платформе %s."
 
-#: spyderlib/app/spyder.py:2722
-msgid "Open session"
-msgstr "Открыть сессию"
-
-#: spyderlib/app/spyder.py:2723 spyderlib/app/spyder.py:2735
-msgid "Spyder sessions"
-msgstr "Сессии Spyder"
-
-#: spyderlib/app/spyder.py:2734
-msgid "Save session"
-msgstr "Сохранить сессию"
-
-#: spyderlib/app/spyder.py:2776
+#: spyder/app/mainwindow.py:2656
 msgid ""
 "Spyder will restart and reset to default settings: <br><br>Do you want to "
 "continue?"
@@ -682,16 +569,15 @@ msgstr ""
 "Spyder будет перезапущен, настройки возвращены по умолчанию:<br><br>Хотите "
 "продолжить?"
 
-#: spyderlib/app/spyder.py:2873 spyderlib/widgets/helperwidgets.py:243
+#: spyder/app/mainwindow.py:2753 spyder/widgets/helperwidgets.py:250
 msgid "Spyder updates"
 msgstr "Обновления Spyder"
 
-#: spyderlib/app/spyder.py:2874 spyderlib/plugins/configdialog.py:799
+#: spyder/app/mainwindow.py:2754 spyder/plugins/configdialog.py:819
 msgid "Check for updates on startup"
 msgstr "Проверять обновления при старте"
 
-#: spyderlib/app/spyder.py:2892
-#, python-format
+#: spyder/app/mainwindow.py:2772
 msgid ""
 "<b>Spyder %s is available!</b> <br><br>Please use your package manager to "
 "update Spyder or go to our <a href=\"%s\">Releases</a> page to download this "
@@ -703,15 +589,63 @@ msgstr ""
 "загрузки новой версии.<br><br>Если Вы не уверены, как произвести обновление "
 "Spyder, ознакомьтесь с нашими инструкциями по <a href=\"%s\">Установке</a>."
 
-#: spyderlib/app/spyder.py:2904
+#: spyder/app/mainwindow.py:2784
 msgid "Spyder is up to date."
 msgstr "Spyder обновлён."
 
-#: spyderlib/app/tour.py:121
+#: spyder/app/restart.py:133
+msgid ""
+"It was not possible to close the previous Spyder instance.\n"
+"Restart aborted."
+msgstr ""
+"Не удалось закрыть предыдущий экземпляр Spyder.\n"
+"Перезапуск прерван."
+
+#: spyder/app/restart.py:135
+msgid ""
+"Spyder could not reset to factory defaults.\n"
+"Restart aborted."
+msgstr ""
+"Невозможно сбросить настройки Spyder в значения по умолчанию.\n"
+"Операция прервана."
+
+#: spyder/app/restart.py:137
+msgid ""
+"It was not possible to restart Spyder.\n"
+"Operation aborted."
+msgstr ""
+"Невозможно перезапустить Spyder.\n"
+"Операция прервана."
+
+#: spyder/app/restart.py:139
+msgid "Spyder exit error"
+msgstr "Ошибка выхода из Spyder"
+
+#: spyder/app/restart.py:140
+msgid "Spyder reset error"
+msgstr "Ошибка сброса настроек Spyder"
+
+#: spyder/app/restart.py:141
+msgid "Spyder restart error"
+msgstr "Ошибка перезапуска Spyder"
+
+#: spyder/app/restart.py:165
+msgid "Closing Spyder"
+msgstr "Закрытие Spyder"
+
+#: spyder/app/restart.py:239
+msgid "Resetting Spyder to defaults"
+msgstr "Восстановить настройки по умолчанию"
+
+#: spyder/app/restart.py:271
+msgid "Restarting"
+msgstr "Перезапуск"
+
+#: spyder/app/tour.py:124
 msgid "Welcome to the Introduction tour"
 msgstr "Добро пожаловать в обучающий тур"
 
-#: spyderlib/app/tour.py:122
+#: spyder/app/tour.py:125
 msgid ""
 "<b>Spyder</b> is a powerful Interactive Development Environment (or IDE) for "
 "the Python programming language.<br><br>Here we are going to guide you "
@@ -723,11 +657,11 @@ msgstr ""
 "возможностями.<br><br>Пожалуйста, используйте клавиши со стрелками или "
 "кнопки внизу, чтобы двигаться вдоль тура."
 
-#: spyderlib/app/tour.py:131
+#: spyder/app/tour.py:134
 msgid "The Editor"
 msgstr "Текстовый редактор"
 
-#: spyderlib/app/tour.py:132
+#: spyder/app/tour.py:135
 msgid ""
 "This is the pane where you write Python code before evaluating it. You can "
 "get automatic suggestions and completions while writing, by pressing the "
@@ -745,12 +679,11 @@ msgstr ""
 "перед запуском кода.<br><br>Также Вы можете установить отладочные точки "
 "останова на панели номеров строк двойным щелчком рядом с непустой строкой."
 
-#: spyderlib/app/tour.py:147
+#: spyder/app/tour.py:150
 msgid "The IPython console"
 msgstr "Консоль IPython"
 
-#: spyderlib/app/tour.py:148
-#, python-brace-format
+#: spyder/app/tour.py:151
 msgid ""
 "This is one of panes where you can run or execute the code you wrote on the "
 "Editor. To do it you need to press the <b>F5</b> key.<br><br>This console "
@@ -769,11 +702,11 @@ msgstr ""
 "запустить простой код в этой консоли. Это будет полезно, чтобы показать Вам "
 "другие важные функции."
 
-#: spyderlib/app/tour.py:164
+#: spyder/app/tour.py:167
 msgid "The Variable Explorer"
 msgstr "Менеджер Переменных"
 
-#: spyderlib/app/tour.py:165
+#: spyder/app/tour.py:168
 msgid ""
 "In this pane you can view and edit the variables generated during the "
 "execution of a program, or those entered directly in one of Spyder consoles."
@@ -788,11 +721,11 @@ msgstr ""
 "шаге тура. Двойным щелчком на любом из них открывается окно, где можно "
 "тщательно изучить и изменить содержимое."
 
-#: spyderlib/app/tour.py:177
+#: spyder/app/tour.py:180
 msgid "The Python console"
 msgstr "Консоль Python"
 
-#: spyderlib/app/tour.py:178
+#: spyder/app/tour.py:181
 msgid ""
 "You can also run your code on a Python console. These consoles are useful "
 "because they let you run a file in a console dedicated only to it.To select "
@@ -808,12 +741,12 @@ msgstr ""
 "Python также подключены к этой панели, и что Менеджер Переменных отображает "
 "только переменные текущей выбранной консоли."
 
-#: spyderlib/app/tour.py:192 spyderlib/widgets/internalshell.py:266
-#: spyderlib/plugins/help.py:490 spyderlib/plugins/help.py:940
+#: spyder/app/tour.py:195 spyder/plugins/help.py:485 spyder/plugins/help.py:929
+#: spyder/widgets/internalshell.py:270
 msgid "Help"
 msgstr "Справка"
 
-#: spyderlib/app/tour.py:193
+#: spyder/app/tour.py:196
 msgid ""
 "This pane displays documentation of the functions, classes, methods or "
 "modules you are currently using in the Editor or the Consoles.<br><br>To use "
@@ -825,11 +758,11 @@ msgstr ""
 "ею, нажмите <b>Ctrl+I</b> напротив объекта. Если у объекта есть какая-либо "
 "документация, она будет показана здесь."
 
-#: spyderlib/app/tour.py:203
+#: spyder/app/tour.py:206
 msgid "The File Explorer"
 msgstr "Файловый менеджер"
 
-#: spyderlib/app/tour.py:204
+#: spyder/app/tour.py:207
 msgid ""
 "This pane lets you navigate through the directories and files present in "
 "your computer.<br><br>You can also open any of these files with its "
@@ -843,55 +776,47 @@ msgstr ""
 "из этого правила: простые текстовые файлы всегда будут открыты в редакторе "
 "Spyder."
 
-#: spyderlib/app/tour.py:214
+#: spyder/app/tour.py:217
 msgid "The History Log"
 msgstr "Журнал истории"
 
-#: spyderlib/app/tour.py:215
+#: spyder/app/tour.py:218
 msgid ""
 "This pane records all commands introduced in the Python and IPython consoles."
 msgstr ""
 "Эта панель записывает все команды, введённые в консолях Python и IPython."
 
-#: spyderlib/app/tour.py:263
-#, fuzzy
+# Такое ощущение, что фраза не окончена и bla здесь (оно же bla-bla-bla) используется вместо '...'
+#: spyder/app/tour.py:266
 msgid "<b>Spyder</b> is an interactive development environment based on bla"
-msgstr "<b>Spyder</b> - интерактивная среда разработки, основанная на bla"
+msgstr "<b>Spyder</b> - интерактивная среда разработки"
 
-#: spyderlib/app/tour.py:267
+#: spyder/app/tour.py:270
 msgid "Welcome to Spyder introduction tour"
 msgstr "Добро пожаловать в обучающий тур Spyder"
 
-#: spyderlib/app/tour.py:268
+# Такое ощущение, что фраза не окончена и bla здесь (оно же bla-bla-bla) используется вместо '...'
+#: spyder/app/tour.py:271
 msgid "Spyder is an interactive development environment based on bla"
-msgstr "Spyder - интерактивная среда разработки, основанная на bla"
+msgstr "Spyder - интерактивная среда разработки"
 
-#: spyderlib/app/tour.py:273
+#: spyder/app/tour.py:276
 msgid "Introduction tour"
 msgstr "Обучающий тур"
 
-#: spyderlib/app/tour.py:274
+#: spyder/app/tour.py:277
 msgid "New features in version 3.0"
 msgstr "Новые возможности в версии 3.0"
 
-#: spyderlib/app/tour.py:552 spyderlib/plugins/ipythonconsole.py:324
+#: spyder/app/tour.py:555 spyder/plugins/ipythonconsole.py:431
 msgid "Run code"
 msgstr "Выполнить код"
 
-#: spyderlib/app/tour.py:821
+#: spyder/app/tour.py:824
 msgid "Go to step: "
 msgstr "Перейти к шагу:"
 
-#: spyderlib/config/ipython.py:23
-msgid "Jupyter Qtconsole integration"
-msgstr "Интеграция Qt-консоли Jupyter"
-
-#: spyderlib/config/ipython.py:25
-#, fuzzy
-msgid "Manipulate Jupyter notebooks on the Editor"
-msgstr "Работать с блокнотами Jupyter в Редакторе"
-
-#: spyderlib/config/base.py:241
+#: spyder/config/base.py:249
 msgid ""
 "Update LANGUAGE_CODES (inside config/base.py) if a new translation has been "
 "added to Spyder"
@@ -899,4636 +824,4692 @@ msgstr ""
 "Обновите LANGUAGE_CODES (в файле config/base.py) если добавили новый перевод "
 "в Spyder"
 
-#: spyderlib/config/utils.py:24
+#: spyder/config/ipython.py:23
+msgid "Integrate the IPython console"
+msgstr "Интегрирует консоли IPython"
+
+#: spyder/config/ipython.py:25
+msgid "Manipulate Jupyter notebooks on the Editor"
+msgstr "Работает с блокнотами Jupyter в Редакторе"
+
+#: spyder/config/utils.py:24
 msgid "Python files"
 msgstr "Файлы Python"
 
-#: spyderlib/config/utils.py:25
+#: spyder/config/utils.py:25
 msgid "Cython/Pyrex files"
 msgstr "Файлы Cython/Pyrex"
 
-#: spyderlib/config/utils.py:26
+#: spyder/config/utils.py:26
 msgid "C files"
 msgstr "Файлы C"
 
-#: spyderlib/config/utils.py:27
+#: spyder/config/utils.py:27
 msgid "C++ files"
 msgstr "Файлы C++"
 
-#: spyderlib/config/utils.py:28
+#: spyder/config/utils.py:28
 msgid "OpenCL files"
 msgstr "Файлы OpenCL"
 
-#: spyderlib/config/utils.py:29
+#: spyder/config/utils.py:29
 msgid "Fortran files"
 msgstr "Файлы Fortran"
 
-#: spyderlib/config/utils.py:30
+#: spyder/config/utils.py:30
 msgid "IDL files"
 msgstr "Файлы IDL"
 
-#: spyderlib/config/utils.py:31
+#: spyder/config/utils.py:31
 msgid "MATLAB files"
 msgstr "Файлы MATLAB"
 
-#: spyderlib/config/utils.py:32
+#: spyder/config/utils.py:32
 msgid "Julia files"
 msgstr "Файлы Julia"
 
-#: spyderlib/config/utils.py:33
+#: spyder/config/utils.py:33
 msgid "Yaml files"
 msgstr "Файлы Yaml"
 
-#: spyderlib/config/utils.py:34
+#: spyder/config/utils.py:34
 msgid "Patch and diff files"
 msgstr "Файлы патчей и diff"
 
-#: spyderlib/config/utils.py:35
+#: spyder/config/utils.py:35
 msgid "Batch files"
 msgstr "Файлы Batch"
 
-#: spyderlib/config/utils.py:36 spyderlib/utils/iofuncs.py:515
+#: spyder/config/utils.py:36 spyder/utils/iofuncs.py:426
 msgid "Text files"
 msgstr "Текстовые файлы"
 
-#: spyderlib/config/utils.py:37
+#: spyder/config/utils.py:37
 msgid "reStructuredText files"
 msgstr "Файлы reStructuredText"
 
-#: spyderlib/config/utils.py:38
+#: spyder/config/utils.py:38
 msgid "gettext files"
 msgstr "Файлы gettext"
 
-#: spyderlib/config/utils.py:39
+#: spyder/config/utils.py:39
 msgid "NSIS files"
 msgstr "Файлы NSIS"
 
-#: spyderlib/config/utils.py:40
+#: spyder/config/utils.py:40
 msgid "Web page files"
 msgstr "Файлы Веб-страниц"
 
-#: spyderlib/config/utils.py:41
+#: spyder/config/utils.py:41
 msgid "XML files"
 msgstr "Файлы XML"
 
-#: spyderlib/config/utils.py:42
+#: spyder/config/utils.py:42
 msgid "Javascript files"
 msgstr "Файлы Javascript"
 
-#: spyderlib/config/utils.py:43
+#: spyder/config/utils.py:43
 msgid "Json files"
 msgstr "Файлы Json"
 
-#: spyderlib/config/utils.py:44
-#, fuzzy
+#: spyder/config/utils.py:44
 msgid "IPython notebooks"
 msgstr "Блокноты IPython"
 
-#: spyderlib/config/utils.py:45
+#: spyder/config/utils.py:45
 msgid "Enaml files"
 msgstr "Файлы Enaml"
 
-#: spyderlib/config/utils.py:46
+#: spyder/config/utils.py:46
 msgid "Configuration files"
 msgstr "Файлы настроек"
 
-#: spyderlib/config/utils.py:51 spyderlib/widgets/explorer.py:670
+#: spyder/config/utils.py:51 spyder/widgets/explorer.py:700
 msgid "All files"
 msgstr "Все файлы"
 
-#: spyderlib/config/utils.py:113
+#: spyder/config/utils.py:121
 msgid "Supported text files"
 msgstr "Поддерживаемые текстовые файлы"
 
-#: spyderlib/utils/environ.py:98
-msgid ""
-"Module <b>pywin32 was not found</b>.<br>Please restart this Windows "
-"<i>session</i> (not the computer) for changes to take effect."
-msgstr ""
-"Модуль <b>pywin32 не найден</b>.<br>Пожалуйста, перезапустите <i>сессию</i> "
-"Windows  (не компьютер), чтобы изменения вступили в силу."
+#: spyder/plugins/__init__.py:508 spyder/plugins/editor.py:98
+#: spyder/plugins/editor.py:545 spyder/plugins/editor.py:1718
+#: spyder/plugins/help.py:118 spyder/plugins/help.py:385
+#: spyder/widgets/editor.py:369 spyder/widgets/sourcecode/codeeditor.py:97
+#: spyder/widgets/sourcecode/codeeditor.py:2960
+msgid "Editor"
+msgstr "Редактор"
 
-#: spyderlib/utils/environ.py:111
-msgid ""
-"If you accept changes, this will modify the current user environment "
-"variables directly <b>in Windows registry</b>. Use it with precautions, at "
-"your own risks.<br><br>Note that for changes to take effect, you will need "
-"to restart the parent process of this application (simply restart Spyder if "
-"you have executed it from a Windows shortcut, otherwise restart any "
-"application from which you may have executed it, like <i>Python(x,y) Home</"
-"i> for example)"
-msgstr ""
-"Если Вы примете изменения, это переопределит переменные окружения для "
-"текущего пользователя непосредственно <b>в реестре Windows</b>. Используйте "
-"с осторожностью, на свой риск.<br><br>Имейте в виду, чтобы изменения "
-"вступили в силу, необходимо перезагрузить родительский процесс приложения "
-"(просто перезапустите Spyder, если запускали его ярлыком Windows, или "
-"перезапустите приложение из которого Вы его запускали, например <i>Python(x,"
-"y) Home</i>)"
-
-#: spyderlib/utils/codeanalysis.py:91
-msgid "Real-time code analysis on the Editor"
-msgstr "Анализ кода в Редакторе в реальном времени"
+#: spyder/plugins/configdialog.py:139
+msgid "Reset to defaults"
+msgstr "Восстановить значения по умолчанию"
 
-#: spyderlib/utils/codeanalysis.py:95
-msgid "Real-time code style analysis on the Editor"
-msgstr "Анализ стиля кода в Редакторе в реальном времени"
+#: spyder/plugins/configdialog.py:151
+msgid "Preferences"
+msgstr "Параметры"
 
-#: spyderlib/utils/iofuncs.py:497
-msgid "Supported files"
-msgstr "Поддерживаемые файлы"
+#: spyder/plugins/configdialog.py:491
+msgid "Invalid directory path"
+msgstr "Неверный путь каталога"
 
-#: spyderlib/utils/iofuncs.py:499
-msgid "All files (*.*)"
-msgstr "Все файлы (*.*)"
+#: spyder/plugins/configdialog.py:494 spyder/plugins/configdialog.py:509
+#: spyder/plugins/runconfig.py:177 spyder/plugins/runconfig.py:241
+#: spyder/plugins/workingdirectory.py:291 spyder/widgets/explorer.py:614
+#: spyder/widgets/externalshell/pythonshell.py:616
+#: spyder/widgets/findinfiles.py:504 spyder/widgets/pathmanager.py:224
+#: spyder/widgets/projects/projectdialog.py:155
+msgid "Select directory"
+msgstr "Выберите каталог"
 
-#: spyderlib/utils/iofuncs.py:509
-msgid "Spyder data files"
-msgstr "Файлы данных Spyder"
+#: spyder/plugins/configdialog.py:521
+msgid "Invalid file path"
+msgstr "Неверный путь файла"
 
-#: spyderlib/utils/iofuncs.py:511
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:1014
-msgid "NumPy arrays"
-msgstr "Массивы NumPy"
+#: spyder/plugins/configdialog.py:524 spyder/plugins/configdialog.py:541
+msgid "Select file"
+msgstr "Выберите файл"
 
-#: spyderlib/utils/iofuncs.py:512
-msgid "NumPy zip arrays"
-msgstr "Сжатые массивы NumPy"
+#: spyder/plugins/configdialog.py:540
+msgid "All files (*)"
+msgstr "Все файлы (*)"
 
-#: spyderlib/utils/iofuncs.py:513
-msgid "Matlab files"
-msgstr "Файлы Matlab"
+#: spyder/plugins/configdialog.py:613 spyder/widgets/formlayout.py:215
+msgid "Bold"
+msgstr "Жирный"
 
-#: spyderlib/utils/iofuncs.py:514
-msgid "CSV text files"
-msgstr "Текстовые файлы CSV"
+#: spyder/plugins/configdialog.py:616 spyder/widgets/formlayout.py:210
+msgid "Italic"
+msgstr "Курсив"
 
-#: spyderlib/utils/iofuncs.py:516
-msgid "JPEG images"
-msgstr "Изображения JPEG"
+#: spyder/plugins/configdialog.py:670
+msgid "Font: "
+msgstr "Шрифт: "
 
-#: spyderlib/utils/iofuncs.py:517
-msgid "PNG images"
-msgstr "Изображения PNG"
+#: spyder/plugins/configdialog.py:676
+msgid "Size: "
+msgstr "Размер: "
 
-#: spyderlib/utils/iofuncs.py:518
-msgid "GIF images"
-msgstr "Изображения GIF"
+#: spyder/plugins/configdialog.py:695
+msgid "Font style"
+msgstr "Стиль шрифта"
 
-#: spyderlib/utils/iofuncs.py:519
-msgid "TIFF images"
-msgstr "Изображения TIFF"
+#: spyder/plugins/configdialog.py:772
+msgid "Spyder needs to restart to change the following setting:"
+msgstr "Необходим перезапуск Spyder для изменения параметра:"
 
-#: spyderlib/utils/iofuncs.py:520 spyderlib/utils/iofuncs.py:521
-msgid "Pickle files"
-msgstr "Архивы Pickle"
+#: spyder/plugins/configdialog.py:775
+msgid "Spyder needs to restart to change the following settings:"
+msgstr "Необходим перезапуск Spyder для изменения настроек:"
 
-#: spyderlib/utils/iofuncs.py:522
-msgid "JSON files"
-msgstr "Файлы JSON"
+#: spyder/plugins/configdialog.py:777
+msgid "Do you wish to restart now?"
+msgstr "Хотите выполнить перезапуск сейчас?"
 
-#: spyderlib/utils/iofuncs.py:541 spyderlib/utils/iofuncs.py:548
-#, python-format
-msgid "<b>Unsupported file type '%s'</b>"
-msgstr "<b>Неподдерживаемый тип файла '%s'</b>"
+#: spyder/plugins/configdialog.py:783
+msgid "Information"
+msgstr "Информация"
 
-#: spyderlib/utils/programs.py:282
-msgid "It was not possible to run this file in an external terminal"
-msgstr "Невозможно запустить файл во внешнем терминале"
+#: spyder/plugins/configdialog.py:797 spyder/plugins/configdialog.py:804
+#: spyder/widgets/projects/configdialog.py:74
+msgid "General"
+msgstr "Основные"
 
-#: spyderlib/utils/help/sphinxify.py:212 spyderlib/utils/help/sphinxify.py:222
+#: spyder/plugins/configdialog.py:807
+msgid "Language"
+msgstr "Язык"
+
+#: spyder/plugins/configdialog.py:810
+msgid "Use a single instance"
+msgstr "Запускать только одну копию"
+
+#: spyder/plugins/configdialog.py:812
 msgid ""
-"It was not possible to generate rich text help for this object.</br>Please "
-"see it in plain text."
+"Set this to open external<br> Python files in an already running instance "
+"(Requires a restart)"
 msgstr ""
-"Невозможно создать форматированную текстовую справку по объекту.</"
-"br>Пожалуйста, просмотрите в виде обычного текста."
+"Отметьте для открытия внешних<br> файлов Python в уже запущенном окружении "
+"(требуется перезапуск)"
 
-#: spyderlib/utils/introspection/manager.py:31
-#: spyderlib/utils/introspection/manager.py:36
-msgid "Editor's code completion, go-to-definition and help"
-msgstr "Автодополнение кода редактора, переход к определению и справка"
+#: spyder/plugins/configdialog.py:815
+msgid "Prompt when exiting"
+msgstr "Спрашиваить подтверждение при закрытии"
 
-#: spyderlib/utils/syntaxhighlighters.py:32
-msgid "Syntax highlighting for Matlab, Julia and other file types"
-msgstr "Подсветка синтаксиса для Matlab, Julia и других типов файлов"
+#: spyder/plugins/configdialog.py:816
+msgid "Pop up internal console when internal errors appear"
+msgstr "Переходить во встроенную консоль при появлении внутренних ошибок"
 
-#: spyderlib/utils/syntaxhighlighters.py:41
-msgid "Background:"
-msgstr "Фон:"
+#: spyder/plugins/configdialog.py:836 spyder/plugins/editor.py:107
+#: spyder/plugins/externalconsole.py:57 spyder/plugins/ipythonconsole.py:273
+#: spyder/widgets/projects/configdialog.py:81
+msgid "Interface"
+msgstr "Интерфейс"
 
-#: spyderlib/utils/syntaxhighlighters.py:42
-#: spyderlib/widgets/sourcecode/codeeditor.py:103
-msgid "Current line:"
-msgstr "Текущая строка:"
+#: spyder/plugins/configdialog.py:844
+msgid "Qt windows style"
+msgstr "Стиль окон Qt"
 
-#: spyderlib/utils/syntaxhighlighters.py:43
-msgid "Current cell:"
-msgstr "Текущий блок:"
+#: spyder/plugins/configdialog.py:850
+msgid "Icon theme"
+msgstr "Тема значков"
 
-#: spyderlib/utils/syntaxhighlighters.py:44
-msgid "Occurrence:"
-msgstr "Вхождения слова:"
+#: spyder/plugins/configdialog.py:854
+msgid "Vertical title bars in panes"
+msgstr "Названия плавающих окон - вертикально"
 
-#: spyderlib/utils/syntaxhighlighters.py:45
-msgid "Link:"
-msgstr "Ссылка:"
+#: spyder/plugins/configdialog.py:856
+msgid "Vertical tabs in panes"
+msgstr "Вертикальные вкладки на плавающих окнах"
 
-#: spyderlib/utils/syntaxhighlighters.py:46
-msgid "Side areas:"
-msgstr "Боковые панели:"
+#: spyder/plugins/configdialog.py:858
+msgid "Animated toolbars and panes"
+msgstr "Анимировать панели инструментов и плавающие окна"
 
-#: spyderlib/utils/syntaxhighlighters.py:47
-msgid "Matched <br>parens:"
-msgstr "Парные <br>скобки:"
+#: spyder/plugins/configdialog.py:860
+msgid "Tear off menus"
+msgstr "Открепляемые меню"
 
-#: spyderlib/utils/syntaxhighlighters.py:48
-msgid "Unmatched <br>parens:"
-msgstr "Скобки <br>без пары:"
+#: spyder/plugins/configdialog.py:861
+msgid "Set this to detach any<br> menu from the main window"
+msgstr "Отметьте для возможности отделить<br> любое меню от главного окна"
 
-#: spyderlib/utils/syntaxhighlighters.py:49
-msgid "Normal text:"
-msgstr "Обычный текст:"
+#: spyder/plugins/configdialog.py:863
+msgid "Custom margin for panes:"
+msgstr "Настроить отступы панелей:"
 
-#: spyderlib/utils/syntaxhighlighters.py:50
-msgid "Keyword:"
-msgstr "Ключевое слово:"
+#: spyder/plugins/configdialog.py:865 spyder/plugins/editor.py:209
+msgid "pixels"
+msgstr "пикселей"
 
-#: spyderlib/utils/syntaxhighlighters.py:51
-msgid "Builtin:"
-msgstr "Встроенные:"
+#: spyder/plugins/configdialog.py:893
+msgid "Status bar"
+msgstr "Панель состояния"
 
-#: spyderlib/utils/syntaxhighlighters.py:52
-msgid "Definition:"
-msgstr "Определение:"
+#: spyder/plugins/configdialog.py:894
+msgid "Show status bar"
+msgstr "Показывать панель состояния"
 
-#: spyderlib/utils/syntaxhighlighters.py:53
-msgid "Comment:"
-msgstr "Комментарий:"
+#: spyder/plugins/configdialog.py:896
+msgid "Show memory usage every"
+msgstr "Показывать использование памяти каждые"
 
-#: spyderlib/utils/syntaxhighlighters.py:54
-msgid "String:"
-msgstr "Строка:"
+#: spyder/plugins/configdialog.py:898 spyder/plugins/configdialog.py:907
+#: spyder/plugins/editor.py:133 spyder/plugins/editor.py:261
+#: spyder/plugins/variableexplorer.py:30
+msgid " ms"
+msgstr " мс"
 
-#: spyderlib/utils/syntaxhighlighters.py:55
-msgid "Number:"
-msgstr "Число:"
+#: spyder/plugins/configdialog.py:905
+msgid "Show CPU usage every"
+msgstr "Показывать загрузку ЦП каждые"
 
-#: spyderlib/utils/syntaxhighlighters.py:56
-msgid "Instance:"
-msgstr "Экземпляр класса:"
+#: spyder/plugins/configdialog.py:940
+msgid "Plain text font"
+msgstr "Шрифт текста"
 
-#: spyderlib/workers/updates.py:86 spyderlib/workers/updates.py:88
-msgid "Unable to retrieve information."
-msgstr "Невозможно получить информацию."
+#: spyder/plugins/configdialog.py:946
+msgid "Rich text font"
+msgstr "Шрифт форматированного текста"
 
-#: spyderlib/workers/updates.py:90
-msgid ""
-"Unable to connect to the internet. <br><br>Make sure the connection is "
-"working properly."
-msgstr ""
-"Не удалось подключиться к интернету.<br><br>Убедитесь, что соединение "
-"работает должным образом."
+#: spyder/plugins/configdialog.py:949
+msgid "Fonts"
+msgstr "Шрифты"
 
-#: spyderlib/workers/updates.py:93
-msgid "Unable to check for updates."
-msgstr "Не удалось проверить обновления."
+#: spyder/plugins/configdialog.py:963
+msgid "Appearance"
+msgstr "Внешний вид"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:113
-msgid "Index"
-msgstr "Индекс"
+#: spyder/plugins/configdialog.py:965 spyder/plugins/ipythonconsole.py:564
+msgid "Advanced Settings"
+msgstr "Расширенные настройки"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:115
-#: spyderlib/plugins/shortcuts.py:517
-msgid "Name"
-msgstr "Действие"
+#: spyder/plugins/configdialog.py:1001
+msgid "Syntax coloring"
+msgstr "Подсветка синтаксиса"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:118
-msgid "Tuple"
-msgstr "Кортеж"
+#: spyder/plugins/configdialog.py:1014
+msgid ""
+"Here you can select the color scheme used in the Editor and all other Spyder "
+"plugins.<br><br>You can also edit the color schemes provided by Spyder or "
+"create your own ones by using the options provided below.<br>"
+msgstr ""
+"Здесь можно выбрать цветовую схему, используемую в Редакторе и всех других "
+"модулях Spyder.<br><br>Вы можете редактировать цветовые схемы, предлагаемые "
+"Spyder, или создать новую с помощью опций, приведённых ниже."
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:121
-msgid "List"
-msgstr "Список"
+#: spyder/plugins/configdialog.py:1019
+msgid "Edit selected"
+msgstr "Редактировать выбранную"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:124
-msgid "Dictionary"
-msgstr "Словарь"
+#: spyder/plugins/configdialog.py:1020
+msgid "Create new scheme"
+msgstr "Создать новую схему"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:126
-msgid "Key"
-msgstr "Клавиша"
+#: spyder/plugins/configdialog.py:1021 spyder/widgets/explorer.py:510
+#: spyder/widgets/shell.py:134
+msgid "Delete"
+msgstr "Удалить"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:130
-#: spyderlib/plugins/help.py:399
-msgid "Object"
-msgstr "Объект"
+#: spyder/plugins/configdialog.py:1024
+msgid "Reset"
+msgstr "Восстановить"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:132
-msgid "Attribute"
-msgstr "Атрибут"
+#: spyder/plugins/configdialog.py:1031
+msgid "Scheme:"
+msgstr "Схема: "
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:134
-msgid "elements"
-msgstr "элементы"
+#: spyder/plugins/configdialog.py:1062
+msgid "Manage color schemes"
+msgstr "Настроить цветовые схемы"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:310
-msgid "Type"
-msgstr "Тип"
+#: spyder/plugins/configdialog.py:1251
+msgid "Are you sure you want to delete this scheme?"
+msgstr "Вы уверены, что хотите удалить цветовую схему?"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:310
-msgid "Size"
-msgstr "Размер"
+#: spyder/plugins/configdialog.py:1368
+msgid "Text"
+msgstr "Текст"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:310
-msgid "Value"
-msgstr "Значение"
+#: spyder/plugins/configdialog.py:1370
+msgid "Highlight"
+msgstr "Подсветка"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:408
-msgid ""
-"Opening this variable can be slow\n"
-"\n"
-"Do you want to continue anyway?"
-msgstr ""
-"Открытие этой переменной может занять время\n"
-"\n"
-"Желаете продолжить?"
+#: spyder/plugins/configdialog.py:1372
+msgid "Background"
+msgstr "Фон"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:416
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:570
-msgid "Edit item"
-msgstr "Редактировать элемент"
+#: spyder/plugins/configdialog.py:1376
+msgid "Scheme name:"
+msgstr "Название схемы:"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:417
-#, python-format
-msgid "<b>Unable to retrieve data.</b><br><br>Error message:<br>%s"
-msgstr "<b>Не удалось вывести данные.</b><br><br>Сообщение об ошибке:<br>%s"
+#: spyder/plugins/configdialog.py:1383
+msgid "Color scheme editor"
+msgstr "Редактор цветовой схемы"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:571
-#, python-format
-msgid "<b>Unable to assign data to item.</b><br><br>Error message:<br>%s"
-msgstr ""
-"<b>Невозможно назначить данные элементу.</b><br><br>Сообщение об ошибке:<br>"
-"%s"
+#: spyder/plugins/console.py:109
+msgid "Internal console"
+msgstr "Встроенная консоль"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:633
-msgid "Resize rows to contents"
-msgstr "Размер строк по содержимому"
+#: spyder/plugins/console.py:139 spyder/plugins/externalconsole.py:743
+msgid "&Run..."
+msgstr "&Выполнить..."
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:641
-#: spyderlib/widgets/explorer.py:241
-msgid "Edit"
-msgstr "Редактировать"
+#: spyder/plugins/console.py:141 spyder/plugins/externalconsole.py:744
+msgid "Run a Python script"
+msgstr "Выполнить скрипт Python"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:644
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:983
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:1000
-msgid "Plot"
-msgstr "График"
+#: spyder/plugins/console.py:144
+msgid "Environment variables..."
+msgstr "Переменные среды..."
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:648
-msgid "Histogram"
-msgstr "Гистограмма"
+#: spyder/plugins/console.py:146
+msgid "Show and edit environment variables (for current session)"
+msgstr "Показать и редактировать переменные среды (для текущей сессии)"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:652
-msgid "Show image"
-msgstr "Показать изображение"
+#: spyder/plugins/console.py:150
+msgid "Show sys.path contents..."
+msgstr "Показать содержимое sys.path..."
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:656
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:1008
-msgid "Save array"
-msgstr "Сохранить массив"
+#: spyder/plugins/console.py:152
+msgid "Show (read-only) sys.path"
+msgstr "Показать (только чтение) sys.path"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:660
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:947
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:955
-msgid "Insert"
-msgstr "Вставить"
+#: spyder/plugins/console.py:155
+msgid "Buffer..."
+msgstr "Буфер..."
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:663
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:897
-msgid "Remove"
-msgstr "Удалить"
+#: spyder/plugins/console.py:156 spyder/plugins/externalconsole.py:75
+#: spyder/plugins/history.py:43
+msgid "Set maximum line count"
+msgstr "Установить максимальное число строк"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:666
-#: spyderlib/plugins/variableexplorer.py:42
-msgid "Truncate values"
-msgstr "Обрезать значения"
+#: spyder/plugins/console.py:159
+msgid "External editor path..."
+msgstr "Путь к внешнему редактору..."
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:670
-#: spyderlib/plugins/variableexplorer.py:44
-msgid "Show arrays min/max"
-msgstr "Показывать min/max массивов"
+#: spyder/plugins/console.py:160
+msgid "Set external editor executable path"
+msgstr "Установить путь запуска внешнего редактора"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:674
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:914
-#: spyderlib/widgets/explorer.py:542 spyderlib/widgets/explorer.py:550
-#: spyderlib/widgets/explorer.py:561
-msgid "Rename"
-msgstr "Переименовать"
+#: spyder/plugins/console.py:163 spyder/plugins/editor.py:139
+#: spyder/plugins/externalconsole.py:76 spyder/plugins/help.py:157
+#: spyder/plugins/help.py:360 spyder/plugins/history.py:46
+#: spyder/plugins/history.py:157
+msgid "Wrap lines"
+msgstr "Переносить строки"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:677
-msgid "Duplicate"
-msgstr "Создать копию"
+#: spyder/plugins/console.py:166 spyder/plugins/editor.py:175
+#: spyder/plugins/externalconsole.py:121 spyder/plugins/ipythonconsole.py:283
+msgid "Display balloon tips"
+msgstr "Показывать всплывающие подсказки"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:895
-msgid "Do you want to remove selected item?"
-msgstr "Вы хотите удалить выбранный элемент?"
+#: spyder/plugins/console.py:170 spyder/plugins/editor.py:169
+#: spyder/plugins/externalconsole.py:115
+msgid "Automatic code completion"
+msgstr "Автоматическое дополнение кода"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:896
-msgid "Do you want to remove all selected items?"
-msgstr "Вы хотите удалить все выбранные элементы?"
+#: spyder/plugins/console.py:174 spyder/plugins/editor.py:173
+#: spyder/plugins/externalconsole.py:119
+msgid "Enter key selects completion"
+msgstr "Клавиша Ввод/Enter выбирает автодополнение"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:914
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:947
-msgid "Key:"
-msgstr "Ключ:"
+#: spyder/plugins/console.py:179
+msgid "Internal console settings"
+msgstr "Настройки встроенной консоли"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:955
-msgid "Value:"
-msgstr "Значение:"
+#: spyder/plugins/console.py:232 spyder/plugins/externalconsole.py:918
+msgid "Run Python script"
+msgstr "Запуск скрипта Python"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:971
-msgid "Import error"
-msgstr "Ошибка импорта"
+#: spyder/plugins/console.py:233 spyder/plugins/externalconsole.py:146
+#: spyder/plugins/externalconsole.py:919 spyder/widgets/explorer.py:715
+msgid "Python scripts"
+msgstr "Скрипты Python"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:972
-msgid "Please install <b>matplotlib</b> or <b>guiqwt</b>."
-msgstr "Пожалуйста, установите <b>matplotlib</b> или <b>guiqwt</b>."
+#: spyder/plugins/console.py:278
+msgid "Buffer"
+msgstr "Буфер"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:984
-#, python-format
-msgid "<b>Unable to plot data.</b><br><br>Error message:<br>%s"
-msgstr ""
-"<b>Не удалось построить график по данным.</b><br><br>Сообщение об ошибке:<br>"
-"%s"
+#: spyder/plugins/console.py:279
+msgid "Maximum line count"
+msgstr "Максимальное количество строк"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:1001
-#, python-format
-msgid "<b>Unable to show image.</b><br><br>Error message:<br>%s"
-msgstr ""
-"<b>Не удалось показать изображение.</b><br><br>Сообщение об ошибке:<br>%s"
+#: spyder/plugins/console.py:289
+msgid "External editor"
+msgstr "Внешний редактор"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:1024
-#, python-format
-msgid "<b>Unable to save array</b><br><br>Error message:<br>%s"
-msgstr "<b>Не удалось сохранить массив</b><br><br>Сообщение об ошибке:<br>%s"
+#: spyder/plugins/console.py:290
+msgid "External editor executable path:"
+msgstr "Путь запуска внешнего редактора:"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:1049
-msgid "It was not possible to copy this array"
-msgstr "Не удалось скопировать этот массив"
+#: spyder/plugins/editor.py:104
+msgid "Edit template for new modules"
+msgstr "Редактировать шаблон для новых модулей"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:1074
-msgid "Clipboard contents"
-msgstr "Содержимое буфера обмена"
+#: spyder/plugins/editor.py:109
+msgid "Sort files according to full path"
+msgstr "Сортировать файлы по полному пути"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:1089
-msgid "Import from clipboard"
-msgstr "Импортировать из буфера обмена"
+#: spyder/plugins/editor.py:111
+msgid "Show tab bar"
+msgstr "Показывать панель вкладок"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:1091
-msgid "Empty clipboard"
-msgstr "Очистить буфер обмена"
+#: spyder/plugins/editor.py:118 spyder/plugins/editor.py:189
+#: spyder/plugins/externalconsole.py:71 spyder/plugins/externalconsole.py:114
+#: spyder/plugins/help.py:156 spyder/plugins/history.py:45
+#: spyder/plugins/ipythonconsole.py:317
+msgid "Source code"
+msgstr "Исходный код"
 
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:1092
-msgid "Nothing to be imported from clipboard."
-msgstr "Нечего импортировать из буфера обмена."
+#: spyder/plugins/editor.py:119
+msgid "Show line numbers"
+msgstr "Показывать номера строк"
 
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:496
-msgid "It was not possible to copy values for this array"
-msgstr "Не удалось скопировать значения этого массива"
+#: spyder/plugins/editor.py:120 spyder/plugins/editor.py:937
+msgid "Show blank spaces"
+msgstr "Показывать отступы"
 
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:531
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:564
-#: spyderlib/widgets/variableexplorer/dataframeeditor.py:524
-#: spyderlib/widgets/variableexplorer/dataframeeditor.py:564
-msgid "Format"
-msgstr "Форматировать"
+#: spyder/plugins/editor.py:121
+msgid "Show vertical line after"
+msgstr "Рисовать вертикальную линию после"
 
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:536
-#: spyderlib/widgets/variableexplorer/dataframeeditor.py:528
-msgid "Resize"
-msgstr "Изменить размер"
+#: spyder/plugins/editor.py:122
+msgid "characters"
+msgstr "символов"
 
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:539
-#: spyderlib/widgets/variableexplorer/dataframeeditor.py:532
-#: spyderlib/plugins/ipythonconsole.py:191
-#: spyderlib/plugins/externalconsole.py:111
-msgid "Background color"
-msgstr "Цвет фона"
+#: spyder/plugins/editor.py:127
+msgid "Highlight current line"
+msgstr "Подсвечивать текущую строку"
 
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:565
-#: spyderlib/widgets/variableexplorer/dataframeeditor.py:565
-msgid "Float formatting"
-msgstr "Форматирование чисел"
+#: spyder/plugins/editor.py:129
+msgid "Highlight current cell"
+msgstr "Подсвечивать текущий блок"
 
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:573
-#: spyderlib/widgets/variableexplorer/dataframeeditor.py:574
-#, python-format
-msgid "Format (%s) is incorrect"
-msgstr "Формат (%s) неверный"
+#: spyder/plugins/editor.py:131
+msgid "Highlight occurrences after"
+msgstr "Подсвечивать вхождения слова через"
 
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:607
-msgid "Array is empty"
-msgstr "Массив пустой"
+#: spyder/plugins/editor.py:159
+msgid "Save all files before running script"
+msgstr "Сохранить все файлы перед выполнением скрипта"
 
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:610
-msgid "Arrays with more than 3 dimensions are not supported"
-msgstr "Массивы с размерностью более 3 не поддерживаются"
+#: spyder/plugins/editor.py:162
+msgid "Run selection"
+msgstr "Выполнить выделение"
 
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:613
-msgid "The 'xlabels' argument length do no match array column number"
-msgstr "Длина аргумента 'xlabels' не соответствует числу столбцов массива"
-
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:617
-msgid "The 'ylabels' argument length do no match array row number"
-msgstr "Длина аргумента 'ylabels' не соответствует числу строк массива"
-
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:624
-#, python-format
-msgid "%s arrays"
-msgstr "%s массивы"
+#: spyder/plugins/editor.py:163
+msgid "Maintain focus in the Editor after running cells or selections"
+msgstr "Сохранять фокус в Редакторе после запуска блоков или выделений"
 
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:625
-#, python-format
-msgid "%s are currently not supported"
-msgstr "%s на данный момент не поддерживается"
+#: spyder/plugins/editor.py:166 spyder/plugins/externalconsole.py:252
+msgid "Introspection"
+msgstr "Интроспекция"
 
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:632
-msgid "NumPy array"
-msgstr "Массив NumPy"
+#: spyder/plugins/editor.py:171 spyder/plugins/externalconsole.py:117
+msgid "Case sensitive code completion"
+msgstr "Чувствительное к регистру автодополнение"
 
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:634
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:788
-msgid "Array editor"
-msgstr "Редактор массивов"
+#: spyder/plugins/editor.py:176
+msgid "Link to object definition"
+msgstr "Ссылка на место определения объекта"
 
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:636
-msgid "read only"
-msgstr "только чтение"
+#: spyder/plugins/editor.py:178
+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 ""
+"Если эта опция активна, при нажатии на имя объекта\n"
+"(левая кнопка мыши + клавиша Ctrl) произойдёт\n"
+"переход в место его определения (если возможно)."
 
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:666
-msgid "Record array fields:"
-msgstr "Заполнить поля массива:"
+#: spyder/plugins/editor.py:182
+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 ""
+"<b>Предупреждение:</b><br>Модуль Python <i>rope</i> не установлен на этом "
+"компьютере: подсказки вызова функций, автодополнение кода и переход к "
+"определению будут недоступны."
 
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:678
-msgid "Masked data"
-msgstr "Скрытые данные"
+#: spyder/plugins/editor.py:190
+msgid "Automatic insertion of parentheses, braces and brackets"
+msgstr "Автоматическая вставка круглых, фигурных и квадратных скобок"
 
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:678
-msgid "Data"
-msgstr "Данные"
+#: spyder/plugins/editor.py:193
+msgid "Automatic insertion of closing quotes"
+msgstr "Автоматическая вставка закрывающих кавычек"
 
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:678
-msgid "Mask"
-msgstr "Маска"
+#: spyder/plugins/editor.py:195
+msgid "Automatic insertion of colons after 'for', 'if', 'def', etc"
+msgstr "Автоматическая вставка двоеточия после 'for', 'if', 'def' и т.п."
 
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:689
-msgid "Axis:"
-msgstr "Оси:"
+#: spyder/plugins/editor.py:198
+msgid "Automatic indentation after 'else', 'elif', etc."
+msgstr "Автоматическая вставка отступа после 'else', 'elif' и т.п."
 
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:694
-msgid "Index:"
-msgstr "Индекс:"
+#: spyder/plugins/editor.py:200
+msgid "Indentation characters: "
+msgstr "Символы отступа: "
 
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:707
-msgid "<u>Warning</u>: changes are applied separately"
-msgstr "<u>Предупреждение</u>: изменения применяются раздельно"
+#: spyder/plugins/editor.py:201
+msgid "2 spaces"
+msgstr "2 пробела"
 
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:708
-msgid ""
-"For performance reasons, changes applied to masked array won't be reflected "
-"in array's data (and vice-versa)."
-msgstr ""
-"По соображениям производительности, изменения принятые для скрытых массивов "
-"не будут отражены в данных массивов (и наоборот)."
+#: spyder/plugins/editor.py:202
+msgid "3 spaces"
+msgstr "3 пробела"
 
-#: spyderlib/widgets/variableexplorer/dataframeeditor.py:430
-msgid "To bool"
-msgstr "В булево"
+#: spyder/plugins/editor.py:203
+msgid "4 spaces"
+msgstr "4 пробела"
 
-#: spyderlib/widgets/variableexplorer/dataframeeditor.py:430
-msgid "To complex"
-msgstr "В комплексное"
+#: spyder/plugins/editor.py:204
+msgid "5 spaces"
+msgstr "5 пробелов"
 
-#: spyderlib/widgets/variableexplorer/dataframeeditor.py:431
-msgid "To int"
-msgstr "В целое"
+#: spyder/plugins/editor.py:205
+msgid "6 spaces"
+msgstr "6 пробелов"
 
-#: spyderlib/widgets/variableexplorer/dataframeeditor.py:431
-msgid "To float"
-msgstr "В вещественное"
+#: spyder/plugins/editor.py:206
+msgid "7 spaces"
+msgstr "7 пробелов"
 
-#: spyderlib/widgets/variableexplorer/dataframeeditor.py:432
-msgid "To str"
-msgstr "В строку"
+#: spyder/plugins/editor.py:207
+msgid "8 spaces"
+msgstr "8 пробелов"
 
-#: spyderlib/widgets/variableexplorer/dataframeeditor.py:506
-#, python-format
-msgid "%s editor"
-msgstr "%s редактор"
+#: spyder/plugins/editor.py:208
+msgid "Tabulations"
+msgstr "Табуляция"
 
-#: spyderlib/widgets/variableexplorer/dataframeeditor.py:538
-msgid "Column min/max"
-msgstr "Min/max столбца"
+#: spyder/plugins/editor.py:209
+msgid "Tab stop width:"
+msgstr "Ширина табуляции:"
 
-#: spyderlib/widgets/variableexplorer/utils.py:28
-msgid "View and edit DataFrames and Series in the Variable Explorer"
-msgstr ""
-"Показ и редактирование структур DataFrame и Serie в Менеджере Переменных"
+#: spyder/plugins/editor.py:211
+msgid "Tab always indent"
+msgstr "Клавиша Tab - всегда отступ"
 
-#: spyderlib/widgets/variableexplorer/utils.py:33
-msgid "View and edit two and three dimensional arrays in the Variable Explorer"
+#: spyder/plugins/editor.py:213
+msgid ""
+"If enabled, pressing Tab will always indent,\n"
+"even when the cursor is not at the beginning\n"
+"of a line (when this option is enabled, code\n"
+"completion may be triggered using the alternate\n"
+"shortcut: Ctrl+Space)"
 msgstr ""
-"Просмотр и редактирование 2-х и 3-мерных массивов в Менеджере Переменных"
+"Если активно, нажатие Tab будет делать отступ\n"
+"всегда, даже когда курсор не в начале строки\n"
+"(когда эта опция включена, автодополнение\n"
+"кода можно будет включить альтернативной\n"
+"комбинацией: Ctrl+Space)"
 
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:151
-#: spyderlib/widgets/editor.py:468 spyderlib/widgets/ipython.py:580
-#: spyderlib/widgets/externalshell/baseshell.py:152
-#: spyderlib/widgets/explorer.py:1040 spyderlib/plugins/help.py:443
-#: spyderlib/plugins/history.py:103
-msgid "Options"
-msgstr "Опции"
+#: spyder/plugins/editor.py:218
+msgid "Intelligent backspace"
+msgstr "Умная клавиша backspace"
 
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:195
-msgid "Refresh"
-msgstr "Обновить"
+#: spyder/plugins/editor.py:220
+msgid "Automatically remove trailing spaces when saving files"
+msgstr ""
+"Автоматически удалять лишние пробелы в конце строк при сохранении файлов"
 
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:199
-msgid "Refresh periodically"
-msgstr "Обновлять периодически"
+#: spyder/plugins/editor.py:224
+msgid "Analysis"
+msgstr "Анализ"
 
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:203
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:456
-msgid "Import data"
-msgstr "Импортировать данные"
+#: spyder/plugins/editor.py:226
+msgid "<i>(Refer to the {} page)</i>"
+msgstr "<i>(смотреть стр. {})</i>"
 
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:206
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:544
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:565
-msgid "Save data"
-msgstr "Сохранить данные"
+#: spyder/plugins/editor.py:230
+msgid "Real-time code analysis"
+msgstr "Анализ кода в реальном времени"
 
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:211
-msgid "Save data as..."
-msgstr "Сохранить данные как..."
+#: spyder/plugins/editor.py:232
+msgid ""
+"<p>If enabled, Python source code will be analyzed using pyflakes, lines "
+"containing errors or warnings will be highlighted.</p><p><u>Note</u>: add "
+"<b>analysis:ignore</b> in a comment to ignore code analysis warnings.</p>"
+msgstr ""
+"<p>Если активно, код Python будет анализироваться с помощью pyflakes, строки "
+"с ошибками или предупреждениями будут подсвечены.</p><p><u>Примечание</u>: "
+"добавьте <b>analysis:ignore</b> в комментарий, чтобы игнорировать "
+"предупреждения анализатора кода.</p>"
 
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:218
-#: spyderlib/plugins/variableexplorer.py:33
-msgid "Exclude private references"
-msgstr "Исключить приватные ссылки"
+#: spyder/plugins/editor.py:240
+msgid "Code analysis requires pyflakes %s+"
+msgstr "Для анализа кода требуется pyflakes %s+"
 
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:219
-msgid "Exclude references which name starts with an underscore"
-msgstr "Исключить ссылки, имена которых начинаются с подчёркивания"
+#: spyder/plugins/editor.py:242
+msgid "Real-time code style analysis"
+msgstr "Анализ стиля кода в реальном времени"
 
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:226
-#: spyderlib/plugins/variableexplorer.py:35
-msgid "Exclude all-uppercase references"
-msgstr "Исключить ссылки со всеми буквами в верхнем регистре"
+#: spyder/plugins/editor.py:244
+msgid ""
+"<p>If enabled, Python source code will be analyzedusing pep8, lines that are "
+"not following PEP8 style guide will be highlighted.</p><p><u>Note</u>: add "
+"<b>analysis:ignore</b> in a comment to ignore style analysis warnings.</p>"
+msgstr ""
+"<p>Если активно, код Python будет анализироваться с помощью pep8, строки не "
+"соответсвующие стилю PEP8, будут подсвечены.</p><p><u>Примечание</u>: "
+"добавьте <b>analysis:ignore</b> в комментарий, чтобы игнорировать "
+"предупреждения анализатора стиля.</p>"
 
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:227
-msgid "Exclude references which name is uppercase"
-msgstr "Исключить ссылки с именем в верхнем регистре"
+#: spyder/plugins/editor.py:251
+msgid "Code annotations (TODO, FIXME, XXX, HINT, TIP, @todo)"
+msgstr "Аннотации кода (TODO, FIXME, XXX, HINT, TIP, @todo)"
 
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:233
-#: spyderlib/plugins/variableexplorer.py:34
-msgid "Exclude capitalized references"
-msgstr "Исключить ссылки с прописной буквы"
+#: spyder/plugins/editor.py:254
+msgid "Perform analysis when saving file and every"
+msgstr "Выполнять анализ при сохранении файла и каждые"
 
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:234
-msgid "Exclude references which name starts with an uppercase character"
-msgstr ""
-"Исключить ссылки, имена которых начинаются с символа в верхнем регистре"
+#: spyder/plugins/editor.py:258
+msgid "Perform analysis only when saving file"
+msgstr "Выполнять анализ только при сохранении файла"
 
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:241
-#: spyderlib/plugins/variableexplorer.py:36
-msgid "Exclude unsupported data types"
-msgstr "Исключить неподдерживаемые типы данных"
+#: spyder/plugins/editor.py:317
+msgid "End-of-line characters"
+msgstr "Символы конца строки"
 
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:242
+#: spyder/plugins/editor.py:318
 msgid ""
-"Exclude references to unsupported data types (i.e. which won't be handled/"
-"saved correctly)"
+"When opening a text file containing mixed end-of-line characters (this may "
+"raise syntax errors in the consoles on Windows platforms), Spyder may fix "
+"the file automatically."
 msgstr ""
-"Исключить ссылки на неподдерживаемые типы данных (т.е. которые не будут "
-"правильно обработаны/сохранены)"
+"Когда открывается текстовый файл, содержащий смешанные символы конца строки "
+"(это может увеличить число синтаксических ошибок в консолях на платформах "
+"Windows), Spyder может исправить файл автоматически."
 
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:351
-#, fuzzy, python-format
-msgid "Object <b>%s</b> is not picklable"
-msgstr "Объект <b>%s</b> не архивируемый"
+#: spyder/plugins/editor.py:324
+msgid "Fix automatically and show warning message box"
+msgstr "Автоматически исправлять и показывать окно предупреждений"
 
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:476
-#, python-format
-msgid ""
-"<b>Unsupported file extension '%s'</b><br><br>Would you like to import it "
-"anyway (by selecting a known file format)?"
-msgstr ""
-"<b>Неподдерживаемое расширение файла '%s'</b><br><br>Хотите его "
-"импортировать (выбрав известный формат файла)?"
+#: spyder/plugins/editor.py:335 spyder/plugins/externalconsole.py:250
+#: spyder/plugins/ipythonconsole.py:558 spyder/plugins/variableexplorer.py:43
+msgid "Display"
+msgstr "Отображение"
 
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:484
-msgid "Open file as:"
-msgstr "Открыть файл как:"
+#: spyder/plugins/editor.py:337
+msgid "Code Introspection/Analysis"
+msgstr "Интроспекция/анализ кода"
 
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:532
-#, python-format
-msgid "<b>Unable to load '%s'</b><br><br>Error message:<br>%s"
-msgstr "<b>Не удалось загрузить '%s'</b><br><br>Сообщение об ошибке:<br>%s"
+#: spyder/plugins/editor.py:340 spyder/plugins/externalconsole.py:253
+msgid "Advanced settings"
+msgstr "Дополнительные настройки"
 
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:566
-#, python-format
-msgid "<b>Unable to save current workspace</b><br><br>Error message:<br>%s"
-msgstr ""
-"<b>Невозможно сохранить текущую рабочую область</b><br><br>Сообщение об "
-"ошибке:<br>%s"
+#: spyder/plugins/editor.py:613 spyder/widgets/editortools.py:510
+msgid "Show/hide outline explorer"
+msgstr "Показать/скрыть менеджер структуры"
 
-#: spyderlib/widgets/variableexplorer/importwizard.py:116
-#: spyderlib/widgets/variableexplorer/importwizard.py:431
-msgid "Import as"
-msgstr "Импортировать как"
+#: spyder/plugins/editor.py:619
+msgid "Show/hide project explorer"
+msgstr "Показать/скрыть менеджер проектов"
 
-#: spyderlib/widgets/variableexplorer/importwizard.py:118
-msgid "data"
-msgstr "данные"
+#: spyder/plugins/editor.py:627
+msgid "&New file..."
+msgstr "&Новый файл"
 
-#: spyderlib/widgets/variableexplorer/importwizard.py:122
-msgid "code"
-msgstr "код"
+#: spyder/plugins/editor.py:628 spyder/plugins/workingdirectory.py:83
+#: spyder/widgets/explorer.py:692 spyder/widgets/explorer.py:699
+msgid "New file"
+msgstr "Новый файл"
 
-#: spyderlib/widgets/variableexplorer/importwizard.py:125
-#: spyderlib/widgets/variableexplorer/importwizard.py:504
-msgid "text"
-msgstr "текст"
+#: spyder/plugins/editor.py:634
+msgid "&Open..."
+msgstr "&Открыть"
 
-#: spyderlib/widgets/variableexplorer/importwizard.py:138
-msgid "Column separator:"
-msgstr "Разделитель столбцов:"
+#: spyder/plugins/editor.py:635 spyder/plugins/editor.py:1767
+#: spyder/plugins/workingdirectory.py:70
+msgid "Open file"
+msgstr "Открыть файл"
 
-#: spyderlib/widgets/variableexplorer/importwizard.py:142
-msgid "Tab"
-msgstr "табуляция"
+#: spyder/plugins/editor.py:641 spyder/widgets/editor.py:345
+msgid "File switcher..."
+msgstr "Переключение по файлам..."
 
-#: spyderlib/widgets/variableexplorer/importwizard.py:145
-#: spyderlib/widgets/variableexplorer/importwizard.py:163
-msgid "other"
-msgstr "другой"
+#: spyder/plugins/editor.py:643
+msgid "Fast switch between files"
+msgstr "Быстрое переключение между файлами"
 
-#: spyderlib/widgets/variableexplorer/importwizard.py:156
-msgid "Row separator:"
-msgstr "Разделитель строк:"
+#: spyder/plugins/editor.py:649
+msgid "&Revert"
+msgstr "За&грузить заново"
 
-#: spyderlib/widgets/variableexplorer/importwizard.py:160
-msgid "EOL"
-msgstr "Конец строки"
+#: spyder/plugins/editor.py:650
+msgid "Revert file from disk"
+msgstr "Загрузить файл с диска"
 
-#: spyderlib/widgets/variableexplorer/importwizard.py:175
-msgid "Additional options"
-msgstr "Дополнительные опции"
+#: spyder/plugins/editor.py:653
+msgid "&Save"
+msgstr "&Сохранить"
 
-#: spyderlib/widgets/variableexplorer/importwizard.py:179
-msgid "Skip rows:"
-msgstr "Пропустить строки:"
+#: spyder/plugins/editor.py:654 spyder/widgets/editor.py:1304
+msgid "Save file"
+msgstr "Сохранить файл"
 
-#: spyderlib/widgets/variableexplorer/importwizard.py:190
-msgid "Comments:"
-msgstr "Комментарии:"
+#: spyder/plugins/editor.py:660
+msgid "Sav&e all"
+msgstr "Сохранить &все"
 
-#: spyderlib/widgets/variableexplorer/importwizard.py:196
-msgid "Transpose"
-msgstr "Транспонировать"
+#: spyder/plugins/editor.py:661
+msgid "Save all files"
+msgstr "Сохранить все файлы"
 
-#: spyderlib/widgets/variableexplorer/importwizard.py:434
-msgid "array"
-msgstr "массив"
+#: spyder/plugins/editor.py:667
+msgid "Save &as..."
+msgstr "Сохранить &как..."
 
-#: spyderlib/widgets/variableexplorer/importwizard.py:439
-msgid "list"
-msgstr "список"
+#: spyder/plugins/editor.py:668
+msgid "Save current file as..."
+msgstr "Сохранить текущий файл как..."
 
-#: spyderlib/widgets/variableexplorer/importwizard.py:444
-msgid "DataFrame"
-msgstr "DataFrame"
+#: spyder/plugins/editor.py:673 spyder/plugins/editor.py:674
+msgid "Print preview..."
+msgstr "Предварительный просмотр..."
 
-#: spyderlib/widgets/variableexplorer/importwizard.py:487
-#: spyderlib/widgets/variableexplorer/importwizard.py:569
-msgid "Import wizard"
-msgstr "Мастер импорта"
+#: spyder/plugins/editor.py:675
+msgid "&Print..."
+msgstr "&Печать"
 
-#: spyderlib/widgets/variableexplorer/importwizard.py:492
-msgid "Raw text"
-msgstr "Необработанный текст"
+#: spyder/plugins/editor.py:676
+msgid "Print current file..."
+msgstr "Печатать текущий файл"
 
-#: spyderlib/widgets/variableexplorer/importwizard.py:495
-msgid "variable_name"
-msgstr "имя_переменной"
+#: spyder/plugins/editor.py:679
+msgid "&Close"
+msgstr "&Закрыть"
 
-#: spyderlib/widgets/variableexplorer/importwizard.py:506
-msgid "table"
-msgstr "таблица"
+#: spyder/plugins/editor.py:680
+msgid "Close current file"
+msgstr "Закрыть текущий файл"
 
-#: spyderlib/widgets/variableexplorer/importwizard.py:507
-msgid "Preview"
-msgstr "Предварительный просмотр"
+#: spyder/plugins/editor.py:683
+msgid "C&lose all"
+msgstr "Закрыть вс&е"
 
-#: spyderlib/widgets/variableexplorer/importwizard.py:511
-msgid "Variable Name"
-msgstr "Имя переменной"
+#: spyder/plugins/editor.py:684
+msgid "Close all opened files"
+msgstr "Закрыть все открытые файлы"
 
-#: spyderlib/widgets/variableexplorer/importwizard.py:519
-msgid "Cancel"
-msgstr "Отмена"
+#: spyder/plugins/editor.py:691
+msgid "&Find text"
+msgstr "&Найти текст"
 
-#: spyderlib/widgets/variableexplorer/importwizard.py:525
-#: spyderlib/widgets/explorer.py:1031
-msgid "Previous"
-msgstr "Предыдущая"
+#: spyder/plugins/editor.py:697
+msgid "Find &next"
+msgstr "Найти &следующий"
 
-#: spyderlib/widgets/variableexplorer/importwizard.py:529
-#: spyderlib/widgets/explorer.py:1034
-#: spyderlib/plugins/workingdirectory.py:179
-msgid "Next"
-msgstr "Далее"
+#: spyder/plugins/editor.py:703
+msgid "Find &previous"
+msgstr "Найти &предыдущий"
 
-#: spyderlib/widgets/variableexplorer/importwizard.py:532
-msgid "Done"
-msgstr "Сделано"
+#: spyder/plugins/editor.py:709
+msgid "&Replace text"
+msgstr "&Заменить текст"
 
-#: spyderlib/widgets/variableexplorer/importwizard.py:570
-#, python-format
-msgid ""
-"<b>Unable to proceed to next step</b><br><br>Please check your entries."
-"<br><br>Error message:<br>%s"
-msgstr ""
-"<b>Невозможно перейти к следующему шагу</b><br><br>Пожалуйста, проверьте "
-"введенные данные.<br><br>Сообщение об ошибке:<br>%s"
+#: spyder/plugins/editor.py:718
+msgid "Set/Clear breakpoint"
+msgstr "Поставить/Убрать точку останова"
 
-#: spyderlib/widgets/variableexplorer/texteditor.py:72
-msgid "Text editor"
-msgstr "Текстовый редактор"
+#: spyder/plugins/editor.py:725
+msgid "Set/Edit conditional breakpoint"
+msgstr "Поставить/Редактировать условную точку останова"
 
-#: spyderlib/widgets/comboboxes.py:165
-msgid "Press enter to validate this entry"
-msgstr "Нажмите Enter для подтверждения этого поля"
+#: spyder/plugins/editor.py:732
+msgid "Clear breakpoints in all files"
+msgstr "Очистить точки останова во всех файлах"
 
-#: spyderlib/widgets/comboboxes.py:166
-msgid "This entry is incorrect"
-msgstr "Это поле неверно"
+#: spyder/plugins/editor.py:734
+msgid "Debug with winpdb"
+msgstr "Отладка с помощью winpdb"
 
-#: spyderlib/widgets/comboboxes.py:209
-msgid "Press enter to validate this path"
-msgstr "Нажмите Enter для подтверждения этого пути"
+#: spyder/plugins/editor.py:741
+msgid "Debug file"
+msgstr "Отладка файла"
 
-#: spyderlib/widgets/onecolumntree.py:50
-msgid "Collapse all"
-msgstr "Свернуть всё"
+#: spyder/plugins/editor.py:746
+msgid "Step"
+msgstr "Шаг"
 
-#: spyderlib/widgets/onecolumntree.py:54
-msgid "Expand all"
-msgstr "Развернуть всё"
+#: spyder/plugins/editor.py:747
+msgid "Run current line"
+msgstr "Выполнить текущую строку"
 
-#: spyderlib/widgets/onecolumntree.py:58
-msgid "Restore"
-msgstr "Восстановить"
+#: spyder/plugins/editor.py:752
+msgid "Continue"
+msgstr "Продолжить"
 
-#: spyderlib/widgets/onecolumntree.py:59
-msgid "Restore original tree layout"
-msgstr "Восстановить оригинальную структуру дерева"
+#: spyder/plugins/editor.py:754
+msgid "Continue execution until next breakpoint"
+msgstr "Продолжить выполнение до следующей точки останова"
 
-#: spyderlib/widgets/onecolumntree.py:63
-msgid "Collapse selection"
-msgstr "Свернуть выделенное"
+#: spyder/plugins/editor.py:759
+msgid "Step Into"
+msgstr "Шаг в функцию"
 
-#: spyderlib/widgets/onecolumntree.py:67
-msgid "Expand selection"
-msgstr "Развернуть выделенное"
+#: spyder/plugins/editor.py:761
+msgid "Step into function or method of current line"
+msgstr "Войти в функцию или метод текущей линии"
 
-#: spyderlib/widgets/editor.py:341 spyderlib/plugins/editor.py:645
-msgid "File switcher..."
-msgstr "Переключение по файлам..."
+#: spyder/plugins/editor.py:766
+msgid "Step Return"
+msgstr "Шаг из функции"
 
-#: spyderlib/widgets/editor.py:344
-msgid "Copy path to clipboard"
-msgstr "Копировать путь в буфер обмена"
+#: spyder/plugins/editor.py:768
+msgid "Run until current function or method returns"
+msgstr "Выполнять пока функция или метод не завершатся"
 
-#: spyderlib/widgets/editor.py:348
-msgid "Close all to the right"
-msgstr "Закрыть все правее"
+#: spyder/plugins/editor.py:773 spyder/widgets/findinfiles.py:333
+#: spyder/widgets/ipythonconsole/client.py:236
+msgid "Stop"
+msgstr "Стоп"
 
-#: spyderlib/widgets/editor.py:350
-msgid "Close all but this"
-msgstr "Закрыть все кроме этой"
+#: spyder/plugins/editor.py:774
+msgid "Stop debugging"
+msgstr "Завершить отладку"
 
-#: spyderlib/widgets/editor.py:365
-#: spyderlib/widgets/sourcecode/codeeditor.py:94
-#: spyderlib/widgets/sourcecode/codeeditor.py:2901
-#: spyderlib/plugins/editor.py:96 spyderlib/plugins/editor.py:556
-#: spyderlib/plugins/editor.py:1636 spyderlib/plugins/help.py:123
-#: spyderlib/plugins/help.py:391 spyderlib/plugins/__init__.py:523
-msgid "Editor"
-msgstr "Редактор"
+#: spyder/plugins/editor.py:781
+msgid "Run file"
+msgstr "Выполнить файл"
 
-#: spyderlib/widgets/editor.py:914
-msgid "Temporary file"
-msgstr "Временный файл"
+#: spyder/plugins/editor.py:786
+msgid "&Configure..."
+msgstr "&Настроить"
 
-#: spyderlib/widgets/editor.py:1011
-msgid "New window"
-msgstr "Новое окно"
+#: spyder/plugins/editor.py:788 spyder/widgets/externalshell/pythonshell.py:304
+msgid "Run settings"
+msgstr "Настройки Запуска"
 
-#: spyderlib/widgets/editor.py:1012
-msgid "Create a new editor window"
-msgstr "Создать новое окно редактора"
+#: spyder/plugins/editor.py:794
+msgid "Re-run &last script"
+msgstr "Перезапустить последний скрипт"
 
-#: spyderlib/widgets/editor.py:1015
-msgid "Split vertically"
-msgstr "Разделить по вертикали"
+#: spyder/plugins/editor.py:796
+msgid "Run again last file"
+msgstr "Выполнить снова последний файл"
 
-#: spyderlib/widgets/editor.py:1017
-msgid "Split vertically this editor window"
-msgstr "Разделить окна редактора по вертикали"
+#: spyder/plugins/editor.py:802 spyder/widgets/sourcecode/codeeditor.py:2507
+msgid "Run &selection or current line"
+msgstr "Выполнить в&ыделенное или текущую строку"
 
-#: spyderlib/widgets/editor.py:1019
-msgid "Split horizontally"
-msgstr "Разделить по горизонтали"
+#: spyder/plugins/editor.py:805
+msgid "Run selection or current line"
+msgstr "Выполнить выделенное или текущую строку"
 
-#: spyderlib/widgets/editor.py:1021
-msgid "Split horizontally this editor window"
-msgstr "Разделить окна редактора по горизонтали"
+#: spyder/plugins/editor.py:813 spyder/widgets/sourcecode/codeeditor.py:2499
+msgid "Run cell"
+msgstr "Выполнить &блок"
 
-#: spyderlib/widgets/editor.py:1023
-msgid "Close this panel"
-msgstr "Закрыть эту панель"
+#: spyder/plugins/editor.py:816
+msgid ""
+"Run current cell (Ctrl+Enter)\n"
+"[Use #%% to create cells]"
+msgstr ""
+"Выполнить текущий блок (Ctrl+Enter)\n"
+"[Используйте #%% для создания блоков]"
 
-#: spyderlib/widgets/editor.py:1180
-#, python-format
-msgid "<b>%s</b> has been modified.<br>Do you want to save changes?"
-msgstr "<b>%s</b> был изменён.<br>Хотите сохранить изменения?"
+#: spyder/plugins/editor.py:822 spyder/widgets/sourcecode/codeeditor.py:2503
+msgid "Run cell and advance"
+msgstr "Выполнить блок и перейти далее"
 
-#: spyderlib/widgets/editor.py:1242
-msgid "Save"
-msgstr "Сохранить"
+#: spyder/plugins/editor.py:825
+msgid "Run current cell and go to the next one (Shift+Enter)"
+msgstr "Выполнить текущий блок и перейти к следующему (Shift+Enter)"
 
-#: spyderlib/widgets/editor.py:1243
-#, python-format
-msgid "<b>Unable to save script '%s'</b><br><br>Error message:<br>%s"
-msgstr ""
-"<b>Не удалось сохранить скрипт '%s'</b><br><br>Сообщение об ошибке:<br>%s"
+#: spyder/plugins/editor.py:832
+msgid "Show todo list"
+msgstr "Показать список задач"
 
-#: spyderlib/widgets/editor.py:1263 spyderlib/plugins/editor.py:657
-msgid "Save file"
-msgstr "Сохранить файл"
+#: spyder/plugins/editor.py:833
+msgid "Show TODO/FIXME/XXX/HINT/TIP/@todo comments list"
+msgstr "Показать список комментариев TODO/FIXME/XXX/HINT/TIP/@todo"
 
-#: spyderlib/widgets/editor.py:1477
-#, python-format
-msgid ""
-"<b>%s</b> is unavailable (this file may have been removed, moved or renamed "
-"outside Spyder).<br>Do you want to close it?"
-msgstr ""
-"<b>%s</b> недоступен (этот файл мог быть удален, перемещён или переименован "
-"вне Spyder).<br>Хотите его закрыть?"
+#: spyder/plugins/editor.py:840
+msgid "Show warning/error list"
+msgstr "Показать список предупреждений/ошибок"
 
-#: spyderlib/widgets/editor.py:1497
-#, python-format
-msgid ""
-"<b>%s</b> has been modified outside Spyder.<br>Do you want to reload it and "
-"lose all your changes?"
-msgstr ""
-"<b>%s</b> был изменён вне Spyder.<br>Хотите перегрузить его и потерять все "
-"изменения?"
+#: spyder/plugins/editor.py:841
+msgid "Show code analysis warnings/errors"
+msgstr "Показать предупреждения/ошибки анализа кода"
 
-#: spyderlib/widgets/editor.py:1593
-#, python-format
-msgid ""
-"All changes to <b>%s</b> will be lost.<br>Do you want to revert file from "
-"disk?"
-msgstr ""
-"Все изменения для <b>%s</b> были потеряны.<br>Хотите перегрузить файл с "
-"диска?"
+#: spyder/plugins/editor.py:847
+msgid "Previous warning/error"
+msgstr "Предыдущее предупреждение/ошибка"
 
-#: spyderlib/widgets/editor.py:1733
-#, python-format
-msgid "Loading %s..."
-msgstr "Загрузка %s..."
+#: spyder/plugins/editor.py:848
+msgid "Go to previous code analysis warning/error"
+msgstr "Перейти к предыдущему предупреждению/ошибке анализа кода"
 
-#: spyderlib/widgets/editor.py:1743
-#, python-format
-msgid ""
-"<b>%s</b> contains mixed end-of-line characters.<br>Spyder will fix this "
-"automatically."
-msgstr ""
-"<b>%s</b> содержит смешанные символы конца строки.<br>Spyder исправит это "
-"автоматически."
+#: spyder/plugins/editor.py:851
+msgid "Next warning/error"
+msgstr "Следующее предупреждение/ошибка"
 
-#: spyderlib/widgets/editor.py:2108
-msgid "Close window"
-msgstr "Закрыть окно"
+#: spyder/plugins/editor.py:852
+msgid "Go to next code analysis warning/error"
+msgstr "Перейти к следующему предупреждению/ошибке анализа кода"
 
-#: spyderlib/widgets/editor.py:2110
-msgid "Close this window"
-msgstr "Закрыть это окно"
+#: spyder/plugins/editor.py:856
+msgid "Last edit location"
+msgstr "Последнее место редактирования"
 
-#: spyderlib/widgets/shell.py:128
-msgid "Save history log..."
-msgstr "Сохранить журнал истории..."
+#: spyder/plugins/editor.py:857
+msgid "Go to last edit location"
+msgstr "Перейти к последнему месту редактирования"
 
-#: spyderlib/widgets/shell.py:130
-msgid "Save current history log (i.e. all inputs and outputs) in a text file"
-msgstr ""
-"Сохранить текущий журнал истории (т.е. все вводы и выводы) в текстовом файле"
+#: spyder/plugins/editor.py:865
+msgid "Previous cursor position"
+msgstr "Предыдущая позиция курсора"
 
-#: spyderlib/widgets/shell.py:133 spyderlib/widgets/projectexplorer.py:1015
-#: spyderlib/widgets/explorer.py:480 spyderlib/plugins/configdialog.py:1000
-msgid "Delete"
-msgstr "Удалить"
+#: spyder/plugins/editor.py:866
+msgid "Go to previous cursor position"
+msgstr "Перейти к предыдущей позиции курсора"
 
-#: spyderlib/widgets/shell.py:256
-msgid "Save history log"
-msgstr "Сохранить журнал истории"
+#: spyder/plugins/editor.py:874
+msgid "Next cursor position"
+msgstr "Следующая позиция курсора"
 
-#: spyderlib/widgets/shell.py:259
-msgid "History logs"
-msgstr "Журналы истории"
+#: spyder/plugins/editor.py:875
+msgid "Go to next cursor position"
+msgstr "Перейти к следующей позиции курсора"
 
-#: spyderlib/widgets/shell.py:270
-#, python-format
-msgid "<b>Unable to save file '%s'</b><br><br>Error message:<br>%s"
-msgstr ""
-"<b>Невозможно сохранить файл <i>%s</i></b><br><br>Сообщение об ошибке:<br>%s"
+#: spyder/plugins/editor.py:885 spyder/widgets/sourcecode/codeeditor.py:2483
+msgid "Comment"
+msgstr "Комментировать"
 
-#: spyderlib/widgets/shell.py:712
-msgid "Copy without prompts"
-msgstr "Копировать без подтверждения"
+#: spyder/plugins/editor.py:885 spyder/widgets/sourcecode/codeeditor.py:2483
+msgid "Uncomment"
+msgstr "Раскомментировать"
 
-#: spyderlib/widgets/shell.py:715 spyderlib/widgets/shell.py:719
-msgid "Clear line"
-msgstr "Очистить строку"
+#: spyder/plugins/editor.py:886
+msgid "Comment current line or selection"
+msgstr "Комментировать текущую строку/выделение"
 
-#: spyderlib/widgets/shell.py:721
-msgid "Clear shell"
-msgstr "Очистить оболочку"
+#: spyder/plugins/editor.py:890
+msgid "Add &block comment"
+msgstr "Добавить &блок комментариев"
 
-#: spyderlib/widgets/shell.py:725
-msgid "Clear shell contents ('cls' command)"
-msgstr "Очистить содержание оболочки (команда 'cls')"
+#: spyder/plugins/editor.py:891
+msgid "Add block comment around current line or selection"
+msgstr "Добавить блок комментариев вокруг текущей строки/выделения"
 
-#: spyderlib/widgets/ipython.py:246
-msgid "Reset IPython namespace"
-msgstr "Перезагрузить пространство имён IPython"
+#: spyder/plugins/editor.py:897
+msgid "R&emove block comment"
+msgstr "У&далить блок комментариев"
 
-#: spyderlib/widgets/ipython.py:247
-msgid ""
-"All user-defined variables will be removed.<br>Are you sure you want to "
-"reset the namespace?"
-msgstr ""
-"Все определённые пользователем переменные будут удалены.<br>Вы уверены, что "
-"хотите переустановить пространство имён?"
+#: spyder/plugins/editor.py:898
+msgid "Remove comment block around current line or selection"
+msgstr "Убрать блок комментариев вокруг текущей строки/выделения"
 
-#: spyderlib/widgets/ipython.py:363 spyderlib/widgets/ipython.py:380
-#: spyderlib/widgets/externalshell/baseshell.py:250
-#: spyderlib/widgets/mixins.py:656
-msgid "Arguments"
-msgstr "Аргументы"
+#: spyder/plugins/editor.py:909
+msgid "Indent"
+msgstr "Добавить отступ"
 
-#: spyderlib/widgets/ipython.py:518
-msgid "An error ocurred while starting the kernel"
-msgstr "При запуске ядра произошла ошибка"
+#: spyder/plugins/editor.py:910
+msgid "Indent current line or selection"
+msgstr "Добавить отступ к текущей строке или выделению"
 
-#: spyderlib/widgets/ipython.py:533
-#: spyderlib/widgets/externalshell/baseshell.py:106
-#: spyderlib/plugins/help.py:391 spyderlib/plugins/runconfig.py:185
-#: spyderlib/plugins/runconfig.py:455 spyderlib/plugins/externalconsole.py:56
-#: spyderlib/plugins/externalconsole.py:999
-msgid "Console"
-msgstr "Консоль"
+#: spyder/plugins/editor.py:913
+msgid "Unindent"
+msgstr "Убрать отступ"
 
-#: spyderlib/widgets/ipython.py:547
-msgid "Restart kernel"
-msgstr "Перезапустить ядро"
+#: spyder/plugins/editor.py:914
+msgid "Unindent current line or selection"
+msgstr "Убрать отступ у текущей строки/выделения"
 
-#: spyderlib/widgets/ipython.py:567 spyderlib/widgets/findinfiles.py:333
-msgid "Stop"
-msgstr "Стоп"
+#: spyder/plugins/editor.py:919
+msgid "Carriage return and line feed (Windows)"
+msgstr "Возврат каретки и перевод строки (Windows)"
 
-#: spyderlib/widgets/ipython.py:569
-msgid "Stop the current command"
-msgstr "Остановить текущую команду"
+#: spyder/plugins/editor.py:922
+msgid "Line feed (UNIX)"
+msgstr "Перевод строки (UNIX)"
 
-#: spyderlib/widgets/ipython.py:593
-msgid "Inspect current object"
-msgstr "Проверить текущий объект"
+#: spyder/plugins/editor.py:925
+msgid "Carriage return (Mac)"
+msgstr "Возврат каретки (Mac)"
 
-#: spyderlib/widgets/ipython.py:598
-msgid "Clear line or block"
-msgstr "Очистить строку или блок"
+#: spyder/plugins/editor.py:931
+msgid "Convert end-of-line characters"
+msgstr "Преобразовать символы конца строки"
 
-#: spyderlib/widgets/ipython.py:602
-msgid "Reset namespace"
-msgstr "Перезагрузить пространство имён"
+#: spyder/plugins/editor.py:935
+msgid "Remove trailing spaces"
+msgstr "Удалить лишние пробелы в конце строк"
 
-#: spyderlib/widgets/ipython.py:605
-msgid "Clear console"
-msgstr "Очистить консоль"
+#: spyder/plugins/editor.py:939
+msgid "Fix indentation"
+msgstr "Исправить отступы"
 
-#: spyderlib/widgets/ipython.py:661
-msgid ""
-"It seems the kernel died unexpectedly. Use 'Restart kernel' to continue "
-"using this console."
-msgstr ""
-"По видимому ядро неожиданно умерло. Используйте 'Перезапустить ядро' для "
-"продолжения работы в консоли."
+#: spyder/plugins/editor.py:940
+msgid "Replace tab characters by space characters"
+msgstr "Заменить символы табуляции пробелами"
 
-#: spyderlib/widgets/ipython.py:681
-msgid "Changing backend to Qt for Mayavi"
-msgstr "Изменить бэкенд для Mayavi на Qt"
+#: spyder/plugins/editor.py:943
+msgid "Go to line..."
+msgstr "Перейти к строке..."
 
-#: spyderlib/widgets/ipython.py:690
-msgid "Kernel process is either remote or unspecified. Cannot interrupt"
-msgstr ""
-"Процесс ядра либо подключён удалённо, либо неопределим. Невозможно прервать"
+#: spyder/plugins/editor.py:951
+msgid "Set console working directory"
+msgstr "Установить рабочий каталог консоли"
 
-#: spyderlib/widgets/ipython.py:699
-msgid "Kernel process is either remote or unspecified. Cannot restart."
+#: spyder/plugins/editor.py:953
+msgid ""
+"Set current console (and file explorer) working directory to current script "
+"directory"
 msgstr ""
-"Процесс ядра либо подключён удалённо, либо неопределим. Невозможно "
-"перезапустить."
-
-#: spyderlib/widgets/ipython.py:778
-msgid "Connecting to kernel..."
-msgstr "Подключение к ядру..."
+"Установить каталог текущего скрипта как рабочий для текущей консоли (и "
+"файлового менеджера) "
 
-#: spyderlib/widgets/pathmanager.py:86
-msgid "Move to top"
-msgstr "Переместить вверх"
+#: spyder/plugins/editor.py:958
+msgid "Maximum number of recent files..."
+msgstr "Максимальное количество недавних файлов..."
 
-#: spyderlib/widgets/pathmanager.py:92
-msgid "Move up"
-msgstr "Переместить выше"
+#: spyder/plugins/editor.py:961
+msgid "Clear recent files list"
+msgstr "Очистить список недавних файлов"
 
-#: spyderlib/widgets/pathmanager.py:98
-msgid "Move down"
-msgstr "Переместить ниже"
+#: spyder/plugins/editor.py:961 spyder/plugins/projects.py:97
+msgid "Clear this list"
+msgstr "Очистить этот список"
 
-#: spyderlib/widgets/pathmanager.py:104
-msgid "Move to bottom"
-msgstr "Переместить вниз"
+#: spyder/plugins/editor.py:965
+msgid "Open &recent"
+msgstr "Открыть не&давние"
 
-#: spyderlib/widgets/pathmanager.py:115 spyderlib/widgets/pathmanager.py:230
-msgid "Add path"
-msgstr "Добавить путь"
+#: spyder/plugins/editor.py:1348
+msgid "?"
+msgstr "?"
 
-#: spyderlib/widgets/pathmanager.py:120 spyderlib/widgets/pathmanager.py:213
-msgid "Remove path"
-msgstr "Удалить путь"
+#: spyder/plugins/editor.py:1575
+msgid "Spyder Editor"
+msgstr "Редактор Spyder"
 
-#: spyderlib/widgets/pathmanager.py:130
-msgid "Synchronize..."
-msgstr "Синхронизация..."
+#: spyder/plugins/editor.py:1576
+msgid "This is a temporary script file."
+msgstr "Это временный скриптовый файл."
 
-#: spyderlib/widgets/pathmanager.py:132
-msgid "Synchronize Spyder's path list with PYTHONPATH environment variable"
-msgstr "Синхронизировать список путей Spyder с переменной среды PYTHONPATH"
+#: spyder/plugins/editor.py:1645
+msgid "untitled"
+msgstr "untitled"
 
-#: spyderlib/widgets/pathmanager.py:144
-msgid "Synchronize"
-msgstr "Синхронизировать"
+#: spyder/plugins/editor.py:1719
+msgid "Maximum number of recent files"
+msgstr "Максимальное количество недавних файлов"
 
-#: spyderlib/widgets/pathmanager.py:145
-msgid ""
-"This will synchronize Spyder's path list with <b>PYTHONPATH</b> environment "
-"variable for current user, allowing you to run your Python modules outside "
-"Spyder without having to configure sys.path. <br>Do you want to clear "
-"contents of PYTHONPATH before adding Spyder's path list?"
-msgstr ""
-"Будет синхронизирован список путей Spyder с переменной среды PYTHONPATH для "
-"текущего пользователя, позволяя Вам запускать Ваши модули Python вне Spyder "
-"без необходимости настраивать sys.path.<br>Хотите очистить содержимое "
-"PYTHONPATH перед добавлением списка путей Spyder?"
+#: spyder/plugins/editor.py:1852
+msgid "Printing..."
+msgstr "Печать..."
 
-#: spyderlib/widgets/pathmanager.py:214
-msgid "Do you really want to remove selected path?"
-msgstr "Вы действительно хотите удалить выбранный путь?"
+#: spyder/plugins/explorer.py:53
+msgid "File explorer"
+msgstr "Файловый менеджер"
 
-#: spyderlib/widgets/pathmanager.py:223 spyderlib/widgets/findinfiles.py:504
-#: spyderlib/widgets/projectexplorer.py:899
-#: spyderlib/widgets/externalshell/pythonshell.py:638
-#: spyderlib/widgets/explorer.py:584 spyderlib/plugins/configdialog.py:490
-#: spyderlib/plugins/configdialog.py:505
-#: spyderlib/plugins/workingdirectory.py:290
-#: spyderlib/plugins/runconfig.py:176 spyderlib/plugins/runconfig.py:240
-msgid "Select directory"
-msgstr "Выберите каталог"
+#: spyder/plugins/externalconsole.py:46
+msgid "Interactive data plotting in the consoles"
+msgstr "Интерактивные графики в консолях"
 
-#: spyderlib/widgets/pathmanager.py:231
-msgid ""
-"This directory is already included in Spyder path list.<br>Do you want to "
-"move it to the top of the list?"
-msgstr ""
-"Этот каталог уже имеется в списке путей Spyder.<br>Хотите переместить его на "
-"вершину списка?"
+#: spyder/plugins/externalconsole.py:54 spyder/plugins/externalconsole.py:709
+msgid "Python console"
+msgstr "Консоль Python"
 
-#: spyderlib/widgets/findinfiles.py:158
-msgid "Unexpected error: see internal console"
-msgstr "Неожиданная ошибка: смотрите во встроенной консоли"
+#: spyder/plugins/externalconsole.py:59
+msgid "One tab per script"
+msgstr "Одна вкладка на скрипт"
 
-#: spyderlib/widgets/findinfiles.py:209 spyderlib/widgets/findinfiles.py:233
-#: spyderlib/widgets/findinfiles.py:280
-msgid "invalid regular expression"
-msgstr "неверное регулярное выражение"
+#: spyder/plugins/externalconsole.py:60
+#: spyder/widgets/externalshell/baseshell.py:160
+msgid "Show elapsed time"
+msgstr "Показывать прошедшее время"
 
-#: spyderlib/widgets/findinfiles.py:278
-msgid "permission denied errors were encountered"
-msgstr "обнаружены ошибки отказа в доступе"
+#: spyder/plugins/externalconsole.py:61 spyder/widgets/explorer.py:1074
+msgid "Show icons and text"
+msgstr "Показывать иконки и текст"
 
-#: spyderlib/widgets/findinfiles.py:315
-msgid "Search pattern"
-msgstr "Найти по шаблону"
+#: spyder/plugins/externalconsole.py:73
+msgid "Buffer: "
+msgstr "Буфер: "
 
-#: spyderlib/widgets/findinfiles.py:318 spyderlib/widgets/findinfiles.py:352
-#: spyderlib/widgets/findinfiles.py:364 spyderlib/widgets/findreplace.py:77
-msgid "Regular expression"
-msgstr "Регулярное выражение"
+#: spyder/plugins/externalconsole.py:73 spyder/plugins/ipythonconsole.py:319
+msgid " lines"
+msgstr " строк"
 
-#: spyderlib/widgets/findinfiles.py:327
-msgid "Search"
-msgstr "Найти"
+#: spyder/plugins/externalconsole.py:78
+msgid "Merge process standard output/error channels"
+msgstr "Объединить стандартные потоки вывода/ошибок"
 
-#: spyderlib/widgets/findinfiles.py:330
-msgid "Start search"
-msgstr "Начать поиск"
+#: spyder/plugins/externalconsole.py:80
+msgid ""
+"Merging the output channels of the process means that\n"
+"the standard error won't be written in red anymore,\n"
+"but this has the effect of speeding up display."
+msgstr ""
+"Объединение потоков вывода процесса означает, что\n"
+"стандартные ошибки не будут более выделяться красным,\n"
+"но это увеличит скорость отображения на дисплее."
 
-#: spyderlib/widgets/findinfiles.py:336
-msgid "Stop search"
-msgstr "Остановить поиск"
+#: spyder/plugins/externalconsole.py:84
+msgid "Colorize standard error channel using ANSI escape codes"
+msgstr "Выделить цветом стандартный поток ошибок управляющими кодами ANSI"
 
-#: spyderlib/widgets/findinfiles.py:346
-msgid "Included filenames pattern"
-msgstr "Включить шаблон имён файлов"
+#: spyder/plugins/externalconsole.py:86
+msgid ""
+"This method is the only way to have colorized standard\n"
+"error channel when the output channels have been merged."
+msgstr ""
+"Это единственный способ цветового выделения стандартного\n"
+"потока ошибок, когда потоки вывода объединены."
 
-#: spyderlib/widgets/findinfiles.py:355
-msgid "Include:"
-msgstr "Включить:"
+#: spyder/plugins/externalconsole.py:102 spyder/plugins/ipythonconsole.py:306
+#: spyder/widgets/variableexplorer/arrayeditor.py:540
+#: spyder/widgets/variableexplorer/dataframeeditor.py:552
+msgid "Background color"
+msgstr "Цвет фона"
 
-#: spyderlib/widgets/findinfiles.py:358
-msgid "Excluded filenames pattern"
-msgstr "Исключить шаблон имён файлов"
+#: spyder/plugins/externalconsole.py:103
+msgid ""
+"This option will be applied the next time a Python console or a terminal is "
+"opened."
+msgstr ""
+"Эта опция будет применена при следующем открытии консоли Python<br>или "
+"терминала."
 
-#: spyderlib/widgets/findinfiles.py:367
-msgid "Exclude:"
-msgstr "Исключить:"
+#: spyder/plugins/externalconsole.py:106
+msgid "Light background (white color)"
+msgstr "Светлый фон (белый цвет)"
 
-#: spyderlib/widgets/findinfiles.py:377
-msgid "PYTHONPATH"
-msgstr "PYTHONPATH"
+#: spyder/plugins/externalconsole.py:131
+msgid "PYTHONSTARTUP replacement"
+msgstr "Замена PYTHONSTARTUP"
 
-#: spyderlib/widgets/findinfiles.py:380
+#: spyder/plugins/externalconsole.py:133
 msgid ""
-"Search in all directories listed in sys.path which are outside the Python "
-"installation directory"
+"This option will override the PYTHONSTARTUP environment variable which\n"
+"defines the script to be executed during the Python console startup."
 msgstr ""
-"Искать во всех каталогах, указанных в sys.path, которые отсутствуют в "
-"установочном каталоге Python"
+"Эта опция перезапишет переменную среды PYTHONSTARTUP, которая\n"
+"определяет скрипт, запускаемый при старте консоли Python."
 
-#: spyderlib/widgets/findinfiles.py:382
-msgid "Hg repository"
-msgstr "Hg-репозиторий"
+#: spyder/plugins/externalconsole.py:138
+msgid "Default PYTHONSTARTUP script"
+msgstr "Скрипт PYTHONSTARTUP по умолчанию"
 
-#: spyderlib/widgets/findinfiles.py:385
-msgid "Search in current directory hg repository"
-msgstr "Поиск в текущем каталоге hg-репозитория"
+#: spyder/plugins/externalconsole.py:142
+msgid "Use the following startup script:"
+msgstr "Использовать следующий скрипт запуска:"
 
-#: spyderlib/widgets/findinfiles.py:386
-msgid "Here:"
-msgstr "Здесь:"
+#: spyder/plugins/externalconsole.py:159
+msgid "Monitor"
+msgstr "Монитор"
 
-#: spyderlib/widgets/findinfiles.py:390
-msgid "Search recursively in this directory"
-msgstr "Искать рекурсивно в каталоге"
+#: spyder/plugins/externalconsole.py:160
+msgid ""
+"The monitor provides introspection features to console: code completion, "
+"calltips and variable explorer. Because it relies on several modules, "
+"disabling the monitor may be useful to accelerate console startup."
+msgstr ""
+"Монитор обеспечивает возможность самоанализа в консоли: автодополнение, "
+"подсказки вызова функций и менеджер переменных. Так как он зависит от "
+"нескольких модулей, отключение монитора может быть полезно для ускорения "
+"запуска консоли."
 
-#: spyderlib/widgets/findinfiles.py:395
-msgid "Browse a search directory"
-msgstr "Выбрать каталог поиска"
+#: spyder/plugins/externalconsole.py:167
+msgid "Enable monitor"
+msgstr "Включить монитор"
 
-#: spyderlib/widgets/findinfiles.py:425
-msgid "Hide advanced options"
-msgstr "Скрыть дополнительные опции"
+#: spyder/plugins/externalconsole.py:180
+msgid "Default library"
+msgstr "Библиотека по умолчанию"
 
-#: spyderlib/widgets/findinfiles.py:428
-msgid "Show advanced options"
-msgstr "Показать дополнительные опции"
-
-#: spyderlib/widgets/findinfiles.py:569
-msgid "Search canceled"
-msgstr "Поиск отменён"
-
-#: spyderlib/widgets/findinfiles.py:573
-msgid "String not found"
-msgstr "Строка не найдена"
-
-#: spyderlib/widgets/findinfiles.py:575
-msgid "matches in"
-msgstr "совпадений в"
-
-#: spyderlib/widgets/findinfiles.py:576
-msgid "file"
-msgstr "файл"
+#: spyder/plugins/externalconsole.py:185
+msgid "Qt-Python Bindings"
+msgstr "Привязка Qt-Python"
 
-#: spyderlib/widgets/findinfiles.py:584
-msgid "interrupted"
-msgstr "прервано"
+#: spyder/plugins/externalconsole.py:187
+msgid "Library:"
+msgstr "Библиотека:"
 
-#: spyderlib/widgets/findinfiles.py:689 spyderlib/plugins/findinfiles.py:114
-msgid "Find in files"
-msgstr "Найти в файлах"
+#: spyder/plugins/externalconsole.py:189
+msgid ""
+"This option will act on<br> libraries such as Matplotlib, guidata or ETS"
+msgstr ""
+"Эта опция будет действовать на<br> \n"
+"библиотеки, такие как Matplotlib, guidata или ETS"
 
-#: spyderlib/widgets/tabs.py:142
-msgid "Browse tabs"
-msgstr "Обзор вкладок"
+#: spyder/plugins/externalconsole.py:198 spyder/plugins/ipythonconsole.py:560
+msgid "Graphics"
+msgstr "Графика"
 
-#: spyderlib/widgets/tabs.py:271
-msgid "Close current tab"
-msgstr "Закрыть текущую вкладку"
+#: spyder/plugins/externalconsole.py:199
+msgid ""
+"Decide which backend to use to display graphics. If unsure, please select "
+"the <b>Automatic</b> backend.<br><br><b>Note:</b> We support a very limited "
+"number of backends in our Python consoles. If you prefer to work with a "
+"different one, please use an IPython console."
+msgstr ""
+"Выберите какой бэкенд использовать для отображения графики. Если не уверены, "
+"выберите <b>Автоматически</b>.<br><br><b>Примечание:</b> Мы поддерживаем "
+"очень ограниченный набор бэкендов в консолях Python. Если Вы предпочитаете "
+"работать с другим, пожалуйста используйте консоль IPython."
 
-#: spyderlib/widgets/pydocgui.py:107
-msgid "Module or package:"
-msgstr "Модуль или пакет:"
+#: spyder/plugins/externalconsole.py:208
+msgid "None"
+msgstr "Отсутствует"
 
-#: spyderlib/widgets/editortools.py:94 spyderlib/widgets/editortools.py:130
-#, python-format
-msgid "Line %s"
-msgstr "Строка %s"
+#: spyder/plugins/externalconsole.py:208 spyder/plugins/ipythonconsole.py:351
+msgid "Automatic"
+msgstr "Автоматически"
 
-#: spyderlib/widgets/editortools.py:99
-#, python-format
-msgid "Class defined at line %s"
-msgstr "Класс определён в строке %s"
+#: spyder/plugins/externalconsole.py:213 spyder/plugins/ipythonconsole.py:373
+msgid "Backend:"
+msgstr "Бэкенд:"
 
-#: spyderlib/widgets/editortools.py:107
-#, python-format
-msgid "Method defined at line %s"
-msgstr "Метод определён в строке %s"
+#: spyder/plugins/externalconsole.py:215 spyder/plugins/ipythonconsole.py:375
+msgid "This option will be applied the next time a console is opened."
+msgstr "Эта опция будет принята при следующем открытии консоли."
 
-#: spyderlib/widgets/editortools.py:117
-#, python-format
-msgid "Function defined at line %s"
-msgstr "Функция определена в строке %s"
+#: spyder/plugins/externalconsole.py:226
+msgid "Enthought Tool Suite"
+msgstr "Набор инструментов Enthought"
 
-#: spyderlib/widgets/editortools.py:149
-#, python-format
-msgid "Cell starts at line %s"
-msgstr "Блок начинается в строке %s"
+#: spyder/plugins/externalconsole.py:227
+msgid ""
+"Enthought Tool Suite (ETS) supports PyQt4 (qt4) and wxPython (wx) graphical "
+"user interfaces."
+msgstr ""
+"Enthought Tool Suite (ETS) поддерживает графические пользовательские "
+"интерфейсы PyQt4 (qt4) и wxPython (wx)."
 
-#: spyderlib/widgets/editortools.py:195
-#: spyderlib/plugins/outlineexplorer.py:48
-msgid "Outline"
-msgstr "Структура"
+#: spyder/plugins/externalconsole.py:231
+msgid "ETS_TOOLKIT:"
+msgstr "ETS_TOOLKIT:"
 
-#: spyderlib/widgets/editortools.py:202 spyderlib/widgets/editortools.py:539
-msgid "Go to cursor position"
-msgstr "Перейти к позиции курсора"
+#: spyder/plugins/externalconsole.py:255
+msgid "External modules"
+msgstr "Внешние модули"
 
-#: spyderlib/widgets/editortools.py:205
-msgid "Show absolute path"
-msgstr "Показать полный путь"
+#: spyder/plugins/externalconsole.py:447
+msgid ""
+"No Python console is currently selected to run <b>%s</b>.<br><br>Please "
+"select or open a new Python console and try again."
+msgstr ""
+"Сейчас нет доступных консолей Python для запуска <b>%s</b>."
+"<br><br>Пожалуйста, откройте новую и попытайтесь снова."
 
-#: spyderlib/widgets/editortools.py:208 spyderlib/widgets/explorer.py:178
-msgid "Show all files"
-msgstr "Показать все файлы"
+#: spyder/plugins/externalconsole.py:518
+msgid ""
+"%s is already running in a separate process.\n"
+"Do you want to kill the process before starting a new one?"
+msgstr ""
+"%s всегда запускается в отдельном процессе.\n"
+"Хотите убить процесс перед запуском нового?"
 
-#: spyderlib/widgets/editortools.py:211
-msgid "Show special comments"
-msgstr "Показать специальные комментарии"
+#: spyder/plugins/externalconsole.py:647
+msgid "Command Window"
+msgstr "Командное окно"
 
-#: spyderlib/widgets/editortools.py:510 spyderlib/plugins/editor.py:615
-msgid "Show/hide outline explorer"
-msgstr "Показать/скрыть менеджер структуры"
+#: spyder/plugins/externalconsole.py:649 spyder/plugins/ipythonconsole.py:297
+msgid "Terminal"
+msgstr "Терминал"
 
-#: spyderlib/widgets/fileswitcher.py:108
-msgid "unsaved file"
-msgstr "несохранённый файл"
+#: spyder/plugins/externalconsole.py:731
+msgid "Open a &Python console"
+msgstr "Открыть консоль &Python"
 
-#: spyderlib/widgets/fileswitcher.py:228
-msgid ""
-"Press <b>Enter</b> to switch files or <b>Esc</b> to cancel.<br><br>Type to "
-"filter filenames.<br><br>Use <b>:number</b> to go to a line, e.g. "
-"<b><code>main:42</code></b><br>Use <b>@symbol_text</b> to go to a symbol, e."
-"g. <b><code>@init</code></b><br><br> Press <b>Ctrl+W</b> to close current "
-"tab.<br>"
-msgstr ""
-"Нажмите <b>Enter</b> для перехода к файлу или <b>Esc</b> для отмены."
-"<br><br>Введите текст для фильтрации имен файлов.<br><br>Используйте <b>:"
-"номер</b> для перехода к строке, напр. <b><code>main:42</code></"
-"b><br>Используйте <b>@имя</b> для перехода к идентификатору, напр. "
-"<b><code>@init</code></b><br><br> Нажмите <b>Ctrl+W</b> для закрытия текущей "
-"вкладки."
+#: spyder/plugins/externalconsole.py:735
+msgid "Open &command prompt"
+msgstr "Открыть &командную строку"
 
-#: spyderlib/widgets/fileswitcher.py:485
-msgid "lines"
-msgstr " строк"
+#: spyder/plugins/externalconsole.py:736
+msgid "Open a Windows command prompt"
+msgstr "Открыть командную строку Windows"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:97
-msgid "Go to line:"
-msgstr "Перейти к строке:"
+#: spyder/plugins/externalconsole.py:738
+msgid "Open a &terminal"
+msgstr "Открыть &терминал"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:105
-msgid "Line count:"
-msgstr "Количество строк:"
+#: spyder/plugins/externalconsole.py:739
+msgid "Open a terminal window"
+msgstr "Открыть окно терминала"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:1269
-msgid "Breakpoint"
-msgstr "Точка останова"
+#: spyder/plugins/findinfiles.py:127 spyder/widgets/findinfiles.py:689
+msgid "Find in files"
+msgstr "Найти в файлах"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:1270
-msgid "Condition:"
-msgstr "Условие:"
+#: spyder/plugins/findinfiles.py:148
+msgid "&Find in files"
+msgstr "Найти в &файлах"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:1672
-msgid "Code analysis"
-msgstr "Анализ кода"
+#: spyder/plugins/findinfiles.py:151
+msgid "Search text in multiple files"
+msgstr "Искать текст в нескольких файлах"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:1726
-msgid "To do"
-msgstr "Список задач"
+#: spyder/plugins/help.py:44
+msgid "Show help for objects in the Editor and Consoles in a dedicated pane"
+msgstr ""
+"Показывать справку об объектах в Редакторе и Консолях в специальной панели"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:1967
-msgid "Removal error"
-msgstr "Ошибка удаления"
+#: spyder/plugins/help.py:110
+msgid "Automatic connections"
+msgstr "Автоматические соединения"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:1968
-#, fuzzy
+#: spyder/plugins/help.py:111
 msgid ""
-"It was not possible to remove outputs from this notebook. The error is:\n"
-"\n"
+"This pane can automatically show an object's help information after a left "
+"parenthesis is written next to it. Below you can decide to which plugin you "
+"want to connect it to turn on this feature."
 msgstr ""
-"Невозможно удалить результаты из notebook. Ошибка:\n"
-"\n"
-
-#: spyderlib/widgets/sourcecode/codeeditor.py:1980
-#: spyderlib/widgets/explorer.py:524
-msgid "Conversion error"
-msgstr "Ошибка преобразования"
+"Инспектор объектов может автоматически показывать справочную информацию по "
+"объекту после ввода открывающей круглой скобки вслед за ним. Ниже вы можете "
+"решить, в каком модуле использовать эту возможность."
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:1981
-#: spyderlib/widgets/explorer.py:525
-#, fuzzy
+#: spyder/plugins/help.py:123
 msgid ""
-"It was not possible to convert this notebook. The error is:\n"
-"\n"
+"This feature requires the Rope or Jedi libraries.\n"
+"It seems you don't have either installed."
 msgstr ""
-"Не удалось конвертировать эту notebook. Ошибка:\n"
-"\n"
+"Эта функция требует библиотеки Rope или Jedi.\n"
+"Похоже, Вы их не установили."
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:2438
-#: spyderlib/plugins/editor.py:879
-msgid "Comment"
-msgstr "Комментировать"
+#: spyder/plugins/help.py:126
+msgid "Python Console"
+msgstr "Консоль Python"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:2438
-#: spyderlib/plugins/editor.py:879
-msgid "Uncomment"
-msgstr "Раскомментировать"
+#: spyder/plugins/help.py:128
+msgid "IPython Console"
+msgstr "Консоль IPython"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:2442
-msgid "Clear all ouput"
-msgstr "Очистить вывод"
+#: spyder/plugins/help.py:140
+msgid "Additional features"
+msgstr "Дополнительные возможности"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:2445
-#: spyderlib/widgets/explorer.py:253
-msgid "Convert to Python script"
-msgstr "Сохранить как скрипт Python"
+#: spyder/plugins/help.py:141
+msgid "Render mathematical equations"
+msgstr "Отрисовывать математические выражения"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:2448
-msgid "Go to definition"
-msgstr "Перейти к определению"
+#: spyder/plugins/help.py:147
+msgid "This feature requires Sphinx 1.1 or superior."
+msgstr "Эта возможность требует Sphinx 1.1 или выше."
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:2451
-#: spyderlib/plugins/editor.py:816
-msgid "Run cell"
-msgstr "Выполнить &блок"
+#: spyder/plugins/help.py:148
+msgid "Sphinx %s is currently installed."
+msgstr "Sphinx %s на данный момент установлено."
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:2455
-#: spyderlib/plugins/editor.py:824
-msgid "Run cell and advance"
-msgstr "Выполнить блок и перейти далее"
+#: spyder/plugins/help.py:309
+msgid "No further documentation available"
+msgstr "Дополнительная документация отсутствует"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:2459
-#: spyderlib/plugins/editor.py:800
-msgid "Run &selection or current line"
-msgstr "Выполнить в&ыделенное или текущую строку"
+#: spyder/plugins/help.py:347
+msgid "No documentation available"
+msgstr "Дополнительная документация отсутствует"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:2462
-#: spyderlib/widgets/browser.py:34
-msgid "Zoom in"
-msgstr "Увеличить"
+#: spyder/plugins/help.py:378
+msgid "Source"
+msgstr "Исходник"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:2465
-#: spyderlib/widgets/browser.py:31
-msgid "Zoom out"
-msgstr "Уменьшить"
+#: spyder/plugins/help.py:385 spyder/plugins/runconfig.py:186
+#: spyder/plugins/runconfig.py:456 spyder/widgets/externalshell/baseshell.py:94
+#: spyder/widgets/ipythonconsole/client.py:200
+msgid "Console"
+msgstr "Консоль"
 
-#: spyderlib/widgets/sourcecode/codeeditor.py:2468
-msgid "Zoom reset"
-msgstr "Восстановить масштаб"
+#: spyder/plugins/help.py:393
+#: spyder/widgets/variableexplorer/collectionseditor.py:133
+msgid "Object"
+msgstr "Объект"
 
-#: spyderlib/widgets/internalshell.py:258
-msgid "Help..."
-msgstr "Справка..."
+#: spyder/plugins/help.py:407
+msgid "Plain Text"
+msgstr "Простой текст"
 
-#: spyderlib/widgets/internalshell.py:275
-msgid "Shell special commands:"
-msgstr "Специальные команды оболочки:"
+#: spyder/plugins/help.py:411
+msgid "Show Source"
+msgstr "Показать исходник"
 
-#: spyderlib/widgets/internalshell.py:276
-msgid "Internal editor:"
-msgstr "Встроенный редактор:"
+#: spyder/plugins/help.py:415
+msgid "Rich Text"
+msgstr "Форматированный текст"
 
-#: spyderlib/widgets/internalshell.py:277
-msgid "External editor:"
-msgstr "Внешний редактор:"
+#: spyder/plugins/help.py:425
+msgid "Automatic import"
+msgstr "Автоматический импорт"
 
-#: spyderlib/widgets/internalshell.py:278
-msgid "Run script:"
-msgstr "Выполнить скрипт:"
+#: spyder/plugins/help.py:437 spyder/plugins/history.py:106
+#: spyder/widgets/editor.py:502 spyder/widgets/explorer.py:1085
+#: spyder/widgets/externalshell/baseshell.py:140
+#: spyder/widgets/ipythonconsole/client.py:249
+#: spyder/widgets/variableexplorer/namespacebrowser.py:162
+msgid "Options"
+msgstr "Опции"
 
-#: spyderlib/widgets/internalshell.py:279
-msgid "Remove references:"
-msgstr "Удалить ссылки:"
+#: spyder/plugins/help.py:695
+msgid ""
+"Here you can get help of any object by pressing %s in front of it, either on "
+"the Editor or the Console.%sHelp can also be shown automatically after "
+"writing a left parenthesis next to an object. You can activate this behavior "
+"in %s."
+msgstr ""
+"Здесь Вы можете получить справку по любому объекту, наведя текстовый курсор "
+"на него и нажав %s, как в Редакторе, так и в Консоли.%sСправка также может "
+"автоматически показываться при вводе открывающей круглой скобки после "
+"объекта. Вы можете активировать эту возможность в %s."
 
-#: spyderlib/widgets/internalshell.py:280
-msgid "System commands:"
-msgstr "Системные команды:"
+#: spyder/plugins/help.py:701
+msgid "Preferences > Help"
+msgstr "Параметры > Справка"
 
-#: spyderlib/widgets/internalshell.py:281
-msgid "Python help:"
-msgstr "Справка Python:"
+#: spyder/plugins/help.py:708
+msgid "Usage"
+msgstr "Использование"
 
-#: spyderlib/widgets/internalshell.py:282
-msgid "GUI-based editor:"
-msgstr "Визуальный редактор:"
+#: spyder/plugins/help.py:709
+msgid "New to Spyder? Read our"
+msgstr "Используете Spyder впервые? Прочитайте наше"
 
-#: spyderlib/widgets/projectexplorer.py:335
-msgid "its own configuration file"
-msgstr "его собственный файл конфигурации"
+#: spyder/plugins/help.py:710
+msgid "tutorial"
+msgstr "руководство"
 
-#: spyderlib/widgets/projectexplorer.py:337
-msgid " and "
-msgstr " и "
-
-#: spyderlib/widgets/projectexplorer.py:341
-#, python-format
-msgid "the following projects:<br>%s"
-msgstr "следующие проекты:<br>%s"
+#: spyder/plugins/help.py:717
+msgid ""
+"Please consider installing Sphinx to get documentation rendered in rich text."
+msgstr ""
+"Пожалуйста, подумайте об установке Sphinx для просмотра документации в "
+"форматированном виде."
 
-#: spyderlib/widgets/projectexplorer.py:545
-msgid "Project..."
-msgstr "Проект..."
+#: spyder/plugins/help.py:886
+msgid "Lock"
+msgstr "Заблокировать"
 
-#: spyderlib/widgets/projectexplorer.py:549
-#: spyderlib/plugins/projectexplorer.py:64
-msgid "New project..."
-msgstr "Новый проект..."
+#: spyder/plugins/help.py:886
+msgid "Unlock"
+msgstr "Разблокировать"
 
-#: spyderlib/widgets/projectexplorer.py:558
-msgid "Existing directory"
-msgstr "Существующий каталог"
+#: spyder/plugins/help.py:930
+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 ""
+"Следующая ошибка появляется при вызове <b>Sphinx %s</b>. <br>Несовместимая "
+"версия Sphinx или ошибка декодирования строки документации.<br><br>Сообщение "
+"об ошибке:<br>%s"
 
-#: spyderlib/widgets/projectexplorer.py:562
-msgid "Existing Spyder project"
-msgstr "Существующий проект Spyder"
+#: spyder/plugins/help.py:974
+msgid "No source code available."
+msgstr "Исходный код не доступен."
 
-#: spyderlib/widgets/projectexplorer.py:566
-msgid "Existing Pydev project"
-msgstr "Существующий проект Pydev"
+#: spyder/plugins/history.py:39
+msgid "Settings"
+msgstr "Настройки"
 
-#: spyderlib/widgets/projectexplorer.py:583
-msgid "Open project"
-msgstr "Открыть проект"
+#: spyder/plugins/history.py:41
+msgid " entries"
+msgstr " записей"
 
-#: spyderlib/widgets/projectexplorer.py:588
-msgid "Close project"
-msgstr "Закрыть проект"
+#: spyder/plugins/history.py:41
+msgid "History depth: "
+msgstr "Глубина истории: "
 
-#: spyderlib/widgets/projectexplorer.py:593
-msgid "Close unrelated projects"
-msgstr "Закрыть несвязанные проекты"
+#: spyder/plugins/history.py:48
+msgid "Scroll automatically to last entry"
+msgstr "Автоматически пролистывать к последней записи"
 
-#: spyderlib/widgets/projectexplorer.py:602
-msgid "Edit related projects"
-msgstr "Редактировать связанные проекты"
+#: spyder/plugins/history.py:126
+msgid "History log"
+msgstr "Журнал истории"
 
-#: spyderlib/widgets/projectexplorer.py:610
-msgid "Add to PYTHONPATH"
-msgstr "Добавить в PYTHONPATH"
+#: spyder/plugins/history.py:153
+msgid "History..."
+msgstr "История..."
 
-#: spyderlib/widgets/projectexplorer.py:615
-msgid "Remove from PYTHONPATH"
-msgstr "Удалить из PYTHONPATH"
+#: spyder/plugins/history.py:155
+msgid "Set history maximum entries"
+msgstr "Установить максимум записей истории"
 
-#: spyderlib/widgets/projectexplorer.py:620
-msgid "Properties"
-msgstr "Свойства"
+#: spyder/plugins/history.py:260
+msgid "History"
+msgstr "История"
 
-#: spyderlib/widgets/projectexplorer.py:655
-msgid "Show horizontal scrollbar"
-msgstr "Показывать горизонтальную полосу прокрутки"
+#: spyder/plugins/history.py:261
+msgid "Maximum entries"
+msgstr "Максимум записей"
 
-#: spyderlib/widgets/projectexplorer.py:692
-msgid "Workspace"
-msgstr "Рабочая область"
+#: spyder/plugins/ipythonconsole.py:64
+msgid "Symbolic mathematics in the IPython Console"
+msgstr "Символьная математика в консоли Python"
 
-#: spyderlib/widgets/projectexplorer.py:693
-#, python-format
+#: spyder/plugins/ipythonconsole.py:116
 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."
+"The authenticity of host <b>%s</b> can't be established. Are you sure you "
+"want to continue connecting?"
 msgstr ""
-"Рабочую область не удалось загрузить или сохранить %s<br><br>Пожалуйста, "
-"проверьте, достаточно ли у Вас прав для записи соответствующих файлов "
-"конфигурации."
+"Подлинность хоста <b>%s</b> не может быть установлена. Вы уверены, что "
+"хотите продолжить соединение?"
+
+#: spyder/plugins/ipythonconsole.py:128
+msgid "The authenticity of the host can't be established"
+msgstr "Подлинность хоста не может быть установлена"
 
-#: spyderlib/widgets/projectexplorer.py:752
-msgid "Import directory"
-msgstr "Импортировать каталог"
+#: spyder/plugins/ipythonconsole.py:135
+msgid "Tunnel '%s' failed to start"
+msgstr "Туннель '%s' не удалось запустить"
+
+#: spyder/plugins/ipythonconsole.py:140
+msgid "Could not connect to remote host"
+msgstr "Не удалось подключиться к удалённому хосту"
+
+#: spyder/plugins/ipythonconsole.py:157 spyder/plugins/ipythonconsole.py:747
+msgid "Connect to an existing kernel"
+msgstr "Подключиться к работающему ядру"
 
-#: spyderlib/widgets/projectexplorer.py:754
-#, python-format
+#: spyder/plugins/ipythonconsole.py:159
 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)?"
+"Please enter the connection info of the kernel you want to connect to. For "
+"that you can either select its JSON connection file using the <tt>Browse</"
+"tt> button, or write directly its id, in case it's a local kernel (for "
+"example <tt>kernel-3764.json</tt> or just <tt>3764</tt>)."
 msgstr ""
-"Выбранного каталога нет в рабочей области:<br><b>%s</b><br><br>Хотите "
-"продолжить (и скопировать каталог в область)?"
-
-#: spyderlib/widgets/projectexplorer.py:770
-#: spyderlib/widgets/projectexplorer.py:1187 spyderlib/widgets/explorer.py:501
-#, python-format
-msgid "<b>Unable to %s <i>%s</i></b><br><br>Error message:<br>%s"
-msgstr "<b>Невозможно %s <i>%s</i></b><br><br>Сообщение об ошибке:<br>%s"
+"Пожалуйста, введите информацию о соединении для ядра, к которому пытаетесь "
+"подключиться. Для этого либо выберите JSON-файл соединения кнопкой "
+"<tt>Обзор</tt>, либо, если ядро локальное, введите его id (напр. "
+"<tt>kernel-3764.json</tt> или просто <tt>3764</tt>)."
 
-#: spyderlib/widgets/projectexplorer.py:772
-#: spyderlib/widgets/projectexplorer.py:1183
-msgid "copy"
-msgstr "скопировать"
+#: spyder/plugins/ipythonconsole.py:170
+msgid "Connection info:"
+msgstr "Информация о соединении:"
 
-#: spyderlib/widgets/projectexplorer.py:823
-#: spyderlib/widgets/projectexplorer.py:830
-#: spyderlib/widgets/projectexplorer.py:1101
-#: spyderlib/widgets/projectexplorer.py:1186 spyderlib/widgets/explorer.py:500
-msgid "Project Explorer"
-msgstr "Менеджер проектов"
+#: spyder/plugins/ipythonconsole.py:172
+msgid "Path to connection file or kernel id"
+msgstr "Путь к файлу соединения или id ядра"
 
-#: spyderlib/widgets/projectexplorer.py:824
-#, python-format
-msgid "The project <b>%s</b> is already opened!"
-msgstr "Проект <b>%s</b> уже открыт!"
+#: spyder/plugins/ipythonconsole.py:174 spyder/plugins/ipythonconsole.py:191
+msgid "Browse"
+msgstr "Обзор"
 
-#: spyderlib/widgets/projectexplorer.py:831
-#, python-format
-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>"
-msgstr ""
-"Корневой каталог проекта находится в рабочей области, но не в качестве "
-"ожидаемого уровня дерева. Он не является каталогом рабочей области:<br><b>"
-"%s</b>"
+#: spyder/plugins/ipythonconsole.py:183
+msgid "This is a remote kernel"
+msgstr "Это удалённо-управляемое ядро"
 
-#: spyderlib/widgets/projectexplorer.py:842
-msgid "Project name:"
-msgstr "Имя проекта:"
+#: spyder/plugins/ipythonconsole.py:187
+msgid "username at hostname:port"
+msgstr "username at hostname:port"
 
-#: spyderlib/widgets/projectexplorer.py:851
-#, python-format
-msgid "A project named <b>%s</b> already exists"
-msgstr "Проект с именем <b>%s</b> уже существует"
+#: spyder/plugins/ipythonconsole.py:190
+msgid "Path to ssh key file"
+msgstr "Путь к ключу ssh"
 
-#: spyderlib/widgets/projectexplorer.py:856
-#, python-format
-msgid ""
-"Invalid project name.<br><br>Name must match the following regular "
-"expression:<br><b>%s</b>"
-msgstr ""
-"Неверное имя проекта.<br><br>Название должно соответствовать регулярному "
-"выражению:<br><b>%s</b>"
+#: spyder/plugins/ipythonconsole.py:199
+msgid "Password or ssh key passphrase"
+msgstr "Пароль или кодовая фраза ключа ssh"
 
-#: spyderlib/widgets/projectexplorer.py:863
-#, python-format
-msgid ""
-"The following directory is not empty:<br><b>%s</b><br><br>Do you want to "
-"continue?"
-msgstr "Выбранный каталог не пуст:<br><b>%s</b><br><br>Хотите продолжить?"
+#: spyder/plugins/ipythonconsole.py:203
+msgid "Host name"
+msgstr "Имя хоста"
 
-#: spyderlib/widgets/projectexplorer.py:876
-msgid "New project"
-msgstr "Новый проект"
+#: spyder/plugins/ipythonconsole.py:204
+msgid "Ssh key"
+msgstr "Ключ ssh"
 
-#: spyderlib/widgets/projectexplorer.py:884
-msgid ""
-"The current workspace has not been configured yet.\n"
-"Do you want to do this now?"
-msgstr ""
-"Текущая рабочая область ещё не сконфигурирована.\n"
-"Сделать это сейчас?"
+#: spyder/plugins/ipythonconsole.py:205
+msgid "Password"
+msgstr "Пароль"
 
-#: spyderlib/widgets/projectexplorer.py:922
-msgid "Import existing project"
-msgstr "Импортировать существующий проект"
+#: spyder/plugins/ipythonconsole.py:234
+msgid "Open connection file"
+msgstr "Открыть файл соединения IPython"
 
-#: spyderlib/widgets/projectexplorer.py:935
-msgid "Select projects to import"
-msgstr "Выбрать проекты для импорта"
+#: spyder/plugins/ipythonconsole.py:239
+msgid "Select ssh key"
+msgstr "Выберите ключ ssh"
 
-#: spyderlib/widgets/projectexplorer.py:947
-#, python-format
-msgid "The folder <i>%s</i> does not contain a valid %s project"
-msgstr "Каталог <i>%s</i> не содержит подходящего проекта %s"
+#: spyder/plugins/ipythonconsole.py:267 spyder/plugins/ipythonconsole.py:686
+msgid "IPython console"
+msgstr "Консоль IPython"
 
-#: spyderlib/widgets/projectexplorer.py:977
-msgid "Import existing Pydev project"
-msgstr "Импортировать существующий проект Pydev"
+#: spyder/plugins/ipythonconsole.py:274
+msgid "Display initial banner"
+msgstr "Показывать стартовый баннер"
 
-#: spyderlib/widgets/projectexplorer.py:978
-#, python-format
+#: spyder/plugins/ipythonconsole.py:275
 msgid ""
-"<b>Unable to read Pydev project <i>%s</i></b><br><br>Error message:<br>%s"
+"This option lets you hide the message shown at\n"
+"the top of the console when it's opened."
 msgstr ""
-"<b>Не удалось прочитать проект Pydev <i>%s</i></b><br><br>Сообщение об "
-"ошибке:<br>%s"
+"Эта обция позволяет Вам спрятать сообщение,\n"
+"показываемое вверху консоли при открытии."
+
+#: spyder/plugins/ipythonconsole.py:277
+msgid "Use a pager to display additional text inside the console"
+msgstr ""
+"Использовать постраничный вывод для показа дополнительного текста в консоли"
 
-#: spyderlib/widgets/projectexplorer.py:1016
-#, python-format
+#: spyder/plugins/ipythonconsole.py:279
 msgid ""
-"Do you really want to delete project <b>%s</b>?<br><br>Note: project files "
-"won't be deleted from disk."
+"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 ""
-"Вы действительно хотите удалить проект <b>%s</b>?<br><br>Примечание: файлы "
-"проекта не будут удалены с диска."
+"Полезно, если Вы не хотите захламлять консоль длинной справкой или сплошным "
+"текстом.\n"
+"Примечание: Используйте клавишу Q для выхода из постраничного вывода."
 
-#: spyderlib/widgets/projectexplorer.py:1069
-msgid "Related projects"
-msgstr "Смежные проекты"
+#: spyder/plugins/ipythonconsole.py:284
+msgid "Ask for confirmation before closing"
+msgstr "Спрашивать подтверждение перед закрытием"
 
-#: spyderlib/widgets/projectexplorer.py:1077
-#, python-format
-msgid "Select projects which are related to <b>%s</b>"
-msgstr "Выбранные проекты связаны с <b>%s</b>"
+#: spyder/plugins/ipythonconsole.py:294
+msgid "Completion Type"
+msgstr "Тип автодополнения"
 
-#: spyderlib/widgets/projectexplorer.py:1102
-#, python-format
-msgid ""
-"Statistics on source files only:<br>(Python, Cython, IPython, Enaml,C/C++, "
-"Fortran)<br><br><b>%s</b> files.<br><b>%s</b> lines of code."
-msgstr ""
-"Статистика по исходному коду только:<br>(Python, Cython, IPython, Enaml,C/C+"
-"+, Fortran)<br><br><b>%s</b> файлов.<br><b>%s</b> строк кода."
+#: spyder/plugins/ipythonconsole.py:295
+msgid "Decide what type of completion to use"
+msgstr "Выберите какой тип автодополнения использовать"
 
-#: spyderlib/widgets/projectexplorer.py:1150
-#: spyderlib/widgets/projectexplorer.py:1164
-#: spyderlib/plugins/projectexplorer.py:53
-msgid "Project explorer"
-msgstr "Менеджер проектов"
+#: spyder/plugins/ipythonconsole.py:297
+msgid "Graphical"
+msgstr "Графический"
 
-#: spyderlib/widgets/projectexplorer.py:1151
-#, python-format
-msgid "File <b>%s</b> already exists.<br>Do you want to overwrite it?"
-msgstr "Файл <b>%s</b> уже существует.<br>Хотите его перезаписать?"
+#: spyder/plugins/ipythonconsole.py:297
+msgid "Plain"
+msgstr "Простой"
 
-#: spyderlib/widgets/projectexplorer.py:1165
-#, python-format
-msgid "Folder <b>%s</b> already exists."
-msgstr "Каталог <b>%s</b> уже существует."
+#: spyder/plugins/ipythonconsole.py:298
+msgid "Completion:"
+msgstr "Автодополнение:"
 
-#: spyderlib/widgets/projectexplorer.py:1185
-msgid "move"
-msgstr "переместить"
+#: spyder/plugins/ipythonconsole.py:307
+msgid "Light background"
+msgstr "Светлый фон"
 
-#: spyderlib/widgets/projectexplorer.py:1195
-msgid "Select an existing workspace directory, or create a new one"
-msgstr "Выберите каталог рабочей области или создайте новый"
+#: spyder/plugins/ipythonconsole.py:309
+msgid "Dark background"
+msgstr "Тёмный фон"
 
-#: spyderlib/widgets/projectexplorer.py:1196
-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>."
-"spyderworkspace</b> configuration file.<br><br>A <b>Spyder project</b> is a "
-"directory with source code (and other related files) and a configuration "
-"file (named <b>.spyderproject</b>) with project settings (PYTHONPATH, linked "
-"projects, ...).<br>"
-msgstr ""
-"<u><b>Что такое рабочая область?</b></u><br><br>A <b>Рабочая область Spyder</"
-"b> - каталог в вашей файловой системе, содержащий проекты Spyder и файл "
-"конфигурации <b>.spyderworkspace</b>.<br><br>A <b>Проект Spyder</b> - "
-"каталог с исходным кодом (и другими связанными файлами) и конфигурационным "
-"файлом (с расширением <b>.spyderproject</b>), содержащим настройки проекта "
-"(PYTHONPATH, взаимосвязанные проекты и т.п.)."
-
-#: spyderlib/widgets/projectexplorer.py:1225
-msgid "This is the current workspace directory"
-msgstr "Это текущий каталог рабочей области"
-
-#: spyderlib/widgets/projectexplorer.py:1255
-#, python-format
+#: spyder/plugins/ipythonconsole.py:319
+msgid "Buffer:  "
+msgstr "Буфер:  "
+
+#: spyder/plugins/ipythonconsole.py:321
 msgid ""
-"The following directory is not a Spyder workspace:<br>%s<br><br>Do you want "
-"to create a new workspace in this directory?"
+"Set the maximum number of lines of text shown in the\n"
+"console before truncation. Specifying -1 disables it\n"
+"(not recommended!)"
 msgstr ""
-"Выбранный каталог не является рабочей областью Spyder:<br>%s<br><br>Хотите "
-"создать новую рабочую область в этом каталоге?"
+"Установите максимальное количество линий, показываемых\n"
+"в консоли перед усечением. Значение -1 отключает функцию\n"
+"(не рекомендуется!)"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:284
-msgid "Variables"
-msgstr "Значения"
+#: spyder/plugins/ipythonconsole.py:330
+msgid "Support for graphics (Matplotlib)"
+msgstr "Поддержка графики (Matplotlib)"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:285
-msgid "Show/hide global variables explorer"
-msgstr "Показать/скрыть менеджер глобальных переменных"
+#: spyder/plugins/ipythonconsole.py:331
+msgid "Activate support"
+msgstr "Активировать поддержку"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:289
-msgid "Terminate"
-msgstr "Прекратить"
+#: spyder/plugins/ipythonconsole.py:332
+msgid "Automatically load Pylab and NumPy modules"
+msgstr "Автоматически загружать модули Pylab и NumPy"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:290
+#: spyder/plugins/ipythonconsole.py:335
 msgid ""
-"Attempts to stop the process. The process\n"
-"may not exit as a result of clicking this\n"
-"button (it is given the chance to prompt\n"
-"the user for any unsaved files, etc)."
+"This lets you load graphics support without importing \n"
+"the commands to do plots. Useful to work with other\n"
+"plotting libraries different to Matplotlib or to develop \n"
+"GUIs with Spyder."
 msgstr ""
-"Попытка остановить процесс. Процесс\n"
-"имеет право не завершится после нажатия этой\n"
-"кнопки (например, чтобы спросить у пользователя\n"
-"о несохранённых файлах и т.п.)."
+"Это позволит загружать поддержку графики без импорта\n"
+"команд построения графиков. Полезно для работы с\n"
+"графическими библиотеками, отличными от Matplotlib или\n"
+"разработки GUI в Spyder."
 
-#: spyderlib/widgets/externalshell/pythonshell.py:303
-msgid "Interact"
+#: spyder/plugins/ipythonconsole.py:350
+msgid "Inline"
+msgstr "Встроенный"
+
+#: spyder/plugins/ipythonconsole.py:352
+msgid "Graphics backend"
+msgstr "Графический бэкенд"
+
+#: spyder/plugins/ipythonconsole.py:353
+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 ""
+"Выберите как графика будет отображаться в консоли. Если не уверены, "
+"пожалуйста выберите <b>%s</b> для вставки графики в консоль или <b>%s</b> "
+"для взаимодействия с ними (через масштабирование и панорамирование) в "
+"отдельном окне."
 
-#: spyderlib/widgets/externalshell/pythonshell.py:305
-msgid "Debug"
-msgstr "Отладка"
+#: spyder/plugins/ipythonconsole.py:386
+msgid "Inline backend"
+msgstr "Встроенный бекэнд"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:307
-#: spyderlib/widgets/externalshell/pythonshell.py:373
-msgid "Arguments..."
-msgstr "Аргументы..."
+#: spyder/plugins/ipythonconsole.py:387
+msgid "Decide how to render the figures created by this backend"
+msgstr "Выберите как рендерить графики, созданные этим бэкендом"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:309
-msgid "Post Mortem Debug"
-msgstr "Отладка в случае падения"
+#: spyder/plugins/ipythonconsole.py:391
+msgid "Format:"
+msgstr "Формат:"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:311
-#: spyderlib/plugins/editor.py:783
-msgid "Run settings"
-msgstr "Настройки Запуска"
+#: spyder/plugins/ipythonconsole.py:394
+msgid "Resolution:"
+msgstr "Разрешение:"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:315
-msgid "Working directory"
-msgstr "Рабочий каталог"
+#: spyder/plugins/ipythonconsole.py:394
+msgid "dpi"
+msgstr "dpi"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:317
-msgid "Set current working directory"
-msgstr "Установить текущий рабочий каталог"
+#: spyder/plugins/ipythonconsole.py:396
+msgid "Only used when the format is PNG. Default is 72"
+msgstr "Используется только для формата PNG. 72 по умолчанию"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:319
-msgid "Environment variables"
-msgstr "Переменные среды"
+#: spyder/plugins/ipythonconsole.py:399
+msgid "Width:"
+msgstr "Ширина:"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:323
-msgid "Show sys.path contents"
-msgstr "Показать содержимое sys.path"
+#: spyder/plugins/ipythonconsole.py:399 spyder/plugins/ipythonconsole.py:403
+msgid "inches"
+msgstr "дюймов"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:369
-#, python-format
-msgid "Arguments: %s"
-msgstr "Аргументы: %s"
+#: spyder/plugins/ipythonconsole.py:401
+msgid "Default is 6"
+msgstr "6 по умолчанию"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:371
-msgid "No argument"
-msgstr "Нет аргументов"
+#: spyder/plugins/ipythonconsole.py:403
+msgid "Height:"
+msgstr "Высота:"
+
+#: spyder/plugins/ipythonconsole.py:405
+msgid "Default is 4"
+msgstr "4 по умолчанию"
 
-#: spyderlib/widgets/externalshell/pythonshell.py:550
+#: spyder/plugins/ipythonconsole.py:432
 msgid ""
-"The kernel failed to start!! That's all we know... Please close this console "
-"and open a new one."
+"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/widgets/externalshell/pythonshell.py:554
-msgid "A Python console failed to start!"
-msgstr "Консоль Python не удалось запустить!"
+"Вы можете выполнить несколько строк кода при запуске консоли. Пожалуйста, "
+"введите их через запятую, например:<br><i>import os, import sys</i>"
 
-#: spyderlib/widgets/externalshell/systemshell.py:105
-msgid "Process failed to start"
-msgstr "Процесс не удалось запустить"
+#: spyder/plugins/ipythonconsole.py:438
+msgid "Lines:"
+msgstr "Строки:"
 
-#: spyderlib/widgets/externalshell/baseshell.py:141
-msgid "Run again this program"
-msgstr "Запустить эту программу снова"
+#: spyder/plugins/ipythonconsole.py:447
+msgid "Run a file"
+msgstr "Выполнить файл"
 
-#: spyderlib/widgets/externalshell/baseshell.py:144
-msgid "Kill"
-msgstr "Убить"
+#: spyder/plugins/ipythonconsole.py:448
+msgid ""
+"You can also run a whole file at startup instead of just some lines (This is "
+"similar to have a PYTHONSTARTUP file)."
+msgstr ""
+"При старте Вы также можете запустить весь файл вместо нескольких строк "
+"(Подобно использованию файла PYTHONSTARTUP)."
 
-#: spyderlib/widgets/externalshell/baseshell.py:146
-msgid "Kills the current process, causing it to exit immediately"
-msgstr "Убивает текущий процесс, заставляя его немедленно завершиться"
+#: spyder/plugins/ipythonconsole.py:452
+msgid "Use the following file:"
+msgstr "Использовать следующий файл:"
 
-#: spyderlib/widgets/externalshell/baseshell.py:172
-#: spyderlib/plugins/externalconsole.py:69
-msgid "Show elapsed time"
-msgstr "Показывать прошедшее время"
+#: spyder/plugins/ipythonconsole.py:466
+msgid "Greedy completion"
+msgstr "Скупое автодополнение"
 
-#: spyderlib/widgets/externalshell/baseshell.py:219
-msgid "<span style='color: #44AA44'><b>Running...</b></span>"
-msgstr "<span style='color: #44AA44'><b>Запуск...</b></span>"
+#: spyder/plugins/ipythonconsole.py:467
+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 ""
+"Включает автодополнение по <tt>Tab</tt> для элементов списков, результатов "
+"вызова функций, и т.п. <i>без</i> присвоения их переменной.<br>Например, Вы "
+"можете сделать автодополнение для таких вещей, как <tt>li[0].<Tab></"
+"tt> или <tt>ins.meth().<Tab></tt>"
 
-#: spyderlib/widgets/externalshell/baseshell.py:225
-msgid "Terminated."
-msgstr "Прекращено."
+#: spyder/plugins/ipythonconsole.py:475
+msgid "Use the greedy completer"
+msgstr "Включить скупое автодополнение"
 
-#: spyderlib/widgets/externalshell/baseshell.py:251
-msgid "Command line arguments:"
-msgstr "Аргументы командной строки:"
+#: spyder/plugins/ipythonconsole.py:486
+msgid "Autocall"
+msgstr "Автовызов"
 
-#: spyderlib/widgets/arraybuilder.py:162
+#: spyder/plugins/ipythonconsole.py:487
 msgid ""
-"\n"
-"           <b>Numpy Array/Matrix Helper</b><br>\n"
-"           Type an array in Matlab    : <code>[1 2;3 4]</code><br>\n"
-"           or Spyder simplified syntax : <code>1 2;3 4</code>\n"
-"           <br><br>\n"
-"           Hit 'Enter' for array or 'Ctrl+Enter' for matrix.\n"
-"           <br><br>\n"
-"           <b>Hint:</b><br>\n"
-"           Use two spaces or two tabs to generate a ';'.\n"
-"           "
+"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 ""
-"\n"
-"           <b>Помощник Массивов/Матриц Numpy</b><br>\n"
-"           Введите массив в Matlab-   : <code>[1 2;3 4]</code><br>\n"
-"           или Spyder-стиле : <code>1 2;3 4</code>\n"
-"           <br><br>\n"
-"           Нажмите 'Enter' для массива или 'Ctrl+Enter' для матрицы.\n"
-"           <br><br>\n"
-"           <b>Трюк:</b><br>\n"
-"           Два пробели или две табуляции образуют ';'.\n"
-"           "
+"Автовызов позволяет IPython автоматически вызывать объекты без явного ввода "
+"скобок.<br>Например, если Вы введете <i>str 43</i>, будет выполнено "
+"<i>str(43)</i> автоматически."
 
-#: spyderlib/widgets/arraybuilder.py:173
+#: spyder/plugins/ipythonconsole.py:494
+msgid "Smart"
+msgstr "Умный"
+
+#: spyder/plugins/ipythonconsole.py:495
+msgid "Full"
+msgstr "Все"
+
+#: spyder/plugins/ipythonconsole.py:496
+msgid "Off"
+msgstr "Отключён"
+
+#: spyder/plugins/ipythonconsole.py:498
+msgid "Autocall:  "
+msgstr "Автовызов: "
+
+#: spyder/plugins/ipythonconsole.py:499
 msgid ""
-"\n"
-"           <b>Numpy Array/Matrix Helper</b><br>\n"
-"           Enter an array in the table. <br>\n"
-"           Use Tab to move between cells.\n"
-"           <br><br>\n"
-"           Hit 'Enter' for array or 'Ctrl+Enter' for matrix.\n"
-"           <br><br>\n"
-"           <b>Hint:</b><br>\n"
-"           Use two tabs at the end of a row to move to the next row.\n"
-"           "
+"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 ""
-"\n"
-"           <b>Помощник Массивов/Матриц Numpy</b><br>\n"
-"           Введите массив в таблицу. <br>\n"
-"           Используйте Tab для перемещения по ячейкам.\n"
-"           <br><br>\n"
-"\n"
-"           Нажмите 'Enter' для массива или 'Ctrl+Enter' для матрицы.\n"
-"           <br><br>\n"
-"           <b>Трюк:</b><br>\n"
-"           Две табуляции в конце строки перемещают на следующую строку.\n"
-"           "
+"В режиме <b>%s</b> Автовызов не происходит если отсутствуют аргументы у "
+"вызываемого. В режиме <b>%s</b> все вызываемые объекты вызываются (даже если "
+"аргументы не переданы)."
 
-#: spyderlib/widgets/arraybuilder.py:337
-msgid "Array dimensions not valid"
-msgstr "Неверная размерность массива"
+#: spyder/plugins/ipythonconsole.py:511
+msgid "Symbolic Mathematics"
+msgstr "Символьная математика"
 
-#: spyderlib/widgets/dependencies.py:59
-msgid "Module"
-msgstr "Модуль"
+#: spyder/plugins/ipythonconsole.py:512
+msgid ""
+"Perfom symbolic operations in the console (e.g. integrals, derivatives, "
+"vector calculus, etc) and get the outputs in a beautifully printed style (it "
+"requires the Sympy module)."
+msgstr ""
+"Производит символьные операции в консоли (напр. интегралы, производные, "
+"векторное исчисление и др.) и выводит результат в красивом виде (требуется "
+"модуль Sympy)."
 
-#: spyderlib/widgets/dependencies.py:59
-msgid " Required "
-msgstr " требуется"
+#: spyder/plugins/ipythonconsole.py:517
+msgid "Use symbolic math"
+msgstr "Использовать символьную математику"
 
-#: spyderlib/widgets/dependencies.py:60
-msgid " Installed "
-msgstr " установлен"
+#: spyder/plugins/ipythonconsole.py:518
+msgid ""
+"This option loads the Sympy library to work with.<br>Please refer to its "
+"documentation to learn how to use it."
+msgstr ""
+"Эта опция подгружает для работы библиотеку Sympy.<br>Пожалуйста ознакомьтесь "
+"с документацией для её использования."
 
-#: spyderlib/widgets/dependencies.py:60
-msgid "Provided features"
-msgstr "Предоставляемые возможности"
+#: spyder/plugins/ipythonconsole.py:528
+msgid "Prompts"
+msgstr "Приглашения к вводу/выводу"
 
-#: spyderlib/widgets/dependencies.py:130
-msgid "Dependencies"
-msgstr "Зависимости"
+#: spyder/plugins/ipythonconsole.py:529
+msgid "Modify how Input and Output prompts are shown in the console."
+msgstr "Определите как показывать приглашения Ввода и Вывода в консоли."
 
-#: spyderlib/widgets/dependencies.py:137
-#, python-format
+#: spyder/plugins/ipythonconsole.py:532
+msgid "Input prompt:"
+msgstr "Строка ввода:"
+
+#: spyder/plugins/ipythonconsole.py:534
 msgid ""
-"Spyder depends on several Python modules to provide the right functionality "
-"for all its panes. The table below shows the required and installed versions "
-"(if any) of all of them.<br><br><b>Note</b>: You can safely use Spyder "
-"without the following modules installed: <b>%s</b> and <b>%s</b>"
+"Default is<br>In [<span class=\"in-prompt-number\">%i</span>]:"
 msgstr ""
-"Spyder зависит от нескольких модулей Python для обеспечения верной "
-"функциональности всех панелей. В таблице ниже показаны требуемые и "
-"установленные версии (если таковые имеются) каждого из них."
-"<br><br><b>Примечание</b>: Вы можете безопасно работать  в Spyder без "
-"следующих модулей: <b>%s</b> и <b>%s</b>."
+"По умолчанию: <br>In [<span class=\"in-prompt-number\">%i</"
+"span>]:"
 
-#: spyderlib/widgets/dependencies.py:150
-msgid "Copy to clipboard"
-msgstr "Копировать в буфер обмена"
+#: spyder/plugins/ipythonconsole.py:538
+msgid "Output prompt:"
+msgstr "Строка вывода:"
 
-#: spyderlib/widgets/explorer.py:174
-msgid "Edit filename filters..."
-msgstr "Редактировать фильтры имён файлов..."
+#: spyder/plugins/ipythonconsole.py:540
+msgid ""
+"Default is<br>Out[<span class=\"out-prompt-number\">%i</span>]:"
+msgstr ""
+"По умолчанию: <br>Out [<span class=\"out-prompt-number\">%i</"
+"span>]:"
 
-#: spyderlib/widgets/explorer.py:188
-msgid "Edit filename filters"
-msgstr "Редактировать фильтры имён файлов"
+#: spyder/plugins/ipythonconsole.py:562 spyder/plugins/workingdirectory.py:45
+msgid "Startup"
+msgstr "Запуск"
 
-#: spyderlib/widgets/explorer.py:189
-msgid "Name filters:"
-msgstr "Фильтры имён:"
+#: spyder/plugins/ipythonconsole.py:734
+msgid "Open an &IPython console"
+msgstr "Открыть консоль &IPython"
 
-#: spyderlib/widgets/explorer.py:208
-msgid "File..."
-msgstr "Файл..."
+#: spyder/plugins/ipythonconsole.py:737
+msgid "Use %s+T when the console is selected to open a new one"
+msgstr "Используйте %s+T когда консоль выбрана, чтобы открыть новую"
 
-#: spyderlib/widgets/explorer.py:212
-msgid "Module..."
-msgstr "Модуль..."
+#: spyder/plugins/ipythonconsole.py:740
+msgid "Open a new console"
+msgstr "Открыть новую консоль"
 
-#: spyderlib/widgets/explorer.py:216
-msgid "Folder..."
-msgstr "Каталог..."
+#: spyder/plugins/ipythonconsole.py:748
+msgid "Open a new IPython console connected to an existing kernel"
+msgstr "Открыть новую консоль IPython, подключенную к существующему ядру"
 
-#: spyderlib/widgets/explorer.py:220
-msgid "Package..."
-msgstr "Пакет..."
+#: spyder/plugins/ipythonconsole.py:836
+msgid ""
+"No IPython console is currently available to run <b>%s</b>.<br><br>Please "
+"open a new one and try again."
+msgstr ""
+"Сейчас нет доступных консолей IPython для запуска <b>%s</b>."
+"<br><br>Пожалуйста, откройте новую и попытайтесь снова."
 
-#: spyderlib/widgets/explorer.py:243
-msgid "Move..."
-msgstr "Перемещение..."
+#: spyder/plugins/ipythonconsole.py:873
+msgid ""
+"Your Python environment or installation doesn't have the <tt>ipykernel</tt> "
+"module installed on it. Without this module is not possible for Spyder to "
+"create a console for you.<br><br>You can install <tt>ipykernel</tt> by "
+"running in a terminal:<br><br><tt>pip install ipykernel</"
+"tt><br><br>or<br><br><tt>conda install ipykernel</tt>"
+msgstr ""
+"В вашем Python окружении или инсталяции отсутствует модуль <tt>ipykernel</"
+"tt>. Без этого модуля Spyder не может создать консоль для Вас.<br><br>Вы "
+"можете установить <tt>ipykernel</tt>, запустив в терминале команду: "
+"<br><br><tt>pip install ipykernel</tt><br><br>или<br><br><tt>conda install "
+"ipykernel</tt>"
+
+#: spyder/plugins/ipythonconsole.py:1098
+msgid "Do you want to close this console?"
+msgstr "Вы уверены, что хотите закрыть эту консоль?"
+
+#: spyder/plugins/ipythonconsole.py:1104
+msgid ""
+"Do you want to close all other consoles connected to the same kernel as this "
+"one?"
+msgstr "Хотите закрыть все другие консоли, подключённые к тому же ядру?"
 
-#: spyderlib/widgets/explorer.py:246
-msgid "Delete..."
-msgstr "Удаление..."
+#: spyder/plugins/ipythonconsole.py:1364
+msgid "IPython"
+msgstr "IPython"
 
-#: spyderlib/widgets/explorer.py:249
-msgid "Rename..."
-msgstr "Переименование..."
+#: spyder/plugins/ipythonconsole.py:1365
+msgid "Unable to connect to <b>%s</b>"
+msgstr "Не удалось подключиться к <b>%s</b>"
 
-#: spyderlib/widgets/explorer.py:252
-msgid "Open"
-msgstr "Открыть"
+#: spyder/plugins/ipythonconsole.py:1422
+msgid "Connection error"
+msgstr "Ошибка соединения"
 
-# Варинаты:
-# - оставить без перевода
-# - использовать кальку: "коммитить"
-# - воспользоваться переводом из источников про Git (например, книга ProGit): "зафиксирвать изменения/индекс".
-#: spyderlib/widgets/explorer.py:287
-msgid "Commit"
+#: spyder/plugins/ipythonconsole.py:1423
+msgid ""
+"Could not open ssh tunnel. The error was:\n"
+"\n"
 msgstr ""
+"Не удалось открыть ssh-туннель. Произошла ошибка:\n"
+"\n"
 
-#: spyderlib/widgets/explorer.py:290
-msgid "Browse repository"
-msgstr "Просмотр репозитария"
+#: spyder/plugins/layoutdialog.py:177
+msgid "Move Up"
+msgstr "Вверх"
 
-#: spyderlib/widgets/explorer.py:301
-msgid "Open command prompt here"
-msgstr "Открыть командную строку здесь"
+#: spyder/plugins/layoutdialog.py:178
+msgid "Move Down"
+msgstr "Вниз"
 
-#: spyderlib/widgets/explorer.py:303
-msgid "Open terminal here"
-msgstr "Открыть терминал здесь"
+#: spyder/plugins/layoutdialog.py:179
+msgid "Delete Layout"
+msgstr "Удалить"
 
-#: spyderlib/widgets/explorer.py:308
-msgid "Open Python console here"
-msgstr "Открыть консоль Python здесь"
+#: spyder/plugins/layoutdialog.py:183
+msgid "Layout Display and Order"
+msgstr "Показывать и Выбирать компоновку"
 
-#: spyderlib/widgets/explorer.py:322
-msgid "New"
-msgstr "Новый"
+#: spyder/plugins/maininterpreter.py:31 spyder/plugins/maininterpreter.py:66
+msgid "Python interpreter"
+msgstr "Интепретатор Python"
 
-#: spyderlib/widgets/explorer.py:330
-msgid "Import"
-msgstr "Импортировать"
+#: spyder/plugins/maininterpreter.py:68
+msgid "Select the Python interpreter for all Spyder consoles"
+msgstr ""
+"Выберите исполняемый файл интерпретатора Python\n"
+"для всех консолей Spyder"
 
-#: spyderlib/widgets/explorer.py:481
-#, python-format
-msgid "Do you really want to delete <b>%s</b>?"
-msgstr "Вы точно хотите удалить <b>%s</b>?"
+#: spyder/plugins/maininterpreter.py:71
+msgid "Default (i.e. the same as Spyder's)"
+msgstr "По умолчанию (тот же, что для Spyder)"
 
-#: spyderlib/widgets/explorer.py:499
-msgid "delete"
-msgstr "удалить"
+#: spyder/plugins/maininterpreter.py:74
+msgid "Use the following Python interpreter:"
+msgstr "Использовать следующий интепретатор Python:"
 
-#: spyderlib/widgets/explorer.py:543
-msgid "New name:"
-msgstr "Новое имя:"
+#: spyder/plugins/maininterpreter.py:77
+msgid "Executables"
+msgstr "Исполняемые файлы"
 
-#: spyderlib/widgets/explorer.py:551
-#, python-format
+#: spyder/plugins/maininterpreter.py:94
+msgid "User Module Reloader (UMR)"
+msgstr "Перезагрузка модулей пользователя (UMR)"
+
+#: spyder/plugins/maininterpreter.py:95
 msgid ""
-"Do you really want to rename <b>%s</b> and overwrite the existing file <b>"
-"%s</b>?"
+"UMR forces Python to reload modules which were imported when executing a "
+"file in a Python or IPython console with the <i>runfile</i> function."
 msgstr ""
-"Вы действительно хотите переименовать <b>%s</b> или перезаписать "
-"существующий файл <b>%s</b>?"
+"UMR заставляет Python перезагружать модули, импортированные при выполнении "
+"скрипта во внешней консоли функцией  <i>runfile</i>."
 
-#: spyderlib/widgets/explorer.py:562
-#, python-format
-msgid "<b>Unable to rename file <i>%s</i></b><br><br>Error message:<br>%s"
+#: spyder/plugins/maininterpreter.py:100
+msgid "Enable UMR"
+msgstr "Включить UMR"
+
+#: spyder/plugins/maininterpreter.py:101
+msgid ""
+"This option will enable the User Module Reloader (UMR) in Python/IPython "
+"consoles. UMR forces Python to reload deeply modules during import when "
+"running a Python script using the Spyder's builtin function <b>runfile</b>."
+"<br><br><b>1.</b> UMR may require to restart the console in which it will be "
+"called (otherwise only newly imported modules will be reloaded when "
+"executing files).<br><br><b>2.</b> If errors occur when re-running a PyQt-"
+"based program, please check that the Qt objects are properly destroyed (e.g. "
+"you may have to use the attribute <b>Qt.WA_DeleteOnClose</b> on your main "
+"window, using the <b>setAttribute</b> method)"
 msgstr ""
-"<b>Невозможно переименовать файл <i>%s</i></b><br><br>Сообщение об ошибке:"
-"<br>%s"
+"Эта опция включает Перезагрузчик Модулей Пользователя (UMR) в консолях "
+"Python/IPython. UMR заставляет Python рекурсивно перезагружать все модули "
+"при запуске скрипта Python встроенной функцией Spyder <b>runfile</b>."
+"<br><br><b>1.</b> UMR может потребовать перезапустить консоль, в которой был "
+"вызван (в противном случае только вновь импортируемые модули будут "
+"перезагружены при выполнении скриптов).<br><br><b>2.</b>Если при перезапуске "
+"программ на PyQt происходят ошибки, убедитесь, что Qt-объекты уничтожены "
+"должным образом (напр. можно установить атрибут <b>Qt.WA_DeleteOnClose</b> "
+"для Вашего главного окна с помощью метода <b>setAttribute</b>)"
 
-#: spyderlib/widgets/explorer.py:598
-#, python-format
-msgid "<b>Unable to move <i>%s</i></b><br><br>Error message:<br>%s"
+#: spyder/plugins/maininterpreter.py:117
+msgid "Show reloaded modules list"
+msgstr "Показать список перезагруженных модулей"
+
+#: spyder/plugins/maininterpreter.py:118
+msgid "Please note that these changes will be applied only to new consoles"
 msgstr ""
-"<b>Невозможно переместить файл <i>%s</i></b><br><br>Сообщение об ошибке:<br>"
-"%s"
+"Обратите внимание, что эти изменения будут применяться только к новым "
+"консолям"
 
-#: spyderlib/widgets/explorer.py:616
-#, python-format
-msgid "<b>Unable to create folder <i>%s</i></b><br><br>Error message:<br>%s"
+#: spyder/plugins/maininterpreter.py:122
+msgid "Set UMR excluded (not reloaded) modules"
+msgstr "Установить модули-исключения для UMR (не перезагружаемые)"
+
+#: spyder/plugins/maininterpreter.py:168
+msgid ""
+"You selected a <b>Python %d</b> interpreter for the console but Spyder is "
+"running on <b>Python %d</b>!.<br><br>Although this is possible, we recommend "
+"you to install and run Spyder directly with your selected interpreter, to "
+"avoid seeing false warnings and errors due to the incompatible syntax "
+"between these two Python versions."
 msgstr ""
-"<b>Невозможно создать каталог <i>%s</i></b><br><br>Сообщение об ошибке:<br>%s"
+"Вы выбрали интерпретатор <b>Python %d</b> для консоли, но Spyder запущен на "
+"<b>Python %d</b>!.<br><br>Мы рекомендуем, если возможно, установить и "
+"запустить Spyder непосредственно выбранным интерпретатором, чтобы избежать "
+"появления ложных предупреждений и ошибок, связанных с несовместимостями в "
+"синтаксисе между этими двумя версиями Python."
 
-#: spyderlib/widgets/explorer.py:629 spyderlib/widgets/explorer.py:663
-#, python-format
-msgid "<b>Unable to create file <i>%s</i></b><br><br>Error message:<br>%s"
+#: spyder/plugins/maininterpreter.py:178 spyder/plugins/maininterpreter.py:191
+#: spyder/plugins/maininterpreter.py:195
+msgid "UMR"
+msgstr "UMR"
+
+#: spyder/plugins/maininterpreter.py:179
+msgid "Set the list of excluded modules as this: <i>numpy, scipy</i>"
+msgstr "Задайте список модулей-исключений вот так: <i>numpy, scipy</i>"
+
+#: spyder/plugins/maininterpreter.py:192
+msgid ""
+"The following modules are not installed on your machine:\n"
+"%s"
 msgstr ""
-"<b>Невозможно создать файл <i>%s</i></b><br><br>Сообщение об ошибке:<br>%s"
+"Следующие модули не установлены на Вашей машине:\n"
+"%s"
 
-#: spyderlib/widgets/explorer.py:637
-msgid "New folder"
-msgstr "Новый каталог"
+#: spyder/plugins/maininterpreter.py:196
+msgid ""
+"Please note that these changes will be applied only to new Python/IPython "
+"consoles"
+msgstr ""
+"Обратите внимание, что эти изменения будут применяться только к новым "
+"консолям Python/IPython"
 
-#: spyderlib/widgets/explorer.py:638
-msgid "Folder name:"
-msgstr "Имя каталога:"
+#: spyder/plugins/onlinehelp.py:70
+msgid "Online help"
+msgstr "Онлайн справка"
 
-#: spyderlib/widgets/explorer.py:643
-msgid "New package"
-msgstr "Новый пакет"
+#: spyder/plugins/outlineexplorer.py:49 spyder/widgets/editortools.py:195
+msgid "Outline"
+msgstr "Структура"
 
-#: spyderlib/widgets/explorer.py:644
-msgid "Package name:"
-msgstr "Имя пакета:"
+#: spyder/plugins/projects.py:76 spyder/widgets/projects/explorer.py:111
+#: spyder/widgets/projects/explorer.py:125
+msgid "Project explorer"
+msgstr "Менеджер проектов"
 
-#: spyderlib/widgets/explorer.py:662 spyderlib/widgets/explorer.py:669
-#: spyderlib/plugins/editor.py:630 spyderlib/plugins/workingdirectory.py:82
-msgid "New file"
-msgstr "Новый файл"
+#: spyder/plugins/projects.py:88
+msgid "New Project..."
+msgstr "Новый проект..."
 
-#: spyderlib/widgets/explorer.py:684
-msgid "New module"
-msgstr "Новый модуль"
+#: spyder/plugins/projects.py:91
+msgid "Open Project..."
+msgstr "Открыть проект..."
 
-#: spyderlib/widgets/explorer.py:685 spyderlib/plugins/console.py:232
-#: spyderlib/plugins/externalconsole.py:223
-#: spyderlib/plugins/externalconsole.py:1211
-msgid "Python scripts"
-msgstr "Скрипты Python"
+#: spyder/plugins/projects.py:94
+msgid "Close Project"
+msgstr "Закрыть проект"
+
+#: spyder/plugins/projects.py:100
+msgid "Project Preferences"
+msgstr "Параметры проекта"
+
+#: spyder/plugins/projects.py:102
+msgid "Recent Projects"
+msgstr "Недавние проекты"
+
+#: spyder/plugins/projects.py:234
+msgid "Open project"
+msgstr "Открыть проект"
 
-#: spyderlib/widgets/explorer.py:696
-#, python-format
+#: spyder/plugins/projects.py:239
+msgid "<b>%s</b> is not a Spyder project!"
+msgstr "<b>%s</b> - не является проектом Spyder!"
+
+#: spyder/plugins/runconfig.py:29
+msgid "Execute in current Python or IPython console"
+msgstr "Выполнить в текущей консоли Python или IPython"
+
+#: spyder/plugins/runconfig.py:30
+msgid "Execute in a new dedicated Python console"
+msgstr "Выполнить в новой отдельной консоли Python"
+
+#: spyder/plugins/runconfig.py:31
+msgid "Execute in an external System terminal"
+msgstr "Выполнить во внешнем системном терминале"
+
+#: spyder/plugins/runconfig.py:41
+msgid "Always show %s on a first file run"
+msgstr "Всегда показывать %s при первом запуске файла"
+
+#: spyder/plugins/runconfig.py:160 spyder/plugins/runconfig.py:474
+msgid "General settings"
+msgstr "Основные настройки"
+
+#: spyder/plugins/runconfig.py:163 spyder/plugins/runconfig.py:209
+msgid "Command line options:"
+msgstr "Опции командной строки:"
+
+#: spyder/plugins/runconfig.py:169
+msgid "Working directory:"
+msgstr "Рабочий каталог:"
+
+#: spyder/plugins/runconfig.py:181 spyder/plugins/runconfig.py:492
+msgid "Enter debugging mode when errors appear during execution"
+msgstr "Запускать отладочный режим, если происходят ошибки в ходе выполнения"
+
+#: spyder/plugins/runconfig.py:197 spyder/plugins/runconfig.py:502
+msgid "Dedicated Python console"
+msgstr "Отдельная консоль Python"
+
+#: spyder/plugins/runconfig.py:201 spyder/plugins/runconfig.py:504
+msgid "Interact with the Python console after execution"
+msgstr "Перейти в консоль Python после выполнения"
+
+#: spyder/plugins/runconfig.py:205
+msgid "Show warning when killing running process"
+msgstr "Показывать предупреждение при завершении работающего процесса"
+
+#: spyder/plugins/runconfig.py:214
+msgid "<b>-u</b> is added to the other options you set here"
+msgstr "<b>-u</b> добавлен к другим опциям, которые Вы здесь установили"
+
+#: spyder/plugins/runconfig.py:224
+msgid "this dialog"
+msgstr "это диалоговое окно"
+
+#: spyder/plugins/runconfig.py:283
+msgid "Run configuration"
+msgstr "Запустить конфигурацию"
+
+#: spyder/plugins/runconfig.py:284
+msgid "The following working directory is not valid:<br><b>%s</b>"
+msgstr "Следующий рабочий каталог не применим:<br><b>%s</b>"
+
+#: spyder/plugins/runconfig.py:362
+msgid "Run settings for %s"
+msgstr "Настройки Запуска для %s"
+
+#: spyder/plugins/runconfig.py:394
+msgid "Select a run configuration:"
+msgstr "Выберите конфигурацию запуска:"
+
+#: spyder/plugins/runconfig.py:423 spyder/plugins/runconfig.py:448
+msgid "Run Settings"
+msgstr "Настройки Запуска"
+
+#: spyder/plugins/runconfig.py:450
 msgid ""
-"For %s support, please install one of the<br/> following tools:<br/><br/>  %s"
+"The following are the default <i>%s</i>. These options may be overriden "
+"using the <b>%s</b> dialog box (see the <b>%s</b> menu)"
 msgstr ""
-"Для поддержки %s, установите, пожалуйста,<br/> один из следующих "
-"инструментов:<br/><br/>  %s"
+"Далее - стандартные <i>%s</i>. Эти опции можно перезаписать с помощью "
+"диалогового окна <b>%s</b> (см. меню <b>%s</b>)"
 
-#: spyderlib/widgets/explorer.py:700
-#, python-format
-msgid "<b>Unable to find external program.</b><br><br>%s"
-msgstr "<b>Не удалось найти внешнюю программу.</b><br><br>%s"
+#: spyder/plugins/runconfig.py:476
+msgid "Default working directory is:"
+msgstr "Рабочий каталог по умолчанию:"
 
-#: spyderlib/widgets/explorer.py:903
-msgid "Show current directory only"
-msgstr "Показывать только текущий каталог"
+#: spyder/plugins/runconfig.py:478
+msgid "the script directory"
+msgstr "каталог скриптов"
 
-#: spyderlib/widgets/explorer.py:1001
-msgid "You don't have the right permissions to open this directory"
-msgstr "У Вас нет прав на открытие этой директории"
+#: spyder/plugins/runconfig.py:481 spyder/plugins/workingdirectory.py:57
+msgid "the following directory:"
+msgstr "указанный каталог:"
 
-#: spyderlib/widgets/explorer.py:1029 spyderlib/plugins/externalconsole.py:70
-msgid "Show icons and text"
-msgstr "Показывать иконки и текст"
+#: spyder/plugins/runconfig.py:507
+msgid "Show warning when killing running processes"
+msgstr "Показывать предупреждение при завершении работающих процессов"
 
-#: spyderlib/widgets/explorer.py:1037
-msgid "Parent"
-msgstr "Родительская"
+#: spyder/plugins/runconfig.py:516
+msgid "Run Settings dialog"
+msgstr "диалог Настроек Запуска"
 
-#: spyderlib/widgets/findreplace.py:59
-msgid "Search string"
-msgstr "Найти строку"
+#: spyder/plugins/shortcuts.py:137
+msgid ""
+"Press the new shortcut and select 'Ok': \n"
+"(Press 'Tab' once to switch focus between the shortcut entry \n"
+"and the buttons below it)"
+msgstr ""
+"Нажмите новую комбинацию клавиш и выберите 'Ok': \n"
+"(Нажатие 'Tab' один раз переключает фокус между\n"
+"полем ввода комбинации клавиш и кнопками под ним)"
 
-#: spyderlib/widgets/findreplace.py:83
-msgid "Case Sensitive"
-msgstr "С учетом регистра"
+#: spyder/plugins/shortcuts.py:140
+msgid "Current shortcut:"
+msgstr "Текущая комбинация клавиш:"
 
-#: spyderlib/widgets/findreplace.py:89
-msgid "Whole words"
-msgstr "Слова целиком"
+#: spyder/plugins/shortcuts.py:142
+msgid "New shortcut:"
+msgstr "Новая комбинация клавиш:"
 
-#: spyderlib/widgets/findreplace.py:95
-msgid "Highlight matches"
-msgstr "Подсвечивать найденные"
+#: spyder/plugins/shortcuts.py:155
+msgid "Shortcut: {0}"
+msgstr "Комбинация клавиш: {0}"
 
-#: spyderlib/widgets/findreplace.py:109
-msgid "Replace with:"
-msgstr "Заменить на:"
+#: spyder/plugins/shortcuts.py:276
+msgid "Please introduce a different shortcut"
+msgstr "Пожалуйста, введите другую комбинацию клавиш"
+
+#: spyder/plugins/shortcuts.py:313
+msgid "The new shorcut conflicts with:"
+msgstr "Новая комбинация клавиш конфликтует с:"
+
+#: spyder/plugins/shortcuts.py:324
+msgid ""
+"A compound sequence can have {break} a maximum of 4 subsequences.{break}"
+msgstr "Не более 4 комбинаций клавиш {break} для одного действия.{break}"
+
+#: spyder/plugins/shortcuts.py:329
+msgid "Invalid key entered"
+msgstr "Введен неверный ключ"
+
+#: spyder/plugins/shortcuts.py:531
+msgid "Context"
+msgstr "Контекст"
+
+#: spyder/plugins/shortcuts.py:533
+#: spyder/widgets/variableexplorer/collectionseditor.py:118
+msgid "Name"
+msgstr "Действие"
+
+#: spyder/plugins/shortcuts.py:535
+msgid "Shortcut"
+msgstr "Комбинация клавиш"
+
+# Не понятно, зачем переводить, если колонка с этим именем не видна
+#: spyder/plugins/shortcuts.py:537
+msgid "Score"
+msgstr "Метка"
+
+#: spyder/plugins/shortcuts.py:697
+msgid "Conflicts"
+msgstr "Конфликты"
+
+#: spyder/plugins/shortcuts.py:698
+msgid "The following conflicts have been detected:"
+msgstr "Обнаружены следующие конфликты:"
+
+#: spyder/plugins/shortcuts.py:783
+msgid "Keyboard shortcuts"
+msgstr "Комбинации клавиш"
 
-#: spyderlib/widgets/findreplace.py:111
-msgid "Replace string"
-msgstr "Заменить строку"
+#: spyder/plugins/shortcuts.py:791
+msgid "Search: "
+msgstr "Поиск:"
 
-#: spyderlib/widgets/findreplace.py:114
-msgid "Replace/find"
-msgstr "Заменить/найти"
+#: spyder/plugins/shortcuts.py:792
+msgid "Reset to default values"
+msgstr "Восстановить значения по умолчанию"
 
-#: spyderlib/widgets/findreplace.py:121
-msgid "Replace all"
-msgstr "Заменить все"
+#: spyder/plugins/variableexplorer.py:26
+msgid "Autorefresh"
+msgstr "Автообновление"
 
-#: spyderlib/widgets/formlayout.py:209 spyderlib/plugins/configdialog.py:612
-msgid "Italic"
-msgstr "Курсив"
+#: spyder/plugins/variableexplorer.py:27
+msgid "Enable autorefresh"
+msgstr "Включить автообновление"
 
-#: spyderlib/widgets/formlayout.py:214 spyderlib/plugins/configdialog.py:609
-msgid "Bold"
-msgstr "Жирный"
+#: spyder/plugins/variableexplorer.py:29
+msgid "Refresh interval: "
+msgstr "Интервал обновления: "
 
-#: spyderlib/widgets/status.py:23
-msgid "CPU and memory usage info in the status bar"
-msgstr "Информация об использовании ЦП и памяти в строке состояния"
+#: spyder/plugins/variableexplorer.py:33
+msgid "Filter"
+msgstr "Фильтр"
 
-#: spyderlib/widgets/status.py:92
-msgid "Memory:"
-msgstr "Память:"
+#: spyder/plugins/variableexplorer.py:35
+#: spyder/widgets/variableexplorer/namespacebrowser.py:229
+msgid "Exclude private references"
+msgstr "Исключить приватные ссылки"
 
-#: spyderlib/widgets/status.py:93
-msgid ""
-"Memory usage status: requires the `psutil` (>=v0.3) library on non-Windows "
-"platforms"
-msgstr ""
-"Состояние использования памяти: требуется библиотека `psutil` (>=v0.3) на не-"
-"Windows платформах"
+#: spyder/plugins/variableexplorer.py:36
+#: spyder/widgets/variableexplorer/namespacebrowser.py:244
+msgid "Exclude capitalized references"
+msgstr "Исключить ссылки с прописной буквы"
 
-#: spyderlib/widgets/status.py:105
-msgid "CPU:"
-msgstr "ЦП:"
+#: spyder/plugins/variableexplorer.py:37
+#: spyder/widgets/variableexplorer/namespacebrowser.py:237
+msgid "Exclude all-uppercase references"
+msgstr "Исключить ссылки со всеми буквами в верхнем регистре"
 
-#: spyderlib/widgets/status.py:106
-msgid "CPU usage status: requires the `psutil` (>=v0.3) library"
-msgstr "Состояние использования ЦП: требуется библиотека `psutil` (>=v0.3)"
+#: spyder/plugins/variableexplorer.py:38
+#: spyder/widgets/variableexplorer/namespacebrowser.py:252
+msgid "Exclude unsupported data types"
+msgstr "Исключить неподдерживаемые типы данных"
 
-#: spyderlib/widgets/status.py:128
-msgid "Permissions:"
-msgstr "Доступ:"
+#: spyder/plugins/variableexplorer.py:44
+#: spyder/widgets/variableexplorer/collectionseditor.py:675
+msgid "Truncate values"
+msgstr "Обрезать значения"
 
-#: spyderlib/widgets/status.py:142
-msgid "End-of-lines:"
-msgstr "Конец строки:"
+#: spyder/plugins/variableexplorer.py:46
+#: spyder/widgets/variableexplorer/collectionseditor.py:679
+msgid "Show arrays min/max"
+msgstr "Показывать min/max массивов"
 
-#: spyderlib/widgets/status.py:156
-msgid "Encoding:"
-msgstr "Кодировка:"
+#: spyder/plugins/variableexplorer.py:48
+msgid "Edit data in the remote process"
+msgstr "Редактировать данные в удалённом процессе"
 
-#: spyderlib/widgets/status.py:169
-msgid "Line:"
-msgstr "Строка:"
+#: spyder/plugins/variableexplorer.py:49
+msgid ""
+"Editors are opened in the remote process for NumPy arrays, PIL images, "
+"lists, tuples and dictionaries.\n"
+"This avoids transfering large amount of data between the remote process and "
+"Spyder (through the socket)."
+msgstr ""
+"Редакторы открыты в удалённом процессе для массивов NumPy, изображений PIL, "
+"списков, кортежей и словарей.\n"
+"Это позволяет избежать передачи больших объёмов данных между удалённым "
+"процессом и Spyder (через сокет)."
 
-#: spyderlib/widgets/status.py:173
-msgid "Column:"
-msgstr "Столбец:"
+#: spyder/plugins/variableexplorer.py:185
+msgid "Variable explorer"
+msgstr "Менеджер переменных"
 
-#: spyderlib/widgets/browser.py:131
-msgid "Home"
-msgstr "Домой"
+#: spyder/plugins/workingdirectory.py:38
+msgid ""
+"The <b>global working directory</b> is the working directory for newly "
+"opened <i>consoles</i> (Python/IPython consoles and terminals), for the "
+"<i>file explorer</i>, for the <i>find in files</i> plugin and for new files "
+"created in the <i>editor</i>."
+msgstr ""
+"<b>Глобальный рабочий каталог</b> - рабочий каталог для новых <i>консолей</"
+"i> (консоли и терминалы Python/IPython), для <i>файлового менеджера</i>, для "
+"модуля <i>поиск по файлам</i> и для новых файлов в <i>редакторе</i>."
 
-#: spyderlib/widgets/browser.py:166
-msgid "Find text"
-msgstr "Найти текст"
+#: spyder/plugins/workingdirectory.py:47
+msgid "At startup, the global working directory is:"
+msgstr "Глобальный рабочий каталог при загрузке:"
 
-#: spyderlib/widgets/browser.py:184
-msgid "Address:"
-msgstr "Адрес:"
+#: spyder/plugins/workingdirectory.py:51
+msgid "the same as in last session"
+msgstr "такой же как в последней сессии"
 
-#: spyderlib/widgets/browser.py:220
-msgid "Unable to load page"
-msgstr "Не удалось загрузить страницу"
+#: spyder/plugins/workingdirectory.py:53
+msgid "At startup, Spyder will restore the global directory from last session"
+msgstr "При загрузке Spyder восстановит глобальный каталог из прошлой сессии"
 
-#: spyderlib/plugins/configdialog.py:139
-msgid "Reset to defaults"
-msgstr "Восстановить значения по умолчанию"
+#: spyder/plugins/workingdirectory.py:59
+msgid "At startup, the global working directory will be the specified path"
+msgstr "При запуске глобальный рабочий каталог будет иметь указанный путь"
 
-#: spyderlib/plugins/configdialog.py:151
-msgid "Preferences"
-msgstr "Параметры"
+#: spyder/plugins/workingdirectory.py:71
+msgid "Files are opened from:"
+msgstr "Файлы открываются из:"
 
-#: spyderlib/plugins/configdialog.py:487
-msgid "Invalid directory path"
-msgstr "Неверный путь каталога"
+#: spyder/plugins/workingdirectory.py:75 spyder/plugins/workingdirectory.py:88
+msgid "the current file directory"
+msgstr "текущий каталог"
 
-#: spyderlib/plugins/configdialog.py:517
-msgid "Invalid file path"
-msgstr "Неверный путь файла"
+#: spyder/plugins/workingdirectory.py:79 spyder/plugins/workingdirectory.py:92
+msgid "the global working directory"
+msgstr "глобальный рабочий каталог"
 
-#: spyderlib/plugins/configdialog.py:520 spyderlib/plugins/configdialog.py:537
-msgid "Select file"
-msgstr "Выберите файл"
+#: spyder/plugins/workingdirectory.py:84
+msgid "Files are created in:"
+msgstr "Файлы создаются в:"
 
-#: spyderlib/plugins/configdialog.py:536
-msgid "All files (*)"
-msgstr "Все файлы (*)"
+#: spyder/plugins/workingdirectory.py:98
+msgid "Change to file base directory"
+msgstr "Изменить на каталог файла"
 
-#: spyderlib/plugins/configdialog.py:666
-msgid "Font: "
-msgstr "Шрифт: "
+#: spyder/plugins/workingdirectory.py:100
+msgid "When opening a file"
+msgstr "При открытии файла"
 
-#: spyderlib/plugins/configdialog.py:672
-msgid "Size: "
-msgstr "Размер: "
+#: spyder/plugins/workingdirectory.py:102
+msgid "When saving a file"
+msgstr "При сохранении файла"
 
-#: spyderlib/plugins/configdialog.py:691
-msgid "Font style"
-msgstr "Стиль шрифта"
+#: spyder/plugins/workingdirectory.py:172
+msgid "Back"
+msgstr "Назад"
 
-#: spyderlib/plugins/configdialog.py:751
-msgid "Spyder needs to restart to change the following setting:"
-msgstr "Необходим перезапуск Spyder для изменения параметра:"
+#: spyder/plugins/workingdirectory.py:180 spyder/widgets/explorer.py:1079
+#: spyder/widgets/variableexplorer/importwizard.py:529
+msgid "Next"
+msgstr "Далее"
 
-#: spyderlib/plugins/configdialog.py:754
-msgid "Spyder needs to restart to change the following settings:"
-msgstr "Необходим перезапуск Spyder для изменения настроек:"
+#: spyder/plugins/workingdirectory.py:191
+msgid ""
+"This is the working directory for newly\n"
+"opened consoles (Python/IPython consoles and\n"
+"terminals), for the file explorer, for the\n"
+"find in files plugin and for new files\n"
+"created in the editor"
+msgstr ""
+"Это - рабочий каталог для новосозданных\n"
+"консолей (консолей и терминалов Python/IPython),\n"
+"для файлового менеджера, для модуля\n"
+"поиска в файлах и для новых файлов,\n"
+"созданных в редакторе"
 
-#: spyderlib/plugins/configdialog.py:756
-msgid "Do you wish to restart now?"
-msgstr "Хотите выполнить перезапуск сейчас?"
+#: spyder/plugins/workingdirectory.py:219
+msgid "Browse a working directory"
+msgstr "Просмотреть рабочий каталог"
 
-#: spyderlib/plugins/configdialog.py:762
-msgid "Information"
-msgstr "Информация"
+#: spyder/plugins/workingdirectory.py:226
+msgid "Change to parent directory"
+msgstr "Изменить на родительский каталог"
 
-#: spyderlib/plugins/configdialog.py:777 spyderlib/plugins/configdialog.py:784
-msgid "General"
-msgstr "Основные"
+#: spyder/plugins/workingdirectory.py:233
+msgid "Global working directory"
+msgstr "Глобальный рабочий каталог"
 
-#: spyderlib/plugins/configdialog.py:787
-msgid "Language"
-msgstr "Язык"
+#: spyder/utils/codeanalysis.py:91
+msgid "Real-time code analysis on the Editor"
+msgstr "Анализ кода в Редакторе в реальном времени"
 
-#: spyderlib/plugins/configdialog.py:790
-msgid "Use a single instance"
-msgstr "Запускать только одну копию"
+#: spyder/utils/codeanalysis.py:95
+msgid "Real-time code style analysis on the Editor"
+msgstr "Анализ стиля кода в Редакторе в реальном времени"
 
-#: spyderlib/plugins/configdialog.py:792
+#: spyder/utils/environ.py:101
 msgid ""
-"Set this to open external<br> Python files in an already running instance "
-"(Requires a restart)"
+"Module <b>pywin32 was not found</b>.<br>Please restart this Windows "
+"<i>session</i> (not the computer) for changes to take effect."
 msgstr ""
-"Отметьте для открытия внешних<br> файлов Python в уже запущенном окружении "
-"(требуется перезапуск)"
-
-#: spyderlib/plugins/configdialog.py:795
-msgid "Prompt when exiting"
-msgstr "Спрашиваить подтверждение при закрытии"
-
-#: spyderlib/plugins/configdialog.py:796
-msgid "Pop up internal console when internal errors appear"
-msgstr "Переходить во встроенную консоль при появлении внутренних ошибок"
+"Модуль <b>pywin32 не найден</b>.<br>Пожалуйста, перезапустите <i>сессию</i> "
+"Windows  (не компьютер), чтобы изменения вступили в силу."
 
-#: spyderlib/plugins/configdialog.py:816 spyderlib/plugins/editor.py:105
-#: spyderlib/plugins/ipythonconsole.py:158
-#: spyderlib/plugins/externalconsole.py:66
-msgid "Interface"
-msgstr "Интерфейс"
+#: spyder/utils/environ.py:114
+msgid ""
+"If you accept changes, this will modify the current user environment "
+"variables directly <b>in Windows registry</b>. Use it with precautions, at "
+"your own risks.<br><br>Note that for changes to take effect, you will need "
+"to restart the parent process of this application (simply restart Spyder if "
+"you have executed it from a Windows shortcut, otherwise restart any "
+"application from which you may have executed it, like <i>Python(x,y) Home</"
+"i> for example)"
+msgstr ""
+"Если Вы примете изменения, это переопределит переменные среды для текущего "
+"пользователя непосредственно <b>в реестре Windows</b>. Используйте с "
+"осторожностью, на свой риск.<br><br>Имейте в виду, чтобы изменения вступили "
+"в силу, необходимо перезагрузить родительский процесс приложения (просто "
+"перезапустите Spyder, если запускали его ярлыком Windows, или перезапустите "
+"приложение из которого Вы его запускали, например <i>Python(x,y) Home</i>)"
 
-#: spyderlib/plugins/configdialog.py:824
-msgid "Qt windows style"
-msgstr "Стиль окон Qt"
+#: spyder/utils/help/sphinxify.py:217 spyder/utils/help/sphinxify.py:227
+msgid ""
+"It was not possible to generate rich text help for this object.</br>Please "
+"see it in plain text."
+msgstr ""
+"Невозможно создать форматированную текстовую справку по объекту.</"
+"br>Пожалуйста, просмотрите в виде обычного текста."
 
-#: spyderlib/plugins/configdialog.py:830
-msgid "Icon theme"
-msgstr "Тема значков"
+#: spyder/utils/introspection/manager.py:33
+#: spyder/utils/introspection/manager.py:38
+msgid "Editor's code completion, go-to-definition and help"
+msgstr "Автодополнение кода редактора, переход к определению и справка"
 
-#: spyderlib/plugins/configdialog.py:834
-msgid "Vertical title bars in panes"
-msgstr "Названия плавающих окон - вертикально"
+#: spyder/utils/iofuncs.py:408
+msgid "Supported files"
+msgstr "Поддерживаемые файлы"
 
-#: spyderlib/plugins/configdialog.py:836
-msgid "Vertical tabs in panes"
-msgstr "Вертикальные вкладки на плавающих окнах"
+#: spyder/utils/iofuncs.py:410
+msgid "All files (*.*)"
+msgstr "Все файлы (*.*)"
 
-#: spyderlib/plugins/configdialog.py:838
-msgid "Animated toolbars and panes"
-msgstr "Анимировать панели инструментов и плавающие окна"
+#: spyder/utils/iofuncs.py:420
+msgid "Spyder data files"
+msgstr "Файлы данных Spyder"
 
-#: spyderlib/plugins/configdialog.py:840
-msgid "Tear off menus"
-msgstr "Открепляемые меню"
+#: spyder/utils/iofuncs.py:422
+#: spyder/widgets/variableexplorer/collectionseditor.py:1029
+msgid "NumPy arrays"
+msgstr "Массивы NumPy"
 
-#: spyderlib/plugins/configdialog.py:841
-msgid "Set this to detach any<br> menu from the main window"
-msgstr "Отметьте для возможности отделить<br> любое меню от главного окна"
+#: spyder/utils/iofuncs.py:423
+msgid "NumPy zip arrays"
+msgstr "Сжатые массивы NumPy"
 
-#: spyderlib/plugins/configdialog.py:843
-msgid "Custom margin for panes:"
-msgstr "Настроить отступы панелей:"
+#: spyder/utils/iofuncs.py:424
+msgid "Matlab files"
+msgstr "Файлы Matlab"
 
-#: spyderlib/plugins/configdialog.py:873
-msgid "Status bar"
-msgstr "Панель состояния"
+#: spyder/utils/iofuncs.py:425
+msgid "CSV text files"
+msgstr "Текстовые файлы CSV"
 
-#: spyderlib/plugins/configdialog.py:874
-msgid "Show status bar"
-msgstr "Показывать панель состояния"
+#: spyder/utils/iofuncs.py:427
+msgid "JPEG images"
+msgstr "Изображения JPEG"
 
-#: spyderlib/plugins/configdialog.py:876
-msgid "Show memory usage every"
-msgstr "Показывать использование памяти каждые"
+#: spyder/utils/iofuncs.py:428
+msgid "PNG images"
+msgstr "Изображения PNG"
 
-#: spyderlib/plugins/configdialog.py:885
-msgid "Show CPU usage every"
-msgstr "Показывать загрузку ЦП каждые"
+#: spyder/utils/iofuncs.py:429
+msgid "GIF images"
+msgstr "Изображения GIF"
 
-#: spyderlib/plugins/configdialog.py:920
-msgid "Plain text font"
-msgstr "Шрифт текста"
+#: spyder/utils/iofuncs.py:430
+msgid "TIFF images"
+msgstr "Изображения TIFF"
 
-#: spyderlib/plugins/configdialog.py:926
-msgid "Rich text font"
-msgstr "Шрифт форматированного текста"
+#: spyder/utils/iofuncs.py:431 spyder/utils/iofuncs.py:432
+msgid "Pickle files"
+msgstr "Архивы Pickle"
 
-#: spyderlib/plugins/configdialog.py:929
-msgid "Fonts"
-msgstr "Шрифты"
+#: spyder/utils/iofuncs.py:433
+msgid "JSON files"
+msgstr "Файлы JSON"
 
-#: spyderlib/plugins/configdialog.py:943
-msgid "Appearance"
-msgstr "Внешний вид"
+#: spyder/utils/iofuncs.py:452 spyder/utils/iofuncs.py:459
+msgid "<b>Unsupported file type '%s'</b>"
+msgstr "<b>Неподдерживаемый тип файла '%s'</b>"
 
-#: spyderlib/plugins/configdialog.py:945
-#: spyderlib/plugins/ipythonconsole.py:465
-msgid "Advanced Settings"
-msgstr "Дополнительные параметры"
+#: spyder/utils/programs.py:286
+msgid "It was not possible to run this file in an external terminal"
+msgstr "Невозможно запустить файл во внешнем терминале"
 
-#: spyderlib/plugins/configdialog.py:981
-msgid "Syntax coloring"
-msgstr "Подсветка синтаксиса"
+#: spyder/utils/syntaxhighlighters.py:33
+msgid "Syntax highlighting for Matlab, Julia and other file types"
+msgstr "Подсветка синтаксиса для Matlab, Julia и других типов файлов"
 
-#: spyderlib/plugins/configdialog.py:993
-msgid ""
-"Here you can select the color scheme used in the Editor and all other Spyder "
-"plugins.<br><br>You can also edit the color schemes provided by Spyder or "
-"create your own ones by using the options provided below.<br>"
-msgstr ""
-"Здесь можно выбрать цветовую схему, используемую в Редакторе и всех других "
-"модулях Spyder.<br><br>Вы можете редактировать цветовые схемы, предлагаемые "
-"Spyder, или создать новую с помощью опций, приведённых ниже."
+#: spyder/utils/syntaxhighlighters.py:42
+msgid "Background:"
+msgstr "Фон:"
 
-#: spyderlib/plugins/configdialog.py:998
-msgid "Edit selected"
-msgstr "Редактировать выбранную"
+#: spyder/utils/syntaxhighlighters.py:43
+#: spyder/widgets/sourcecode/codeeditor.py:106
+msgid "Current line:"
+msgstr "Текущая строка:"
 
-#: spyderlib/plugins/configdialog.py:999
-msgid "Create new scheme"
-msgstr "Создать новую схему"
+#: spyder/utils/syntaxhighlighters.py:44
+msgid "Current cell:"
+msgstr "Текущий блок:"
 
-#: spyderlib/plugins/configdialog.py:1003
-msgid "Reset"
-msgstr "Восстановить"
+#: spyder/utils/syntaxhighlighters.py:45
+msgid "Occurrence:"
+msgstr "Вхождения слова:"
 
-#: spyderlib/plugins/configdialog.py:1010
-msgid "Scheme:"
-msgstr "Схема: "
+#: spyder/utils/syntaxhighlighters.py:46
+msgid "Link:"
+msgstr "Ссылка:"
 
-#: spyderlib/plugins/configdialog.py:1041
-msgid "Manage color schemes"
-msgstr "Настроить цветовые схемы"
+#: spyder/utils/syntaxhighlighters.py:47
+msgid "Side areas:"
+msgstr "Боковые панели:"
 
-#: spyderlib/plugins/configdialog.py:1230
-msgid "Are you sure you want to delete this scheme?"
-msgstr "Вы уверены, что хотите удалить цветовую схему?"
+#: spyder/utils/syntaxhighlighters.py:48
+msgid "Matched <br>parens:"
+msgstr "Парные <br>скобки:"
 
-#: spyderlib/plugins/configdialog.py:1347
-msgid "Text"
-msgstr "Текст"
+#: spyder/utils/syntaxhighlighters.py:49
+msgid "Unmatched <br>parens:"
+msgstr "Скобки <br>без пары:"
 
-#: spyderlib/plugins/configdialog.py:1349
-msgid "Highlight"
-msgstr "Подсветка"
+#: spyder/utils/syntaxhighlighters.py:50
+msgid "Normal text:"
+msgstr "Обычный текст:"
 
-#: spyderlib/plugins/configdialog.py:1351
-msgid "Background"
-msgstr "Фон"
+#: spyder/utils/syntaxhighlighters.py:51
+msgid "Keyword:"
+msgstr "Ключевое слово:"
 
-#: spyderlib/plugins/configdialog.py:1355
-msgid "Scheme name:"
-msgstr "Название схемы:"
+#: spyder/utils/syntaxhighlighters.py:52
+msgid "Builtin:"
+msgstr "Встроенные:"
 
-#: spyderlib/plugins/configdialog.py:1362
-msgid "Color scheme editor"
-msgstr "Редактор цветовой схемы"
+#: spyder/utils/syntaxhighlighters.py:53
+msgid "Definition:"
+msgstr "Определение:"
 
-#: spyderlib/plugins/editor.py:102
-msgid "Edit template for new modules"
-msgstr "Редактировать шаблон для новых модулей"
+#: spyder/utils/syntaxhighlighters.py:54
+msgid "Comment:"
+msgstr "Комментарий:"
 
-#: spyderlib/plugins/editor.py:107
-msgid "Sort files according to full path"
-msgstr "Сортировать файлы по полному пути"
+#: spyder/utils/syntaxhighlighters.py:55
+msgid "String:"
+msgstr "Строка:"
 
-#: spyderlib/plugins/editor.py:109
-msgid "Show tab bar"
-msgstr "Показывать панель вкладок"
+#: spyder/utils/syntaxhighlighters.py:56
+msgid "Number:"
+msgstr "Число:"
 
-#: spyderlib/plugins/editor.py:116 spyderlib/plugins/editor.py:187
-#: spyderlib/plugins/help.py:161 spyderlib/plugins/ipythonconsole.py:202
-#: spyderlib/plugins/history.py:41 spyderlib/plugins/externalconsole.py:80
-#: spyderlib/plugins/externalconsole.py:123
-msgid "Source code"
-msgstr "Исходный код"
+#: spyder/utils/syntaxhighlighters.py:57
+msgid "Instance:"
+msgstr "Экземпляр класса:"
 
-#: spyderlib/plugins/editor.py:117
-msgid "Show line numbers"
-msgstr "Показывать номера строк"
+#: spyder/widgets/arraybuilder.py:179
+msgid ""
+"\n"
+"           <b>Numpy Array/Matrix Helper</b><br>\n"
+"           Type an array in Matlab    : <code>[1 2;3 4]</code><br>\n"
+"           or Spyder simplified syntax : <code>1 2;3 4</code>\n"
+"           <br><br>\n"
+"           Hit 'Enter' for array or 'Ctrl+Enter' for matrix.\n"
+"           <br><br>\n"
+"           <b>Hint:</b><br>\n"
+"           Use two spaces or two tabs to generate a ';'.\n"
+"           "
+msgstr ""
+"\n"
+"           <b>Помощник Массивов/Матриц Numpy</b><br>\n"
+"           Введите массив в Matlab-   : <code>[1 2;3 4]</code><br>\n"
+"           или Spyder-стиле : <code>1 2;3 4</code>\n"
+"           <br><br>\n"
+"           Нажмите 'Enter' для массива или 'Ctrl+Enter' для матрицы.\n"
+"           <br><br>\n"
+"           <b>Трюк:</b><br>\n"
+"           Два пробели или две табуляции образуют ';'.\n"
+"           "
 
-#: spyderlib/plugins/editor.py:118 spyderlib/plugins/editor.py:931
-msgid "Show blank spaces"
-msgstr "Показывать отступы"
+#: spyder/widgets/arraybuilder.py:190
+msgid ""
+"\n"
+"           <b>Numpy Array/Matrix Helper</b><br>\n"
+"           Enter an array in the table. <br>\n"
+"           Use Tab to move between cells.\n"
+"           <br><br>\n"
+"           Hit 'Enter' for array or 'Ctrl+Enter' for matrix.\n"
+"           <br><br>\n"
+"           <b>Hint:</b><br>\n"
+"           Use two tabs at the end of a row to move to the next row.\n"
+"           "
+msgstr ""
+"\n"
+"           <b>Помощник Массивов/Матриц Numpy</b><br>\n"
+"           Введите массив в таблицу. <br>\n"
+"           Используйте Tab для перемещения по ячейкам.\n"
+"           <br><br>\n"
+"\n"
+"           Нажмите 'Enter' для массива или 'Ctrl+Enter' для матрицы.\n"
+"           <br><br>\n"
+"           <b>Трюк:</b><br>\n"
+"           Две табуляции в конце строки перемещают на следующую строку.\n"
+"           "
 
-#: spyderlib/plugins/editor.py:119
-msgid "Show vertical line after"
-msgstr "Рисовать вертикальную линию после"
+#: spyder/widgets/arraybuilder.py:365
+msgid "Array dimensions not valid"
+msgstr "Неверная размерность массива"
 
-#: spyderlib/plugins/editor.py:120
-msgid "characters"
-msgstr "символов"
+#: spyder/widgets/browser.py:54 spyder/widgets/sourcecode/codeeditor.py:2518
+msgid "Zoom out"
+msgstr "Уменьшить"
 
-#: spyderlib/plugins/editor.py:125
-msgid "Highlight current line"
-msgstr "Подсвечивать текущую строку"
+#: spyder/widgets/browser.py:57 spyder/widgets/sourcecode/codeeditor.py:2514
+msgid "Zoom in"
+msgstr "Увеличить"
 
-#: spyderlib/plugins/editor.py:127
-msgid "Highlight current cell"
-msgstr "Подсвечивать текущий блок"
+#: spyder/widgets/browser.py:162
+msgid "Home"
+msgstr "Домой"
 
-#: spyderlib/plugins/editor.py:129
-msgid "Highlight occurrences after"
-msgstr "Подсвечивать вхождения слова через"
+#: spyder/widgets/browser.py:198
+msgid "Find text"
+msgstr "Найти текст"
 
-#: spyderlib/plugins/editor.py:137 spyderlib/plugins/help.py:162
-#: spyderlib/plugins/help.py:364 spyderlib/plugins/console.py:162
-#: spyderlib/plugins/history.py:42 spyderlib/plugins/history.py:154
-#: spyderlib/plugins/externalconsole.py:85
-msgid "Wrap lines"
-msgstr "Переносить строки"
+#: spyder/widgets/browser.py:216
+msgid "Address:"
+msgstr "Адрес:"
 
-#: spyderlib/plugins/editor.py:157
-msgid "Save all files before running script"
-msgstr "Сохранить все файлы перед выполнением скрипта"
+#: spyder/widgets/browser.py:252
+msgid "Unable to load page"
+msgstr "Не удалось загрузить страницу"
 
-#: spyderlib/plugins/editor.py:160
-msgid "Run selection"
-msgstr "Выполнить выделение"
+#: spyder/widgets/comboboxes.py:165
+msgid "Press enter to validate this entry"
+msgstr "Нажмите Enter для подтверждения этого поля"
 
-#: spyderlib/plugins/editor.py:161
-msgid "Maintain focus in the Editor after running cells or selections"
-msgstr "Сохранять фокус в Редакторе после запуска блоков или выделений"
+#: spyder/widgets/comboboxes.py:166
+msgid "This entry is incorrect"
+msgstr "Это поле неверно"
 
-#: spyderlib/plugins/editor.py:164 spyderlib/plugins/externalconsole.py:329
-msgid "Introspection"
-msgstr "Интроспекция"
+#: spyder/widgets/comboboxes.py:209
+msgid "Press enter to validate this path"
+msgstr "Нажмите Enter для подтверждения этого пути"
 
-#: spyderlib/plugins/editor.py:167 spyderlib/plugins/console.py:169
-#: spyderlib/plugins/externalconsole.py:124
-msgid "Automatic code completion"
-msgstr "Автоматическое дополнение кода"
+#: spyder/widgets/dependencies.py:63
+msgid " Required "
+msgstr " требуется"
 
-#: spyderlib/plugins/editor.py:169 spyderlib/plugins/externalconsole.py:126
-msgid "Case sensitive code completion"
-msgstr "Чувствительное к регистру автодополнение"
+#: spyder/widgets/dependencies.py:63
+msgid "Module"
+msgstr "Модуль"
 
-#: spyderlib/plugins/editor.py:171 spyderlib/plugins/console.py:173
-#: spyderlib/plugins/externalconsole.py:128
-msgid "Enter key selects completion"
-msgstr "Клавиша Enter выбирает автодополнение"
+#: spyder/widgets/dependencies.py:64
+msgid " Installed "
+msgstr " установлен"
 
-#: spyderlib/plugins/editor.py:173 spyderlib/plugins/ipythonconsole.py:168
-#: spyderlib/plugins/console.py:165 spyderlib/plugins/externalconsole.py:130
-msgid "Display balloon tips"
-msgstr "Показывать всплывающие подсказки"
+#: spyder/widgets/dependencies.py:64
+msgid "Provided features"
+msgstr "Предоставляемые возможности"
 
-#: spyderlib/plugins/editor.py:174
-msgid "Link to object definition"
-msgstr "Ссылка на место определения объекта"
+#: spyder/widgets/dependencies.py:134
+msgid "Dependencies"
+msgstr "Зависимости"
 
-#: spyderlib/plugins/editor.py:176
+#: spyder/widgets/dependencies.py:141
 msgid ""
-"If this option is enabled, clicking on an object\n"
-"name (left-click + Ctrl key) will go this object\n"
-"definition (if resolved)."
+"Spyder depends on several Python modules to provide the right functionality "
+"for all its panes. The table below shows the required and installed versions "
+"(if any) of all of them.<br><br><b>Note</b>: You can safely use Spyder "
+"without the following modules installed: <b>%s</b> and <b>%s</b>"
 msgstr ""
-"Если эта опция активна, при нажатии на имя объекта\n"
-"(левая кнопка мыши + клавиша Ctrl) произойдёт\n"
-"переход в место его определения (если возможно)."
+"Spyder зависит от нескольких модулей Python для обеспечения верной "
+"функциональности всех панелей. В таблице ниже показаны требуемые и "
+"установленные версии (если таковые имеются) каждого из них."
+"<br><br><b>Примечание</b>: Вы можете безопасно работать  в Spyder без "
+"следующих модулей: <b>%s</b> и <b>%s</b>."
 
-#: spyderlib/plugins/editor.py:180
-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 ""
-"<b>Предупреждение:</b><br>Модуль Python <i>rope</i> не установлен на этом "
-"компьютере: подсказки вызова функций, автодополнение кода и переход к "
-"определению будут недоступны."
+#: spyder/widgets/dependencies.py:154
+msgid "Copy to clipboard"
+msgstr "Копировать в буфер обмена"
 
-#: spyderlib/plugins/editor.py:188
-msgid "Automatic insertion of parentheses, braces and brackets"
-msgstr "Автоматическая вставка круглых, фигурных и квадратных скобок"
+#: spyder/widgets/editor.py:348
+msgid "Copy path to clipboard"
+msgstr "Копировать путь в буфер обмена"
 
-#: spyderlib/plugins/editor.py:191
-msgid "Automatic insertion of closing quotes"
-msgstr "Автоматическая вставка закрывающих кавычек"
+#: spyder/widgets/editor.py:352
+msgid "Close all to the right"
+msgstr "Закрыть все правее"
 
-#: spyderlib/plugins/editor.py:193
-msgid "Automatic insertion of colons after 'for', 'if', 'def', etc"
-msgstr "Автоматическая вставка двоеточия после 'for', 'if', 'def' и т.п."
+#: spyder/widgets/editor.py:354
+msgid "Close all but this"
+msgstr "Закрыть все кроме этой"
 
-#: spyderlib/plugins/editor.py:196
-msgid "Automatic indentation after 'else', 'elif', etc."
-msgstr "Автоматическая вставка отступа после 'else', 'elif' и т.п."
+#: spyder/widgets/editor.py:957
+msgid "Temporary file"
+msgstr "Временный файл"
 
-#: spyderlib/plugins/editor.py:198
-msgid "Indentation characters: "
-msgstr "Символы отступа: "
+#: spyder/widgets/editor.py:1052
+msgid "New window"
+msgstr "Новое окно"
 
-#: spyderlib/plugins/editor.py:199
-msgid "2 spaces"
-msgstr "2 пробела"
+#: spyder/widgets/editor.py:1053
+msgid "Create a new editor window"
+msgstr "Создать новое окно редактора"
 
-#: spyderlib/plugins/editor.py:200
-msgid "3 spaces"
-msgstr "3 пробела"
+#: spyder/widgets/editor.py:1056
+msgid "Split vertically"
+msgstr "Разделить по вертикали"
 
-#: spyderlib/plugins/editor.py:201
-msgid "4 spaces"
-msgstr "4 пробела"
+#: spyder/widgets/editor.py:1058
+msgid "Split vertically this editor window"
+msgstr "Разделить окна редактора по вертикали"
 
-#: spyderlib/plugins/editor.py:202
-msgid "5 spaces"
-msgstr "5 пробелов"
+#: spyder/widgets/editor.py:1060
+msgid "Split horizontally"
+msgstr "Разделить по горизонтали"
 
-#: spyderlib/plugins/editor.py:203
-msgid "6 spaces"
-msgstr "6 пробелов"
+#: spyder/widgets/editor.py:1062
+msgid "Split horizontally this editor window"
+msgstr "Разделить окна редактора по горизонтали"
 
-#: spyderlib/plugins/editor.py:204
-msgid "7 spaces"
-msgstr "7 пробелов"
+#: spyder/widgets/editor.py:1064
+msgid "Close this panel"
+msgstr "Закрыть эту панель"
 
-#: spyderlib/plugins/editor.py:205
-msgid "8 spaces"
-msgstr "8 пробелов"
+#: spyder/widgets/editor.py:1221
+msgid "<b>%s</b> has been modified.<br>Do you want to save changes?"
+msgstr "<b>%s</b> был изменён.<br>Хотите сохранить изменения?"
 
-#: spyderlib/plugins/editor.py:206
-msgid "Tabulations"
-msgstr "Отступы"
+#: spyder/widgets/editor.py:1283
+msgid "Save"
+msgstr "Сохранить"
 
-#: spyderlib/plugins/editor.py:207
-msgid "Tab stop width:"
-msgstr "Ширина табуляции:"
+#: spyder/widgets/editor.py:1284
+msgid "<b>Unable to save script '%s'</b><br><br>Error message:<br>%s"
+msgstr ""
+"<b>Не удалось сохранить скрипт '%s'</b><br><br>Сообщение об ошибке:<br>%s"
 
-#: spyderlib/plugins/editor.py:207
-msgid "pixels"
-msgstr "пикселей"
+#: spyder/widgets/editor.py:1518
+msgid ""
+"<b>%s</b> is unavailable (this file may have been removed, moved or renamed "
+"outside Spyder).<br>Do you want to close it?"
+msgstr ""
+"<b>%s</b> недоступен (этот файл мог быть удален, перемещён или переименован "
+"вне Spyder).<br>Хотите его закрыть?"
 
-#: spyderlib/plugins/editor.py:209
-msgid "Tab always indent"
-msgstr "Клавиша Tab - всегда отступ"
+#: spyder/widgets/editor.py:1538
+msgid ""
+"<b>%s</b> has been modified outside Spyder.<br>Do you want to reload it and "
+"lose all your changes?"
+msgstr ""
+"<b>%s</b> был изменён вне Spyder.<br>Хотите перегрузить его и потерять все "
+"изменения?"
 
-#: spyderlib/plugins/editor.py:211
+#: spyder/widgets/editor.py:1634
 msgid ""
-"If enabled, pressing Tab will always indent,\n"
-"even when the cursor is not at the beginning\n"
-"of a line (when this option is enabled, code\n"
-"completion may be triggered using the alternate\n"
-"shortcut: Ctrl+Space)"
+"All changes to <b>%s</b> will be lost.<br>Do you want to revert file from "
+"disk?"
 msgstr ""
-"Если активно, нажатие Tab будет делать отступ\n"
-"всегда, даже когда курсор не в начале строки\n"
-"(когда эта опция включена, автодополнение\n"
-"кода можно будет включить альтернативной\n"
-"комбинацией: Ctrl+Space)"
+"Все изменения для <b>%s</b> были потеряны.<br>Хотите перегрузить файл с "
+"диска?"
 
-#: spyderlib/plugins/editor.py:216
-msgid "Intelligent backspace"
-msgstr "Умная клавиша backspace"
+#: spyder/widgets/editor.py:1774
+msgid "Loading %s..."
+msgstr "Загрузка %s..."
 
-#: spyderlib/plugins/editor.py:218
-msgid "Automatically remove trailing spaces when saving files"
+#: spyder/widgets/editor.py:1784
+msgid ""
+"<b>%s</b> contains mixed end-of-line characters.<br>Spyder will fix this "
+"automatically."
 msgstr ""
-"Автоматически удалять лишние пробелы в конце строк при сохранении файлов"
+"<b>%s</b> содержит смешанные символы конца строки.<br>Spyder исправит это "
+"автоматически."
 
-#: spyderlib/plugins/editor.py:222
-msgid "Analysis"
-msgstr "Анализ"
+#: spyder/widgets/editor.py:2166
+msgid "Close window"
+msgstr "Закрыть окно"
 
-#: spyderlib/plugins/editor.py:224
-msgid "<i>(Refer to the {} page)</i>"
-msgstr "<i>(смотреть стр. {})</i>"
+#: spyder/widgets/editor.py:2168
+msgid "Close this window"
+msgstr "Закрыть это окно"
 
-#: spyderlib/plugins/editor.py:228
-msgid "Real-time code analysis"
-msgstr "Анализ кода в реальном времени"
+#: spyder/widgets/editortools.py:94 spyder/widgets/editortools.py:130
+msgid "Line %s"
+msgstr "Строка %s"
 
-#: spyderlib/plugins/editor.py:230
-msgid ""
-"<p>If enabled, Python source code will be analyzed using pyflakes, lines "
-"containing errors or warnings will be highlighted.</p><p><u>Note</u>: add "
-"<b>analysis:ignore</b> in a comment to ignore code analysis warnings.</p>"
-msgstr ""
-"<p>Если активно, код Python будет анализироваться с помощью pyflakes, строки "
-"с ошибками или предупреждениями будут подсвечены.</p><p><u>Примечание</u>: "
-"добавьте <b>analysis:ignore</b> в комментарий, чтобы игнорировать "
-"предупреждения анализатора кода.</p>"
+#: spyder/widgets/editortools.py:99
+msgid "Class defined at line %s"
+msgstr "Класс определён в строке %s"
 
-#: spyderlib/plugins/editor.py:238
-#, python-format
-msgid "Code analysis requires pyflakes %s+"
-msgstr "Для анализа кода требуется pyflakes %s+"
+#: spyder/widgets/editortools.py:107
+msgid "Method defined at line %s"
+msgstr "Метод определён в строке %s"
 
-#: spyderlib/plugins/editor.py:240
-msgid "Real-time code style analysis"
-msgstr "Анализ стиля кода в реальном времени"
+#: spyder/widgets/editortools.py:117
+msgid "Function defined at line %s"
+msgstr "Функция определена в строке %s"
 
-#: spyderlib/plugins/editor.py:242
-msgid ""
-"<p>If enabled, Python source code will be analyzedusing pep8, lines that are "
-"not following PEP8 style guide will be highlighted.</p><p><u>Note</u>: add "
-"<b>analysis:ignore</b> in a comment to ignore style analysis warnings.</p>"
-msgstr ""
-"<p>Если активно, код Python будет анализироваться с помощью pep8, строки не "
-"соответсвующие стилю PEP8, будут подсвечены.</p><p><u>Примечание</u>: "
-"добавьте <b>analysis:ignore</b> в комментарий, чтобы игнорировать "
-"предупреждения анализатора стиля.</p>"
+#: spyder/widgets/editortools.py:149
+msgid "Cell starts at line %s"
+msgstr "Блок начинается в строке %s"
 
-#: spyderlib/plugins/editor.py:249
-msgid "Code annotations (TODO, FIXME, XXX, HINT, TIP, @todo)"
-msgstr "Аннотации кода (TODO, FIXME, XXX, HINT, TIP, @todo)"
+#: spyder/widgets/editortools.py:202 spyder/widgets/editortools.py:539
+msgid "Go to cursor position"
+msgstr "Перейти к позиции курсора"
 
-#: spyderlib/plugins/editor.py:252
-msgid "Perform analysis when saving file and every"
-msgstr "Выполнять анализ при сохранении файла и каждые"
+#: spyder/widgets/editortools.py:205
+msgid "Show absolute path"
+msgstr "Показать полный путь"
 
-#: spyderlib/plugins/editor.py:256
-msgid "Perform analysis only when saving file"
-msgstr "Выполнять анализ только при сохранении файла"
+#: spyder/widgets/editortools.py:208 spyder/widgets/explorer.py:208
+msgid "Show all files"
+msgstr "Показать все файлы"
 
-#: spyderlib/plugins/editor.py:315
-msgid "End-of-line characters"
-msgstr "Символы конца строки"
+#: spyder/widgets/editortools.py:211
+msgid "Show special comments"
+msgstr "Показать специальные комментарии"
 
-#: spyderlib/plugins/editor.py:316
-msgid ""
-"When opening a text file containing mixed end-of-line characters (this may "
-"raise syntax errors in the consoles on Windows platforms), Spyder may fix "
-"the file automatically."
-msgstr ""
-"Когда открывается текстовый файл, содержащий смешанные символы конца строки "
-"(это может увеличить число синтаксических ошибок в консолях на платформах "
-"Windows), Spyder может исправить файл автоматически."
+#: spyder/widgets/explorer.py:204
+msgid "Edit filename filters..."
+msgstr "Редактировать фильтры имён файлов..."
 
-#: spyderlib/plugins/editor.py:322
-msgid "Fix automatically and show warning message box"
-msgstr "Автоматически исправлять и показывать окно предупреждений"
+#: spyder/widgets/explorer.py:218
+msgid "Edit filename filters"
+msgstr "Редактировать фильтры имён файлов"
 
-#: spyderlib/plugins/editor.py:333 spyderlib/plugins/ipythonconsole.py:459
-#: spyderlib/plugins/variableexplorer.py:41
-#: spyderlib/plugins/externalconsole.py:327
-msgid "Display"
-msgstr "Отображение"
+#: spyder/widgets/explorer.py:219
+msgid "Name filters:"
+msgstr "Фильтры имён:"
 
-#: spyderlib/plugins/editor.py:335
-msgid "Code Introspection/Analysis"
-msgstr "Интроспекция/анализ кода"
+#: spyder/widgets/explorer.py:238
+msgid "File..."
+msgstr "Файл..."
 
-#: spyderlib/plugins/editor.py:338 spyderlib/plugins/externalconsole.py:331
-msgid "Advanced settings"
-msgstr "Дополнительные настройки"
+#: spyder/widgets/explorer.py:242
+msgid "Module..."
+msgstr "Модуль..."
 
-#: spyderlib/plugins/editor.py:621
-msgid "Show/hide project explorer"
-msgstr "Показать/скрыть менеджер проектов"
+#: spyder/widgets/explorer.py:246
+msgid "Folder..."
+msgstr "Каталог..."
 
-#: spyderlib/plugins/editor.py:629
-msgid "&New file..."
-msgstr "&Новый файл"
+#: spyder/widgets/explorer.py:250
+msgid "Package..."
+msgstr "Пакет..."
 
-#: spyderlib/plugins/editor.py:637
-msgid "&Open..."
-msgstr "&Открыть"
+#: spyder/widgets/explorer.py:271
+#: spyder/widgets/variableexplorer/collectionseditor.py:650
+msgid "Edit"
+msgstr "Редактировать"
 
-#: spyderlib/plugins/editor.py:638 spyderlib/plugins/editor.py:1683
-#: spyderlib/plugins/workingdirectory.py:69
-msgid "Open file"
-msgstr "Открыть файл"
+#: spyder/widgets/explorer.py:273
+msgid "Move..."
+msgstr "Перемещение..."
 
-#: spyderlib/plugins/editor.py:647
-msgid "Fast switch between files"
-msgstr "Быстрое переключение между файлами"
+#: spyder/widgets/explorer.py:276
+msgid "Delete..."
+msgstr "Удаление..."
 
-#: spyderlib/plugins/editor.py:652
-msgid "&Revert"
-msgstr "За&грузить заново"
+#: spyder/widgets/explorer.py:279
+msgid "Rename..."
+msgstr "Переименование..."
 
-#: spyderlib/plugins/editor.py:653
-msgid "Revert file from disk"
-msgstr "Загрузить файл с диска"
+#: spyder/widgets/explorer.py:282
+msgid "Open"
+msgstr "Открыть"
 
-#: spyderlib/plugins/editor.py:656
-msgid "&Save"
-msgstr "&Сохранить"
+#: spyder/widgets/explorer.py:283 spyder/widgets/sourcecode/codeeditor.py:2490
+msgid "Convert to Python script"
+msgstr "Сохранить как скрипт Python"
 
-#: spyderlib/plugins/editor.py:664
-msgid "Sav&e all"
-msgstr "Сохранить &все"
+# Варинаты:
+# - оставить без перевода
+# - использовать кальку: "коммитить"
+# - воспользоваться переводом из источников про Git (например, книга ProGit): "зафиксирвать изменения/индекс".
+#: spyder/widgets/explorer.py:317
+msgid "Commit"
+msgstr "Зафиксировать"
 
-#: spyderlib/plugins/editor.py:665
-msgid "Save all files"
-msgstr "Сохранить все файлы"
+#: spyder/widgets/explorer.py:320
+msgid "Browse repository"
+msgstr "Просмотр репозитария"
 
-#: spyderlib/plugins/editor.py:673
-msgid "Save &as..."
-msgstr "Сохранить &как..."
+#: spyder/widgets/explorer.py:331
+msgid "Open command prompt here"
+msgstr "Открыть командную строку здесь"
 
-#: spyderlib/plugins/editor.py:674
-msgid "Save current file as..."
-msgstr "Сохранить текущий файл как..."
+#: spyder/widgets/explorer.py:333
+msgid "Open terminal here"
+msgstr "Открыть терминал здесь"
 
-#: spyderlib/plugins/editor.py:678 spyderlib/plugins/editor.py:679
-msgid "Print preview..."
-msgstr "Предварительный просмотр..."
+#: spyder/widgets/explorer.py:338
+msgid "Open Python console here"
+msgstr "Открыть консоль Python здесь"
 
-#: spyderlib/plugins/editor.py:680
-msgid "&Print..."
-msgstr "&Печать"
+#: spyder/widgets/explorer.py:352
+msgid "New"
+msgstr "Новый"
 
-#: spyderlib/plugins/editor.py:681
-msgid "Print current file..."
-msgstr "Печатать текущий файл"
+#: spyder/widgets/explorer.py:360
+msgid "Import"
+msgstr "Импортировать"
 
-#: spyderlib/plugins/editor.py:684
-msgid "&Close"
-msgstr "&Закрыть"
+#: spyder/widgets/explorer.py:511
+msgid "Do you really want to delete <b>%s</b>?"
+msgstr "Вы точно хотите удалить <b>%s</b>?"
 
-#: spyderlib/plugins/editor.py:685
-msgid "Close current file"
-msgstr "Закрыть текущий файл"
+#: spyder/widgets/explorer.py:529
+msgid "delete"
+msgstr "удалить"
 
-#: spyderlib/plugins/editor.py:688
-msgid "C&lose all"
-msgstr "Закрыть вс&е"
+#: spyder/widgets/explorer.py:530 spyder/widgets/projects/explorer.py:147
+msgid "Project Explorer"
+msgstr "Менеджер проектов"
 
-#: spyderlib/plugins/editor.py:689
-msgid "Close all opened files"
-msgstr "Закрыть все открытые файлы"
+#: spyder/widgets/explorer.py:531 spyder/widgets/projects/explorer.py:148
+msgid "<b>Unable to %s <i>%s</i></b><br><br>Error message:<br>%s"
+msgstr "<b>Невозможно %s <i>%s</i></b><br><br>Сообщение об ошибке:<br>%s"
 
-#: spyderlib/plugins/editor.py:696
-msgid "Set/Clear breakpoint"
-msgstr "Поставить/Убрать точку останова"
+#: spyder/widgets/explorer.py:554 spyder/widgets/sourcecode/codeeditor.py:2007
+msgid "Conversion error"
+msgstr "Ошибка преобразования"
 
-#: spyderlib/plugins/editor.py:703
-msgid "Set/Edit conditional breakpoint"
-msgstr "Поставить/Редактировать условную точку останова"
+#: spyder/widgets/explorer.py:555 spyder/widgets/sourcecode/codeeditor.py:2008
+msgid ""
+"It was not possible to convert this notebook. The error is:\n"
+"\n"
+msgstr ""
+"Не удалось сконвертировать этот блокнот. Ошибка:\n"
+"\n"
 
-#: spyderlib/plugins/editor.py:710
-msgid "Clear breakpoints in all files"
-msgstr "Очистить точки останова во всех файлах"
+#: spyder/widgets/explorer.py:572 spyder/widgets/explorer.py:580
+#: spyder/widgets/explorer.py:591
+#: spyder/widgets/variableexplorer/collectionseditor.py:683
+#: spyder/widgets/variableexplorer/collectionseditor.py:924
+msgid "Rename"
+msgstr "Переименовать"
 
-#: spyderlib/plugins/editor.py:712
-msgid "Breakpoints"
-msgstr "Точки останова"
+#: spyder/widgets/explorer.py:573
+msgid "New name:"
+msgstr "Новое имя:"
 
-#: spyderlib/plugins/editor.py:716
-msgid "Debug with winpdb"
-msgstr "Отладка с помощью winpdb"
+#: spyder/widgets/explorer.py:581
+msgid ""
+"Do you really want to rename <b>%s</b> and overwrite the existing file <b>"
+"%s</b>?"
+msgstr ""
+"Вы действительно хотите переименовать <b>%s</b> или перезаписать "
+"существующий файл <b>%s</b>?"
+
+#: spyder/widgets/explorer.py:592
+msgid "<b>Unable to rename file <i>%s</i></b><br><br>Error message:<br>%s"
+msgstr ""
+"<b>Невозможно переименовать файл <i>%s</i></b><br><br>Сообщение об ошибке:"
+"<br>%s"
+
+#: spyder/widgets/explorer.py:628
+msgid "<b>Unable to move <i>%s</i></b><br><br>Error message:<br>%s"
+msgstr ""
+"<b>Невозможно переместить файл <i>%s</i></b><br><br>Сообщение об ошибке:<br>"
+"%s"
+
+#: spyder/widgets/explorer.py:646
+msgid "<b>Unable to create folder <i>%s</i></b><br><br>Error message:<br>%s"
+msgstr ""
+"<b>Невозможно создать каталог <i>%s</i></b><br><br>Сообщение об ошибке:<br>%s"
 
-#: spyderlib/plugins/editor.py:724
-msgid "Debug file"
-msgstr "Отладка файла"
+#: spyder/widgets/explorer.py:659 spyder/widgets/explorer.py:693
+msgid "<b>Unable to create file <i>%s</i></b><br><br>Error message:<br>%s"
+msgstr ""
+"<b>Невозможно создать файл <i>%s</i></b><br><br>Сообщение об ошибке:<br>%s"
 
-#: spyderlib/plugins/editor.py:728
-msgid "Step"
-msgstr "Шаг"
+#: spyder/widgets/explorer.py:667
+msgid "New folder"
+msgstr "Новый каталог"
 
-#: spyderlib/plugins/editor.py:729
-msgid "Run current line"
-msgstr "Выполнить текущую строку"
+#: spyder/widgets/explorer.py:668
+msgid "Folder name:"
+msgstr "Имя каталога:"
 
-#: spyderlib/plugins/editor.py:735
-msgid "Continue"
-msgstr "Продолжить"
+#: spyder/widgets/explorer.py:673
+msgid "New package"
+msgstr "Новый пакет"
 
-#: spyderlib/plugins/editor.py:736
-msgid "Continue execution until next breakpoint"
-msgstr "Продолжить выполнение до следующей точки останова"
+#: spyder/widgets/explorer.py:674
+msgid "Package name:"
+msgstr "Имя пакета:"
 
-#: spyderlib/plugins/editor.py:743
-msgid "Step Into"
-msgstr "Шаг в функцию"
+#: spyder/widgets/explorer.py:714
+msgid "New module"
+msgstr "Новый модуль"
 
-#: spyderlib/plugins/editor.py:744
-msgid "Step into function or method of current line"
-msgstr "Войти в функцию или метод текущей линии"
+#: spyder/widgets/explorer.py:729
+msgid ""
+"For %s support, please install one of the<br/> following tools:<br/><br/>  %s"
+msgstr ""
+"Для поддержки %s, установите, пожалуйста,<br/> один из следующих "
+"инструментов:<br/><br/>  %s"
 
-#: spyderlib/plugins/editor.py:751
-msgid "Step Return"
-msgstr "Шаг из функции"
+#: spyder/widgets/explorer.py:733
+msgid "<b>Unable to find external program.</b><br><br>%s"
+msgstr "<b>Не удалось найти внешнюю программу.</b><br><br>%s"
 
-#: spyderlib/plugins/editor.py:752
-msgid "Run until current function or method returns"
-msgstr "Выполнять пока функция или метод не завершатся"
+#: spyder/widgets/explorer.py:948
+msgid "Show current directory only"
+msgstr "Показывать только текущий каталог"
 
-#: spyderlib/plugins/editor.py:759
-msgid "Exit"
-msgstr "Выход"
+#: spyder/widgets/explorer.py:1046
+msgid "You don't have the right permissions to open this directory"
+msgstr "У Вас нет прав на открытие этой директории"
 
-#: spyderlib/plugins/editor.py:760
-msgid "Exit Debug"
-msgstr "Завершить отладку"
+#: spyder/widgets/explorer.py:1076
+#: spyder/widgets/variableexplorer/importwizard.py:525
+msgid "Previous"
+msgstr "Предыдущая"
 
-#: spyderlib/plugins/editor.py:771
-msgid "Debugging control"
-msgstr "Управление отладкой"
+#: spyder/widgets/explorer.py:1082
+msgid "Parent"
+msgstr "Родительская"
 
-#: spyderlib/plugins/editor.py:776
-msgid "Run file"
-msgstr "Выполнить файл"
+#: spyder/widgets/externalshell/baseshell.py:129
+msgid "Run again this program"
+msgstr "Запустить эту программу снова"
 
-#: spyderlib/plugins/editor.py:781
-msgid "&Configure..."
-msgstr "&Настроить"
+#: spyder/widgets/externalshell/baseshell.py:132
+msgid "Kill"
+msgstr "Убить"
 
-#: spyderlib/plugins/editor.py:791
-msgid "Re-run &last script"
-msgstr "Перезапустить последний скрипт"
+#: spyder/widgets/externalshell/baseshell.py:134
+msgid "Kills the current process, causing it to exit immediately"
+msgstr "Убивает текущий процесс, заставляя его немедленно завершиться"
 
-#: spyderlib/plugins/editor.py:793
-msgid "Run again last file"
-msgstr "Выполнить снова последний файл"
+#: spyder/widgets/externalshell/baseshell.py:206
+msgid "<span style='color: #44AA44'><b>Running...</b></span>"
+msgstr "<span style='color: #44AA44'><b>Запуск...</b></span>"
 
-#: spyderlib/plugins/editor.py:803
-msgid "Run selection or current line"
-msgstr "Выполнить выделенное или текущую строку"
+#: spyder/widgets/externalshell/baseshell.py:213
+msgid "Terminated."
+msgstr "Прекращено."
 
-#: spyderlib/plugins/editor.py:819
-#, python-format
-msgid ""
-"Run current cell (Ctrl+Enter)\n"
-"[Use #%% to create cells]"
-msgstr ""
-"Выполнить текущий блок (Ctrl+Enter)\n"
-"[Используйте #%% для создания блоков]"
+#: spyder/widgets/externalshell/baseshell.py:238
+#: spyder/widgets/ipythonconsole/help.py:125 spyder/widgets/mixins.py:661
+msgid "Arguments"
+msgstr "Аргументы"
 
-#: spyderlib/plugins/editor.py:827
-msgid "Run current cell and go to the next one (Shift+Enter)"
-msgstr "Выполнить текущий блок и перейти к следующему (Shift+Enter)"
+#: spyder/widgets/externalshell/baseshell.py:239
+msgid "Command line arguments:"
+msgstr "Аргументы командной строки:"
 
-#: spyderlib/plugins/editor.py:833
-msgid "Show todo list"
-msgstr "Показать список задач"
+#: spyder/widgets/externalshell/pythonshell.py:277
+msgid "Variables"
+msgstr "Значения"
 
-#: spyderlib/plugins/editor.py:834
-msgid "Show TODO/FIXME/XXX/HINT/TIP/@todo comments list"
-msgstr "Показать список комментариев TODO/FIXME/XXX/HINT/TIP/@todo"
+#: spyder/widgets/externalshell/pythonshell.py:278
+msgid "Show/hide global variables explorer"
+msgstr "Показать/скрыть менеджер глобальных переменных"
 
-#: spyderlib/plugins/editor.py:841
-msgid "Show warning/error list"
-msgstr "Показать список предупреждений/ошибок"
+#: spyder/widgets/externalshell/pythonshell.py:282
+msgid "Terminate"
+msgstr "Прекратить"
 
-#: spyderlib/plugins/editor.py:842
-msgid "Show code analysis warnings/errors"
-msgstr "Показать предупреждения/ошибки анализа кода"
+#: spyder/widgets/externalshell/pythonshell.py:283
+msgid ""
+"Attempts to stop the process. The process\n"
+"may not exit as a result of clicking this\n"
+"button (it is given the chance to prompt\n"
+"the user for any unsaved files, etc)."
+msgstr ""
+"Попытка остановить процесс. Процесс\n"
+"имеет право не завершится после нажатия этой\n"
+"кнопки (например, чтобы спросить у пользователя\n"
+"о несохранённых файлах и т.п.)."
 
-#: spyderlib/plugins/editor.py:848
-msgid "Previous warning/error"
-msgstr "Предыдущее предупреждение/ошибка"
+#: spyder/widgets/externalshell/pythonshell.py:296
+msgid "Interact"
+msgstr "Интерактивный"
 
-#: spyderlib/plugins/editor.py:849
-msgid "Go to previous code analysis warning/error"
-msgstr "Перейти к предыдущему предупреждению/ошибке анализа кода"
+#: spyder/widgets/externalshell/pythonshell.py:298
+msgid "Debug"
+msgstr "Отладка"
 
-#: spyderlib/plugins/editor.py:852
-msgid "Next warning/error"
-msgstr "Следующее предупреждение/ошибка"
+#: spyder/widgets/externalshell/pythonshell.py:300
+#: spyder/widgets/externalshell/pythonshell.py:366
+msgid "Arguments..."
+msgstr "Аргументы..."
 
-#: spyderlib/plugins/editor.py:853
-msgid "Go to next code analysis warning/error"
-msgstr "Перейти к следующему предупреждению/ошибке анализа кода"
+#: spyder/widgets/externalshell/pythonshell.py:302
+msgid "Post Mortem Debug"
+msgstr "Отладка в случае падения"
 
-#: spyderlib/plugins/editor.py:857
-msgid "Last edit location"
-msgstr "Последнее место редактирования"
+#: spyder/widgets/externalshell/pythonshell.py:308
+msgid "Working directory"
+msgstr "Рабочий каталог"
 
-#: spyderlib/plugins/editor.py:858
-msgid "Go to last edit location"
-msgstr "Перейти к последнему месту редактирования"
+#: spyder/widgets/externalshell/pythonshell.py:310
+msgid "Set current working directory"
+msgstr "Установить текущий рабочий каталог"
 
-#: spyderlib/plugins/editor.py:864
-msgid "Previous cursor position"
-msgstr "Предыдущая позиция курсора"
+#: spyder/widgets/externalshell/pythonshell.py:312
+msgid "Environment variables"
+msgstr "Переменные среды"
 
-#: spyderlib/plugins/editor.py:865
-msgid "Go to previous cursor position"
-msgstr "Перейти к предыдущей позиции курсора"
+#: spyder/widgets/externalshell/pythonshell.py:316
+msgid "Show sys.path contents"
+msgstr "Показать содержимое sys.path"
 
-#: spyderlib/plugins/editor.py:871
-msgid "Next cursor position"
-msgstr "Следующая позиция курсора"
+#: spyder/widgets/externalshell/pythonshell.py:362
+msgid "Arguments: %s"
+msgstr "Аргументы: %s"
 
-#: spyderlib/plugins/editor.py:872
-msgid "Go to next cursor position"
-msgstr "Перейти к следующей позиции курсора"
+#: spyder/widgets/externalshell/pythonshell.py:364
+msgid "No argument"
+msgstr "Нет аргументов"
 
-#: spyderlib/plugins/editor.py:880
-msgid "Comment current line or selection"
-msgstr "Комментировать текущую строку/выделение"
+#: spyder/widgets/externalshell/pythonshell.py:534
+msgid "A Python console failed to start!"
+msgstr "Консоль Python не удалось запустить!"
 
-#: spyderlib/plugins/editor.py:884
-msgid "Add &block comment"
-msgstr "Добавить &блок комментариев"
+#: spyder/widgets/externalshell/systemshell.py:106
+msgid "Process failed to start"
+msgstr "Процесс не удалось запустить"
 
-#: spyderlib/plugins/editor.py:885
-msgid "Add block comment around current line or selection"
-msgstr "Добавить блок комментариев вокруг текущей строки/выделения"
+#: spyder/widgets/fileswitcher.py:109
+msgid "unsaved file"
+msgstr "несохранённый файл"
 
-#: spyderlib/plugins/editor.py:891
-msgid "R&emove block comment"
-msgstr "У&далить блок комментариев"
+#: spyder/widgets/fileswitcher.py:230
+msgid ""
+"Press <b>Enter</b> to switch files or <b>Esc</b> to cancel.<br><br>Type to "
+"filter filenames.<br><br>Use <b>:number</b> to go to a line, e.g. "
+"<b><code>main:42</code></b><br>Use <b>@symbol_text</b> to go to a symbol, e."
+"g. <b><code>@init</code></b><br><br> Press <b>Ctrl+W</b> to close current "
+"tab.<br>"
+msgstr ""
+"Нажмите <b>Enter</b> для перехода к файлу или <b>Esc</b> для отмены."
+"<br><br>Введите текст для фильтрации имен файлов.<br><br>Используйте <b>:"
+"номер</b> для перехода к строке, напр. <b><code>main:42</code></"
+"b><br>Используйте <b>@имя</b> для перехода к идентификатору, напр. "
+"<b><code>@init</code></b><br><br> Нажмите <b>Ctrl+W</b> для закрытия текущей "
+"вкладки."
 
-#: spyderlib/plugins/editor.py:892
-msgid "Remove comment block around current line or selection"
-msgstr "Убрать блок комментариев вокруг текущей строки/выделения"
+#: spyder/widgets/fileswitcher.py:508
+msgid "lines"
+msgstr " строк"
 
-#: spyderlib/plugins/editor.py:903
-msgid "Indent"
-msgstr "Добавить отступ"
+#: spyder/widgets/findinfiles.py:158
+msgid "Unexpected error: see internal console"
+msgstr "Неожиданная ошибка: смотрите во встроенной консоли"
 
-#: spyderlib/plugins/editor.py:904
-msgid "Indent current line or selection"
-msgstr "Добавить отступ к текущей строке или выделению"
+#: spyder/widgets/findinfiles.py:209 spyder/widgets/findinfiles.py:233
+#: spyder/widgets/findinfiles.py:280
+msgid "invalid regular expression"
+msgstr "неверное регулярное выражение"
 
-#: spyderlib/plugins/editor.py:907
-msgid "Unindent"
-msgstr "Убрать отступ"
+#: spyder/widgets/findinfiles.py:278
+msgid "permission denied errors were encountered"
+msgstr "обнаружены ошибки отказа в доступе"
 
-#: spyderlib/plugins/editor.py:908
-msgid "Unindent current line or selection"
-msgstr "Убрать отступ у текущей строки/выделения"
+#: spyder/widgets/findinfiles.py:315
+msgid "Search pattern"
+msgstr "Найти по шаблону"
 
-#: spyderlib/plugins/editor.py:913
-msgid "Carriage return and line feed (Windows)"
-msgstr "Возврат каретки и перевод строки (Windows)"
+#: spyder/widgets/findinfiles.py:318 spyder/widgets/findinfiles.py:352
+#: spyder/widgets/findinfiles.py:364 spyder/widgets/findreplace.py:81
+msgid "Regular expression"
+msgstr "Регулярное выражение"
 
-#: spyderlib/plugins/editor.py:916
-msgid "Line feed (UNIX)"
-msgstr "Перевод строки (UNIX)"
+#: spyder/widgets/findinfiles.py:327
+msgid "Search"
+msgstr "Найти"
 
-#: spyderlib/plugins/editor.py:919
-msgid "Carriage return (Mac)"
-msgstr "Возврат каретки (Mac)"
+#: spyder/widgets/findinfiles.py:330
+msgid "Start search"
+msgstr "Начать поиск"
 
-#: spyderlib/plugins/editor.py:925
-msgid "Convert end-of-line characters"
-msgstr "Преобразовать символы конца строки"
+#: spyder/widgets/findinfiles.py:336
+msgid "Stop search"
+msgstr "Остановить поиск"
 
-#: spyderlib/plugins/editor.py:929
-msgid "Remove trailing spaces"
-msgstr "Удалить лишние пробелы в конце строк"
+#: spyder/widgets/findinfiles.py:346
+msgid "Included filenames pattern"
+msgstr "Шаблон имён влючаемых файлов"
 
-#: spyderlib/plugins/editor.py:933
-msgid "Fix indentation"
-msgstr "Исправить отступы"
+#: spyder/widgets/findinfiles.py:355
+msgid "Include:"
+msgstr "Включить:"
 
-#: spyderlib/plugins/editor.py:934
-msgid "Replace tab characters by space characters"
-msgstr "Заменить символы табуляции пробелами"
+#: spyder/widgets/findinfiles.py:358
+msgid "Excluded filenames pattern"
+msgstr "Шаблон имён исключаемых файлов"
 
-#: spyderlib/plugins/editor.py:937
-msgid "Go to line..."
-msgstr "Перейти к строке..."
+#: spyder/widgets/findinfiles.py:367
+msgid "Exclude:"
+msgstr "Исключить:"
 
-#: spyderlib/plugins/editor.py:945
-msgid "Set console working directory"
-msgstr "Установить рабочий каталог консоли"
+#: spyder/widgets/findinfiles.py:377
+msgid "PYTHONPATH"
+msgstr "PYTHONPATH"
 
-#: spyderlib/plugins/editor.py:947
+#: spyder/widgets/findinfiles.py:379
 msgid ""
-"Set current console (and file explorer) working directory to current script "
-"directory"
+"Search in all directories listed in sys.path which are outside the Python "
+"installation directory"
 msgstr ""
-"Установить каталог текущего скрипта как рабочий для текущей консоли (и "
-"файлового менеджера) "
-
-#: spyderlib/plugins/editor.py:952
-msgid "Maximum number of recent files..."
-msgstr "Максимальное количество недавних файлов..."
+"Искать во всех каталогах, указанных в sys.path, которые отсутствуют в "
+"установочном каталоге Python"
 
-#: spyderlib/plugins/editor.py:955
-msgid "Clear this list"
-msgstr "Очистить этот список"
+#: spyder/widgets/findinfiles.py:382
+msgid "Hg repository"
+msgstr "Hg-репозиторий"
 
-#: spyderlib/plugins/editor.py:955
-msgid "Clear recent files list"
-msgstr "Очистить список недавних файлов"
+#: spyder/widgets/findinfiles.py:385
+msgid "Search in current directory hg repository"
+msgstr "Поиск в текущем каталоге hg-репозитория"
 
-#: spyderlib/plugins/editor.py:957
-msgid "Open &recent"
-msgstr "Открыть не&давние"
+#: spyder/widgets/findinfiles.py:386
+msgid "Here:"
+msgstr "Здесь:"
 
-#: spyderlib/plugins/editor.py:1263
-msgid "?"
-msgstr "?"
+#: spyder/widgets/findinfiles.py:390
+msgid "Search recursively in this directory"
+msgstr "Искать рекурсивно в каталоге"
 
-#: spyderlib/plugins/editor.py:1490
-msgid "Spyder Editor"
-msgstr "Редактор Spyder"
+#: spyder/widgets/findinfiles.py:395
+msgid "Browse a search directory"
+msgstr "Выбрать каталог поиска"
 
-#: spyderlib/plugins/editor.py:1491
-msgid "This is a temporary script file."
-msgstr "Это временный скриптовый файл."
+#: spyder/widgets/findinfiles.py:425
+msgid "Hide advanced options"
+msgstr "Скрыть дополнительные опции"
 
-#: spyderlib/plugins/editor.py:1559
-msgid "untitled"
-msgstr "untitled"
+#: spyder/widgets/findinfiles.py:428
+msgid "Show advanced options"
+msgstr "Показать дополнительные опции"
 
-#: spyderlib/plugins/editor.py:1637
-msgid "Maximum number of recent files"
-msgstr "Максимальное количество недавних файлов"
+#: spyder/widgets/findinfiles.py:569
+msgid "Search canceled"
+msgstr "Поиск отменён"
 
-#: spyderlib/plugins/editor.py:1768
-msgid "Printing..."
-msgstr "Печать..."
+#: spyder/widgets/findinfiles.py:573
+msgid "String not found"
+msgstr "Строка не найдена"
 
-#: spyderlib/plugins/help.py:42
-msgid "Show help for objects in the Editor and Consoles in a dedicated pane"
-msgstr ""
-"Показывать справку об объектах в Редакторе и Консолях в специальной панели"
+#: spyder/widgets/findinfiles.py:575
+msgid "matches in"
+msgstr "совпадений в"
 
-#: spyderlib/plugins/help.py:115
-msgid "Automatic connections"
-msgstr "Автоматические соединения"
+#: spyder/widgets/findinfiles.py:576
+msgid "file"
+msgstr "файл"
 
-#: spyderlib/plugins/help.py:116
-msgid ""
-"This pane can automatically show an object's help information after a left "
-"parenthesis is written next to it. Below you can decide to which plugin you "
-"want to connect it to turn on this feature."
-msgstr ""
-"Инспектор объектов может автоматически показывать справочную информацию по "
-"объекту после ввода открывающей круглой скобки вслед за ним. Ниже вы можете "
-"решить, какой модуль вы хотите подключить, чтобы включить эту возможность."
+#: spyder/widgets/findinfiles.py:584
+msgid "interrupted"
+msgstr "прервано"
 
-#: spyderlib/plugins/help.py:128
-msgid ""
-"This feature requires the Rope or Jedi libraries.\n"
-"It seems you don't have either installed."
-msgstr ""
-"Эта функция требует библиотеки Rope или Jedi.\n"
-"Похоже, Вы их не установили."
+#: spyder/widgets/findreplace.py:63
+msgid "Search string"
+msgstr "Найти строку"
 
-#: spyderlib/plugins/help.py:131
-msgid "Python Console"
-msgstr "Консоль Python"
+#: spyder/widgets/findreplace.py:87
+msgid "Case Sensitive"
+msgstr "С учетом регистра"
 
-#: spyderlib/plugins/help.py:133
-msgid "IPython Console"
-msgstr "Консоль IPython"
+#: spyder/widgets/findreplace.py:93
+msgid "Whole words"
+msgstr "Слова целиком"
 
-#: spyderlib/plugins/help.py:145
-msgid "Additional features"
-msgstr "Дополнительные возможности"
+#: spyder/widgets/findreplace.py:99
+msgid "Highlight matches"
+msgstr "Подсвечивать найденные"
 
-#: spyderlib/plugins/help.py:146
-msgid "Render mathematical equations"
-msgstr "Отрисовывать математические выражения"
+#: spyder/widgets/findreplace.py:113
+msgid "Replace with:"
+msgstr "Заменить на:"
 
-#: spyderlib/plugins/help.py:152
-msgid "This feature requires Sphinx 1.1 or superior."
-msgstr "Эта возможность требует Sphinx 1.1 или выше."
+#: spyder/widgets/findreplace.py:115
+msgid "Replace string"
+msgstr "Заменить строку"
 
-#: spyderlib/plugins/help.py:153
-#, python-format
-msgid "Sphinx %s is currently installed."
-msgstr "Sphinx %s на данный момент установлено."
+#: spyder/widgets/findreplace.py:118
+msgid "Replace/find"
+msgstr "Заменить/найти"
 
-#: spyderlib/plugins/help.py:351
-msgid "No further documentation available"
-msgstr "Дополнительная документация отсутствует"
+#: spyder/widgets/findreplace.py:125
+msgid "Replace all"
+msgstr "Заменить все"
 
-#: spyderlib/plugins/help.py:384
-msgid "Source"
-msgstr "Исходник"
+#: spyder/widgets/internalshell.py:262
+msgid "Help..."
+msgstr "Справка..."
 
-#: spyderlib/plugins/help.py:413
-msgid "Plain Text"
-msgstr "Простой текст"
+#: spyder/widgets/internalshell.py:279
+msgid "Shell special commands:"
+msgstr "Специальные команды оболочки:"
 
-#: spyderlib/plugins/help.py:417
-msgid "Show Source"
-msgstr "Показать исходник"
+#: spyder/widgets/internalshell.py:280
+msgid "Internal editor:"
+msgstr "Встроенный редактор:"
 
-#: spyderlib/plugins/help.py:421
-msgid "Rich Text"
-msgstr "Форматированный текст"
+#: spyder/widgets/internalshell.py:281
+msgid "External editor:"
+msgstr "Внешний редактор:"
 
-#: spyderlib/plugins/help.py:431
-msgid "Automatic import"
-msgstr "Автоматический импорт"
+#: spyder/widgets/internalshell.py:282
+msgid "Run script:"
+msgstr "Выполнить скрипт:"
 
-#: spyderlib/plugins/help.py:700
-#, python-format
-msgid ""
-"Here you can get help of any object by pressing %s in front of it, either on "
-"the Editor or the Console.%sHelp can also be shown automatically after "
-"writing a left parenthesis next to an object. You can activate this behavior "
-"in %s."
-msgstr ""
-"Здесь Вы можете получить справку по любому объекту, наведя текстовый курсор "
-"на него и нажав %s, как в Редакторе, так и в Консоли.%sСправка также может "
-"автоматически показываться при вводе открывающей круглой скобки после "
-"объекта. Вы можете активировать эту возможность в %s."
+#: spyder/widgets/internalshell.py:283
+msgid "Remove references:"
+msgstr "Удалить ссылки:"
 
-#: spyderlib/plugins/help.py:706
-msgid "Preferences > Help"
-msgstr "Параметры > Справка"
+#: spyder/widgets/internalshell.py:284
+msgid "System commands:"
+msgstr "Системные команды:"
 
-#: spyderlib/plugins/help.py:713
-msgid "Usage"
-msgstr "Использование"
+#: spyder/widgets/internalshell.py:285
+msgid "Python help:"
+msgstr "Справка Python:"
 
-#: spyderlib/plugins/help.py:714
-msgid "New to Spyder? Read our"
-msgstr "Используете Spyder впервые? Прочитайте наше"
+#: spyder/widgets/internalshell.py:286
+msgid "GUI-based editor:"
+msgstr "Визуальный редактор:"
 
-#: spyderlib/plugins/help.py:715
-msgid "tutorial"
-msgstr "руководство"
+#: spyder/widgets/ipythonconsole/client.py:187
+msgid "An error ocurred while starting the kernel"
+msgstr "При запуске ядра произошла ошибка"
 
-#: spyderlib/plugins/help.py:722
-msgid ""
-"Please consider installing Sphinx to get documentation rendered in rich text."
-msgstr ""
-"Пожалуйста, подумайте об установке Sphinx для просмотра документации в "
-"форматированном виде."
+#: spyder/widgets/ipythonconsole/client.py:218
+msgid "Restart kernel"
+msgstr "Перезапустить ядро"
 
-#: spyderlib/plugins/help.py:895
-msgid "Unlock"
-msgstr "Разблокировать"
+#: spyder/widgets/ipythonconsole/client.py:238
+msgid "Stop the current command"
+msgstr "Остановить текущую команду"
 
-#: spyderlib/plugins/help.py:895
-msgid "Lock"
-msgstr "Заблокировать"
+#: spyder/widgets/ipythonconsole/client.py:261
+msgid "Inspect current object"
+msgstr "Проверить текущий объект"
 
-#: spyderlib/plugins/help.py:941
-#, python-format
-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 ""
-"Следующая ошибка появляется при вызове <b>Sphinx %s</b>. <br>Несовместимая "
-"версия Sphinx или ошибка декодирования строки документации.<br><br>Сообщение "
-"об ошибке:<br>%s"
+#: spyder/widgets/ipythonconsole/client.py:266
+msgid "Clear line or block"
+msgstr "Очистить строку или блок"
 
-#: spyderlib/plugins/help.py:985
-msgid "No source code available."
-msgstr "Исходный код не доступен."
+#: spyder/widgets/ipythonconsole/client.py:270
+msgid "Reset namespace"
+msgstr "Перезагрузить пространство имён"
 
-#: spyderlib/plugins/findinfiles.py:135
-msgid "&Find in files"
-msgstr "Найти в &файлах"
+#: spyder/widgets/ipythonconsole/client.py:273
+msgid "Clear console"
+msgstr "Очистить консоль"
 
-#: spyderlib/plugins/findinfiles.py:138
-msgid "Search text in multiple files"
-msgstr "Искать текст в нескольких файлах"
+#: spyder/widgets/ipythonconsole/client.py:314
+msgid "Are you sure you want to restart the kernel?"
+msgstr "Вы уверены, что хотите перезапустить ядро?"
 
-#: spyderlib/plugins/ipythonconsole.py:62
-msgid "Symbolic mathematics in the IPython Console"
-msgstr "Символьная математика в консоли Python"
+#: spyder/widgets/ipythonconsole/client.py:316
+msgid "Restart kernel?"
+msgstr "Перезапустить ядро?"
 
-#: spyderlib/plugins/ipythonconsole.py:111
-#, python-format
+#: spyder/widgets/ipythonconsole/client.py:325
+msgid "Error restarting kernel: %s\n"
+msgstr "Ошибка при перезапуске ядра: %s\n"
+
+#: spyder/widgets/ipythonconsole/client.py:329
 msgid ""
-"The authenticity of host <b>%s</b> can't be established. Are you sure you "
-"want to continue connecting?"
+"<br>Restarting kernel...\n"
+"<hr><br>"
 msgstr ""
-"Подлинность хоста <b>%s</b> не может быть установлена. Вы уверены, что "
-"хотите продолжить соединение?"
-
-#: spyderlib/plugins/ipythonconsole.py:123
-msgid "The authenticity of the host can't be established"
-msgstr "Подлинность хоста не может быть установлена"
-
-#: spyderlib/plugins/ipythonconsole.py:130
-#, python-format
-msgid "Tunnel '%s' failed to start"
-msgstr "Туннель '%s' не удалось запустить"
+"<br>Перезапуск ядра...\n"
+"<hr><br>"
 
-#: spyderlib/plugins/ipythonconsole.py:135
-msgid "Could not connect to remote host"
-msgstr "Не удалось подключиться к удалённому хосту"
+#: spyder/widgets/ipythonconsole/client.py:334
+msgid "Cannot restart a kernel not started by Spyder\n"
+msgstr "Не удается перезапусть ядро, запущенное не из Spyder\n"
 
-#: spyderlib/plugins/ipythonconsole.py:151
-#: spyderlib/plugins/ipythonconsole.py:691
-msgid "IPython console"
-msgstr "Консоль IPython"
+#: spyder/widgets/ipythonconsole/client.py:374
+msgid "Changing backend to Qt for Mayavi"
+msgstr "Изменить бэкенд для Mayavi на Qt"
 
-#: spyderlib/plugins/ipythonconsole.py:159
-msgid "Display initial banner"
-msgstr "Показывать стартовый баннер"
+#: spyder/widgets/ipythonconsole/client.py:385
+msgid "Connecting to kernel..."
+msgstr "Подключение к ядру..."
 
-#: spyderlib/plugins/ipythonconsole.py:160
+#: spyder/widgets/ipythonconsole/namespacebrowser.py:76
 msgid ""
-"This option lets you hide the message shown at\n"
-"the top of the console when it's opened."
+"Inspecting and setting values while debugging in IPython consoles is not "
+"supported yet by Spyder."
 msgstr ""
-"Эта обция позволяет Вам спрятать сообщение,\n"
-"показываемое вверху консоли при открытии."
+"Spyder не поддерживет просмотр и установку значений во время отладки в "
+"консоли IPython."
 
-#: spyderlib/plugins/ipythonconsole.py:162
-msgid "Use a pager to display additional text inside the console"
-msgstr ""
-"Использовать постраничный вывод для показа дополнительного текста в консоли"
+#: spyder/widgets/ipythonconsole/shell.py:135
+msgid "Reset IPython namespace"
+msgstr "Перезагрузить пространство имён IPython"
 
-#: spyderlib/plugins/ipythonconsole.py:164
+#: spyder/widgets/ipythonconsole/shell.py:136
 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."
+"All user-defined variables will be removed.<br>Are you sure you want to "
+"reset the namespace?"
 msgstr ""
-"Полезно, если Вы не хотите захламлять консоль длинной справкой или сплошным "
-"текстом.\n"
-"Примечание: Используйте клавишу Q для выхода из постраничного вывода."
+"Все определённые пользователем переменные будут удалены.<br>Вы уверены, что "
+"хотите переустановить пространство имён?"
 
-#: spyderlib/plugins/ipythonconsole.py:169
-msgid "Ask for confirmation before closing"
-msgstr "Спрашивать подтверждение перед закрытием"
+#: spyder/widgets/onecolumntree.py:52
+msgid "Collapse all"
+msgstr "Свернуть всё"
 
-#: spyderlib/plugins/ipythonconsole.py:179
-msgid "Completion Type"
-msgstr "Тип автодополнения"
+#: spyder/widgets/onecolumntree.py:56
+msgid "Expand all"
+msgstr "Развернуть всё"
 
-#: spyderlib/plugins/ipythonconsole.py:180
-msgid "Decide what type of completion to use"
-msgstr "Выберите какой тип автодополнения использовать"
+#: spyder/widgets/onecolumntree.py:60
+msgid "Restore"
+msgstr "Восстановить"
 
-#: spyderlib/plugins/ipythonconsole.py:183
-msgid "Completion:"
-msgstr "Автодополнение:"
+#: spyder/widgets/onecolumntree.py:61
+msgid "Restore original tree layout"
+msgstr "Восстановить оригинальную структуру дерева"
 
-#: spyderlib/plugins/ipythonconsole.py:192
-msgid "Light background"
-msgstr "Светлый фон"
+#: spyder/widgets/onecolumntree.py:65
+msgid "Collapse selection"
+msgstr "Свернуть выделенное"
 
-#: spyderlib/plugins/ipythonconsole.py:194
-msgid "Dark background"
-msgstr "Тёмный фон"
+#: spyder/widgets/onecolumntree.py:69
+msgid "Expand selection"
+msgstr "Развернуть выделенное"
 
-#: spyderlib/plugins/ipythonconsole.py:204
-msgid "Buffer:  "
-msgstr "Буфер:  "
+#: spyder/widgets/pathmanager.py:87
+msgid "Move to top"
+msgstr "Переместить вверх"
 
-#: spyderlib/plugins/ipythonconsole.py:204
-#: spyderlib/plugins/externalconsole.py:82
-msgid " lines"
-msgstr " строк"
+#: spyder/widgets/pathmanager.py:93
+msgid "Move up"
+msgstr "Переместить выше"
 
-#: spyderlib/plugins/ipythonconsole.py:206
-msgid ""
-"Set the maximum number of lines of text shown in the\n"
-"console before truncation. Specifying -1 disables it\n"
-"(not recommended!)"
-msgstr ""
-"Установите максимальное количество линий, показываемых\n"
-"в консоли перед усечением. Значение -1 отключает функцию\n"
-"(не рекомендуется!)"
+#: spyder/widgets/pathmanager.py:99
+msgid "Move down"
+msgstr "Переместить ниже"
 
-#: spyderlib/plugins/ipythonconsole.py:215
-msgid "Support for graphics (Matplotlib)"
-msgstr "Поддержка графики (Matplotlib)"
+#: spyder/widgets/pathmanager.py:105
+msgid "Move to bottom"
+msgstr "Переместить вниз"
 
-#: spyderlib/plugins/ipythonconsole.py:216
-msgid "Activate support"
-msgstr "Активировать поддержку"
+#: spyder/widgets/pathmanager.py:116 spyder/widgets/pathmanager.py:231
+msgid "Add path"
+msgstr "Добавить путь"
+
+#: spyder/widgets/pathmanager.py:121 spyder/widgets/pathmanager.py:214
+msgid "Remove path"
+msgstr "Удалить путь"
+
+#: spyder/widgets/pathmanager.py:131
+msgid "Synchronize..."
+msgstr "Синхронизация..."
+
+#: spyder/widgets/pathmanager.py:133
+msgid "Synchronize Spyder's path list with PYTHONPATH environment variable"
+msgstr "Синхронизировать список путей Spyder с переменной среды PYTHONPATH"
 
-#: spyderlib/plugins/ipythonconsole.py:217
-msgid "Automatically load Pylab and NumPy modules"
-msgstr "Автоматически загружать модули Pylab и NumPy"
+#: spyder/widgets/pathmanager.py:145
+msgid "Synchronize"
+msgstr "Синхронизировать"
 
-#: spyderlib/plugins/ipythonconsole.py:220
+#: spyder/widgets/pathmanager.py:146
 msgid ""
-"This lets you load graphics support without importing \n"
-"the commands to do plots. Useful to work with other\n"
-"plotting libraries different to Matplotlib or to develop \n"
-"GUIs with Spyder."
+"This will synchronize Spyder's path list with <b>PYTHONPATH</b> environment "
+"variable for current user, allowing you to run your Python modules outside "
+"Spyder without having to configure sys.path. <br>Do you want to clear "
+"contents of PYTHONPATH before adding Spyder's path list?"
 msgstr ""
-"Это позволит загружать поддержку графики без импорта\n"
-"команд построения графиков. Полезно для работы с\n"
-"графическими библиотеками, отличными от Matplotlib или\n"
-"разработки GUI в Spyder."
+"Будет синхронизирован список путей Spyder с переменной среды PYTHONPATH для "
+"текущего пользователя, позволяя Вам запускать Ваши модули Python вне Spyder "
+"без необходимости настраивать sys.path.<br>Хотите очистить содержимое "
+"PYTHONPATH перед добавлением списка путей Spyder?"
+
+#: spyder/widgets/pathmanager.py:215
+msgid "Do you really want to remove selected path?"
+msgstr "Вы действительно хотите удалить выбранный путь?"
 
-#: spyderlib/plugins/ipythonconsole.py:238
+#: spyder/widgets/pathmanager.py:232
 msgid ""
-"This feature requires the Matplotlib library.\n"
-"It seems you don't have it installed."
+"This directory is already included in Spyder path list.<br>Do you want to "
+"move it to the top of the list?"
 msgstr ""
-"Эта функция требует библиотеку Matplotlib.\n"
-"Похоже, Вы её не установили."
+"Этот каталог уже имеется в списке путей Spyder.<br>Хотите переместить его на "
+"вершину списка?"
 
-#: spyderlib/plugins/ipythonconsole.py:243
-msgid "Inline"
-msgstr "Встроенный"
+#: spyder/widgets/projects/configdialog.py:30
+msgid "Project preferences"
+msgstr "Параметры проекта"
 
-#: spyderlib/plugins/ipythonconsole.py:244
-msgid "Automatic"
-msgstr "Автоматически"
+#: spyder/widgets/projects/configdialog.py:82
+#: spyder/widgets/projects/configdialog.py:119
+msgid "Restore data on startup"
+msgstr "Восстанавливать данные при запуске"
 
-#: spyderlib/plugins/ipythonconsole.py:245
-msgid "Graphics backend"
-msgstr "Графический бэкенд"
+#: spyder/widgets/projects/configdialog.py:84
+#: spyder/widgets/projects/configdialog.py:121
+msgid "Save data on exit"
+msgstr "Сохранять данные перед выходом"
 
-#: spyderlib/plugins/ipythonconsole.py:246
-#, python-format
-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 ""
-"Выберите как графика будет отображаться в консоли. Если не уверены, "
-"пожалуйста выберите <b>%s</b> для вставки графики в консоль или <b>%s</b> "
-"для взаимодействия с ними (через масштабирование и панорамирование) в "
-"отдельном окне."
+#: spyder/widgets/projects/configdialog.py:86
+#: spyder/widgets/projects/configdialog.py:123
+msgid "Save history"
+msgstr "Сохранять журнал истории"
 
-#: spyderlib/plugins/ipythonconsole.py:266
-#: spyderlib/plugins/externalconsole.py:290
-msgid "Backend:"
-msgstr "Бэкенд:"
+#: spyder/widgets/projects/configdialog.py:88
+#: spyder/widgets/projects/configdialog.py:125
+msgid "Save non project files opened"
+msgstr "Сохранять файлы не из проекта"
 
-#: spyderlib/plugins/ipythonconsole.py:268
-#: spyderlib/plugins/externalconsole.py:292
-msgid "This option will be applied the next time a console is opened."
-msgstr "Эта опция будет принята при следующем открытии консоли."
+#: spyder/widgets/projects/configdialog.py:111
+msgid "Code"
+msgstr "Код"
 
-#: spyderlib/plugins/ipythonconsole.py:279
-msgid "Inline backend"
-msgstr "Встроенный бекэнд"
+#: spyder/widgets/projects/configdialog.py:118
+msgid "Workspace"
+msgstr "Рабочая область"
 
-#: spyderlib/plugins/ipythonconsole.py:280
-msgid "Decide how to render the figures created by this backend"
-msgstr "Выберите как рендерить графики, созданные этим бэкендом"
+#: spyder/widgets/projects/configdialog.py:148
+#: spyder/widgets/projects/configdialog.py:155
+msgid "Version control"
+msgstr "Контроль версий"
 
-#: spyderlib/plugins/ipythonconsole.py:284
-msgid "Format:"
-msgstr "Формат:"
+#: spyder/widgets/projects/configdialog.py:156
+msgid "Use version control"
+msgstr "Использовать контроль версий"
 
-#: spyderlib/plugins/ipythonconsole.py:287
-msgid "Resolution:"
-msgstr "Разрешение:"
+#: spyder/widgets/projects/configdialog.py:161
+msgid "Version control system"
+msgstr "Система контроля версий"
 
-#: spyderlib/plugins/ipythonconsole.py:287
-msgid "dpi"
-msgstr "dpi"
+#: spyder/widgets/projects/explorer.py:50
+msgid "Show horizontal scrollbar"
+msgstr "Показывать горизонтальную полосу прокрутки"
 
-#: spyderlib/plugins/ipythonconsole.py:289
-msgid "Only used when the format is PNG. Default is 72"
-msgstr "Используется только для формата PNG. 72 по умолчанию"
+#: spyder/widgets/projects/explorer.py:112
+msgid "File <b>%s</b> already exists.<br>Do you want to overwrite it?"
+msgstr "Файл <b>%s</b> уже существует.<br>Хотите его перезаписать?"
 
-#: spyderlib/plugins/ipythonconsole.py:292
-msgid "Width:"
-msgstr "Ширина:"
+#: spyder/widgets/projects/explorer.py:126
+msgid "Folder <b>%s</b> already exists."
+msgstr "Каталог <b>%s</b> уже существует."
 
-#: spyderlib/plugins/ipythonconsole.py:292
-#: spyderlib/plugins/ipythonconsole.py:296
-msgid "inches"
-msgstr "дюймов"
+#: spyder/widgets/projects/explorer.py:144
+msgid "copy"
+msgstr "скопировать"
 
-#: spyderlib/plugins/ipythonconsole.py:294
-msgid "Default is 6"
-msgstr "6 по умолчанию"
+#: spyder/widgets/projects/explorer.py:146
+msgid "move"
+msgstr "переместить"
 
-#: spyderlib/plugins/ipythonconsole.py:296
-msgid "Height:"
-msgstr "Высота:"
+#: spyder/widgets/projects/projectdialog.py:69
+msgid "New directory"
+msgstr "Новый каталог"
 
-#: spyderlib/plugins/ipythonconsole.py:298
-msgid "Default is 4"
-msgstr "4 по умолчанию"
+#: spyder/widgets/projects/projectdialog.py:70
+msgid "Existing directory"
+msgstr "Существующий каталог"
 
-#: spyderlib/plugins/ipythonconsole.py:325
-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 ""
-"Вы можете выполнить несколько строк кода при запуске консоли. Пожалуйста, "
-"введите их через запятую, например:<br><i>import os, import sys</i>"
+#: spyder/widgets/projects/projectdialog.py:72
+msgid "Project name"
+msgstr "Имя проекта"
 
-#: spyderlib/plugins/ipythonconsole.py:331
-msgid "Lines:"
-msgstr "Строки:"
+#: spyder/widgets/projects/projectdialog.py:73
+msgid "Location"
+msgstr "Расположение"
 
-#: spyderlib/plugins/ipythonconsole.py:340
-msgid "Run a file"
-msgstr "Выполнить файл"
+#: spyder/widgets/projects/projectdialog.py:74
+msgid "Project type"
+msgstr "Тип проекта"
 
-#: spyderlib/plugins/ipythonconsole.py:341
-msgid ""
-"You can also run a whole file at startup instead of just some lines (This is "
-"similar to have a PYTHONSTARTUP file)."
-msgstr ""
-"При старте Вы также можете запустить весь файл вместо нескольких строк "
-"(Подобно использованию файла PYTHONSTARTUP)."
+#: spyder/widgets/projects/projectdialog.py:75
+msgid "Python version"
+msgstr "Версия Python"
 
-#: spyderlib/plugins/ipythonconsole.py:345
-msgid "Use the following file:"
-msgstr "Использовать следующий файл:"
+#: spyder/widgets/projects/projectdialog.py:83
+#: spyder/widgets/variableexplorer/importwizard.py:519
+msgid "Cancel"
+msgstr "Отмена"
 
-#: spyderlib/plugins/ipythonconsole.py:359
-msgid "Greedy completion"
-msgstr "Скупое автодополнение"
+#: spyder/widgets/projects/projectdialog.py:84
+msgid "Create"
+msgstr "Создать"
 
-#: spyderlib/plugins/ipythonconsole.py:360
-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 ""
-"Включает автодополнение по <tt>Tab</tt> для элементов списков, результатов "
-"вызова функций, и т.п. <i>без</i> присвоения их переменной.<br>Например, Вы "
-"можете сделать автодополнение для таких вещей, как <tt>li[0].<Tab></"
-"tt> или <tt>ins.meth().<Tab></tt>"
+#: spyder/widgets/projects/projectdialog.py:102
+msgid "Create new project"
+msgstr "Создать новый проект"
 
-#: spyderlib/plugins/ipythonconsole.py:368
-msgid "Use the greedy completer"
-msgstr "Включить скупое автодополнение"
+#: spyder/widgets/projects/type/__init__.py:215
+msgid "Empty project"
+msgstr "Пустой проект"
 
-#: spyderlib/plugins/ipythonconsole.py:379
-msgid "Autocall"
-msgstr "Автовызов"
+#: spyder/widgets/projects/type/python.py:20
+msgid "Python project"
+msgstr "Проект Python"
 
-#: spyderlib/plugins/ipythonconsole.py:380
-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 ""
-"Автовызов позволяет IPython автоматически вызывать объекты без явного ввода "
-"скобок.<br>Например, если Вы введете <i>str 43</i>, будет выполнено "
-"<i>str(43)</i> автоматически."
+#: spyder/widgets/projects/type/python.py:76
+msgid "Python package"
+msgstr "Пакет Python"
 
-#: spyderlib/plugins/ipythonconsole.py:387
-msgid "Smart"
-msgstr "Умный"
+#: spyder/widgets/pydocgui.py:110
+msgid "Module or package:"
+msgstr "Модуль или пакет:"
 
-#: spyderlib/plugins/ipythonconsole.py:388
-msgid "Full"
-msgstr "Все"
+#: spyder/widgets/shell.py:129
+msgid "Save history log..."
+msgstr "Сохранить журнал истории..."
 
-#: spyderlib/plugins/ipythonconsole.py:389
-msgid "Off"
-msgstr "Отключён"
+#: spyder/widgets/shell.py:131
+msgid "Save current history log (i.e. all inputs and outputs) in a text file"
+msgstr ""
+"Сохранить текущий журнал истории (т.е. все вводы и выводы) в текстовом файле"
 
-#: spyderlib/plugins/ipythonconsole.py:391
-msgid "Autocall:  "
-msgstr "Автовызов: "
+#: spyder/widgets/shell.py:257
+msgid "Save history log"
+msgstr "Сохранить журнал истории"
 
-#: spyderlib/plugins/ipythonconsole.py:392
-#, python-format
-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)."
+#: spyder/widgets/shell.py:260
+msgid "History logs"
+msgstr "Журналы истории"
+
+#: spyder/widgets/shell.py:271
+msgid "<b>Unable to save file '%s'</b><br><br>Error message:<br>%s"
 msgstr ""
-"В режиме <b>%s</b> Автовызов не происходит если отсутствуют аргументы у "
-"вызываемого. В режиме <b>%s</b> все вызываемые объекты вызываются (даже если "
-"аргументы не переданы)."
+"<b>Невозможно сохранить файл <i>%s</i></b><br><br>Сообщение об ошибке:<br>%s"
 
-#: spyderlib/plugins/ipythonconsole.py:404
-msgid "Symbolic Mathematics"
-msgstr "Символьная математика"
+#: spyder/widgets/shell.py:713
+msgid "Copy without prompts"
+msgstr "Копировать без подтверждения"
 
-#: spyderlib/plugins/ipythonconsole.py:405
-msgid ""
-"Perfom symbolic operations in the console (e.g. integrals, derivatives, "
-"vector calculus, etc) and get the outputs in a beautifully printed style."
-msgstr ""
-"Производит символьные операции в консоли (напр. интегралы, производные, "
-"векторное исчисление и др.) и выводит результат в приятном глазу виде."
+#: spyder/widgets/shell.py:716 spyder/widgets/shell.py:720
+msgid "Clear line"
+msgstr "Очистить строку"
 
-#: spyderlib/plugins/ipythonconsole.py:410
-msgid "Use symbolic math"
-msgstr "Использовать символьную математику"
+#: spyder/widgets/shell.py:722
+msgid "Clear shell"
+msgstr "Очистить оболочку"
 
-#: spyderlib/plugins/ipythonconsole.py:411
-msgid ""
-"This option loads the Sympy library to work with.<br>Please refer to its "
-"documentation to learn how to use it."
-msgstr ""
-"Эта опция подгружает для работы библиотеку Sympy.<br>Пожалуйста ознакомьтесь "
-"с документацией для её использования."
+#: spyder/widgets/shell.py:726
+msgid "Clear shell contents ('cls' command)"
+msgstr "Очистить содержание оболочки (команда 'cls')"
 
-#: spyderlib/plugins/ipythonconsole.py:424
-msgid ""
-"This feature requires the Sympy library.\n"
-"It seems you don't have it installed."
-msgstr ""
-"Эта функция требует библиотеку Sympy.\n"
-"По-видимому, она не установлена."
+#: spyder/widgets/sourcecode/codeeditor.py:100
+msgid "Go to line:"
+msgstr "Перейти к строке:"
 
-#: spyderlib/plugins/ipythonconsole.py:429
-msgid "Prompts"
-msgstr "Приглашения к вводу/выводу"
+#: spyder/widgets/sourcecode/codeeditor.py:108
+msgid "Line count:"
+msgstr "Количество строк:"
 
-#: spyderlib/plugins/ipythonconsole.py:430
-msgid "Modify how Input and Output prompts are shown in the console."
-msgstr "Определите как показывать приглашения Ввода и Вывода в консоли."
+#: spyder/widgets/sourcecode/codeeditor.py:1296
+msgid "Breakpoint"
+msgstr "Точка останова"
 
-#: spyderlib/plugins/ipythonconsole.py:433
-msgid "Input prompt:"
-msgstr "Строка ввода:"
+#: spyder/widgets/sourcecode/codeeditor.py:1297
+msgid "Condition:"
+msgstr "Условие:"
 
-#: spyderlib/plugins/ipythonconsole.py:435
-#, python-format
-msgid ""
-"Default is<br>In [<span class=\"in-prompt-number\">%i</span>]:"
-msgstr ""
-"По умолчанию: <br>In [<span class=\"in-prompt-number\">%i</"
-"span>]:"
+#: spyder/widgets/sourcecode/codeeditor.py:1703
+msgid "Code analysis"
+msgstr "Анализ кода"
 
-#: spyderlib/plugins/ipythonconsole.py:439
-msgid "Output prompt:"
-msgstr "Строка вывода:"
+#: spyder/widgets/sourcecode/codeeditor.py:1757
+msgid "To do"
+msgstr "Список задач"
+
+#: spyder/widgets/sourcecode/codeeditor.py:1994
+msgid "Removal error"
+msgstr "Ошибка удаления"
 
-#: spyderlib/plugins/ipythonconsole.py:441
-#, python-format
+#: spyder/widgets/sourcecode/codeeditor.py:1995
 msgid ""
-"Default is<br>Out[<span class=\"out-prompt-number\">%i</span>]:"
+"It was not possible to remove outputs from this notebook. The error is:\n"
+"\n"
 msgstr ""
-"По умолчанию: <br>Out [<span class=\"out-prompt-number\">%i</"
-"span>]:"
+"Невозможно удалить результаты из блокнота. Ошибка:\n"
+"\n"
 
-#: spyderlib/plugins/ipythonconsole.py:461
-#: spyderlib/plugins/externalconsole.py:275
-msgid "Graphics"
-msgstr "Графика"
+#: spyder/widgets/sourcecode/codeeditor.py:2487
+msgid "Clear all ouput"
+msgstr "Очистить вывод"
 
-#: spyderlib/plugins/ipythonconsole.py:463
-#: spyderlib/plugins/workingdirectory.py:44
-msgid "Startup"
-msgstr "Запуск"
+#: spyder/widgets/sourcecode/codeeditor.py:2493
+msgid "Go to definition"
+msgstr "Перейти к определению"
 
-#: spyderlib/plugins/ipythonconsole.py:477
-#: spyderlib/plugins/ipythonconsole.py:751
-msgid "Connect to an existing kernel"
-msgstr "Подключиться к работающему ядру"
+#: spyder/widgets/sourcecode/codeeditor.py:2522
+msgid "Zoom reset"
+msgstr "Восстановить масштаб"
+
+#: spyder/widgets/status.py:25
+msgid "CPU and memory usage info in the status bar"
+msgstr "Информация об использовании ЦП и памяти в строке состояния"
+
+#: spyder/widgets/status.py:94
+msgid "Memory:"
+msgstr "Память:"
 
-#: spyderlib/plugins/ipythonconsole.py:479
+#: spyder/widgets/status.py:95
 msgid ""
-"Please enter the connection info of the kernel you want to connect to. For "
-"that you can either select its JSON connection file using the <tt>Browse</"
-"tt> button, or write directly its id, in case it's a local kernel (for "
-"example <tt>kernel-3764.json</tt> or just <tt>3764</tt>)."
+"Memory usage status: requires the `psutil` (>=v0.3) library on non-Windows "
+"platforms"
 msgstr ""
-"Пожалуйста, введите информацию о соединении для ядра, к которому пытаетесь "
-"подключиться. Для этого либо выберите JSON-файл соединения кнопкой "
-"<tt>Обзор</tt>, либо, если ядро локальное, введите его id (напр. "
-"<tt>kernel-3764.json</tt> или просто <tt>3764</tt>)."
+"Состояние использования памяти: требуется библиотека `psutil` (>=v0.3) на не-"
+"Windows платформах"
 
-#: spyderlib/plugins/ipythonconsole.py:490
-msgid "Connection info:"
-msgstr "Информация о соединении:"
+#: spyder/widgets/status.py:107
+msgid "CPU:"
+msgstr "ЦП:"
 
-#: spyderlib/plugins/ipythonconsole.py:492
-msgid "Path to connection file or kernel id"
-msgstr "Путь к файлу соединения или id ядра"
+#: spyder/widgets/status.py:108
+msgid "CPU usage status: requires the `psutil` (>=v0.3) library"
+msgstr "Состояние использования ЦП: требуется библиотека `psutil` (>=v0.3)"
 
-#: spyderlib/plugins/ipythonconsole.py:494
-#: spyderlib/plugins/ipythonconsole.py:511
-msgid "Browse"
-msgstr "Обзор"
+#: spyder/widgets/status.py:130
+msgid "Permissions:"
+msgstr "Доступ:"
 
-#: spyderlib/plugins/ipythonconsole.py:503
-msgid "This is a remote kernel"
-msgstr "Это удалённо-управляемое ядро"
+#: spyder/widgets/status.py:144
+msgid "End-of-lines:"
+msgstr "Конец строки:"
 
-#: spyderlib/plugins/ipythonconsole.py:507
-msgid "username at hostname:port"
-msgstr "username at hostname:port"
+#: spyder/widgets/status.py:158
+msgid "Encoding:"
+msgstr "Кодировка:"
 
-#: spyderlib/plugins/ipythonconsole.py:510
-msgid "Path to ssh key file"
-msgstr "Путь к ключу ssh"
+#: spyder/widgets/status.py:171
+msgid "Line:"
+msgstr "Строка:"
 
-#: spyderlib/plugins/ipythonconsole.py:519
-msgid "Password or ssh key passphrase"
-msgstr "Пароль или кодовая фраза ключа ssh"
+#: spyder/widgets/status.py:175
+msgid "Column:"
+msgstr "Столбец:"
 
-#: spyderlib/plugins/ipythonconsole.py:523
-msgid "Host name"
-msgstr "Имя хоста"
+#: spyder/widgets/tabs.py:146
+msgid "Browse tabs"
+msgstr "Обзор вкладок"
 
-#: spyderlib/plugins/ipythonconsole.py:524
-msgid "Ssh key"
-msgstr "Ключ ssh"
+#: spyder/widgets/tabs.py:275
+msgid "Close current tab"
+msgstr "Закрыть текущую вкладку"
 
-#: spyderlib/plugins/ipythonconsole.py:525
-msgid "Password"
-msgstr "Пароль"
+#: spyder/widgets/variableexplorer/arrayeditor.py:497
+msgid "It was not possible to copy values for this array"
+msgstr "Не удалось скопировать значения этого массива"
 
-#: spyderlib/plugins/ipythonconsole.py:554
-msgid "Open IPython connection file"
-msgstr "Открыть файл соединения IPython"
+#: spyder/widgets/variableexplorer/arrayeditor.py:532
+#: spyder/widgets/variableexplorer/arrayeditor.py:565
+#: spyder/widgets/variableexplorer/dataframeeditor.py:544
+#: spyder/widgets/variableexplorer/dataframeeditor.py:584
+msgid "Format"
+msgstr "Форматировать"
 
-#: spyderlib/plugins/ipythonconsole.py:560
-msgid "Select ssh key"
-msgstr "Выберите ключ ssh"
+#: spyder/widgets/variableexplorer/arrayeditor.py:537
+#: spyder/widgets/variableexplorer/dataframeeditor.py:548
+msgid "Resize"
+msgstr "Изменить размер"
 
-#: spyderlib/plugins/ipythonconsole.py:739
-msgid "Open an &IPython console"
-msgstr "Открыть консоль &IPython"
+#: spyder/widgets/variableexplorer/arrayeditor.py:566
+#: spyder/widgets/variableexplorer/dataframeeditor.py:585
+msgid "Float formatting"
+msgstr "Форматирование чисел"
 
-#: spyderlib/plugins/ipythonconsole.py:742
-#, python-format
-msgid "Use %s+T when the console is selected to open a new one"
-msgstr "Используйте %s+T когда консоль выбрана, чтобы открыть новую"
+#: spyder/widgets/variableexplorer/arrayeditor.py:574
+#: spyder/widgets/variableexplorer/dataframeeditor.py:594
+msgid "Format (%s) is incorrect"
+msgstr "Формат (%s) неверный"
 
-#: spyderlib/plugins/ipythonconsole.py:745
-msgid "Open a new console"
-msgstr "Открыть новую консоль"
+#: spyder/widgets/variableexplorer/arrayeditor.py:609
+msgid "Array is empty"
+msgstr "Массив пустой"
 
-#: spyderlib/plugins/ipythonconsole.py:752
-msgid "Open a new IPython console connected to an existing kernel"
-msgstr "Открыть новую консоль IPython, подключенную к существующему ядру"
+#: spyder/widgets/variableexplorer/arrayeditor.py:612
+msgid "Arrays with more than 3 dimensions are not supported"
+msgstr "Массивы с размерностью более 3 не поддерживаются"
 
-#: spyderlib/plugins/ipythonconsole.py:835
-#, python-format
-msgid ""
-"No IPython console is currently available to run <b>%s</b>.<br><br>Please "
-"open a new one and try again."
-msgstr ""
-"Сейчас нет доступных консолей IPython для запуска <b>%s</b>."
-"<br><br>Пожалуйста, откройте новую и попытайтесь снова."
+#: spyder/widgets/variableexplorer/arrayeditor.py:615
+msgid "The 'xlabels' argument length do no match array column number"
+msgstr "Длина аргумента 'xlabels' не соответствует числу столбцов массива"
 
-#: spyderlib/plugins/ipythonconsole.py:970
-msgid ""
-"Do you want to close all other consoles connected to the same kernel as this "
-"one?"
-msgstr "Хотите закрыть все другие консоли, подключённые к тому же ядру?"
+#: spyder/widgets/variableexplorer/arrayeditor.py:619
+msgid "The 'ylabels' argument length do no match array row number"
+msgstr "Длина аргумента 'ylabels' не соответствует числу строк массива"
 
-#: spyderlib/plugins/ipythonconsole.py:1052
-msgid "Connection error"
-msgstr "Ошибка соединения"
+#: spyder/widgets/variableexplorer/arrayeditor.py:626
+msgid "%s arrays"
+msgstr "%s массивы"
 
-#: spyderlib/plugins/ipythonconsole.py:1053
-msgid ""
-"Could not open ssh tunnel. The error was:\n"
-"\n"
-msgstr ""
-"Не удалось открыть ssh-туннель. Произошла ошибка:\n"
-"\n"
+#: spyder/widgets/variableexplorer/arrayeditor.py:627
+msgid "%s are currently not supported"
+msgstr "%s на данный момент не поддерживается"
 
-#: spyderlib/plugins/ipythonconsole.py:1090
-msgid "IPython"
-msgstr "IPython"
+#: spyder/widgets/variableexplorer/arrayeditor.py:634
+msgid "NumPy array"
+msgstr "Массив NumPy"
 
-#: spyderlib/plugins/ipythonconsole.py:1091
-#, python-format
-msgid "Unable to connect to IPython <b>%s"
-msgstr "Не удалось подключиться к IPython <b>%s"
+#: spyder/widgets/variableexplorer/arrayeditor.py:636
+#: spyder/widgets/variableexplorer/arrayeditor.py:790
+msgid "Array editor"
+msgstr "Редактор массивов"
 
-#: spyderlib/plugins/ipythonconsole.py:1142
-msgid "Are you sure you want to restart the kernel?"
-msgstr "Вы уверены, что хотите перезапустить ядро?"
+#: spyder/widgets/variableexplorer/arrayeditor.py:638
+msgid "read only"
+msgstr "только чтение"
 
-#: spyderlib/plugins/ipythonconsole.py:1144
-msgid "Restart kernel?"
-msgstr "Перезапустить ядро?"
+#: spyder/widgets/variableexplorer/arrayeditor.py:668
+msgid "Record array fields:"
+msgstr "Заполнить поля массива:"
 
-#: spyderlib/plugins/variableexplorer.py:24
-msgid "Autorefresh"
-msgstr "Автообновление"
+#: spyder/widgets/variableexplorer/arrayeditor.py:680
+msgid "Data"
+msgstr "Данные"
 
-#: spyderlib/plugins/variableexplorer.py:25
-msgid "Enable autorefresh"
-msgstr "Включить автообновление"
+#: spyder/widgets/variableexplorer/arrayeditor.py:680
+msgid "Mask"
+msgstr "Маска"
 
-#: spyderlib/plugins/variableexplorer.py:27
-msgid "Refresh interval: "
-msgstr "Интервал обновления: "
+#: spyder/widgets/variableexplorer/arrayeditor.py:680
+msgid "Masked data"
+msgstr "Скрытые данные"
 
-#: spyderlib/plugins/variableexplorer.py:28
-msgid " ms"
-msgstr " мс"
+#: spyder/widgets/variableexplorer/arrayeditor.py:691
+msgid "Axis:"
+msgstr "Оси:"
 
-#: spyderlib/plugins/variableexplorer.py:31
-msgid "Filter"
-msgstr "Фильтр"
+#: spyder/widgets/variableexplorer/arrayeditor.py:696
+msgid "Index:"
+msgstr "Индекс:"
 
-#: spyderlib/plugins/variableexplorer.py:46
-msgid "Edit data in the remote process"
-msgstr "Редактировать данные в удалённом процессе"
+#: spyder/widgets/variableexplorer/arrayeditor.py:709
+msgid "<u>Warning</u>: changes are applied separately"
+msgstr "<u>Предупреждение</u>: изменения применяются раздельно"
 
-#: spyderlib/plugins/variableexplorer.py:47
+#: spyder/widgets/variableexplorer/arrayeditor.py:710
 msgid ""
-"Editors are opened in the remote process for NumPy arrays, PIL images, "
-"lists, tuples and dictionaries.\n"
-"This avoids transfering large amount of data between the remote process and "
-"Spyder (through the socket)."
+"For performance reasons, changes applied to masked array won't be reflected "
+"in array's data (and vice-versa)."
 msgstr ""
-"Редакторы открыты в удалённом процессе для массивов NumPy, изображений PIL, "
-"списков, кортежей и словарей.\n"
-"Это позволяет избежать передачи больших объёмов данных между удалённым "
-"процессом и Spyder (через сокет)."
+"По соображениям производительности, изменения принятые для скрытых массивов "
+"не будут отражены в данных массивов (и наоборот)."
 
-#: spyderlib/plugins/variableexplorer.py:183
-msgid "Variable explorer"
-msgstr "Менеджер переменных"
+#: spyder/widgets/variableexplorer/collectionseditor.py:116
+msgid "Index"
+msgstr "Индекс"
 
-#: spyderlib/plugins/console.py:108
-msgid "Internal console"
-msgstr "Встроенная консоль"
+#: spyder/widgets/variableexplorer/collectionseditor.py:121
+msgid "Tuple"
+msgstr "Кортеж"
 
-#: spyderlib/plugins/console.py:138 spyderlib/plugins/externalconsole.py:1033
-msgid "&Run..."
-msgstr "&Выполнить..."
+#: spyder/widgets/variableexplorer/collectionseditor.py:124
+msgid "List"
+msgstr "Список"
 
-#: spyderlib/plugins/console.py:140 spyderlib/plugins/externalconsole.py:1034
-msgid "Run a Python script"
-msgstr "Выполнить скрипт Python"
+#: spyder/widgets/variableexplorer/collectionseditor.py:127
+msgid "Dictionary"
+msgstr "Словарь"
 
-#: spyderlib/plugins/console.py:143
-msgid "Environment variables..."
-msgstr "Переменные окружения"
+#: spyder/widgets/variableexplorer/collectionseditor.py:129
+msgid "Key"
+msgstr "Ключ"
 
-#: spyderlib/plugins/console.py:145
-msgid "Show and edit environment variables (for current session)"
-msgstr "Показать и редактировать переменные окружения (для текущей сессии)"
+#: spyder/widgets/variableexplorer/collectionseditor.py:135
+msgid "Attribute"
+msgstr "Атрибут"
 
-#: spyderlib/plugins/console.py:149
-msgid "Show sys.path contents..."
-msgstr "Показать содержимое sys.path..."
+#: spyder/widgets/variableexplorer/collectionseditor.py:137
+msgid "elements"
+msgstr "элементов"
 
-#: spyderlib/plugins/console.py:151
-msgid "Show (read-only) sys.path"
-msgstr "Показать (только чтение) sys.path"
+#: spyder/widgets/variableexplorer/collectionseditor.py:313
+msgid "Size"
+msgstr "Размер"
 
-#: spyderlib/plugins/console.py:154
-msgid "Buffer..."
-msgstr "Буфер..."
+#: spyder/widgets/variableexplorer/collectionseditor.py:313
+msgid "Type"
+msgstr "Тип"
 
-#: spyderlib/plugins/console.py:155 spyderlib/plugins/history.py:39
-#: spyderlib/plugins/externalconsole.py:84
-msgid "Set maximum line count"
-msgstr "Установить максимальное число строк"
+#: spyder/widgets/variableexplorer/collectionseditor.py:313
+msgid "Value"
+msgstr "Значение"
 
-#: spyderlib/plugins/console.py:158
-msgid "External editor path..."
-msgstr "Путь к внешнему редактору..."
+#: spyder/widgets/variableexplorer/collectionseditor.py:411
+msgid ""
+"Opening this variable can be slow\n"
+"\n"
+"Do you want to continue anyway?"
+msgstr ""
+"Открытие этой переменной может занять время\n"
+"\n"
+"Желаете продолжить?"
 
-#: spyderlib/plugins/console.py:159
-msgid "Set external editor executable path"
-msgstr "Установить путь запуска внешнего редактора"
+#: spyder/widgets/variableexplorer/collectionseditor.py:420
+msgid ""
+"Spyder was unable to retrieve the value of this variable from the console."
+"<br><br>The error mesage was:<br><i>%s</i>"
+msgstr ""
+"Spyder не смог извлечь значение этой переменной из консоли. "
+"<br><br>Сообщение об ошибке:<br><i>%s</i>"
 
-#: spyderlib/plugins/console.py:178
-msgid "Internal console settings"
-msgstr "Настройки встроенной консоли"
+#: spyder/widgets/variableexplorer/collectionseditor.py:579
+msgid "Edit item"
+msgstr "Редактировать элемент"
 
-#: spyderlib/plugins/console.py:231 spyderlib/plugins/externalconsole.py:1210
-msgid "Run Python script"
-msgstr "Запуск скрипта Python"
+#: spyder/widgets/variableexplorer/collectionseditor.py:580
+msgid "<b>Unable to assign data to item.</b><br><br>Error message:<br>%s"
+msgstr ""
+"<b>Невозможно назначить данные элементу.</b><br><br>Сообщение об ошибке:<br>"
+"%s"
 
-#: spyderlib/plugins/console.py:277
-msgid "Buffer"
-msgstr "Буфер"
+#: spyder/widgets/variableexplorer/collectionseditor.py:642
+msgid "Resize rows to contents"
+msgstr "Размер строк по содержимому"
 
-#: spyderlib/plugins/console.py:278
-msgid "Maximum line count"
-msgstr "Максимальное количество строк"
+#: spyder/widgets/variableexplorer/collectionseditor.py:653
+#: spyder/widgets/variableexplorer/collectionseditor.py:998
+#: spyder/widgets/variableexplorer/collectionseditor.py:1015
+msgid "Plot"
+msgstr "График"
 
-#: spyderlib/plugins/console.py:288
-msgid "External editor"
-msgstr "Внешний редактор"
+#: spyder/widgets/variableexplorer/collectionseditor.py:657
+msgid "Histogram"
+msgstr "Гистограмма"
 
-#: spyderlib/plugins/console.py:289
-msgid "External editor executable path:"
-msgstr "Путь запуска внешнего редактора:"
+#: spyder/widgets/variableexplorer/collectionseditor.py:661
+msgid "Show image"
+msgstr "Показать изображение"
 
-#: spyderlib/plugins/projectexplorer.py:68
-msgid "&Font..."
-msgstr "&Шрифт"
+#: spyder/widgets/variableexplorer/collectionseditor.py:665
+#: spyder/widgets/variableexplorer/collectionseditor.py:1023
+msgid "Save array"
+msgstr "Сохранить массив"
 
-#: spyderlib/plugins/projectexplorer.py:69
-msgid "Set font style"
-msgstr "Установить стиль шрифта"
+#: spyder/widgets/variableexplorer/collectionseditor.py:669
+#: spyder/widgets/variableexplorer/collectionseditor.py:962
+#: spyder/widgets/variableexplorer/collectionseditor.py:970
+msgid "Insert"
+msgstr "Вставить"
 
-#: spyderlib/plugins/projectexplorer.py:126
-msgid "Select a new font"
-msgstr "Выбрать новый шрифт"
+#: spyder/widgets/variableexplorer/collectionseditor.py:672
+#: spyder/widgets/variableexplorer/collectionseditor.py:906
+msgid "Remove"
+msgstr "Удалить"
 
-#: spyderlib/plugins/workingdirectory.py:37
-msgid ""
-"The <b>global working directory</b> is the working directory for newly "
-"opened <i>consoles</i> (Python/IPython consoles and terminals), for the "
-"<i>file explorer</i>, for the <i>find in files</i> plugin and for new files "
-"created in the <i>editor</i>."
-msgstr ""
-"<b>Глобальный рабочий каталог</b> - рабочий каталог для новых <i>консолей</"
-"i> (консоли и терминалы Python/IPython), для <i>файлового менеджера</i>, для "
-"модуля <i>поиск по файлам</i> и для новых файлов в <i>редакторе</i>."
+#: spyder/widgets/variableexplorer/collectionseditor.py:686
+#: spyder/widgets/variableexplorer/collectionseditor.py:927
+msgid "Duplicate"
+msgstr "Создать копию"
 
-#: spyderlib/plugins/workingdirectory.py:46
-msgid "At startup, the global working directory is:"
-msgstr "Глобальный рабочий каталог при загрузке:"
+#: spyder/widgets/variableexplorer/collectionseditor.py:904
+msgid "Do you want to remove the selected item?"
+msgstr "Вы хотите удалить выбранный элемент?"
 
-#: spyderlib/plugins/workingdirectory.py:50
-msgid "the same as in last session"
-msgstr "такая же как в последней сессии"
+#: spyder/widgets/variableexplorer/collectionseditor.py:905
+msgid "Do you want to remove all selected items?"
+msgstr "Вы хотите удалить все выбранные элементы?"
 
-#: spyderlib/plugins/workingdirectory.py:52
-msgid "At startup, Spyder will restore the global directory from last session"
-msgstr "При загрузке Spyder восстановит глобальный каталог из прошлой сессии"
+#: spyder/widgets/variableexplorer/collectionseditor.py:925
+msgid "New variable name:"
+msgstr "Новое имя переменной:"
 
-#: spyderlib/plugins/workingdirectory.py:56 spyderlib/plugins/runconfig.py:480
-msgid "the following directory:"
-msgstr "следующий каталог:"
+#: spyder/widgets/variableexplorer/collectionseditor.py:928
+msgid "Variable name:"
+msgstr "Имя переменной:"
 
-#: spyderlib/plugins/workingdirectory.py:58
-msgid "At startup, the global working directory will be the specified path"
-msgstr "При запуске глобальный рабочий каталог будет иметь указанный путь"
+#: spyder/widgets/variableexplorer/collectionseditor.py:962
+msgid "Key:"
+msgstr "Ключ:"
 
-#: spyderlib/plugins/workingdirectory.py:70
-msgid "Files are opened from:"
-msgstr "Файлы открываются из:"
+#: spyder/widgets/variableexplorer/collectionseditor.py:970
+msgid "Value:"
+msgstr "Значение:"
 
-#: spyderlib/plugins/workingdirectory.py:74
-#: spyderlib/plugins/workingdirectory.py:87
-msgid "the current file directory"
-msgstr "текущего каталога"
+#: spyder/widgets/variableexplorer/collectionseditor.py:986
+msgid "Import error"
+msgstr "Ошибка импорта"
 
-#: spyderlib/plugins/workingdirectory.py:78
-#: spyderlib/plugins/workingdirectory.py:91
-msgid "the global working directory"
-msgstr "глобального рабочего каталога"
+#: spyder/widgets/variableexplorer/collectionseditor.py:987
+msgid "Please install <b>matplotlib</b> or <b>guiqwt</b>."
+msgstr "Пожалуйста, установите <b>matplotlib</b> или <b>guiqwt</b>."
+
+#: spyder/widgets/variableexplorer/collectionseditor.py:999
+msgid "<b>Unable to plot data.</b><br><br>Error message:<br>%s"
+msgstr ""
+"<b>Не удалось построить график по данным.</b><br><br>Сообщение об ошибке:<br>"
+"%s"
+
+#: spyder/widgets/variableexplorer/collectionseditor.py:1016
+msgid "<b>Unable to show image.</b><br><br>Error message:<br>%s"
+msgstr ""
+"<b>Не удалось показать изображение.</b><br><br>Сообщение об ошибке:<br>%s"
+
+#: spyder/widgets/variableexplorer/collectionseditor.py:1039
+msgid "<b>Unable to save array</b><br><br>Error message:<br>%s"
+msgstr "<b>Не удалось сохранить массив</b><br><br>Сообщение об ошибке:<br>%s"
 
-#: spyderlib/plugins/workingdirectory.py:83
-msgid "Files are created in:"
-msgstr "Файлы создаются в:"
+#: spyder/widgets/variableexplorer/collectionseditor.py:1064
+msgid "It was not possible to copy this array"
+msgstr "Не удалось скопировать этот массив"
 
-#: spyderlib/plugins/workingdirectory.py:97
-msgid "Change to file base directory"
-msgstr "Изменить на каталог файла"
+#: spyder/widgets/variableexplorer/collectionseditor.py:1089
+msgid "Clipboard contents"
+msgstr "Содержимое буфера обмена"
 
-#: spyderlib/plugins/workingdirectory.py:99
-msgid "When opening a file"
-msgstr "При открытии файла"
+#: spyder/widgets/variableexplorer/collectionseditor.py:1104
+msgid "Import from clipboard"
+msgstr "Импортировать из буфера обмена"
 
-#: spyderlib/plugins/workingdirectory.py:101
-msgid "When saving a file"
-msgstr "При сохранении файла"
+#: spyder/widgets/variableexplorer/collectionseditor.py:1106
+msgid "Empty clipboard"
+msgstr "Очистить буфер обмена"
 
-#: spyderlib/plugins/workingdirectory.py:171
-msgid "Back"
-msgstr "Назад"
+#: spyder/widgets/variableexplorer/collectionseditor.py:1107
+msgid "Nothing to be imported from clipboard."
+msgstr "Нечего импортировать из буфера обмена."
 
-#: spyderlib/plugins/workingdirectory.py:190
-msgid ""
-"This is the working directory for newly\n"
-"opened consoles (Python/IPython consoles and\n"
-"terminals), for the file explorer, for the\n"
-"find in files plugin and for new files\n"
-"created in the editor"
-msgstr ""
-"Это - рабочий каталог для новосозданных\n"
-"консолей (консолей и терминалов Python/IPython),\n"
-"для файлового менеджера, для модуля\n"
-"поиска в файлах и для новых файлов,\n"
-"созданных в редакторе"
+#: spyder/widgets/variableexplorer/dataframeeditor.py:450
+msgid "To bool"
+msgstr "В булево"
 
-#: spyderlib/plugins/workingdirectory.py:218
-msgid "Browse a working directory"
-msgstr "Просмотреть рабочий каталог"
+#: spyder/widgets/variableexplorer/dataframeeditor.py:450
+msgid "To complex"
+msgstr "В комплексное"
 
-#: spyderlib/plugins/workingdirectory.py:225
-msgid "Change to parent directory"
-msgstr "Изменить на родительский каталог"
+#: spyder/widgets/variableexplorer/dataframeeditor.py:451
+msgid "To float"
+msgstr "В вещественное"
 
-#: spyderlib/plugins/workingdirectory.py:232
-msgid "Global working directory"
-msgstr "Глобальный рабочий каталог"
+#: spyder/widgets/variableexplorer/dataframeeditor.py:451
+msgid "To int"
+msgstr "В целое"
 
-#: spyderlib/plugins/explorer.py:50
-msgid "File explorer"
-msgstr "Файловый менеджер"
+#: spyder/widgets/variableexplorer/dataframeeditor.py:452
+msgid "To str"
+msgstr "В строку"
 
-#: spyderlib/plugins/shortcuts.py:134
-msgid ""
-"Press the new shortcut and select 'Ok': \n"
-"(Press 'Tab' once to switch focus between the shortcut entry \n"
-"and the buttons below it)"
-msgstr ""
-"Нажмите новую комбинацию клавиш и выберите 'Ok': \n"
-"(Нажатие 'Tab' один раз переключает фокус между\n"
-"полем ввода комбинации клавиш и кнопками под ним)"
+#: spyder/widgets/variableexplorer/dataframeeditor.py:526
+msgid "%s editor"
+msgstr "%s редактор"
 
-#: spyderlib/plugins/shortcuts.py:137
-msgid "Current shortcut:"
-msgstr "Текущая комбинация клавиш:"
+#: spyder/widgets/variableexplorer/dataframeeditor.py:558
+msgid "Column min/max"
+msgstr "Min/max столбца"
 
-#: spyderlib/plugins/shortcuts.py:139
-msgid "New shortcut:"
-msgstr "Новая комбинация клавиш:"
+#: spyder/widgets/variableexplorer/importwizard.py:116
+#: spyder/widgets/variableexplorer/importwizard.py:431
+msgid "Import as"
+msgstr "Импортировать как"
 
-#: spyderlib/plugins/shortcuts.py:152
-#, python-brace-format
-msgid "Shortcut: {0}"
-msgstr "Комбинация клавиш: {0}"
+#: spyder/widgets/variableexplorer/importwizard.py:118
+msgid "data"
+msgstr "данные"
 
-#: spyderlib/plugins/shortcuts.py:273
-msgid "Please introduce a different shortcut"
-msgstr "Пожалуйста, введите другую комбинацию клавиш"
+#: spyder/widgets/variableexplorer/importwizard.py:122
+msgid "code"
+msgstr "код"
 
-#: spyderlib/plugins/shortcuts.py:310
-msgid "The new shorcut conflicts with:"
-msgstr "Новая комбинация клавиш конфликтует с:"
+#: spyder/widgets/variableexplorer/importwizard.py:125
+#: spyder/widgets/variableexplorer/importwizard.py:504
+msgid "text"
+msgstr "текст"
 
-#: spyderlib/plugins/shortcuts.py:321
-#, python-brace-format
-msgid ""
-"A compound sequence can have {break} a maximum of 4 subsequences.{break}"
-msgstr "Не более 4 комбинаций клавиш {break} для одного действия.{break}"
+#: spyder/widgets/variableexplorer/importwizard.py:138
+msgid "Column separator:"
+msgstr "Разделитель столбцов:"
 
-#: spyderlib/plugins/shortcuts.py:326
-msgid "Invalid key entered"
-msgstr "Введен неверный ключ"
+#: spyder/widgets/variableexplorer/importwizard.py:142
+msgid "Tab"
+msgstr "табуляция"
 
-#: spyderlib/plugins/shortcuts.py:515
-msgid "Context"
-msgstr "Контекст"
+#: spyder/widgets/variableexplorer/importwizard.py:145
+#: spyder/widgets/variableexplorer/importwizard.py:163
+msgid "other"
+msgstr "другой"
 
-#: spyderlib/plugins/shortcuts.py:519
-msgid "Shortcut"
-msgstr "Комбинация клавиш"
+#: spyder/widgets/variableexplorer/importwizard.py:156
+msgid "Row separator:"
+msgstr "Разделитель строк:"
 
-# Не понятно, зачем переводить, если колонка с этим именем не видна
-#: spyderlib/plugins/shortcuts.py:521
-#, fuzzy
-msgid "Score"
-msgstr "Метка"
+#: spyder/widgets/variableexplorer/importwizard.py:160
+msgid "EOL"
+msgstr "Конец строки"
 
-#: spyderlib/plugins/shortcuts.py:681
-msgid "Conflicts"
-msgstr "Конфликты"
+#: spyder/widgets/variableexplorer/importwizard.py:175
+msgid "Additional options"
+msgstr "Дополнительные опции"
 
-#: spyderlib/plugins/shortcuts.py:682
-msgid "The following conflicts have been detected:"
-msgstr "Обнаружены следующие конфликты:"
+#: spyder/widgets/variableexplorer/importwizard.py:179
+msgid "Skip rows:"
+msgstr "Пропустить строки:"
 
-#: spyderlib/plugins/shortcuts.py:767
-msgid "Keyboard shortcuts"
-msgstr "Комбинации клавиш"
+#: spyder/widgets/variableexplorer/importwizard.py:190
+msgid "Comments:"
+msgstr "Комментарии:"
 
-#: spyderlib/plugins/shortcuts.py:775
-msgid "Search: "
-msgstr "Поиск:"
+#: spyder/widgets/variableexplorer/importwizard.py:196
+msgid "Transpose"
+msgstr "Транспонировать"
 
-#: spyderlib/plugins/shortcuts.py:776
-msgid "Reset to default values"
-msgstr "Восстановить значения по умолчанию"
+#: spyder/widgets/variableexplorer/importwizard.py:434
+msgid "array"
+msgstr "массив"
 
-#: spyderlib/plugins/runconfig.py:28
-msgid "Execute in current Python or IPython console"
-msgstr "Выполнить в текущей консоли Python или IPython"
+#: spyder/widgets/variableexplorer/importwizard.py:439
+msgid "list"
+msgstr "список"
 
-#: spyderlib/plugins/runconfig.py:29
-msgid "Execute in a new dedicated Python console"
-msgstr "Выполнить в новой отдельной консоли Python"
+#: spyder/widgets/variableexplorer/importwizard.py:444
+msgid "DataFrame"
+msgstr "DataFrame"
 
-#: spyderlib/plugins/runconfig.py:30
-msgid "Execute in an external System terminal"
-msgstr "Выполнить во внешнем системном терминале"
+#: spyder/widgets/variableexplorer/importwizard.py:487
+#: spyder/widgets/variableexplorer/importwizard.py:571
+msgid "Import wizard"
+msgstr "Мастер импорта"
 
-#: spyderlib/plugins/runconfig.py:40
-#, python-format
-msgid "Always show %s on a first file run"
-msgstr "Всегда показывать %s при первом запуске файла"
+#: spyder/widgets/variableexplorer/importwizard.py:492
+msgid "Raw text"
+msgstr "Необработанный текст"
 
-#: spyderlib/plugins/runconfig.py:159
-msgid "General settings"
-msgstr "Основные настройки"
+#: spyder/widgets/variableexplorer/importwizard.py:495
+msgid "variable_name"
+msgstr "имя_переменной"
 
-#: spyderlib/plugins/runconfig.py:162 spyderlib/plugins/runconfig.py:208
-msgid "Command line options:"
-msgstr "Опции командной строки:"
+#: spyder/widgets/variableexplorer/importwizard.py:506
+msgid "table"
+msgstr "таблица"
 
-#: spyderlib/plugins/runconfig.py:168
-msgid "Working directory:"
-msgstr "Рабочий каталог:"
+#: spyder/widgets/variableexplorer/importwizard.py:507
+msgid "Preview"
+msgstr "Предварительный просмотр"
 
-#: spyderlib/plugins/runconfig.py:180 spyderlib/plugins/runconfig.py:491
-msgid "Enter debugging mode when errors appear during execution"
-msgstr "Запускать отладочный режим, если происходят ошибки в ходе выполнения"
+#: spyder/widgets/variableexplorer/importwizard.py:511
+msgid "Variable Name"
+msgstr "Имя переменной"
 
-#: spyderlib/plugins/runconfig.py:196 spyderlib/plugins/runconfig.py:501
-msgid "Dedicated Python console"
-msgstr "Отдельная консоль Python"
+#: spyder/widgets/variableexplorer/importwizard.py:534
+msgid "Done"
+msgstr "Сделано"
 
-#: spyderlib/plugins/runconfig.py:200 spyderlib/plugins/runconfig.py:503
-msgid "Interact with the Python console after execution"
-msgstr "Перейти в консоль Python после выполнения"
+#: spyder/widgets/variableexplorer/importwizard.py:572
+msgid ""
+"<b>Unable to proceed to next step</b><br><br>Please check your entries."
+"<br><br>Error message:<br>%s"
+msgstr ""
+"<b>Невозможно перейти к следующему шагу</b><br><br>Пожалуйста, проверьте "
+"введенные данные.<br><br>Сообщение об ошибке:<br>%s"
 
-#: spyderlib/plugins/runconfig.py:204
-msgid "Show warning when killing running process"
-msgstr "Показывать предупреждение при завершении работающего процесса"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:199
+msgid "Refresh"
+msgstr "Обновить"
 
-#: spyderlib/plugins/runconfig.py:213
-msgid "<b>-u</b> is added to the other options you set here"
-msgstr "<b>-u</b> добавлен к другим опциям, которые Вы здесь установили"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:203
+msgid "Refresh periodically"
+msgstr "Обновлять периодически"
 
-#: spyderlib/plugins/runconfig.py:223
-msgid "this dialog"
-msgstr "это диалоговое окно"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:210
+#: spyder/widgets/variableexplorer/namespacebrowser.py:490
+msgid "Import data"
+msgstr "Импортировать данные"
 
-#: spyderlib/plugins/runconfig.py:282
-msgid "Run configuration"
-msgstr "Запустить конфигурацию"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:213
+#: spyder/widgets/variableexplorer/namespacebrowser.py:568
+#: spyder/widgets/variableexplorer/namespacebrowser.py:587
+msgid "Save data"
+msgstr "Сохранить данные"
 
-#: spyderlib/plugins/runconfig.py:283
-#, python-format
-msgid "The following working directory is not valid:<br><b>%s</b>"
-msgstr "Следующий рабочий каталог не применим:<br><b>%s</b>"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:218
+msgid "Save data as..."
+msgstr "Сохранить данные как..."
 
-#: spyderlib/plugins/runconfig.py:361
-#, python-format
-msgid "Run settings for %s"
-msgstr "Настройки Запуска для %s"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:230
+msgid "Exclude references which name starts with an underscore"
+msgstr "Исключить ссылки, имена которых начинаются с подчёркивания"
 
-#: spyderlib/plugins/runconfig.py:393
-msgid "Select a run configuration:"
-msgstr "Выберите конфигурацию запуска:"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:238
+msgid "Exclude references which name is uppercase"
+msgstr "Исключить ссылки с именем в верхнем регистре"
 
-#: spyderlib/plugins/runconfig.py:422 spyderlib/plugins/runconfig.py:447
-msgid "Run Settings"
-msgstr "Настройки Запуска"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:245
+msgid "Exclude references which name starts with an uppercase character"
+msgstr ""
+"Исключить ссылки, имена которых начинаются с символа в верхнем регистре"
 
-#: spyderlib/plugins/runconfig.py:449
-#, python-format
+#: spyder/widgets/variableexplorer/namespacebrowser.py:253
 msgid ""
-"The following are the default <i>%s</i>. These options may be overriden "
-"using the <b>%s</b> dialog box (see the <b>%s</b> menu)"
+"Exclude references to unsupported data types (i.e. which won't be handled/"
+"saved correctly)"
 msgstr ""
-"Следующие - стандартные <i>%s</i>. Эти опции можно перезаписать с помощью "
-"диалогового окна <b>%s</b> (см. меню <b>%s</b>)"
-
-#: spyderlib/plugins/runconfig.py:475
-msgid "Default working directory is:"
-msgstr "Рабочий каталог по умолчанию:"
-
-#: spyderlib/plugins/runconfig.py:477
-msgid "the script directory"
-msgstr "каталог скриптов"
+"Исключить ссылки на неподдерживаемые типы данных (т.е. которые не будут "
+"правильно обработаны/сохранены)"
 
-#: spyderlib/plugins/runconfig.py:506
-msgid "Show warning when killing running processes"
-msgstr "Показывать предупреждение при завершении работающих процессов"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:348
+msgid "Object <b>%s</b> is not picklable"
+msgstr "Объект <b>%s</b> не сериализуем"
 
-#: spyderlib/plugins/runconfig.py:515
-msgid "Run Settings dialog"
-msgstr "диалог Настроек Запуска"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:510
+msgid ""
+"<b>Unsupported file extension '%s'</b><br><br>Would you like to import it "
+"anyway (by selecting a known file format)?"
+msgstr ""
+"<b>Неподдерживаемое расширение файла '%s'</b><br><br>Хотите его "
+"импортировать (выбрав известный формат файла)?"
 
-#: spyderlib/plugins/history.py:35
-msgid "Settings"
-msgstr "Настройки"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:518
+msgid "Open file as:"
+msgstr "Открыть файл как:"
 
-#: spyderlib/plugins/history.py:37
-msgid "History depth: "
-msgstr "Глубина истории: "
+#: spyder/widgets/variableexplorer/namespacebrowser.py:556
+msgid "<b>Unable to load '%s'</b><br><br>Error message:<br>%s"
+msgstr "<b>Не удалось загрузить '%s'</b><br><br>Сообщение об ошибке:<br>%s"
 
-#: spyderlib/plugins/history.py:37
-msgid " entries"
-msgstr " записей"
+#: spyder/widgets/variableexplorer/namespacebrowser.py:588
+msgid "<b>Unable to save current workspace</b><br><br>Error message:<br>%s"
+msgstr ""
+"<b>Невозможно сохранить текущую рабочую область</b><br><br>Сообщение об "
+"ошибке:<br>%s"
 
-#: spyderlib/plugins/history.py:44
-msgid "Scroll automatically to last entry"
-msgstr "Автоматически пролистывать к последней записи"
+#: spyder/widgets/variableexplorer/texteditor.py:74
+msgid "Text editor"
+msgstr "Текстовый редактор"
 
-#: spyderlib/plugins/history.py:123
-msgid "History log"
-msgstr "Журнал истории"
+#: spyder/widgets/variableexplorer/utils.py:29
+msgid "View and edit DataFrames and Series in the Variable Explorer"
+msgstr ""
+"Показ и редактирование структур DataFrame и Serie в Менеджере Переменных"
 
-#: spyderlib/plugins/history.py:150
-msgid "History..."
-msgstr "История..."
+#: spyder/widgets/variableexplorer/utils.py:34
+msgid "View and edit two and three dimensional arrays in the Variable Explorer"
+msgstr ""
+"Просмотр и редактирование 2-х и 3-мерных массивов в Менеджере Переменных"
 
-#: spyderlib/plugins/history.py:152
-msgid "Set history maximum entries"
-msgstr "Установить максимум записей истории"
+#: spyder/workers/updates.py:89 spyder/workers/updates.py:91
+msgid "Unable to retrieve information."
+msgstr "Невозможно получить информацию."
 
-#: spyderlib/plugins/history.py:263
-msgid "History"
-msgstr "История"
+#: spyder/workers/updates.py:93
+msgid ""
+"Unable to connect to the internet. <br><br>Make sure the connection is "
+"working properly."
+msgstr ""
+"Не удалось подключиться к интернету.<br><br>Убедитесь, что соединение "
+"работает должным образом."
 
-#: spyderlib/plugins/history.py:264
-msgid "Maximum entries"
-msgstr "Максимум записей"
+#: spyder/workers/updates.py:96
+msgid "Unable to check for updates."
+msgstr "Не удалось проверить обновления."
 
-#: spyderlib/plugins/externalconsole.py:48
-msgid "Interactive data plotting in the consoles"
-msgstr "Интерактивные графики в консолях"
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "{0}"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "{0}"
 
-#: spyderlib/plugins/externalconsole.py:68
-msgid "One tab per script"
-msgstr "Одна вкладка на скрипт"
+#~ msgid "Reload last session"
+#~ msgstr "Перезапустить последнюю сессию"
 
-#: spyderlib/plugins/externalconsole.py:82
-msgid "Buffer: "
-msgstr "Буфер: "
+#~ msgid "Load session..."
+#~ msgstr "Загрузить сессию..."
 
-#: spyderlib/plugins/externalconsole.py:87
-msgid "Merge process standard output/error channels"
-msgstr "Объединить стандартные потоки вывода/ошибок"
+#~ msgid "Load Spyder session"
+#~ msgstr "Загрузить сессию Spyder"
 
-#: spyderlib/plugins/externalconsole.py:89
-msgid ""
-"Merging the output channels of the process means that\n"
-"the standard error won't be written in red anymore,\n"
-"but this has the effect of speeding up display."
-msgstr ""
-"Объединение потоков вывода процесса означает, что\n"
-"стандартные ошибки не будут более выделяться красным,\n"
-"но это увеличит скорость отображения на дисплее."
+#, fuzzy
+#~ msgid "Save session..."
+#~ msgstr "Сохранить сессию"
 
-#: spyderlib/plugins/externalconsole.py:93
-msgid "Colorize standard error channel using ANSI escape codes"
-msgstr "Выделить цветом стандартный поток ошибок управляющими кодами ANSI"
+#~ msgid "Save current session and quit application"
+#~ msgstr "Сохранить текущую сессию и закрыть приложение"
 
-#: spyderlib/plugins/externalconsole.py:95
-msgid ""
-"This method is the only way to have colorized standard\n"
-"error channel when the output channels have been merged."
-msgstr ""
-"Это единственный способ цветового выделения стандартного\n"
-"потока ошибок, когда потоки вывода объединены."
+#~ msgid "Open session"
+#~ msgstr "Открыть сессию"
 
-#: spyderlib/plugins/externalconsole.py:112
-msgid ""
-"This option will be applied the next time a Python console or a terminal is "
-"opened."
-msgstr ""
-"Эта опция будет применена при следующем открытии консоли Python<br>или "
-"терминала."
+#~ msgid "Spyder sessions"
+#~ msgstr "Сессии Spyder"
 
-#: spyderlib/plugins/externalconsole.py:115
-msgid "Light background (white color)"
-msgstr "Светлый фон (белый цвет)"
+#~ msgid "Save session"
+#~ msgstr "Сохранить сессию"
 
-#: spyderlib/plugins/externalconsole.py:140
-msgid "User Module Reloader (UMR)"
-msgstr "Перезагрузка модулей пользователя (UMR)"
+#~ msgid "Jupyter Qtconsole integration"
+#~ msgstr "Интеграция Qt-консоли Jupyter"
 
-#: spyderlib/plugins/externalconsole.py:141
-msgid ""
-"UMR forces Python to reload modules which were imported when executing a \n"
-"script in the external console with the 'runfile' function."
-msgstr ""
-"UMR заставляет Python перезагружать модули, импортированные при \n"
-"выполнении скрипта во внешней консоли функцией  'runfile'."
+#~ msgid "Python executable"
+#~ msgstr "Исполняемый файл Python"
 
-#: spyderlib/plugins/externalconsole.py:144
-msgid "Enable UMR"
-msgstr "Включить UMR"
+#~ msgid "Trying to kill a kernel?"
+#~ msgstr "Попытаться убить ядро?"
 
-#: spyderlib/plugins/externalconsole.py:146
-msgid ""
-"This option will enable the User Module Reloader (UMR) in Python/IPython "
-"consoles. UMR forces Python to reload deeply modules during import when "
-"running a Python script using the Spyder's builtin function <b>runfile</b>."
-"<br><br><b>1.</b> UMR may require to restart the console in which it will be "
-"called (otherwise only newly imported modules will be reloaded when "
-"executing scripts).<br><br><b>2.</b> If errors occur when re-running a PyQt-"
-"based program, please check that the Qt objects are properly destroyed (e.g. "
-"you may have to use the attribute <b>Qt.WA_DeleteOnClose</b> on your main "
-"window, using the <b>setAttribute</b> method)"
-msgstr ""
-"Эта опция включает Перезагрузчик Модулей Пользователя (UMR) в консолях "
-"Python/IPython. UMR заставляет Python рекурсивно перезагружать все модули "
-"при запуске скрипта Python встроенной функцией Spyder <b>runfile</b>."
-"<br><br><b>1.</b> UMR может потребовать перезапустить консоль, в которой был "
-"вызван (в противном случае только вновь импортируемые модули будут "
-"перезагружены при выполнении скриптов).<br><br><b>2.</b>Если при перезапуске "
-"программ на PyQt происходят ошибки, убедитесь, что Qt-объекты уничтожены "
-"должным образом (напр. можно установить атрибут <b>Qt.WA_DeleteOnClose</b> "
-"для Вашего главного окна с помощью метода <b>setAttribute</b>)"
+#~ 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 the second button from right to left."
+#~ msgstr ""
+#~ "Вы не можете закрыть это ядро, т.к. к нему подключены одна или более "
+#~ "консолей<br><br>Сначала Вам нужно их закрыть или можете убить ядро второй "
+#~ "кнопкой справа."
 
-#: spyderlib/plugins/externalconsole.py:161
-msgid "Show reloaded modules list"
-msgstr "Показать список перезагруженных модулей"
+#~ msgid "Kernel"
+#~ msgstr "Ядро"
 
-#: spyderlib/plugins/externalconsole.py:163
-msgid "Please note that these changes will be applied only to new consoles"
-msgstr ""
-"Обратите внимание, что эти изменения будут применяться только к новым "
-"консолям"
+#, fuzzy
+#~ msgid ""
+#~ "Either:<ol><li>Your IPython frontend and kernel versions are "
+#~ "<b>incompatible</b> or</li><li>You <b>don't have</b> IPython installed in "
+#~ "your external interpreter.</li></ol>In any case, we're sorry but we can't "
+#~ "create a console for you."
+#~ msgstr ""
+#~ "Либо:<ol><li>версии Ваших пользовательского и ядерного IPython "
+#~ "<b>несовместимы</b>, либо</li><li>у Вас <b>не установлен</b> IPython в "
+#~ "Вашем внешнем интерпретаторе.</li></ol>В любом случае, мы сожалеем, что "
+#~ "не можем создать консоль для Вас."
 
-#: spyderlib/plugins/externalconsole.py:166
-msgid "Set UMR excluded (not reloaded) modules"
-msgstr "Установить модули-исключения для UMR (не перезагружаемые)"
+#~ msgid "Kernel %s"
+#~ msgstr "Ядро %s"
 
-#: spyderlib/plugins/externalconsole.py:177
-msgid "Python executable"
-msgstr "Исполняемый файл Python"
+#~ msgid "Open an IPython console"
+#~ msgstr "Открыть консоль IPython"
 
-#: spyderlib/plugins/externalconsole.py:179
-msgid ""
-"Select the Python interpreter executable binary in which Spyder will run "
-"scripts:"
-msgstr ""
-"Выберите исполняемый бинарный файл интерпретатора Python,\n"
-"который Spyder будет запускать скрипты:"
+#~ 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 ""
+#~ "Монитор консоли был отключен: ядро IPython будет запущено как ожидалось, "
+#~ "но консоль IPython нужно будет подключить к ядру вручную."
 
-#: spyderlib/plugins/externalconsole.py:182
-msgid "Default (i.e. the same as Spyder's)"
-msgstr "По умолчанию (тот же, что для Spyder)"
+#~ msgid ""
+#~ "UMR excluded modules:\n"
+#~ "(example: guidata, guiqwt)"
+#~ msgstr ""
+#~ "Модули-исключения для UMR:\n"
+#~ "(например: guidata, guiqwt)"
 
-#: spyderlib/plugins/externalconsole.py:186
-msgid "Use the following Python interpreter:"
-msgstr "Использовать следующий интепретатор Python:"
+#~ msgid ""
+#~ "This feature requires the Matplotlib library.\n"
+#~ "It seems you don't have it installed."
+#~ msgstr ""
+#~ "Эта функция требует библиотеку Matplotlib.\n"
+#~ "Похоже, Вы её не установили."
 
-#: spyderlib/plugins/externalconsole.py:190
-msgid "Executables"
-msgstr "Исполняемые файлы"
+#~ msgid ""
+#~ "This feature requires the Sympy library.\n"
+#~ "It seems you don't have it installed."
+#~ msgstr ""
+#~ "Эта функция требует библиотеку Sympy.\n"
+#~ "По-видимому, она не установлена."
 
-#: spyderlib/plugins/externalconsole.py:208
-msgid "PYTHONSTARTUP replacement"
-msgstr "Замена PYTHONSTARTUP"
+#~ msgid "&Font..."
+#~ msgstr "&Шрифт"
 
-#: spyderlib/plugins/externalconsole.py:210
-msgid ""
-"This option will override the PYTHONSTARTUP environment variable which\n"
-"defines the script to be executed during the Python console startup."
-msgstr ""
-"Эта опция перезапишет переменную среды PYTHONSTARTUP, которая\n"
-"определяет скрипт, запускаемый при старте консоли Python."
+#~ msgid "Set font style"
+#~ msgstr "Установить стиль шрифта"
 
-#: spyderlib/plugins/externalconsole.py:215
-msgid "Default PYTHONSTARTUP script"
-msgstr "Скрипт PYTHONSTARTUP по умолчанию"
+#~ msgid "Select a new font"
+#~ msgstr "Выбрать новый шрифт"
 
-#: spyderlib/plugins/externalconsole.py:219
-msgid "Use the following startup script:"
-msgstr "Использовать следующий скрипт запуска:"
+#~ msgid ""
+#~ "The kernel failed to start!! That's all we know... Please close this "
+#~ "console and open a new one."
+#~ msgstr ""
+#~ "Ошибка запуска ядра!! Это всё, что известно... Пожалуйста, закройте "
+#~ "консоль и откройте новую."
 
-#: spyderlib/plugins/externalconsole.py:236
-msgid "Monitor"
-msgstr "Монитор"
+#~ msgid ""
+#~ "It seems the kernel died unexpectedly. Use 'Restart kernel' to continue "
+#~ "using this console."
+#~ msgstr ""
+#~ "По видимому ядро неожиданно умерло. Используйте 'Перезапустить ядро' для "
+#~ "продолжения работы в консоли."
 
-#: spyderlib/plugins/externalconsole.py:237
-msgid ""
-"The monitor provides introspection features to console: code completion, "
-"calltips and variable explorer. Because it relies on several modules, "
-"disabling the monitor may be useful to accelerate console startup."
-msgstr ""
-"Монитор обеспечивает возможность самоанализа в консоли: автодополнение, "
-"подсказки вызова функций и менеджер переменных. Так как он зависит от "
-"нескольких модулей, отключение монитора может быть полезно для ускорения "
-"запуска консоли."
+#~ msgid "Kernel process is either remote or unspecified. Cannot interrupt"
+#~ msgstr ""
+#~ "Процесс ядра либо подключён удалённо, либо неопределим. Невозможно "
+#~ "прервать"
 
-#: spyderlib/plugins/externalconsole.py:244
-msgid "Enable monitor"
-msgstr "Включить монитор"
+#~ msgid "Kernel process is either remote or unspecified. Cannot restart."
+#~ msgstr ""
+#~ "Процесс ядра либо подключён удалённо, либо неопределим. Невозможно "
+#~ "перезапустить."
 
-#: spyderlib/plugins/externalconsole.py:257
-msgid "Default library"
-msgstr "Библиотека по умолчанию"
+#~ msgid "its own configuration file"
+#~ msgstr "его собственный файл конфигурации"
 
-#: spyderlib/plugins/externalconsole.py:262
-msgid "Qt-Python Bindings"
-msgstr ""
+#~ msgid " and "
+#~ msgstr " и "
 
-#: spyderlib/plugins/externalconsole.py:264
-msgid "Library:"
-msgstr "Библиотека:"
+#~ msgid "the following projects:<br>%s"
+#~ msgstr "следующие проекты:<br>%s"
 
-#: spyderlib/plugins/externalconsole.py:266
-msgid ""
-"This option will act on<br> libraries such as Matplotlib, guidata or ETS"
-msgstr ""
-"Эта опция будет действовать на<br> \n"
-"библиотеки, такие как Matplotlib, guidata или ETS"
+#~ msgid "Existing Pydev project"
+#~ msgstr "Существующий проект Pydev"
 
-#: spyderlib/plugins/externalconsole.py:276
-msgid ""
-"Decide which backend to use to display graphics. If unsure, please select "
-"the <b>Automatic</b> backend.<br><br><b>Note:</b> We support a very limited "
-"number of backends in our Python consoles. If you prefer to work with a "
-"different one, please use an IPython console."
-msgstr ""
-"Выберите какой бэкенд использовать для отображения графики. Если не уверены, "
-"выберите <b>Автоматически</b>.<br><br><b>Примечание:</b> Мы поддерживаем "
-"очень ограниченный набор бэкендов в консолях Python. Если Вы предпочитаете "
-"работать с другим, пожалуйста используйте консоль IPython."
+#~ msgid "Close unrelated projects"
+#~ msgstr "Закрыть несвязанные проекты"
 
-#: spyderlib/plugins/externalconsole.py:303
-msgid "Enthought Tool Suite"
-msgstr ""
+#~ msgid "Edit related projects"
+#~ msgstr "Редактировать связанные проекты"
 
-#: spyderlib/plugins/externalconsole.py:304
-msgid ""
-"Enthought Tool Suite (ETS) supports PyQt4 (qt4) and wxPython (wx) graphical "
-"user interfaces."
-msgstr ""
+#~ msgid "Add to PYTHONPATH"
+#~ msgstr "Добавить в PYTHONPATH"
 
-#: spyderlib/plugins/externalconsole.py:308
-msgid "ETS_TOOLKIT:"
-msgstr ""
+#~ msgid "Remove from PYTHONPATH"
+#~ msgstr "Удалить из PYTHONPATH"
 
-#: spyderlib/plugins/externalconsole.py:333
-msgid "External modules"
-msgstr "Внешние модули"
+#~ msgid "Properties"
+#~ msgstr "Свойства"
 
-#: spyderlib/plugins/externalconsole.py:369
-#, python-format
-msgid ""
-"You selected a <b>Python %d</b> interpreter for the console but Spyder is "
-"running on <b>Python %d</b>!.<br><br>Although this is possible, we recommend "
-"you to install and run Spyder directly with your selected interpreter, to "
-"avoid seeing false warnings and errors due to the incompatible syntax "
-"between these two Python versions."
-msgstr ""
-"Вы выбрали интерпретатор <b>Python %d</b> для консоли, но Spyder запущен на "
-"<b>Python %d</b>!.<br><br>Мы рекомендуем, если возможно, установить и "
-"запустить Spyder непосредственно выбранным интерпретатором, чтобы избежать "
-"появления ложных предупреждений и ошибок, связанных с несовместимостями в "
-"синтаксисе между этими двумя версиями Python."
+#~ 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."
+#~ msgstr ""
+#~ "Рабочую область не удалось загрузить или сохранить %s<br><br>Пожалуйста, "
+#~ "проверьте, достаточно ли у Вас прав для записи соответствующих файлов "
+#~ "конфигурации."
 
-#: spyderlib/plugins/externalconsole.py:532
-msgid "Trying to kill a kernel?"
-msgstr "Попытаться убить ядро?"
+#~ msgid "Import directory"
+#~ msgstr "Импортировать каталог"
 
-#: spyderlib/plugins/externalconsole.py:533
-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 "
-"the second button from right to left."
-msgstr ""
-"Вы не можете закрыть это ядро, т.к. к нему подключены одна или более "
-"консолей<br><br>Сначала Вам нужно их закрыть или можете убить ядро второй "
-"кнопкой справа."
+#~ 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)?"
+#~ msgstr ""
+#~ "Выбранного каталога нет в рабочей области:<br><b>%s</b><br><br>Хотите "
+#~ "продолжить (и скопировать каталог в область)?"
 
-#: spyderlib/plugins/externalconsole.py:612
-#, python-format
-msgid ""
-"No Python console is currently selected to run <b>%s</b>.<br><br>Please "
-"select or open a new Python console and try again."
-msgstr ""
-"Сейчас нет доступных консолей Python для запуска <b>%s</b>."
-"<br><br>Пожалуйста, откройте новую и попытайтесь снова."
+#~ msgid "The project <b>%s</b> is already opened!"
+#~ msgstr "Проект <b>%s</b> уже открыт!"
 
-#: spyderlib/plugins/externalconsole.py:692
-#, python-format
-msgid ""
-"%s is already running in a separate process.\n"
-"Do you want to kill the process before starting a new one?"
-msgstr ""
-"%s всегда запускается в отдельном процессе.\n"
-"Хотите убить процесс перед запуском нового?"
+#~ 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>"
+#~ msgstr ""
+#~ "Корневой каталог проекта находится в рабочей области, но не в качестве "
+#~ "ожидаемого уровня дерева. Он не является каталогом рабочей области:<br><b>"
+#~ "%s</b>"
 
-#: spyderlib/plugins/externalconsole.py:852
-msgid "Kernel"
-msgstr "Ядро"
+#~ msgid "A project named <b>%s</b> already exists"
+#~ msgstr "Проект с именем <b>%s</b> уже существует"
 
-#: spyderlib/plugins/externalconsole.py:862
-#, fuzzy
-msgid ""
-"Either:<ol><li>Your IPython frontend and kernel versions are "
-"<b>incompatible</b> or</li><li>You <b>don't have</b> IPython installed in "
-"your external interpreter.</li></ol>In any case, we're sorry but we can't "
-"create a console for you."
-msgstr ""
-"Либо:<ol><li>версии Ваших пользовательского и ядерного IPython "
-"<b>несовместимы</b>, либо</li><li>у Вас <b>не установлен</b> IPython в Вашем "
-"внешнем интерпретаторе.</li></ol>В любом случае, мы сожалеем, что не можем "
-"создать консоль для Вас."
+#~ msgid ""
+#~ "Invalid project name.<br><br>Name must match the following regular "
+#~ "expression:<br><b>%s</b>"
+#~ msgstr ""
+#~ "Неверное имя проекта.<br><br>Название должно соответствовать регулярному "
+#~ "выражению:<br><b>%s</b>"
 
-#: spyderlib/plugins/externalconsole.py:886
-msgid "Command Window"
-msgstr "Командное окно"
+#~ msgid ""
+#~ "The following directory is not empty:<br><b>%s</b><br><br>Do you want to "
+#~ "continue?"
+#~ msgstr "Выбранный каталог не пуст:<br><b>%s</b><br><br>Хотите продолжить?"
 
-#: spyderlib/plugins/externalconsole.py:888
-msgid "Terminal"
-msgstr "Терминал"
+#~ msgid "New project"
+#~ msgstr "Новый проект"
 
-#: spyderlib/plugins/externalconsole.py:941
-#, python-format
-msgid "Kernel %s"
-msgstr "Ядро %s"
+#~ msgid ""
+#~ "The current workspace has not been configured yet.\n"
+#~ "Do you want to do this now?"
+#~ msgstr ""
+#~ "Текущая рабочая область ещё не сконфигурирована.\n"
+#~ "Сделать это сейчас?"
 
-#: spyderlib/plugins/externalconsole.py:1021
-msgid "Open a &Python console"
-msgstr "Открыть консоль &Python"
+#~ msgid "Import existing project"
+#~ msgstr "Импортировать существующий проект"
 
-#: spyderlib/plugins/externalconsole.py:1025
-msgid "Open &command prompt"
-msgstr "Открыть &командную строку"
+#~ msgid "Select projects to import"
+#~ msgstr "Выбрать проекты для импорта"
 
-#: spyderlib/plugins/externalconsole.py:1026
-msgid "Open a Windows command prompt"
-msgstr "Открыть командную строку Windows"
+#~ msgid "The folder <i>%s</i> does not contain a valid %s project"
+#~ msgstr "Каталог <i>%s</i> не содержит подходящего проекта %s"
 
-#: spyderlib/plugins/externalconsole.py:1028
-msgid "Open a &terminal"
-msgstr "Открыть &терминал"
+#~ msgid "Import existing Pydev project"
+#~ msgstr "Импортировать существующий проект Pydev"
 
-#: spyderlib/plugins/externalconsole.py:1029
-msgid "Open a terminal window"
-msgstr "Открыть окно терминала"
+#~ msgid ""
+#~ "<b>Unable to read Pydev project <i>%s</i></b><br><br>Error message:<br>%s"
+#~ msgstr ""
+#~ "<b>Не удалось прочитать проект Pydev <i>%s</i></b><br><br>Сообщение об "
+#~ "ошибке:<br>%s"
 
-#: spyderlib/plugins/externalconsole.py:1186
-msgid "Open an IPython console"
-msgstr "Открыть консоль IPython"
+#~ msgid ""
+#~ "Do you really want to delete project <b>%s</b>?<br><br>Note: project "
+#~ "files won't be deleted from disk."
+#~ msgstr ""
+#~ "Вы действительно хотите удалить проект <b>%s</b>?<br><br>Примечание: "
+#~ "файлы проекта не будут удалены с диска."
 
-#: spyderlib/plugins/externalconsole.py:1187
-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 ""
-"Монитор консоли был отключен: ядро IPython будет запущено как ожидалось, но "
-"консоль IPython нужно будет подключить к ядру вручную."
+#~ msgid "Select projects which are related to <b>%s</b>"
+#~ msgstr "Выбранные проекты связаны с <b>%s</b>"
 
-#: spyderlib/plugins/externalconsole.py:1219
-#: spyderlib/plugins/externalconsole.py:1232
-#: spyderlib/plugins/externalconsole.py:1236
-msgid "UMR"
-msgstr "UMR"
+#~ msgid ""
+#~ "Statistics on source files only:<br>(Python, Cython, IPython, Enaml,C/C+"
+#~ "+, Fortran)<br><br><b>%s</b> files.<br><b>%s</b> lines of code."
+#~ msgstr ""
+#~ "Статистика по исходному коду только:<br>(Python, Cython, IPython, Enaml,C/"
+#~ "C++, Fortran)<br><br><b>%s</b> файлов.<br><b>%s</b> строк кода."
 
-#: spyderlib/plugins/externalconsole.py:1220
-msgid ""
-"UMR excluded modules:\n"
-"(example: guidata, guiqwt)"
-msgstr ""
-"Модули-исключения для UMR:\n"
-"(например: guidata, guiqwt)"
+#~ msgid "Select an existing workspace directory, or create a new one"
+#~ msgstr "Выберите каталог рабочей области или создайте новый"
 
-#: spyderlib/plugins/externalconsole.py:1233
-#, python-format
-msgid ""
-"The following modules are not installed on your machine:\n"
-"%s"
-msgstr ""
-"Следующие модули не установлены на Вашей машине:\n"
-"%s"
+#~ 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>."
+#~ "spyderworkspace</b> configuration file.<br><br>A <b>Spyder project</b> is "
+#~ "a directory with source code (and other related files) and a "
+#~ "configuration file (named <b>.spyderproject</b>) with project settings "
+#~ "(PYTHONPATH, linked projects, ...).<br>"
+#~ msgstr ""
+#~ "<u><b>Что такое рабочая область?</b></u><br><br>A <b>Рабочая область "
+#~ "Spyder</b> - каталог в вашей файловой системе, содержащий проекты Spyder "
+#~ "и файл конфигурации <b>.spyderworkspace</b>.<br><br>A <b>Проект Spyder</"
+#~ "b> - каталог с исходным кодом (и другими связанными файлами) и "
+#~ "конфигурационным файлом (с расширением <b>.spyderproject</b>), содержащим "
+#~ "настройки проекта (PYTHONPATH, взаимосвязанные проекты и т.п.)."
 
-#: spyderlib/plugins/externalconsole.py:1237
-msgid ""
-"Please note that these changes will be applied only to new Python/IPython "
-"consoles"
-msgstr ""
-"Обратите внимание, что эти изменения будут применяться только к новым "
-"консолям Python/IPython"
+#~ msgid "This is the current workspace directory"
+#~ msgstr "Это текущий каталог рабочей области"
 
-#: spyderlib/plugins/layoutdialog.py:174
-msgid "Move Up"
-msgstr "Вверх"
+#~ msgid ""
+#~ "The following directory is not a Spyder workspace:<br>%s<br><br>Do you "
+#~ "want to create a new workspace in this directory?"
+#~ msgstr ""
+#~ "Выбранный каталог не является рабочей областью Spyder:<br>"
+#~ "%s<br><br>Хотите создать новую рабочую область в этом каталоге?"
 
-#: spyderlib/plugins/layoutdialog.py:175
-msgid "Move Down"
-msgstr "Вниз"
+#~ msgid "<b>Unable to retrieve data.</b><br><br>Error message:<br>%s"
+#~ msgstr "<b>Не удалось вывести данные.</b><br><br>Сообщение об ошибке:<br>%s"
 
-#: spyderlib/plugins/layoutdialog.py:176
-msgid "Delete Layout"
-msgstr "Удалить"
+#~ msgid "Save session and quit..."
+#~ msgstr "Сохранить сессию и выйти..."
 
-#: spyderlib/plugins/layoutdialog.py:180
-msgid "Layout Display and Order"
-msgstr "Показывать и Выбирать компоновку"
+#~ msgid "Breakpoints"
+#~ msgstr "Точки останова"
 
-#: spyderlib/plugins/onlinehelp.py:68
-msgid "Online help"
-msgstr "Онлайн справка"
+#~ msgid "Exit"
+#~ msgstr "Выход"
 
-#~ msgid "Debugging"
-#~ msgstr "Отладка"
+#~ msgid "Exit Debug"
+#~ msgstr "Завершить отладку"
 
 #~ msgid "Updates"
 #~ msgstr "Обновления"
diff --git a/spyder/locale/spyder.pot b/spyder/locale/spyder.pot
new file mode 100644
index 0000000..cbe2e21
--- /dev/null
+++ b/spyder/locale/spyder.pot
@@ -0,0 +1,4624 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR ORGANIZATION
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2016-09-24 04:45+COT\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: ENCODING\n"
+"Generated-By: pygettext.py 1.5\n"
+
+
+#: spyder/app/mainwindow.py:120
+msgid "Initializing..."
+msgstr ""
+
+#: spyder/app/mainwindow.py:236
+msgid "Numpy and Scipy documentation"
+msgstr ""
+
+#: spyder/app/mainwindow.py:238 spyder/app/mainwindow.py:1022
+msgid "Matplotlib documentation"
+msgstr ""
+
+#: spyder/app/mainwindow.py:241
+msgid "PyQt4 Reference Guide"
+msgstr ""
+
+#: spyder/app/mainwindow.py:244
+msgid "PyQt4 API Reference"
+msgstr ""
+
+#: spyder/app/mainwindow.py:246
+msgid "Python(x,y)"
+msgstr ""
+
+#: spyder/app/mainwindow.py:248
+msgid "WinPython"
+msgstr ""
+
+#: spyder/app/mainwindow.py:519
+msgid "Close current pane"
+msgstr ""
+
+#: spyder/app/mainwindow.py:524
+msgid "Lock panes"
+msgstr ""
+
+#: spyder/app/mainwindow.py:531
+msgid "Use next layout"
+msgstr ""
+
+#: spyder/app/mainwindow.py:535
+msgid "Use previous layout"
+msgstr ""
+
+#: spyder/app/mainwindow.py:554 spyder/widgets/sourcecode/codeeditor.py:2464
+msgid "Undo"
+msgstr ""
+
+#: spyder/app/mainwindow.py:556 spyder/widgets/sourcecode/codeeditor.py:2467
+msgid "Redo"
+msgstr ""
+
+#: spyder/app/mainwindow.py:558 spyder/widgets/shell.py:121
+#: spyder/widgets/sourcecode/codeeditor.py:2473
+#: spyder/widgets/variableexplorer/arrayeditor.py:453
+#: spyder/widgets/variableexplorer/collectionseditor.py:647
+#: spyder/widgets/variableexplorer/dataframeeditor.py:445
+msgid "Copy"
+msgstr ""
+
+#: spyder/app/mainwindow.py:560 spyder/widgets/shell.py:117
+#: spyder/widgets/sourcecode/codeeditor.py:2470
+msgid "Cut"
+msgstr ""
+
+#: spyder/app/mainwindow.py:562 spyder/widgets/shell.py:125
+#: spyder/widgets/sourcecode/codeeditor.py:2476
+#: spyder/widgets/variableexplorer/collectionseditor.py:644
+msgid "Paste"
+msgstr ""
+
+#: spyder/app/mainwindow.py:565 spyder/widgets/shell.py:138
+#: spyder/widgets/sourcecode/codeeditor.py:2479
+msgid "Select All"
+msgstr ""
+
+#: spyder/app/mainwindow.py:575 spyder/plugins/editor.py:1342
+msgid "&File"
+msgstr ""
+
+#: spyder/app/mainwindow.py:576 spyder/plugins/editor.py:1334
+msgid "File toolbar"
+msgstr ""
+
+#: spyder/app/mainwindow.py:580 spyder/plugins/editor.py:1343
+msgid "&Edit"
+msgstr ""
+
+#: spyder/app/mainwindow.py:581 spyder/plugins/editor.py:1339
+msgid "Edit toolbar"
+msgstr ""
+
+#: spyder/app/mainwindow.py:585 spyder/plugins/editor.py:1344
+msgid "&Search"
+msgstr ""
+
+#: spyder/app/mainwindow.py:586 spyder/plugins/editor.py:1335
+msgid "Search toolbar"
+msgstr ""
+
+#: spyder/app/mainwindow.py:590 spyder/plugins/editor.py:1345
+msgid "Sour&ce"
+msgstr ""
+
+#: spyder/app/mainwindow.py:591 spyder/plugins/editor.py:1336
+msgid "Source toolbar"
+msgstr ""
+
+#: spyder/app/mainwindow.py:595 spyder/plugins/editor.py:780
+#: spyder/plugins/editor.py:1346
+msgid "&Run"
+msgstr ""
+
+#: spyder/app/mainwindow.py:596 spyder/plugins/editor.py:1337
+msgid "Run toolbar"
+msgstr ""
+
+#: spyder/app/mainwindow.py:600 spyder/plugins/editor.py:739
+msgid "&Debug"
+msgstr ""
+
+#: spyder/app/mainwindow.py:601 spyder/plugins/editor.py:1338
+msgid "Debug toolbar"
+msgstr ""
+
+#: spyder/app/mainwindow.py:605
+msgid "C&onsoles"
+msgstr ""
+
+#: spyder/app/mainwindow.py:608
+msgid "&Projects"
+msgstr ""
+
+#: spyder/app/mainwindow.py:611 spyder/plugins/editor.py:1347
+msgid "&Tools"
+msgstr ""
+
+#: spyder/app/mainwindow.py:614
+msgid "&View"
+msgstr ""
+
+#: spyder/app/mainwindow.py:617
+msgid "&Help"
+msgstr ""
+
+#: spyder/app/mainwindow.py:622
+msgid "Welcome to Spyder!"
+msgstr ""
+
+#: spyder/app/mainwindow.py:627
+msgid "Pre&ferences"
+msgstr ""
+
+#: spyder/app/mainwindow.py:634 spyder/widgets/pathmanager.py:49
+msgid "PYTHONPATH manager"
+msgstr ""
+
+#: spyder/app/mainwindow.py:637
+msgid "Python Path Manager"
+msgstr ""
+
+#: spyder/app/mainwindow.py:640
+msgid "Update module names list"
+msgstr ""
+
+#: spyder/app/mainwindow.py:643
+msgid "Refresh list of module names available in PYTHONPATH"
+msgstr ""
+
+#: spyder/app/mainwindow.py:646
+msgid "Reset Spyder to factory defaults"
+msgstr ""
+
+#: spyder/app/mainwindow.py:651
+msgid "Current user environment variables..."
+msgstr ""
+
+#: spyder/app/mainwindow.py:653
+msgid "Show and edit current user environment variables in Windows registry (i.e. for all sessions)"
+msgstr ""
+
+#: spyder/app/mainwindow.py:662 spyder/app/mainwindow.py:1118
+msgid "External Tools"
+msgstr ""
+
+#: spyder/app/mainwindow.py:666
+msgid "Python(x,y) launcher"
+msgstr ""
+
+#: spyder/app/mainwindow.py:673
+msgid "WinPython control panel"
+msgstr ""
+
+#: spyder/app/mainwindow.py:682
+msgid "Qt Designer"
+msgstr ""
+
+#: spyder/app/mainwindow.py:687
+msgid "Qt Linguist"
+msgstr ""
+
+#: spyder/app/mainwindow.py:693
+msgid "Qt examples"
+msgstr ""
+
+#: spyder/app/mainwindow.py:714
+msgid "guidata examples"
+msgstr ""
+
+#: spyder/app/mainwindow.py:725
+msgid "guiqwt examples"
+msgstr ""
+
+#: spyder/app/mainwindow.py:730
+msgid "Sift"
+msgstr ""
+
+#: spyder/app/mainwindow.py:740
+msgid "ViTables"
+msgstr ""
+
+#: spyder/app/mainwindow.py:754
+msgid "Fullscreen mode"
+msgstr ""
+
+#: spyder/app/mainwindow.py:766
+msgid "Main toolbar"
+msgstr ""
+
+#: spyder/app/mainwindow.py:775
+msgid ""
+"Spyder Internal Console\n"
+"\n"
+"This console is used to report application\n"
+"internal errors and to inspect Spyder\n"
+"internals with the following commands:\n"
+"  spy.app, spy.window, dir(spy)\n"
+"\n"
+"Please don't use it to run your code\n"
+"\n"
+msgstr ""
+
+#: spyder/app/mainwindow.py:792
+msgid "Loading help..."
+msgstr ""
+
+#: spyder/app/mainwindow.py:799
+msgid "Loading outline explorer..."
+msgstr ""
+
+#: spyder/app/mainwindow.py:807
+msgid "Loading editor..."
+msgstr ""
+
+#: spyder/app/mainwindow.py:813 spyder/plugins/console.py:134
+#: spyder/widgets/ipythonconsole/client.py:278
+msgid "&Quit"
+msgstr ""
+
+#: spyder/app/mainwindow.py:815 spyder/plugins/console.py:136
+msgid "Quit"
+msgstr ""
+
+#: spyder/app/mainwindow.py:819
+msgid "&Restart"
+msgstr ""
+
+#: spyder/app/mainwindow.py:821
+msgid "Restart"
+msgstr ""
+
+#: spyder/app/mainwindow.py:838
+msgid "Loading file explorer..."
+msgstr ""
+
+#: spyder/app/mainwindow.py:845
+msgid "Loading history plugin..."
+msgstr ""
+
+#: spyder/app/mainwindow.py:856
+msgid "Loading online help..."
+msgstr ""
+
+#: spyder/app/mainwindow.py:862
+msgid "Loading project explorer..."
+msgstr ""
+
+#: spyder/app/mainwindow.py:869
+msgid "Loading external console..."
+msgstr ""
+
+#: spyder/app/mainwindow.py:875
+msgid "Loading namespace browser..."
+msgstr ""
+
+#: spyder/app/mainwindow.py:882
+msgid "Loading IPython console..."
+msgstr ""
+
+#: spyder/app/mainwindow.py:887
+msgid "Setting up main window..."
+msgstr ""
+
+#: spyder/app/mainwindow.py:890
+msgid "Dependencies..."
+msgstr ""
+
+#: spyder/app/mainwindow.py:894
+msgid "Report issue..."
+msgstr ""
+
+#: spyder/app/mainwindow.py:898
+msgid "Spyder support..."
+msgstr ""
+
+#: spyder/app/mainwindow.py:901
+msgid "Check for updates..."
+msgstr ""
+
+#: spyder/app/mainwindow.py:924
+msgid "Spyder documentation"
+msgstr ""
+
+#: spyder/app/mainwindow.py:929
+msgid "Spyder tutorial"
+msgstr ""
+
+#: spyder/app/mainwindow.py:936
+msgid "Interactive tours"
+msgstr ""
+
+#: spyder/app/mainwindow.py:964
+msgid "Python documentation"
+msgstr ""
+
+#: spyder/app/mainwindow.py:970 spyder/app/mainwindow.py:1014
+msgid "IPython documentation"
+msgstr ""
+
+#: spyder/app/mainwindow.py:971
+msgid "Intro to IPython"
+msgstr ""
+
+#: spyder/app/mainwindow.py:973
+msgid "Quick reference"
+msgstr ""
+
+#: spyder/app/mainwindow.py:975
+msgid "Console help"
+msgstr ""
+
+#: spyder/app/mainwindow.py:1012
+msgid "Python(x,y) documentation folder"
+msgstr ""
+
+#: spyder/app/mainwindow.py:1016
+msgid "guidata documentation"
+msgstr ""
+
+#: spyder/app/mainwindow.py:1019
+msgid "guiqwt documentation"
+msgstr ""
+
+#: spyder/app/mainwindow.py:1025
+msgid "NumPy documentation"
+msgstr ""
+
+#: spyder/app/mainwindow.py:1027
+msgid "NumPy reference guide"
+msgstr ""
+
+#: spyder/app/mainwindow.py:1029
+msgid "NumPy user guide"
+msgstr ""
+
+#: spyder/app/mainwindow.py:1031
+msgid "SciPy documentation"
+msgstr ""
+
+#: spyder/app/mainwindow.py:1038
+msgid "Installed Python modules"
+msgstr ""
+
+#: spyder/app/mainwindow.py:1042
+msgid "Online documentation"
+msgstr ""
+
+#: spyder/app/mainwindow.py:1054
+msgid "Qt documentation"
+msgstr ""
+
+#: spyder/app/mainwindow.py:1060
+msgid "About %s..."
+msgstr ""
+
+#: spyder/app/mainwindow.py:1084
+msgid "Panes"
+msgstr ""
+
+#: spyder/app/mainwindow.py:1086
+msgid "Toolbars"
+msgstr ""
+
+#: spyder/app/mainwindow.py:1087
+msgid "Window layouts"
+msgstr ""
+
+#: spyder/app/mainwindow.py:1096 spyder/app/mainwindow.py:1893
+#: spyder/app/mainwindow.py:1894
+msgid "Show toolbars"
+msgstr ""
+
+#: spyder/app/mainwindow.py:1111
+msgid "Attached console window (debugging)"
+msgstr ""
+
+#: spyder/app/mainwindow.py:1294 spyder/plugins/projects.py:238
+#: spyder/widgets/explorer.py:627 spyder/widgets/explorer.py:732
+#: spyder/widgets/externalshell/pythonshell.py:533
+#: spyder/widgets/externalshell/systemshell.py:105
+#: spyder/widgets/variableexplorer/arrayeditor.py:573
+#: spyder/widgets/variableexplorer/collectionseditor.py:419
+#: spyder/widgets/variableexplorer/dataframeeditor.py:593
+msgid "Error"
+msgstr ""
+
+#: spyder/app/mainwindow.py:1295
+msgid "<b>You have missing dependencies!</b><br><br><tt>%s</tt><br><br><b>Please install them to avoid this message.</b><br><br><i>Note</i>: Spyder could work without some of these dependencies, however to have a smooth experience when using Spyder we <i>strongly</i> recommend you to install all the listed missing dependencies.<br><br>Failing to install these dependencies might result in bugs. Please be sure that any found bugs are not the direct result of missing dependencies, prior to  [...]
+msgstr ""
+
+#: spyder/app/mainwindow.py:1740
+msgid "Spyder Default Layout"
+msgstr ""
+
+#: spyder/app/mainwindow.py:1758
+msgid "Save current layout"
+msgstr ""
+
+#: spyder/app/mainwindow.py:1762
+msgid "Layout preferences"
+msgstr ""
+
+#: spyder/app/mainwindow.py:1766
+msgid "Reset to spyder default"
+msgstr ""
+
+#: spyder/app/mainwindow.py:1786 spyder/app/mainwindow.py:1808
+#: spyder/app/mainwindow.py:1871 spyder/app/mainwindow.py:2655
+#: spyder/plugins/configdialog.py:1250 spyder/plugins/externalconsole.py:446
+#: spyder/plugins/ipythonconsole.py:119 spyder/plugins/ipythonconsole.py:835
+#: spyder/plugins/maininterpreter.py:167 spyder/utils/environ.py:100
+#: spyder/utils/environ.py:113
+#: spyder/widgets/variableexplorer/arrayeditor.py:496
+#: spyder/widgets/variableexplorer/collectionseditor.py:410
+#: spyder/widgets/variableexplorer/collectionseditor.py:1063
+msgid "Warning"
+msgstr ""
+
+#: spyder/app/mainwindow.py:1787
+msgid ""
+"Window layout will be reset to default settings: this affects window position, size and dockwidgets.\n"
+"Do you want to continue?"
+msgstr ""
+
+#: spyder/app/mainwindow.py:1809
+msgid "Layout <b>%s</b> will be                                                overwritten. Do you want to                                                continue?"
+msgstr ""
+
+#: spyder/app/mainwindow.py:1872
+msgid "Quick switch layout #%s has not yet been defined."
+msgstr ""
+
+#: spyder/app/mainwindow.py:1890 spyder/app/mainwindow.py:1891
+msgid "Hide toolbars"
+msgstr ""
+
+#: spyder/app/mainwindow.py:2184 spyder/app/mainwindow.py:2185
+msgid "Maximize current pane"
+msgstr ""
+
+#: spyder/app/mainwindow.py:2188
+msgid "Restore current pane"
+msgstr ""
+
+#: spyder/app/mainwindow.py:2189
+msgid "Restore pane to its original size"
+msgstr ""
+
+#: spyder/app/mainwindow.py:2273
+msgid "About %s"
+msgstr ""
+
+#: spyder/app/mainwindow.py:2400 spyder/plugins/editor.py:158
+#: spyder/plugins/runconfig.py:322 spyder/plugins/runconfig.py:444
+#: spyder/plugins/runconfig.py:449 spyder/utils/programs.py:285
+#: spyder/widgets/explorer.py:269
+#: spyder/widgets/externalshell/baseshell.py:127
+msgid "Run"
+msgstr ""
+
+#: spyder/app/mainwindow.py:2401
+msgid "Running an external system terminal is not supported on platform %s."
+msgstr ""
+
+#: spyder/app/mainwindow.py:2656
+msgid "Spyder will restart and reset to default settings: <br><br>Do you want to continue?"
+msgstr ""
+
+#: spyder/app/mainwindow.py:2753 spyder/widgets/helperwidgets.py:250
+msgid "Spyder updates"
+msgstr ""
+
+#: spyder/app/mainwindow.py:2754 spyder/plugins/configdialog.py:819
+msgid "Check for updates on startup"
+msgstr ""
+
+#: spyder/app/mainwindow.py:2772
+msgid "<b>Spyder %s is available!</b> <br><br>Please use your package manager to update Spyder or go to our <a href=\"%s\">Releases</a> page to download this new version. <br><br>If you are not sure how to proceed to update Spyder please refer to our  <a href=\"%s\">Installation</a> instructions."
+msgstr ""
+
+#: spyder/app/mainwindow.py:2784
+msgid "Spyder is up to date."
+msgstr ""
+
+#: spyder/app/restart.py:133
+msgid ""
+"It was not possible to close the previous Spyder instance.\n"
+"Restart aborted."
+msgstr ""
+
+#: spyder/app/restart.py:135
+msgid ""
+"Spyder could not reset to factory defaults.\n"
+"Restart aborted."
+msgstr ""
+
+#: spyder/app/restart.py:137
+msgid ""
+"It was not possible to restart Spyder.\n"
+"Operation aborted."
+msgstr ""
+
+#: spyder/app/restart.py:139
+msgid "Spyder exit error"
+msgstr ""
+
+#: spyder/app/restart.py:140
+msgid "Spyder reset error"
+msgstr ""
+
+#: spyder/app/restart.py:141
+msgid "Spyder restart error"
+msgstr ""
+
+#: spyder/app/restart.py:165
+msgid "Closing Spyder"
+msgstr ""
+
+#: spyder/app/restart.py:239
+msgid "Resetting Spyder to defaults"
+msgstr ""
+
+#: spyder/app/restart.py:271
+msgid "Restarting"
+msgstr ""
+
+#: spyder/app/tour.py:124
+msgid "Welcome to the Introduction tour"
+msgstr ""
+
+#: spyder/app/tour.py:125
+msgid "<b>Spyder</b> is a powerful Interactive Development Environment (or IDE) for the Python programming language.<br><br>Here we are going to guide you through its most important features.<br><br>Please use the arrow keys or click on the buttons below to move along the tour."
+msgstr ""
+
+#: spyder/app/tour.py:134
+msgid "The Editor"
+msgstr ""
+
+#: spyder/app/tour.py:135
+msgid "This is the pane where you write Python code before evaluating it. You can get automatic suggestions and completions while writing, by pressing the <b>Tab</b> key next to a given text.<br><br>The Editor comes with a line number area (highlighted here in red), where Spyder shows warnings and syntax errors. They can help you to detect potential problems before running the code.<br><br>You can also set debug breakpoints in the line number area, by doing a double click next to a non-e [...]
+msgstr ""
+
+#: spyder/app/tour.py:150
+msgid "The IPython console"
+msgstr ""
+
+#: spyder/app/tour.py:151
+msgid "This is one of panes where you can run or execute the code you wrote on the Editor. To do it you need to press the <b>F5</b> key.<br><br>This console comes with several useful features that greatly improve your programming workflow (like syntax highlighting and inline plots). If you want to know more about them, please follow this <a href=\"{0}\">link</a>.<br><br>Please click on the button below to run some simple code in this console. This will be useful to show you other importa [...]
+msgstr ""
+
+#: spyder/app/tour.py:167
+msgid "The Variable Explorer"
+msgstr ""
+
+#: spyder/app/tour.py:168
+msgid "In this pane you can view and edit the variables generated during the execution of a program, or those entered directly in one of Spyder consoles.<br><br>As you can see, the Variable Explorer is showing the variables generated during the last step of this tour. By doing a double-click on any of them, a new window will be opened, where you can inspect and modify their contents."
+msgstr ""
+
+#: spyder/app/tour.py:180
+msgid "The Python console"
+msgstr ""
+
+#: spyder/app/tour.py:181
+msgid "You can also run your code on a Python console. These consoles are useful because they let you run a file in a console dedicated only to it.To select this behavior, please press the <b>F6</b> key.<br><br>By pressing the button below and then focusing the Variable Explorer, you will notice that Python consoles are also connected to that pane, and that the Variable Explorer only shows the variables of the currently focused console."
+msgstr ""
+
+#: spyder/app/tour.py:195 spyder/plugins/help.py:485
+#: spyder/plugins/help.py:929 spyder/widgets/internalshell.py:270
+msgid "Help"
+msgstr ""
+
+#: spyder/app/tour.py:196
+msgid "This pane displays documentation of the functions, classes, methods or modules you are currently using in the Editor or the Consoles.<br><br>To use it, you need to press <b>Ctrl+I</b> in front of an object. If that object has some documentation associated with it, it will be displayed here."
+msgstr ""
+
+#: spyder/app/tour.py:206
+msgid "The File Explorer"
+msgstr ""
+
+#: spyder/app/tour.py:207
+msgid "This pane lets you navigate through the directories and files present in your computer.<br><br>You can also open any of these files with its corresponding application, by doing a double click on it.<br><br>There is one exception to this rule: plain-text files will always be opened in the Spyder Editor."
+msgstr ""
+
+#: spyder/app/tour.py:217
+msgid "The History Log"
+msgstr ""
+
+#: spyder/app/tour.py:218
+msgid "This pane records all commands introduced in the Python and IPython consoles."
+msgstr ""
+
+#: spyder/app/tour.py:266
+msgid "<b>Spyder</b> is an interactive development environment based on bla"
+msgstr ""
+
+#: spyder/app/tour.py:270
+msgid "Welcome to Spyder introduction tour"
+msgstr ""
+
+#: spyder/app/tour.py:271
+msgid "Spyder is an interactive development environment based on bla"
+msgstr ""
+
+#: spyder/app/tour.py:276
+msgid "Introduction tour"
+msgstr ""
+
+#: spyder/app/tour.py:277
+msgid "New features in version 3.0"
+msgstr ""
+
+#: spyder/app/tour.py:555 spyder/plugins/ipythonconsole.py:431
+msgid "Run code"
+msgstr ""
+
+#: spyder/app/tour.py:824
+msgid "Go to step: "
+msgstr ""
+
+#: spyder/config/base.py:249
+msgid "Update LANGUAGE_CODES (inside config/base.py) if a new translation has been added to Spyder"
+msgstr ""
+
+#: spyder/config/ipython.py:23
+msgid "Integrate the IPython console"
+msgstr ""
+
+#: spyder/config/ipython.py:25
+msgid "Manipulate Jupyter notebooks on the Editor"
+msgstr ""
+
+#: spyder/config/utils.py:24
+msgid "Python files"
+msgstr ""
+
+#: spyder/config/utils.py:25
+msgid "Cython/Pyrex files"
+msgstr ""
+
+#: spyder/config/utils.py:26
+msgid "C files"
+msgstr ""
+
+#: spyder/config/utils.py:27
+msgid "C++ files"
+msgstr ""
+
+#: spyder/config/utils.py:28
+msgid "OpenCL files"
+msgstr ""
+
+#: spyder/config/utils.py:29
+msgid "Fortran files"
+msgstr ""
+
+#: spyder/config/utils.py:30
+msgid "IDL files"
+msgstr ""
+
+#: spyder/config/utils.py:31
+msgid "MATLAB files"
+msgstr ""
+
+#: spyder/config/utils.py:32
+msgid "Julia files"
+msgstr ""
+
+#: spyder/config/utils.py:33
+msgid "Yaml files"
+msgstr ""
+
+#: spyder/config/utils.py:34
+msgid "Patch and diff files"
+msgstr ""
+
+#: spyder/config/utils.py:35
+msgid "Batch files"
+msgstr ""
+
+#: spyder/config/utils.py:36 spyder/utils/iofuncs.py:426
+msgid "Text files"
+msgstr ""
+
+#: spyder/config/utils.py:37
+msgid "reStructuredText files"
+msgstr ""
+
+#: spyder/config/utils.py:38
+msgid "gettext files"
+msgstr ""
+
+#: spyder/config/utils.py:39
+msgid "NSIS files"
+msgstr ""
+
+#: spyder/config/utils.py:40
+msgid "Web page files"
+msgstr ""
+
+#: spyder/config/utils.py:41
+msgid "XML files"
+msgstr ""
+
+#: spyder/config/utils.py:42
+msgid "Javascript files"
+msgstr ""
+
+#: spyder/config/utils.py:43
+msgid "Json files"
+msgstr ""
+
+#: spyder/config/utils.py:44
+msgid "IPython notebooks"
+msgstr ""
+
+#: spyder/config/utils.py:45
+msgid "Enaml files"
+msgstr ""
+
+#: spyder/config/utils.py:46
+msgid "Configuration files"
+msgstr ""
+
+#: spyder/config/utils.py:51 spyder/widgets/explorer.py:700
+msgid "All files"
+msgstr ""
+
+#: spyder/config/utils.py:121
+msgid "Supported text files"
+msgstr ""
+
+#: spyder/plugins/__init__.py:508 spyder/plugins/editor.py:98
+#: spyder/plugins/editor.py:545 spyder/plugins/editor.py:1718
+#: spyder/plugins/help.py:118 spyder/plugins/help.py:385
+#: spyder/widgets/editor.py:369 spyder/widgets/sourcecode/codeeditor.py:97
+#: spyder/widgets/sourcecode/codeeditor.py:2960
+msgid "Editor"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:139
+msgid "Reset to defaults"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:151
+msgid "Preferences"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:491
+msgid "Invalid directory path"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:494 spyder/plugins/configdialog.py:509
+#: spyder/plugins/runconfig.py:177 spyder/plugins/runconfig.py:241
+#: spyder/plugins/workingdirectory.py:291 spyder/widgets/explorer.py:614
+#: spyder/widgets/externalshell/pythonshell.py:616
+#: spyder/widgets/findinfiles.py:504 spyder/widgets/pathmanager.py:224
+#: spyder/widgets/projects/projectdialog.py:155
+msgid "Select directory"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:521
+msgid "Invalid file path"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:524 spyder/plugins/configdialog.py:541
+msgid "Select file"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:540
+msgid "All files (*)"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:613 spyder/widgets/formlayout.py:215
+msgid "Bold"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:616 spyder/widgets/formlayout.py:210
+msgid "Italic"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:670
+msgid "Font: "
+msgstr ""
+
+#: spyder/plugins/configdialog.py:676
+msgid "Size: "
+msgstr ""
+
+#: spyder/plugins/configdialog.py:695
+msgid "Font style"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:772
+msgid "Spyder needs to restart to change the following setting:"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:775
+msgid "Spyder needs to restart to change the following settings:"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:777
+msgid "Do you wish to restart now?"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:783
+msgid "Information"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:797 spyder/plugins/configdialog.py:804
+#: spyder/widgets/projects/configdialog.py:74
+msgid "General"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:807
+msgid "Language"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:810
+msgid "Use a single instance"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:812
+msgid "Set this to open external<br> Python files in an already running instance (Requires a restart)"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:815
+msgid "Prompt when exiting"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:816
+msgid "Pop up internal console when internal errors appear"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:836 spyder/plugins/editor.py:107
+#: spyder/plugins/externalconsole.py:57 spyder/plugins/ipythonconsole.py:273
+#: spyder/widgets/projects/configdialog.py:81
+msgid "Interface"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:844
+msgid "Qt windows style"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:850
+msgid "Icon theme"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:854
+msgid "Vertical title bars in panes"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:856
+msgid "Vertical tabs in panes"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:858
+msgid "Animated toolbars and panes"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:860
+msgid "Tear off menus"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:861
+msgid "Set this to detach any<br> menu from the main window"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:863
+msgid "Custom margin for panes:"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:865 spyder/plugins/editor.py:209
+msgid "pixels"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:893
+msgid "Status bar"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:894
+msgid "Show status bar"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:896
+msgid "Show memory usage every"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:898 spyder/plugins/configdialog.py:907
+#: spyder/plugins/editor.py:133 spyder/plugins/editor.py:261
+#: spyder/plugins/variableexplorer.py:30
+msgid " ms"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:905
+msgid "Show CPU usage every"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:940
+msgid "Plain text font"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:946
+msgid "Rich text font"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:949
+msgid "Fonts"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:963
+msgid "Appearance"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:965 spyder/plugins/ipythonconsole.py:564
+msgid "Advanced Settings"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:1001
+msgid "Syntax coloring"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:1014
+msgid "Here you can select the color scheme used in the Editor and all other Spyder plugins.<br><br>You can also edit the color schemes provided by Spyder or create your own ones by using the options provided below.<br>"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:1019
+msgid "Edit selected"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:1020
+msgid "Create new scheme"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:1021 spyder/widgets/explorer.py:510
+#: spyder/widgets/shell.py:134
+msgid "Delete"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:1024
+msgid "Reset"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:1031
+msgid "Scheme:"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:1062
+msgid "Manage color schemes"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:1251
+msgid "Are you sure you want to delete this scheme?"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:1368
+msgid "Text"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:1370
+msgid "Highlight"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:1372
+msgid "Background"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:1376
+msgid "Scheme name:"
+msgstr ""
+
+#: spyder/plugins/configdialog.py:1383
+msgid "Color scheme editor"
+msgstr ""
+
+#: spyder/plugins/console.py:109
+msgid "Internal console"
+msgstr ""
+
+#: spyder/plugins/console.py:139 spyder/plugins/externalconsole.py:743
+msgid "&Run..."
+msgstr ""
+
+#: spyder/plugins/console.py:141 spyder/plugins/externalconsole.py:744
+msgid "Run a Python script"
+msgstr ""
+
+#: spyder/plugins/console.py:144
+msgid "Environment variables..."
+msgstr ""
+
+#: spyder/plugins/console.py:146
+msgid "Show and edit environment variables (for current session)"
+msgstr ""
+
+#: spyder/plugins/console.py:150
+msgid "Show sys.path contents..."
+msgstr ""
+
+#: spyder/plugins/console.py:152
+msgid "Show (read-only) sys.path"
+msgstr ""
+
+#: spyder/plugins/console.py:155
+msgid "Buffer..."
+msgstr ""
+
+#: spyder/plugins/console.py:156 spyder/plugins/externalconsole.py:75
+#: spyder/plugins/history.py:43
+msgid "Set maximum line count"
+msgstr ""
+
+#: spyder/plugins/console.py:159
+msgid "External editor path..."
+msgstr ""
+
+#: spyder/plugins/console.py:160
+msgid "Set external editor executable path"
+msgstr ""
+
+#: spyder/plugins/console.py:163 spyder/plugins/editor.py:139
+#: spyder/plugins/externalconsole.py:76 spyder/plugins/help.py:157
+#: spyder/plugins/help.py:360 spyder/plugins/history.py:46
+#: spyder/plugins/history.py:157
+msgid "Wrap lines"
+msgstr ""
+
+#: spyder/plugins/console.py:166 spyder/plugins/editor.py:175
+#: spyder/plugins/externalconsole.py:121 spyder/plugins/ipythonconsole.py:283
+msgid "Display balloon tips"
+msgstr ""
+
+#: spyder/plugins/console.py:170 spyder/plugins/editor.py:169
+#: spyder/plugins/externalconsole.py:115
+msgid "Automatic code completion"
+msgstr ""
+
+#: spyder/plugins/console.py:174 spyder/plugins/editor.py:173
+#: spyder/plugins/externalconsole.py:119
+msgid "Enter key selects completion"
+msgstr ""
+
+#: spyder/plugins/console.py:179
+msgid "Internal console settings"
+msgstr ""
+
+#: spyder/plugins/console.py:232 spyder/plugins/externalconsole.py:918
+msgid "Run Python script"
+msgstr ""
+
+#: spyder/plugins/console.py:233 spyder/plugins/externalconsole.py:146
+#: spyder/plugins/externalconsole.py:919 spyder/widgets/explorer.py:715
+msgid "Python scripts"
+msgstr ""
+
+#: spyder/plugins/console.py:278
+msgid "Buffer"
+msgstr ""
+
+#: spyder/plugins/console.py:279
+msgid "Maximum line count"
+msgstr ""
+
+#: spyder/plugins/console.py:289
+msgid "External editor"
+msgstr ""
+
+#: spyder/plugins/console.py:290
+msgid "External editor executable path:"
+msgstr ""
+
+#: spyder/plugins/editor.py:104
+msgid "Edit template for new modules"
+msgstr ""
+
+#: spyder/plugins/editor.py:109
+msgid "Sort files according to full path"
+msgstr ""
+
+#: spyder/plugins/editor.py:111
+msgid "Show tab bar"
+msgstr ""
+
+#: spyder/plugins/editor.py:118 spyder/plugins/editor.py:189
+#: spyder/plugins/externalconsole.py:71 spyder/plugins/externalconsole.py:114
+#: spyder/plugins/help.py:156 spyder/plugins/history.py:45
+#: spyder/plugins/ipythonconsole.py:317
+msgid "Source code"
+msgstr ""
+
+#: spyder/plugins/editor.py:119
+msgid "Show line numbers"
+msgstr ""
+
+#: spyder/plugins/editor.py:120 spyder/plugins/editor.py:937
+msgid "Show blank spaces"
+msgstr ""
+
+#: spyder/plugins/editor.py:121
+msgid "Show vertical line after"
+msgstr ""
+
+#: spyder/plugins/editor.py:122
+msgid "characters"
+msgstr ""
+
+#: spyder/plugins/editor.py:127
+msgid "Highlight current line"
+msgstr ""
+
+#: spyder/plugins/editor.py:129
+msgid "Highlight current cell"
+msgstr ""
+
+#: spyder/plugins/editor.py:131
+msgid "Highlight occurrences after"
+msgstr ""
+
+#: spyder/plugins/editor.py:159
+msgid "Save all files before running script"
+msgstr ""
+
+#: spyder/plugins/editor.py:162
+msgid "Run selection"
+msgstr ""
+
+#: spyder/plugins/editor.py:163
+msgid "Maintain focus in the Editor after running cells or selections"
+msgstr ""
+
+#: spyder/plugins/editor.py:166 spyder/plugins/externalconsole.py:252
+msgid "Introspection"
+msgstr ""
+
+#: spyder/plugins/editor.py:171 spyder/plugins/externalconsole.py:117
+msgid "Case sensitive code completion"
+msgstr ""
+
+#: spyder/plugins/editor.py:176
+msgid "Link to object definition"
+msgstr ""
+
+#: spyder/plugins/editor.py:178
+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 ""
+
+#: spyder/plugins/editor.py:182
+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 ""
+
+#: spyder/plugins/editor.py:190
+msgid "Automatic insertion of parentheses, braces and brackets"
+msgstr ""
+
+#: spyder/plugins/editor.py:193
+msgid "Automatic insertion of closing quotes"
+msgstr ""
+
+#: spyder/plugins/editor.py:195
+msgid "Automatic insertion of colons after 'for', 'if', 'def', etc"
+msgstr ""
+
+#: spyder/plugins/editor.py:198
+msgid "Automatic indentation after 'else', 'elif', etc."
+msgstr ""
+
+#: spyder/plugins/editor.py:200
+msgid "Indentation characters: "
+msgstr ""
+
+#: spyder/plugins/editor.py:201
+msgid "2 spaces"
+msgstr ""
+
+#: spyder/plugins/editor.py:202
+msgid "3 spaces"
+msgstr ""
+
+#: spyder/plugins/editor.py:203
+msgid "4 spaces"
+msgstr ""
+
+#: spyder/plugins/editor.py:204
+msgid "5 spaces"
+msgstr ""
+
+#: spyder/plugins/editor.py:205
+msgid "6 spaces"
+msgstr ""
+
+#: spyder/plugins/editor.py:206
+msgid "7 spaces"
+msgstr ""
+
+#: spyder/plugins/editor.py:207
+msgid "8 spaces"
+msgstr ""
+
+#: spyder/plugins/editor.py:208
+msgid "Tabulations"
+msgstr ""
+
+#: spyder/plugins/editor.py:209
+msgid "Tab stop width:"
+msgstr ""
+
+#: spyder/plugins/editor.py:211
+msgid "Tab always indent"
+msgstr ""
+
+#: spyder/plugins/editor.py:213
+msgid ""
+"If enabled, pressing Tab will always indent,\n"
+"even when the cursor is not at the beginning\n"
+"of a line (when this option is enabled, code\n"
+"completion may be triggered using the alternate\n"
+"shortcut: Ctrl+Space)"
+msgstr ""
+
+#: spyder/plugins/editor.py:218
+msgid "Intelligent backspace"
+msgstr ""
+
+#: spyder/plugins/editor.py:220
+msgid "Automatically remove trailing spaces when saving files"
+msgstr ""
+
+#: spyder/plugins/editor.py:224
+msgid "Analysis"
+msgstr ""
+
+#: spyder/plugins/editor.py:226
+msgid "<i>(Refer to the {} page)</i>"
+msgstr ""
+
+#: spyder/plugins/editor.py:230
+msgid "Real-time code analysis"
+msgstr ""
+
+#: spyder/plugins/editor.py:232
+msgid "<p>If enabled, Python source code will be analyzed using pyflakes, lines containing errors or warnings will be highlighted.</p><p><u>Note</u>: add <b>analysis:ignore</b> in a comment to ignore code analysis warnings.</p>"
+msgstr ""
+
+#: spyder/plugins/editor.py:240
+msgid "Code analysis requires pyflakes %s+"
+msgstr ""
+
+#: spyder/plugins/editor.py:242
+msgid "Real-time code style analysis"
+msgstr ""
+
+#: spyder/plugins/editor.py:244
+msgid "<p>If enabled, Python source code will be analyzedusing pep8, lines that are not following PEP8 style guide will be highlighted.</p><p><u>Note</u>: add <b>analysis:ignore</b> in a comment to ignore style analysis warnings.</p>"
+msgstr ""
+
+#: spyder/plugins/editor.py:251
+msgid "Code annotations (TODO, FIXME, XXX, HINT, TIP, @todo)"
+msgstr ""
+
+#: spyder/plugins/editor.py:254
+msgid "Perform analysis when saving file and every"
+msgstr ""
+
+#: spyder/plugins/editor.py:258
+msgid "Perform analysis only when saving file"
+msgstr ""
+
+#: spyder/plugins/editor.py:317
+msgid "End-of-line characters"
+msgstr ""
+
+#: spyder/plugins/editor.py:318
+msgid "When opening a text file containing mixed end-of-line characters (this may raise syntax errors in the consoles on Windows platforms), Spyder may fix the file automatically."
+msgstr ""
+
+#: spyder/plugins/editor.py:324
+msgid "Fix automatically and show warning message box"
+msgstr ""
+
+#: spyder/plugins/editor.py:335 spyder/plugins/externalconsole.py:250
+#: spyder/plugins/ipythonconsole.py:558 spyder/plugins/variableexplorer.py:43
+msgid "Display"
+msgstr ""
+
+#: spyder/plugins/editor.py:337
+msgid "Code Introspection/Analysis"
+msgstr ""
+
+#: spyder/plugins/editor.py:340 spyder/plugins/externalconsole.py:253
+msgid "Advanced settings"
+msgstr ""
+
+#: spyder/plugins/editor.py:613 spyder/widgets/editortools.py:510
+msgid "Show/hide outline explorer"
+msgstr ""
+
+#: spyder/plugins/editor.py:619
+msgid "Show/hide project explorer"
+msgstr ""
+
+#: spyder/plugins/editor.py:627
+msgid "&New file..."
+msgstr ""
+
+#: spyder/plugins/editor.py:628 spyder/plugins/workingdirectory.py:83
+#: spyder/widgets/explorer.py:692 spyder/widgets/explorer.py:699
+msgid "New file"
+msgstr ""
+
+#: spyder/plugins/editor.py:634
+msgid "&Open..."
+msgstr ""
+
+#: spyder/plugins/editor.py:635 spyder/plugins/editor.py:1767
+#: spyder/plugins/workingdirectory.py:70
+msgid "Open file"
+msgstr ""
+
+#: spyder/plugins/editor.py:641 spyder/widgets/editor.py:345
+msgid "File switcher..."
+msgstr ""
+
+#: spyder/plugins/editor.py:643
+msgid "Fast switch between files"
+msgstr ""
+
+#: spyder/plugins/editor.py:649
+msgid "&Revert"
+msgstr ""
+
+#: spyder/plugins/editor.py:650
+msgid "Revert file from disk"
+msgstr ""
+
+#: spyder/plugins/editor.py:653
+msgid "&Save"
+msgstr ""
+
+#: spyder/plugins/editor.py:654 spyder/widgets/editor.py:1304
+msgid "Save file"
+msgstr ""
+
+#: spyder/plugins/editor.py:660
+msgid "Sav&e all"
+msgstr ""
+
+#: spyder/plugins/editor.py:661
+msgid "Save all files"
+msgstr ""
+
+#: spyder/plugins/editor.py:667
+msgid "Save &as..."
+msgstr ""
+
+#: spyder/plugins/editor.py:668
+msgid "Save current file as..."
+msgstr ""
+
+#: spyder/plugins/editor.py:673 spyder/plugins/editor.py:674
+msgid "Print preview..."
+msgstr ""
+
+#: spyder/plugins/editor.py:675
+msgid "&Print..."
+msgstr ""
+
+#: spyder/plugins/editor.py:676
+msgid "Print current file..."
+msgstr ""
+
+#: spyder/plugins/editor.py:679
+msgid "&Close"
+msgstr ""
+
+#: spyder/plugins/editor.py:680
+msgid "Close current file"
+msgstr ""
+
+#: spyder/plugins/editor.py:683
+msgid "C&lose all"
+msgstr ""
+
+#: spyder/plugins/editor.py:684
+msgid "Close all opened files"
+msgstr ""
+
+#: spyder/plugins/editor.py:691
+msgid "&Find text"
+msgstr ""
+
+#: spyder/plugins/editor.py:697
+msgid "Find &next"
+msgstr ""
+
+#: spyder/plugins/editor.py:703
+msgid "Find &previous"
+msgstr ""
+
+#: spyder/plugins/editor.py:709
+msgid "&Replace text"
+msgstr ""
+
+#: spyder/plugins/editor.py:718
+msgid "Set/Clear breakpoint"
+msgstr ""
+
+#: spyder/plugins/editor.py:725
+msgid "Set/Edit conditional breakpoint"
+msgstr ""
+
+#: spyder/plugins/editor.py:732
+msgid "Clear breakpoints in all files"
+msgstr ""
+
+#: spyder/plugins/editor.py:734
+msgid "Debug with winpdb"
+msgstr ""
+
+#: spyder/plugins/editor.py:741
+msgid "Debug file"
+msgstr ""
+
+#: spyder/plugins/editor.py:746
+msgid "Step"
+msgstr ""
+
+#: spyder/plugins/editor.py:747
+msgid "Run current line"
+msgstr ""
+
+#: spyder/plugins/editor.py:752
+msgid "Continue"
+msgstr ""
+
+#: spyder/plugins/editor.py:754
+msgid "Continue execution until next breakpoint"
+msgstr ""
+
+#: spyder/plugins/editor.py:759
+msgid "Step Into"
+msgstr ""
+
+#: spyder/plugins/editor.py:761
+msgid "Step into function or method of current line"
+msgstr ""
+
+#: spyder/plugins/editor.py:766
+msgid "Step Return"
+msgstr ""
+
+#: spyder/plugins/editor.py:768
+msgid "Run until current function or method returns"
+msgstr ""
+
+#: spyder/plugins/editor.py:773 spyder/widgets/findinfiles.py:333
+#: spyder/widgets/ipythonconsole/client.py:236
+msgid "Stop"
+msgstr ""
+
+#: spyder/plugins/editor.py:774
+msgid "Stop debugging"
+msgstr ""
+
+#: spyder/plugins/editor.py:781
+msgid "Run file"
+msgstr ""
+
+#: spyder/plugins/editor.py:786
+msgid "&Configure..."
+msgstr ""
+
+#: spyder/plugins/editor.py:788
+#: spyder/widgets/externalshell/pythonshell.py:304
+msgid "Run settings"
+msgstr ""
+
+#: spyder/plugins/editor.py:794
+msgid "Re-run &last script"
+msgstr ""
+
+#: spyder/plugins/editor.py:796
+msgid "Run again last file"
+msgstr ""
+
+#: spyder/plugins/editor.py:802 spyder/widgets/sourcecode/codeeditor.py:2507
+msgid "Run &selection or current line"
+msgstr ""
+
+#: spyder/plugins/editor.py:805
+msgid "Run selection or current line"
+msgstr ""
+
+#: spyder/plugins/editor.py:813 spyder/widgets/sourcecode/codeeditor.py:2499
+msgid "Run cell"
+msgstr ""
+
+#: spyder/plugins/editor.py:816
+msgid ""
+"Run current cell (Ctrl+Enter)\n"
+"[Use #%% to create cells]"
+msgstr ""
+
+#: spyder/plugins/editor.py:822 spyder/widgets/sourcecode/codeeditor.py:2503
+msgid "Run cell and advance"
+msgstr ""
+
+#: spyder/plugins/editor.py:825
+msgid "Run current cell and go to the next one (Shift+Enter)"
+msgstr ""
+
+#: spyder/plugins/editor.py:832
+msgid "Show todo list"
+msgstr ""
+
+#: spyder/plugins/editor.py:833
+msgid "Show TODO/FIXME/XXX/HINT/TIP/@todo comments list"
+msgstr ""
+
+#: spyder/plugins/editor.py:840
+msgid "Show warning/error list"
+msgstr ""
+
+#: spyder/plugins/editor.py:841
+msgid "Show code analysis warnings/errors"
+msgstr ""
+
+#: spyder/plugins/editor.py:847
+msgid "Previous warning/error"
+msgstr ""
+
+#: spyder/plugins/editor.py:848
+msgid "Go to previous code analysis warning/error"
+msgstr ""
+
+#: spyder/plugins/editor.py:851
+msgid "Next warning/error"
+msgstr ""
+
+#: spyder/plugins/editor.py:852
+msgid "Go to next code analysis warning/error"
+msgstr ""
+
+#: spyder/plugins/editor.py:856
+msgid "Last edit location"
+msgstr ""
+
+#: spyder/plugins/editor.py:857
+msgid "Go to last edit location"
+msgstr ""
+
+#: spyder/plugins/editor.py:865
+msgid "Previous cursor position"
+msgstr ""
+
+#: spyder/plugins/editor.py:866
+msgid "Go to previous cursor position"
+msgstr ""
+
+#: spyder/plugins/editor.py:874
+msgid "Next cursor position"
+msgstr ""
+
+#: spyder/plugins/editor.py:875
+msgid "Go to next cursor position"
+msgstr ""
+
+#: spyder/plugins/editor.py:885 spyder/widgets/sourcecode/codeeditor.py:2483
+msgid "Comment"
+msgstr ""
+
+#: spyder/plugins/editor.py:885 spyder/widgets/sourcecode/codeeditor.py:2483
+msgid "Uncomment"
+msgstr ""
+
+#: spyder/plugins/editor.py:886
+msgid "Comment current line or selection"
+msgstr ""
+
+#: spyder/plugins/editor.py:890
+msgid "Add &block comment"
+msgstr ""
+
+#: spyder/plugins/editor.py:891
+msgid "Add block comment around current line or selection"
+msgstr ""
+
+#: spyder/plugins/editor.py:897
+msgid "R&emove block comment"
+msgstr ""
+
+#: spyder/plugins/editor.py:898
+msgid "Remove comment block around current line or selection"
+msgstr ""
+
+#: spyder/plugins/editor.py:909
+msgid "Indent"
+msgstr ""
+
+#: spyder/plugins/editor.py:910
+msgid "Indent current line or selection"
+msgstr ""
+
+#: spyder/plugins/editor.py:913
+msgid "Unindent"
+msgstr ""
+
+#: spyder/plugins/editor.py:914
+msgid "Unindent current line or selection"
+msgstr ""
+
+#: spyder/plugins/editor.py:919
+msgid "Carriage return and line feed (Windows)"
+msgstr ""
+
+#: spyder/plugins/editor.py:922
+msgid "Line feed (UNIX)"
+msgstr ""
+
+#: spyder/plugins/editor.py:925
+msgid "Carriage return (Mac)"
+msgstr ""
+
+#: spyder/plugins/editor.py:931
+msgid "Convert end-of-line characters"
+msgstr ""
+
+#: spyder/plugins/editor.py:935
+msgid "Remove trailing spaces"
+msgstr ""
+
+#: spyder/plugins/editor.py:939
+msgid "Fix indentation"
+msgstr ""
+
+#: spyder/plugins/editor.py:940
+msgid "Replace tab characters by space characters"
+msgstr ""
+
+#: spyder/plugins/editor.py:943
+msgid "Go to line..."
+msgstr ""
+
+#: spyder/plugins/editor.py:951
+msgid "Set console working directory"
+msgstr ""
+
+#: spyder/plugins/editor.py:953
+msgid "Set current console (and file explorer) working directory to current script directory"
+msgstr ""
+
+#: spyder/plugins/editor.py:958
+msgid "Maximum number of recent files..."
+msgstr ""
+
+#: spyder/plugins/editor.py:961
+msgid "Clear recent files list"
+msgstr ""
+
+#: spyder/plugins/editor.py:961 spyder/plugins/projects.py:97
+msgid "Clear this list"
+msgstr ""
+
+#: spyder/plugins/editor.py:965
+msgid "Open &recent"
+msgstr ""
+
+#: spyder/plugins/editor.py:1348
+msgid "?"
+msgstr ""
+
+#: spyder/plugins/editor.py:1575
+msgid "Spyder Editor"
+msgstr ""
+
+#: spyder/plugins/editor.py:1576
+msgid "This is a temporary script file."
+msgstr ""
+
+#: spyder/plugins/editor.py:1645
+msgid "untitled"
+msgstr ""
+
+#: spyder/plugins/editor.py:1719
+msgid "Maximum number of recent files"
+msgstr ""
+
+#: spyder/plugins/editor.py:1852
+msgid "Printing..."
+msgstr ""
+
+#: spyder/plugins/explorer.py:53
+msgid "File explorer"
+msgstr ""
+
+#: spyder/plugins/externalconsole.py:46
+msgid "Interactive data plotting in the consoles"
+msgstr ""
+
+#: spyder/plugins/externalconsole.py:54 spyder/plugins/externalconsole.py:709
+msgid "Python console"
+msgstr ""
+
+#: spyder/plugins/externalconsole.py:59
+msgid "One tab per script"
+msgstr ""
+
+#: spyder/plugins/externalconsole.py:60
+#: spyder/widgets/externalshell/baseshell.py:160
+msgid "Show elapsed time"
+msgstr ""
+
+#: spyder/plugins/externalconsole.py:61 spyder/widgets/explorer.py:1074
+msgid "Show icons and text"
+msgstr ""
+
+#: spyder/plugins/externalconsole.py:73
+msgid "Buffer: "
+msgstr ""
+
+#: spyder/plugins/externalconsole.py:73 spyder/plugins/ipythonconsole.py:319
+msgid " lines"
+msgstr ""
+
+#: spyder/plugins/externalconsole.py:78
+msgid "Merge process standard output/error channels"
+msgstr ""
+
+#: spyder/plugins/externalconsole.py:80
+msgid ""
+"Merging the output channels of the process means that\n"
+"the standard error won't be written in red anymore,\n"
+"but this has the effect of speeding up display."
+msgstr ""
+
+#: spyder/plugins/externalconsole.py:84
+msgid "Colorize standard error channel using ANSI escape codes"
+msgstr ""
+
+#: spyder/plugins/externalconsole.py:86
+msgid ""
+"This method is the only way to have colorized standard\n"
+"error channel when the output channels have been merged."
+msgstr ""
+
+#: spyder/plugins/externalconsole.py:102 spyder/plugins/ipythonconsole.py:306
+#: spyder/widgets/variableexplorer/arrayeditor.py:540
+#: spyder/widgets/variableexplorer/dataframeeditor.py:552
+msgid "Background color"
+msgstr ""
+
+#: spyder/plugins/externalconsole.py:103
+msgid "This option will be applied the next time a Python console or a terminal is opened."
+msgstr ""
+
+#: spyder/plugins/externalconsole.py:106
+msgid "Light background (white color)"
+msgstr ""
+
+#: spyder/plugins/externalconsole.py:131
+msgid "PYTHONSTARTUP replacement"
+msgstr ""
+
+#: spyder/plugins/externalconsole.py:133
+msgid ""
+"This option will override the PYTHONSTARTUP environment variable which\n"
+"defines the script to be executed during the Python console startup."
+msgstr ""
+
+#: spyder/plugins/externalconsole.py:138
+msgid "Default PYTHONSTARTUP script"
+msgstr ""
+
+#: spyder/plugins/externalconsole.py:142
+msgid "Use the following startup script:"
+msgstr ""
+
+#: spyder/plugins/externalconsole.py:159
+msgid "Monitor"
+msgstr ""
+
+#: spyder/plugins/externalconsole.py:160
+msgid "The monitor provides introspection features to console: code completion, calltips and variable explorer. Because it relies on several modules, disabling the monitor may be useful to accelerate console startup."
+msgstr ""
+
+#: spyder/plugins/externalconsole.py:167
+msgid "Enable monitor"
+msgstr ""
+
+#: spyder/plugins/externalconsole.py:180
+msgid "Default library"
+msgstr ""
+
+#: spyder/plugins/externalconsole.py:185
+msgid "Qt-Python Bindings"
+msgstr ""
+
+#: spyder/plugins/externalconsole.py:187
+msgid "Library:"
+msgstr ""
+
+#: spyder/plugins/externalconsole.py:189
+msgid "This option will act on<br> libraries such as Matplotlib, guidata or ETS"
+msgstr ""
+
+#: spyder/plugins/externalconsole.py:198 spyder/plugins/ipythonconsole.py:560
+msgid "Graphics"
+msgstr ""
+
+#: spyder/plugins/externalconsole.py:199
+msgid "Decide which backend to use to display graphics. If unsure, please select the <b>Automatic</b> backend.<br><br><b>Note:</b> We support a very limited number of backends in our Python consoles. If you prefer to work with a different one, please use an IPython console."
+msgstr ""
+
+#: spyder/plugins/externalconsole.py:208
+msgid "None"
+msgstr ""
+
+#: spyder/plugins/externalconsole.py:208 spyder/plugins/ipythonconsole.py:351
+msgid "Automatic"
+msgstr ""
+
+#: spyder/plugins/externalconsole.py:213 spyder/plugins/ipythonconsole.py:373
+msgid "Backend:"
+msgstr ""
+
+#: spyder/plugins/externalconsole.py:215 spyder/plugins/ipythonconsole.py:375
+msgid "This option will be applied the next time a console is opened."
+msgstr ""
+
+#: spyder/plugins/externalconsole.py:226
+msgid "Enthought Tool Suite"
+msgstr ""
+
+#: spyder/plugins/externalconsole.py:227
+msgid "Enthought Tool Suite (ETS) supports PyQt4 (qt4) and wxPython (wx) graphical user interfaces."
+msgstr ""
+
+#: spyder/plugins/externalconsole.py:231
+msgid "ETS_TOOLKIT:"
+msgstr ""
+
+#: spyder/plugins/externalconsole.py:255
+msgid "External modules"
+msgstr ""
+
+#: spyder/plugins/externalconsole.py:447
+msgid "No Python console is currently selected to run <b>%s</b>.<br><br>Please select or open a new Python console and try again."
+msgstr ""
+
+#: spyder/plugins/externalconsole.py:518
+msgid ""
+"%s is already running in a separate process.\n"
+"Do you want to kill the process before starting a new one?"
+msgstr ""
+
+#: spyder/plugins/externalconsole.py:647
+msgid "Command Window"
+msgstr ""
+
+#: spyder/plugins/externalconsole.py:649 spyder/plugins/ipythonconsole.py:297
+msgid "Terminal"
+msgstr ""
+
+#: spyder/plugins/externalconsole.py:731
+msgid "Open a &Python console"
+msgstr ""
+
+#: spyder/plugins/externalconsole.py:735
+msgid "Open &command prompt"
+msgstr ""
+
+#: spyder/plugins/externalconsole.py:736
+msgid "Open a Windows command prompt"
+msgstr ""
+
+#: spyder/plugins/externalconsole.py:738
+msgid "Open a &terminal"
+msgstr ""
+
+#: spyder/plugins/externalconsole.py:739
+msgid "Open a terminal window"
+msgstr ""
+
+#: spyder/plugins/findinfiles.py:127 spyder/widgets/findinfiles.py:689
+msgid "Find in files"
+msgstr ""
+
+#: spyder/plugins/findinfiles.py:148
+msgid "&Find in files"
+msgstr ""
+
+#: spyder/plugins/findinfiles.py:151
+msgid "Search text in multiple files"
+msgstr ""
+
+#: spyder/plugins/help.py:44
+msgid "Show help for objects in the Editor and Consoles in a dedicated pane"
+msgstr ""
+
+#: spyder/plugins/help.py:110
+msgid "Automatic connections"
+msgstr ""
+
+#: spyder/plugins/help.py:111
+msgid "This pane can automatically show an object's help information after a left parenthesis is written next to it. Below you can decide to which plugin you want to connect it to turn on this feature."
+msgstr ""
+
+#: spyder/plugins/help.py:123
+msgid ""
+"This feature requires the Rope or Jedi libraries.\n"
+"It seems you don't have either installed."
+msgstr ""
+
+#: spyder/plugins/help.py:126
+msgid "Python Console"
+msgstr ""
+
+#: spyder/plugins/help.py:128
+msgid "IPython Console"
+msgstr ""
+
+#: spyder/plugins/help.py:140
+msgid "Additional features"
+msgstr ""
+
+#: spyder/plugins/help.py:141
+msgid "Render mathematical equations"
+msgstr ""
+
+#: spyder/plugins/help.py:147
+msgid "This feature requires Sphinx 1.1 or superior."
+msgstr ""
+
+#: spyder/plugins/help.py:148
+msgid "Sphinx %s is currently installed."
+msgstr ""
+
+#: spyder/plugins/help.py:309
+msgid "No further documentation available"
+msgstr ""
+
+#: spyder/plugins/help.py:347
+msgid "No documentation available"
+msgstr ""
+
+#: spyder/plugins/help.py:378
+msgid "Source"
+msgstr ""
+
+#: spyder/plugins/help.py:385 spyder/plugins/runconfig.py:186
+#: spyder/plugins/runconfig.py:456
+#: spyder/widgets/externalshell/baseshell.py:94
+#: spyder/widgets/ipythonconsole/client.py:200
+msgid "Console"
+msgstr ""
+
+#: spyder/plugins/help.py:393
+#: spyder/widgets/variableexplorer/collectionseditor.py:133
+msgid "Object"
+msgstr ""
+
+#: spyder/plugins/help.py:407
+msgid "Plain Text"
+msgstr ""
+
+#: spyder/plugins/help.py:411
+msgid "Show Source"
+msgstr ""
+
+#: spyder/plugins/help.py:415
+msgid "Rich Text"
+msgstr ""
+
+#: spyder/plugins/help.py:425
+msgid "Automatic import"
+msgstr ""
+
+#: spyder/plugins/help.py:437 spyder/plugins/history.py:106
+#: spyder/widgets/editor.py:502 spyder/widgets/explorer.py:1085
+#: spyder/widgets/externalshell/baseshell.py:140
+#: spyder/widgets/ipythonconsole/client.py:249
+#: spyder/widgets/variableexplorer/namespacebrowser.py:162
+msgid "Options"
+msgstr ""
+
+#: spyder/plugins/help.py:695
+msgid "Here you can get help of any object by pressing %s in front of it, either on the Editor or the Console.%sHelp can also be shown automatically after writing a left parenthesis next to an object. You can activate this behavior in %s."
+msgstr ""
+
+#: spyder/plugins/help.py:701
+msgid "Preferences > Help"
+msgstr ""
+
+#: spyder/plugins/help.py:708
+msgid "Usage"
+msgstr ""
+
+#: spyder/plugins/help.py:709
+msgid "New to Spyder? Read our"
+msgstr ""
+
+#: spyder/plugins/help.py:710
+msgid "tutorial"
+msgstr ""
+
+#: spyder/plugins/help.py:717
+msgid "Please consider installing Sphinx to get documentation rendered in rich text."
+msgstr ""
+
+#: spyder/plugins/help.py:886
+msgid "Lock"
+msgstr ""
+
+#: spyder/plugins/help.py:886
+msgid "Unlock"
+msgstr ""
+
+#: spyder/plugins/help.py:930
+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 ""
+
+#: spyder/plugins/help.py:974
+msgid "No source code available."
+msgstr ""
+
+#: spyder/plugins/history.py:39
+msgid "Settings"
+msgstr ""
+
+#: spyder/plugins/history.py:41
+msgid " entries"
+msgstr ""
+
+#: spyder/plugins/history.py:41
+msgid "History depth: "
+msgstr ""
+
+#: spyder/plugins/history.py:48
+msgid "Scroll automatically to last entry"
+msgstr ""
+
+#: spyder/plugins/history.py:126
+msgid "History log"
+msgstr ""
+
+#: spyder/plugins/history.py:153
+msgid "History..."
+msgstr ""
+
+#: spyder/plugins/history.py:155
+msgid "Set history maximum entries"
+msgstr ""
+
+#: spyder/plugins/history.py:260
+msgid "History"
+msgstr ""
+
+#: spyder/plugins/history.py:261
+msgid "Maximum entries"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:64
+msgid "Symbolic mathematics in the IPython Console"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:116
+msgid "The authenticity of host <b>%s</b> can't be established. Are you sure you want to continue connecting?"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:128
+msgid "The authenticity of the host can't be established"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:135
+msgid "Tunnel '%s' failed to start"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:140
+msgid "Could not connect to remote host"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:157 spyder/plugins/ipythonconsole.py:747
+msgid "Connect to an existing kernel"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:159
+msgid "Please enter the connection info of the kernel you want to connect to. For that you can either select its JSON connection file using the <tt>Browse</tt> button, or write directly its id, in case it's a local kernel (for example <tt>kernel-3764.json</tt> or just <tt>3764</tt>)."
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:170
+msgid "Connection info:"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:172
+msgid "Path to connection file or kernel id"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:174 spyder/plugins/ipythonconsole.py:191
+msgid "Browse"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:183
+msgid "This is a remote kernel"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:187
+msgid "username at hostname:port"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:190
+msgid "Path to ssh key file"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:199
+msgid "Password or ssh key passphrase"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:203
+msgid "Host name"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:204
+msgid "Ssh key"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:205
+msgid "Password"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:234
+msgid "Open connection file"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:239
+msgid "Select ssh key"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:267 spyder/plugins/ipythonconsole.py:686
+msgid "IPython console"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:274
+msgid "Display initial banner"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:275
+msgid ""
+"This option lets you hide the message shown at\n"
+"the top of the console when it's opened."
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:277
+msgid "Use a pager to display additional text inside the console"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:279
+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 ""
+
+#: spyder/plugins/ipythonconsole.py:284
+msgid "Ask for confirmation before closing"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:294
+msgid "Completion Type"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:295
+msgid "Decide what type of completion to use"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:297
+msgid "Graphical"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:297
+msgid "Plain"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:298
+msgid "Completion:"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:307
+msgid "Light background"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:309
+msgid "Dark background"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:319
+msgid "Buffer:  "
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:321
+msgid ""
+"Set the maximum number of lines of text shown in the\n"
+"console before truncation. Specifying -1 disables it\n"
+"(not recommended!)"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:330
+msgid "Support for graphics (Matplotlib)"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:331
+msgid "Activate support"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:332
+msgid "Automatically load Pylab and NumPy modules"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:335
+msgid ""
+"This lets you load graphics support without importing \n"
+"the commands to do plots. Useful to work with other\n"
+"plotting libraries different to Matplotlib or to develop \n"
+"GUIs with Spyder."
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:350
+msgid "Inline"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:352
+msgid "Graphics backend"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:353
+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 ""
+
+#: spyder/plugins/ipythonconsole.py:386
+msgid "Inline backend"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:387
+msgid "Decide how to render the figures created by this backend"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:391
+msgid "Format:"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:394
+msgid "Resolution:"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:394
+msgid "dpi"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:396
+msgid "Only used when the format is PNG. Default is 72"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:399
+msgid "Width:"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:399 spyder/plugins/ipythonconsole.py:403
+msgid "inches"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:401
+msgid "Default is 6"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:403
+msgid "Height:"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:405
+msgid "Default is 4"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:432
+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 ""
+
+#: spyder/plugins/ipythonconsole.py:438
+msgid "Lines:"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:447
+msgid "Run a file"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:448
+msgid "You can also run a whole file at startup instead of just some lines (This is similar to have a PYTHONSTARTUP file)."
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:452
+msgid "Use the following file:"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:466
+msgid "Greedy completion"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:467
+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 ""
+
+#: spyder/plugins/ipythonconsole.py:475
+msgid "Use the greedy completer"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:486
+msgid "Autocall"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:487
+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 ""
+
+#: spyder/plugins/ipythonconsole.py:494
+msgid "Smart"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:495
+msgid "Full"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:496
+msgid "Off"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:498
+msgid "Autocall:  "
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:499
+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 ""
+
+#: spyder/plugins/ipythonconsole.py:511
+msgid "Symbolic Mathematics"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:512
+msgid "Perfom symbolic operations in the console (e.g. integrals, derivatives, vector calculus, etc) and get the outputs in a beautifully printed style (it requires the Sympy module)."
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:517
+msgid "Use symbolic math"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:518
+msgid "This option loads the Sympy library to work with.<br>Please refer to its documentation to learn how to use it."
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:528
+msgid "Prompts"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:529
+msgid "Modify how Input and Output prompts are shown in the console."
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:532
+msgid "Input prompt:"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:534
+msgid "Default is<br>In [<span class=\"in-prompt-number\">%i</span>]:"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:538
+msgid "Output prompt:"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:540
+msgid "Default is<br>Out[<span class=\"out-prompt-number\">%i</span>]:"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:562 spyder/plugins/workingdirectory.py:45
+msgid "Startup"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:734
+msgid "Open an &IPython console"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:737
+msgid "Use %s+T when the console is selected to open a new one"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:740
+msgid "Open a new console"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:748
+msgid "Open a new IPython console connected to an existing kernel"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:836
+msgid "No IPython console is currently available to run <b>%s</b>.<br><br>Please open a new one and try again."
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:873
+msgid "Your Python environment or installation doesn't have the <tt>ipykernel</tt> module installed on it. Without this module is not possible for Spyder to create a console for you.<br><br>You can install <tt>ipykernel</tt> by running in a terminal:<br><br><tt>pip install ipykernel</tt><br><br>or<br><br><tt>conda install ipykernel</tt>"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:1098
+msgid "Do you want to close this console?"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:1104
+msgid "Do you want to close all other consoles connected to the same kernel as this one?"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:1364
+msgid "IPython"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:1365
+msgid "Unable to connect to <b>%s</b>"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:1422
+msgid "Connection error"
+msgstr ""
+
+#: spyder/plugins/ipythonconsole.py:1423
+msgid ""
+"Could not open ssh tunnel. The error was:\n"
+"\n"
+msgstr ""
+
+#: spyder/plugins/layoutdialog.py:177
+msgid "Move Up"
+msgstr ""
+
+#: spyder/plugins/layoutdialog.py:178
+msgid "Move Down"
+msgstr ""
+
+#: spyder/plugins/layoutdialog.py:179
+msgid "Delete Layout"
+msgstr ""
+
+#: spyder/plugins/layoutdialog.py:183
+msgid "Layout Display and Order"
+msgstr ""
+
+#: spyder/plugins/maininterpreter.py:31 spyder/plugins/maininterpreter.py:66
+msgid "Python interpreter"
+msgstr ""
+
+#: spyder/plugins/maininterpreter.py:68
+msgid "Select the Python interpreter for all Spyder consoles"
+msgstr ""
+
+#: spyder/plugins/maininterpreter.py:71
+msgid "Default (i.e. the same as Spyder's)"
+msgstr ""
+
+#: spyder/plugins/maininterpreter.py:74
+msgid "Use the following Python interpreter:"
+msgstr ""
+
+#: spyder/plugins/maininterpreter.py:77
+msgid "Executables"
+msgstr ""
+
+#: spyder/plugins/maininterpreter.py:94
+msgid "User Module Reloader (UMR)"
+msgstr ""
+
+#: spyder/plugins/maininterpreter.py:95
+msgid "UMR forces Python to reload modules which were imported when executing a file in a Python or IPython console with the <i>runfile</i> function."
+msgstr ""
+
+#: spyder/plugins/maininterpreter.py:100
+msgid "Enable UMR"
+msgstr ""
+
+#: spyder/plugins/maininterpreter.py:101
+msgid "This option will enable the User Module Reloader (UMR) in Python/IPython consoles. UMR forces Python to reload deeply modules during import when running a Python script using the Spyder's builtin function <b>runfile</b>.<br><br><b>1.</b> UMR may require to restart the console in which it will be called (otherwise only newly imported modules will be reloaded when executing files).<br><br><b>2.</b> If errors occur when re-running a PyQt-based program, please check that the Qt object [...]
+msgstr ""
+
+#: spyder/plugins/maininterpreter.py:117
+msgid "Show reloaded modules list"
+msgstr ""
+
+#: spyder/plugins/maininterpreter.py:118
+msgid "Please note that these changes will be applied only to new consoles"
+msgstr ""
+
+#: spyder/plugins/maininterpreter.py:122
+msgid "Set UMR excluded (not reloaded) modules"
+msgstr ""
+
+#: spyder/plugins/maininterpreter.py:168
+msgid "You selected a <b>Python %d</b> interpreter for the console but Spyder is running on <b>Python %d</b>!.<br><br>Although this is possible, we recommend you to install and run Spyder directly with your selected interpreter, to avoid seeing false warnings and errors due to the incompatible syntax between these two Python versions."
+msgstr ""
+
+#: spyder/plugins/maininterpreter.py:178 spyder/plugins/maininterpreter.py:191
+#: spyder/plugins/maininterpreter.py:195
+msgid "UMR"
+msgstr ""
+
+#: spyder/plugins/maininterpreter.py:179
+msgid "Set the list of excluded modules as this: <i>numpy, scipy</i>"
+msgstr ""
+
+#: spyder/plugins/maininterpreter.py:192
+msgid ""
+"The following modules are not installed on your machine:\n"
+"%s"
+msgstr ""
+
+#: spyder/plugins/maininterpreter.py:196
+msgid "Please note that these changes will be applied only to new Python/IPython consoles"
+msgstr ""
+
+#: spyder/plugins/onlinehelp.py:70
+msgid "Online help"
+msgstr ""
+
+#: spyder/plugins/outlineexplorer.py:49 spyder/widgets/editortools.py:195
+msgid "Outline"
+msgstr ""
+
+#: spyder/plugins/projects.py:76 spyder/widgets/projects/explorer.py:111
+#: spyder/widgets/projects/explorer.py:125
+msgid "Project explorer"
+msgstr ""
+
+#: spyder/plugins/projects.py:88
+msgid "New Project..."
+msgstr ""
+
+#: spyder/plugins/projects.py:91
+msgid "Open Project..."
+msgstr ""
+
+#: spyder/plugins/projects.py:94
+msgid "Close Project"
+msgstr ""
+
+#: spyder/plugins/projects.py:100
+msgid "Project Preferences"
+msgstr ""
+
+#: spyder/plugins/projects.py:102
+msgid "Recent Projects"
+msgstr ""
+
+#: spyder/plugins/projects.py:234
+msgid "Open project"
+msgstr ""
+
+#: spyder/plugins/projects.py:239
+msgid "<b>%s</b> is not a Spyder project!"
+msgstr ""
+
+#: spyder/plugins/runconfig.py:29
+msgid "Execute in current Python or IPython console"
+msgstr ""
+
+#: spyder/plugins/runconfig.py:30
+msgid "Execute in a new dedicated Python console"
+msgstr ""
+
+#: spyder/plugins/runconfig.py:31
+msgid "Execute in an external System terminal"
+msgstr ""
+
+#: spyder/plugins/runconfig.py:41
+msgid "Always show %s on a first file run"
+msgstr ""
+
+#: spyder/plugins/runconfig.py:160 spyder/plugins/runconfig.py:474
+msgid "General settings"
+msgstr ""
+
+#: spyder/plugins/runconfig.py:163 spyder/plugins/runconfig.py:209
+msgid "Command line options:"
+msgstr ""
+
+#: spyder/plugins/runconfig.py:169
+msgid "Working directory:"
+msgstr ""
+
+#: spyder/plugins/runconfig.py:181 spyder/plugins/runconfig.py:492
+msgid "Enter debugging mode when errors appear during execution"
+msgstr ""
+
+#: spyder/plugins/runconfig.py:197 spyder/plugins/runconfig.py:502
+msgid "Dedicated Python console"
+msgstr ""
+
+#: spyder/plugins/runconfig.py:201 spyder/plugins/runconfig.py:504
+msgid "Interact with the Python console after execution"
+msgstr ""
+
+#: spyder/plugins/runconfig.py:205
+msgid "Show warning when killing running process"
+msgstr ""
+
+#: spyder/plugins/runconfig.py:214
+msgid "<b>-u</b> is added to the other options you set here"
+msgstr ""
+
+#: spyder/plugins/runconfig.py:224
+msgid "this dialog"
+msgstr ""
+
+#: spyder/plugins/runconfig.py:283
+msgid "Run configuration"
+msgstr ""
+
+#: spyder/plugins/runconfig.py:284
+msgid "The following working directory is not valid:<br><b>%s</b>"
+msgstr ""
+
+#: spyder/plugins/runconfig.py:362
+msgid "Run settings for %s"
+msgstr ""
+
+#: spyder/plugins/runconfig.py:394
+msgid "Select a run configuration:"
+msgstr ""
+
+#: spyder/plugins/runconfig.py:423 spyder/plugins/runconfig.py:448
+msgid "Run Settings"
+msgstr ""
+
+#: spyder/plugins/runconfig.py:450
+msgid "The following are the default <i>%s</i>. These options may be overriden using the <b>%s</b> dialog box (see the <b>%s</b> menu)"
+msgstr ""
+
+#: spyder/plugins/runconfig.py:476
+msgid "Default working directory is:"
+msgstr ""
+
+#: spyder/plugins/runconfig.py:478
+msgid "the script directory"
+msgstr ""
+
+#: spyder/plugins/runconfig.py:481 spyder/plugins/workingdirectory.py:57
+msgid "the following directory:"
+msgstr ""
+
+#: spyder/plugins/runconfig.py:507
+msgid "Show warning when killing running processes"
+msgstr ""
+
+#: spyder/plugins/runconfig.py:516
+msgid "Run Settings dialog"
+msgstr ""
+
+#: spyder/plugins/shortcuts.py:137
+msgid ""
+"Press the new shortcut and select 'Ok': \n"
+"(Press 'Tab' once to switch focus between the shortcut entry \n"
+"and the buttons below it)"
+msgstr ""
+
+#: spyder/plugins/shortcuts.py:140
+msgid "Current shortcut:"
+msgstr ""
+
+#: spyder/plugins/shortcuts.py:142
+msgid "New shortcut:"
+msgstr ""
+
+#: spyder/plugins/shortcuts.py:155
+msgid "Shortcut: {0}"
+msgstr ""
+
+#: spyder/plugins/shortcuts.py:276
+msgid "Please introduce a different shortcut"
+msgstr ""
+
+#: spyder/plugins/shortcuts.py:313
+msgid "The new shorcut conflicts with:"
+msgstr ""
+
+#: spyder/plugins/shortcuts.py:324
+msgid "A compound sequence can have {break} a maximum of 4 subsequences.{break}"
+msgstr ""
+
+#: spyder/plugins/shortcuts.py:329
+msgid "Invalid key entered"
+msgstr ""
+
+#: spyder/plugins/shortcuts.py:531
+msgid "Context"
+msgstr ""
+
+#: spyder/plugins/shortcuts.py:533
+#: spyder/widgets/variableexplorer/collectionseditor.py:118
+msgid "Name"
+msgstr ""
+
+#: spyder/plugins/shortcuts.py:535
+msgid "Shortcut"
+msgstr ""
+
+#: spyder/plugins/shortcuts.py:537
+msgid "Score"
+msgstr ""
+
+#: spyder/plugins/shortcuts.py:697
+msgid "Conflicts"
+msgstr ""
+
+#: spyder/plugins/shortcuts.py:698
+msgid "The following conflicts have been detected:"
+msgstr ""
+
+#: spyder/plugins/shortcuts.py:783
+msgid "Keyboard shortcuts"
+msgstr ""
+
+#: spyder/plugins/shortcuts.py:791
+msgid "Search: "
+msgstr ""
+
+#: spyder/plugins/shortcuts.py:792
+msgid "Reset to default values"
+msgstr ""
+
+#: spyder/plugins/variableexplorer.py:26
+msgid "Autorefresh"
+msgstr ""
+
+#: spyder/plugins/variableexplorer.py:27
+msgid "Enable autorefresh"
+msgstr ""
+
+#: spyder/plugins/variableexplorer.py:29
+msgid "Refresh interval: "
+msgstr ""
+
+#: spyder/plugins/variableexplorer.py:33
+msgid "Filter"
+msgstr ""
+
+#: spyder/plugins/variableexplorer.py:35
+#: spyder/widgets/variableexplorer/namespacebrowser.py:229
+msgid "Exclude private references"
+msgstr ""
+
+#: spyder/plugins/variableexplorer.py:36
+#: spyder/widgets/variableexplorer/namespacebrowser.py:244
+msgid "Exclude capitalized references"
+msgstr ""
+
+#: spyder/plugins/variableexplorer.py:37
+#: spyder/widgets/variableexplorer/namespacebrowser.py:237
+msgid "Exclude all-uppercase references"
+msgstr ""
+
+#: spyder/plugins/variableexplorer.py:38
+#: spyder/widgets/variableexplorer/namespacebrowser.py:252
+msgid "Exclude unsupported data types"
+msgstr ""
+
+#: spyder/plugins/variableexplorer.py:44
+#: spyder/widgets/variableexplorer/collectionseditor.py:675
+msgid "Truncate values"
+msgstr ""
+
+#: spyder/plugins/variableexplorer.py:46
+#: spyder/widgets/variableexplorer/collectionseditor.py:679
+msgid "Show arrays min/max"
+msgstr ""
+
+#: spyder/plugins/variableexplorer.py:48
+msgid "Edit data in the remote process"
+msgstr ""
+
+#: spyder/plugins/variableexplorer.py:49
+msgid ""
+"Editors are opened in the remote process for NumPy arrays, PIL images, lists, tuples and dictionaries.\n"
+"This avoids transfering large amount of data between the remote process and Spyder (through the socket)."
+msgstr ""
+
+#: spyder/plugins/variableexplorer.py:185
+msgid "Variable explorer"
+msgstr ""
+
+#: spyder/plugins/workingdirectory.py:38
+msgid "The <b>global working directory</b> is the working directory for newly opened <i>consoles</i> (Python/IPython consoles and terminals), for the <i>file explorer</i>, for the <i>find in files</i> plugin and for new files created in the <i>editor</i>."
+msgstr ""
+
+#: spyder/plugins/workingdirectory.py:47
+msgid "At startup, the global working directory is:"
+msgstr ""
+
+#: spyder/plugins/workingdirectory.py:51
+msgid "the same as in last session"
+msgstr ""
+
+#: spyder/plugins/workingdirectory.py:53
+msgid "At startup, Spyder will restore the global directory from last session"
+msgstr ""
+
+#: spyder/plugins/workingdirectory.py:59
+msgid "At startup, the global working directory will be the specified path"
+msgstr ""
+
+#: spyder/plugins/workingdirectory.py:71
+msgid "Files are opened from:"
+msgstr ""
+
+#: spyder/plugins/workingdirectory.py:75 spyder/plugins/workingdirectory.py:88
+msgid "the current file directory"
+msgstr ""
+
+#: spyder/plugins/workingdirectory.py:79 spyder/plugins/workingdirectory.py:92
+msgid "the global working directory"
+msgstr ""
+
+#: spyder/plugins/workingdirectory.py:84
+msgid "Files are created in:"
+msgstr ""
+
+#: spyder/plugins/workingdirectory.py:98
+msgid "Change to file base directory"
+msgstr ""
+
+#: spyder/plugins/workingdirectory.py:100
+msgid "When opening a file"
+msgstr ""
+
+#: spyder/plugins/workingdirectory.py:102
+msgid "When saving a file"
+msgstr ""
+
+#: spyder/plugins/workingdirectory.py:172
+msgid "Back"
+msgstr ""
+
+#: spyder/plugins/workingdirectory.py:180 spyder/widgets/explorer.py:1079
+#: spyder/widgets/variableexplorer/importwizard.py:529
+msgid "Next"
+msgstr ""
+
+#: spyder/plugins/workingdirectory.py:191
+msgid ""
+"This is the working directory for newly\n"
+"opened consoles (Python/IPython consoles and\n"
+"terminals), for the file explorer, for the\n"
+"find in files plugin and for new files\n"
+"created in the editor"
+msgstr ""
+
+#: spyder/plugins/workingdirectory.py:219
+msgid "Browse a working directory"
+msgstr ""
+
+#: spyder/plugins/workingdirectory.py:226
+msgid "Change to parent directory"
+msgstr ""
+
+#: spyder/plugins/workingdirectory.py:233
+msgid "Global working directory"
+msgstr ""
+
+#: spyder/utils/codeanalysis.py:91
+msgid "Real-time code analysis on the Editor"
+msgstr ""
+
+#: spyder/utils/codeanalysis.py:95
+msgid "Real-time code style analysis on the Editor"
+msgstr ""
+
+#: spyder/utils/environ.py:101
+msgid "Module <b>pywin32 was not found</b>.<br>Please restart this Windows <i>session</i> (not the computer) for changes to take effect."
+msgstr ""
+
+#: spyder/utils/environ.py:114
+msgid "If you accept changes, this will modify the current user environment variables directly <b>in Windows registry</b>. Use it with precautions, at your own risks.<br><br>Note that for changes to take effect, you will need to restart the parent process of this application (simply restart Spyder if you have executed it from a Windows shortcut, otherwise restart any application from which you may have executed it, like <i>Python(x,y) Home</i> for example)"
+msgstr ""
+
+#: spyder/utils/help/sphinxify.py:217 spyder/utils/help/sphinxify.py:227
+msgid "It was not possible to generate rich text help for this object.</br>Please see it in plain text."
+msgstr ""
+
+#: spyder/utils/introspection/manager.py:33
+#: spyder/utils/introspection/manager.py:38
+msgid "Editor's code completion, go-to-definition and help"
+msgstr ""
+
+#: spyder/utils/iofuncs.py:408
+msgid "Supported files"
+msgstr ""
+
+#: spyder/utils/iofuncs.py:410
+msgid "All files (*.*)"
+msgstr ""
+
+#: spyder/utils/iofuncs.py:420
+msgid "Spyder data files"
+msgstr ""
+
+#: spyder/utils/iofuncs.py:422
+#: spyder/widgets/variableexplorer/collectionseditor.py:1029
+msgid "NumPy arrays"
+msgstr ""
+
+#: spyder/utils/iofuncs.py:423
+msgid "NumPy zip arrays"
+msgstr ""
+
+#: spyder/utils/iofuncs.py:424
+msgid "Matlab files"
+msgstr ""
+
+#: spyder/utils/iofuncs.py:425
+msgid "CSV text files"
+msgstr ""
+
+#: spyder/utils/iofuncs.py:427
+msgid "JPEG images"
+msgstr ""
+
+#: spyder/utils/iofuncs.py:428
+msgid "PNG images"
+msgstr ""
+
+#: spyder/utils/iofuncs.py:429
+msgid "GIF images"
+msgstr ""
+
+#: spyder/utils/iofuncs.py:430
+msgid "TIFF images"
+msgstr ""
+
+#: spyder/utils/iofuncs.py:431 spyder/utils/iofuncs.py:432
+msgid "Pickle files"
+msgstr ""
+
+#: spyder/utils/iofuncs.py:433
+msgid "JSON files"
+msgstr ""
+
+#: spyder/utils/iofuncs.py:452 spyder/utils/iofuncs.py:459
+msgid "<b>Unsupported file type '%s'</b>"
+msgstr ""
+
+#: spyder/utils/programs.py:286
+msgid "It was not possible to run this file in an external terminal"
+msgstr ""
+
+#: spyder/utils/syntaxhighlighters.py:33
+msgid "Syntax highlighting for Matlab, Julia and other file types"
+msgstr ""
+
+#: spyder/utils/syntaxhighlighters.py:42
+msgid "Background:"
+msgstr ""
+
+#: spyder/utils/syntaxhighlighters.py:43
+#: spyder/widgets/sourcecode/codeeditor.py:106
+msgid "Current line:"
+msgstr ""
+
+#: spyder/utils/syntaxhighlighters.py:44
+msgid "Current cell:"
+msgstr ""
+
+#: spyder/utils/syntaxhighlighters.py:45
+msgid "Occurrence:"
+msgstr ""
+
+#: spyder/utils/syntaxhighlighters.py:46
+msgid "Link:"
+msgstr ""
+
+#: spyder/utils/syntaxhighlighters.py:47
+msgid "Side areas:"
+msgstr ""
+
+#: spyder/utils/syntaxhighlighters.py:48
+msgid "Matched <br>parens:"
+msgstr ""
+
+#: spyder/utils/syntaxhighlighters.py:49
+msgid "Unmatched <br>parens:"
+msgstr ""
+
+#: spyder/utils/syntaxhighlighters.py:50
+msgid "Normal text:"
+msgstr ""
+
+#: spyder/utils/syntaxhighlighters.py:51
+msgid "Keyword:"
+msgstr ""
+
+#: spyder/utils/syntaxhighlighters.py:52
+msgid "Builtin:"
+msgstr ""
+
+#: spyder/utils/syntaxhighlighters.py:53
+msgid "Definition:"
+msgstr ""
+
+#: spyder/utils/syntaxhighlighters.py:54
+msgid "Comment:"
+msgstr ""
+
+#: spyder/utils/syntaxhighlighters.py:55
+msgid "String:"
+msgstr ""
+
+#: spyder/utils/syntaxhighlighters.py:56
+msgid "Number:"
+msgstr ""
+
+#: spyder/utils/syntaxhighlighters.py:57
+msgid "Instance:"
+msgstr ""
+
+#: spyder/widgets/arraybuilder.py:179
+msgid ""
+"\n"
+"           <b>Numpy Array/Matrix Helper</b><br>\n"
+"           Type an array in Matlab    : <code>[1 2;3 4]</code><br>\n"
+"           or Spyder simplified syntax : <code>1 2;3 4</code>\n"
+"           <br><br>\n"
+"           Hit 'Enter' for array or 'Ctrl+Enter' for matrix.\n"
+"           <br><br>\n"
+"           <b>Hint:</b><br>\n"
+"           Use two spaces or two tabs to generate a ';'.\n"
+"           "
+msgstr ""
+
+#: spyder/widgets/arraybuilder.py:190
+msgid ""
+"\n"
+"           <b>Numpy Array/Matrix Helper</b><br>\n"
+"           Enter an array in the table. <br>\n"
+"           Use Tab to move between cells.\n"
+"           <br><br>\n"
+"           Hit 'Enter' for array or 'Ctrl+Enter' for matrix.\n"
+"           <br><br>\n"
+"           <b>Hint:</b><br>\n"
+"           Use two tabs at the end of a row to move to the next row.\n"
+"           "
+msgstr ""
+
+#: spyder/widgets/arraybuilder.py:365
+msgid "Array dimensions not valid"
+msgstr ""
+
+#: spyder/widgets/browser.py:54 spyder/widgets/sourcecode/codeeditor.py:2518
+msgid "Zoom out"
+msgstr ""
+
+#: spyder/widgets/browser.py:57 spyder/widgets/sourcecode/codeeditor.py:2514
+msgid "Zoom in"
+msgstr ""
+
+#: spyder/widgets/browser.py:162
+msgid "Home"
+msgstr ""
+
+#: spyder/widgets/browser.py:198
+msgid "Find text"
+msgstr ""
+
+#: spyder/widgets/browser.py:216
+msgid "Address:"
+msgstr ""
+
+#: spyder/widgets/browser.py:252
+msgid "Unable to load page"
+msgstr ""
+
+#: spyder/widgets/comboboxes.py:165
+msgid "Press enter to validate this entry"
+msgstr ""
+
+#: spyder/widgets/comboboxes.py:166
+msgid "This entry is incorrect"
+msgstr ""
+
+#: spyder/widgets/comboboxes.py:209
+msgid "Press enter to validate this path"
+msgstr ""
+
+#: spyder/widgets/dependencies.py:63
+msgid " Required "
+msgstr ""
+
+#: spyder/widgets/dependencies.py:63
+msgid "Module"
+msgstr ""
+
+#: spyder/widgets/dependencies.py:64
+msgid " Installed "
+msgstr ""
+
+#: spyder/widgets/dependencies.py:64
+msgid "Provided features"
+msgstr ""
+
+#: spyder/widgets/dependencies.py:134
+msgid "Dependencies"
+msgstr ""
+
+#: spyder/widgets/dependencies.py:141
+msgid "Spyder depends on several Python modules to provide the right functionality for all its panes. The table below shows the required and installed versions (if any) of all of them.<br><br><b>Note</b>: You can safely use Spyder without the following modules installed: <b>%s</b> and <b>%s</b>"
+msgstr ""
+
+#: spyder/widgets/dependencies.py:154
+msgid "Copy to clipboard"
+msgstr ""
+
+#: spyder/widgets/editor.py:348
+msgid "Copy path to clipboard"
+msgstr ""
+
+#: spyder/widgets/editor.py:352
+msgid "Close all to the right"
+msgstr ""
+
+#: spyder/widgets/editor.py:354
+msgid "Close all but this"
+msgstr ""
+
+#: spyder/widgets/editor.py:957
+msgid "Temporary file"
+msgstr ""
+
+#: spyder/widgets/editor.py:1052
+msgid "New window"
+msgstr ""
+
+#: spyder/widgets/editor.py:1053
+msgid "Create a new editor window"
+msgstr ""
+
+#: spyder/widgets/editor.py:1056
+msgid "Split vertically"
+msgstr ""
+
+#: spyder/widgets/editor.py:1058
+msgid "Split vertically this editor window"
+msgstr ""
+
+#: spyder/widgets/editor.py:1060
+msgid "Split horizontally"
+msgstr ""
+
+#: spyder/widgets/editor.py:1062
+msgid "Split horizontally this editor window"
+msgstr ""
+
+#: spyder/widgets/editor.py:1064
+msgid "Close this panel"
+msgstr ""
+
+#: spyder/widgets/editor.py:1221
+msgid "<b>%s</b> has been modified.<br>Do you want to save changes?"
+msgstr ""
+
+#: spyder/widgets/editor.py:1283
+msgid "Save"
+msgstr ""
+
+#: spyder/widgets/editor.py:1284
+msgid "<b>Unable to save script '%s'</b><br><br>Error message:<br>%s"
+msgstr ""
+
+#: spyder/widgets/editor.py:1518
+msgid "<b>%s</b> is unavailable (this file may have been removed, moved or renamed outside Spyder).<br>Do you want to close it?"
+msgstr ""
+
+#: spyder/widgets/editor.py:1538
+msgid "<b>%s</b> has been modified outside Spyder.<br>Do you want to reload it and lose all your changes?"
+msgstr ""
+
+#: spyder/widgets/editor.py:1634
+msgid "All changes to <b>%s</b> will be lost.<br>Do you want to revert file from disk?"
+msgstr ""
+
+#: spyder/widgets/editor.py:1774
+msgid "Loading %s..."
+msgstr ""
+
+#: spyder/widgets/editor.py:1784
+msgid "<b>%s</b> contains mixed end-of-line characters.<br>Spyder will fix this automatically."
+msgstr ""
+
+#: spyder/widgets/editor.py:2166
+msgid "Close window"
+msgstr ""
+
+#: spyder/widgets/editor.py:2168
+msgid "Close this window"
+msgstr ""
+
+#: spyder/widgets/editortools.py:94 spyder/widgets/editortools.py:130
+msgid "Line %s"
+msgstr ""
+
+#: spyder/widgets/editortools.py:99
+msgid "Class defined at line %s"
+msgstr ""
+
+#: spyder/widgets/editortools.py:107
+msgid "Method defined at line %s"
+msgstr ""
+
+#: spyder/widgets/editortools.py:117
+msgid "Function defined at line %s"
+msgstr ""
+
+#: spyder/widgets/editortools.py:149
+msgid "Cell starts at line %s"
+msgstr ""
+
+#: spyder/widgets/editortools.py:202 spyder/widgets/editortools.py:539
+msgid "Go to cursor position"
+msgstr ""
+
+#: spyder/widgets/editortools.py:205
+msgid "Show absolute path"
+msgstr ""
+
+#: spyder/widgets/editortools.py:208 spyder/widgets/explorer.py:208
+msgid "Show all files"
+msgstr ""
+
+#: spyder/widgets/editortools.py:211
+msgid "Show special comments"
+msgstr ""
+
+#: spyder/widgets/explorer.py:204
+msgid "Edit filename filters..."
+msgstr ""
+
+#: spyder/widgets/explorer.py:218
+msgid "Edit filename filters"
+msgstr ""
+
+#: spyder/widgets/explorer.py:219
+msgid "Name filters:"
+msgstr ""
+
+#: spyder/widgets/explorer.py:238
+msgid "File..."
+msgstr ""
+
+#: spyder/widgets/explorer.py:242
+msgid "Module..."
+msgstr ""
+
+#: spyder/widgets/explorer.py:246
+msgid "Folder..."
+msgstr ""
+
+#: spyder/widgets/explorer.py:250
+msgid "Package..."
+msgstr ""
+
+#: spyder/widgets/explorer.py:271
+#: spyder/widgets/variableexplorer/collectionseditor.py:650
+msgid "Edit"
+msgstr ""
+
+#: spyder/widgets/explorer.py:273
+msgid "Move..."
+msgstr ""
+
+#: spyder/widgets/explorer.py:276
+msgid "Delete..."
+msgstr ""
+
+#: spyder/widgets/explorer.py:279
+msgid "Rename..."
+msgstr ""
+
+#: spyder/widgets/explorer.py:282
+msgid "Open"
+msgstr ""
+
+#: spyder/widgets/explorer.py:283 spyder/widgets/sourcecode/codeeditor.py:2490
+msgid "Convert to Python script"
+msgstr ""
+
+#: spyder/widgets/explorer.py:317
+msgid "Commit"
+msgstr ""
+
+#: spyder/widgets/explorer.py:320
+msgid "Browse repository"
+msgstr ""
+
+#: spyder/widgets/explorer.py:331
+msgid "Open command prompt here"
+msgstr ""
+
+#: spyder/widgets/explorer.py:333
+msgid "Open terminal here"
+msgstr ""
+
+#: spyder/widgets/explorer.py:338
+msgid "Open Python console here"
+msgstr ""
+
+#: spyder/widgets/explorer.py:352
+msgid "New"
+msgstr ""
+
+#: spyder/widgets/explorer.py:360
+msgid "Import"
+msgstr ""
+
+#: spyder/widgets/explorer.py:511
+msgid "Do you really want to delete <b>%s</b>?"
+msgstr ""
+
+#: spyder/widgets/explorer.py:529
+msgid "delete"
+msgstr ""
+
+#: spyder/widgets/explorer.py:530 spyder/widgets/projects/explorer.py:147
+msgid "Project Explorer"
+msgstr ""
+
+#: spyder/widgets/explorer.py:531 spyder/widgets/projects/explorer.py:148
+msgid "<b>Unable to %s <i>%s</i></b><br><br>Error message:<br>%s"
+msgstr ""
+
+#: spyder/widgets/explorer.py:554 spyder/widgets/sourcecode/codeeditor.py:2007
+msgid "Conversion error"
+msgstr ""
+
+#: spyder/widgets/explorer.py:555 spyder/widgets/sourcecode/codeeditor.py:2008
+msgid ""
+"It was not possible to convert this notebook. The error is:\n"
+"\n"
+msgstr ""
+
+#: spyder/widgets/explorer.py:572 spyder/widgets/explorer.py:580
+#: spyder/widgets/explorer.py:591
+#: spyder/widgets/variableexplorer/collectionseditor.py:683
+#: spyder/widgets/variableexplorer/collectionseditor.py:924
+msgid "Rename"
+msgstr ""
+
+#: spyder/widgets/explorer.py:573
+msgid "New name:"
+msgstr ""
+
+#: spyder/widgets/explorer.py:581
+msgid "Do you really want to rename <b>%s</b> and overwrite the existing file <b>%s</b>?"
+msgstr ""
+
+#: spyder/widgets/explorer.py:592
+msgid "<b>Unable to rename file <i>%s</i></b><br><br>Error message:<br>%s"
+msgstr ""
+
+#: spyder/widgets/explorer.py:628
+msgid "<b>Unable to move <i>%s</i></b><br><br>Error message:<br>%s"
+msgstr ""
+
+#: spyder/widgets/explorer.py:646
+msgid "<b>Unable to create folder <i>%s</i></b><br><br>Error message:<br>%s"
+msgstr ""
+
+#: spyder/widgets/explorer.py:659 spyder/widgets/explorer.py:693
+msgid "<b>Unable to create file <i>%s</i></b><br><br>Error message:<br>%s"
+msgstr ""
+
+#: spyder/widgets/explorer.py:667
+msgid "New folder"
+msgstr ""
+
+#: spyder/widgets/explorer.py:668
+msgid "Folder name:"
+msgstr ""
+
+#: spyder/widgets/explorer.py:673
+msgid "New package"
+msgstr ""
+
+#: spyder/widgets/explorer.py:674
+msgid "Package name:"
+msgstr ""
+
+#: spyder/widgets/explorer.py:714
+msgid "New module"
+msgstr ""
+
+#: spyder/widgets/explorer.py:729
+msgid "For %s support, please install one of the<br/> following tools:<br/><br/>  %s"
+msgstr ""
+
+#: spyder/widgets/explorer.py:733
+msgid "<b>Unable to find external program.</b><br><br>%s"
+msgstr ""
+
+#: spyder/widgets/explorer.py:948
+msgid "Show current directory only"
+msgstr ""
+
+#: spyder/widgets/explorer.py:1046
+msgid "You don't have the right permissions to open this directory"
+msgstr ""
+
+#: spyder/widgets/explorer.py:1076
+#: spyder/widgets/variableexplorer/importwizard.py:525
+msgid "Previous"
+msgstr ""
+
+#: spyder/widgets/explorer.py:1082
+msgid "Parent"
+msgstr ""
+
+#: spyder/widgets/externalshell/baseshell.py:129
+msgid "Run again this program"
+msgstr ""
+
+#: spyder/widgets/externalshell/baseshell.py:132
+msgid "Kill"
+msgstr ""
+
+#: spyder/widgets/externalshell/baseshell.py:134
+msgid "Kills the current process, causing it to exit immediately"
+msgstr ""
+
+#: spyder/widgets/externalshell/baseshell.py:206
+msgid "<span style='color: #44AA44'><b>Running...</b></span>"
+msgstr ""
+
+#: spyder/widgets/externalshell/baseshell.py:213
+msgid "Terminated."
+msgstr ""
+
+#: spyder/widgets/externalshell/baseshell.py:238
+#: spyder/widgets/ipythonconsole/help.py:125 spyder/widgets/mixins.py:661
+msgid "Arguments"
+msgstr ""
+
+#: spyder/widgets/externalshell/baseshell.py:239
+msgid "Command line arguments:"
+msgstr ""
+
+#: spyder/widgets/externalshell/pythonshell.py:277
+msgid "Variables"
+msgstr ""
+
+#: spyder/widgets/externalshell/pythonshell.py:278
+msgid "Show/hide global variables explorer"
+msgstr ""
+
+#: spyder/widgets/externalshell/pythonshell.py:282
+msgid "Terminate"
+msgstr ""
+
+#: spyder/widgets/externalshell/pythonshell.py:283
+msgid ""
+"Attempts to stop the process. The process\n"
+"may not exit as a result of clicking this\n"
+"button (it is given the chance to prompt\n"
+"the user for any unsaved files, etc)."
+msgstr ""
+
+#: spyder/widgets/externalshell/pythonshell.py:296
+msgid "Interact"
+msgstr ""
+
+#: spyder/widgets/externalshell/pythonshell.py:298
+msgid "Debug"
+msgstr ""
+
+#: spyder/widgets/externalshell/pythonshell.py:300
+#: spyder/widgets/externalshell/pythonshell.py:366
+msgid "Arguments..."
+msgstr ""
+
+#: spyder/widgets/externalshell/pythonshell.py:302
+msgid "Post Mortem Debug"
+msgstr ""
+
+#: spyder/widgets/externalshell/pythonshell.py:308
+msgid "Working directory"
+msgstr ""
+
+#: spyder/widgets/externalshell/pythonshell.py:310
+msgid "Set current working directory"
+msgstr ""
+
+#: spyder/widgets/externalshell/pythonshell.py:312
+msgid "Environment variables"
+msgstr ""
+
+#: spyder/widgets/externalshell/pythonshell.py:316
+msgid "Show sys.path contents"
+msgstr ""
+
+#: spyder/widgets/externalshell/pythonshell.py:362
+msgid "Arguments: %s"
+msgstr ""
+
+#: spyder/widgets/externalshell/pythonshell.py:364
+msgid "No argument"
+msgstr ""
+
+#: spyder/widgets/externalshell/pythonshell.py:534
+msgid "A Python console failed to start!"
+msgstr ""
+
+#: spyder/widgets/externalshell/systemshell.py:106
+msgid "Process failed to start"
+msgstr ""
+
+#: spyder/widgets/fileswitcher.py:109
+msgid "unsaved file"
+msgstr ""
+
+#: spyder/widgets/fileswitcher.py:230
+msgid "Press <b>Enter</b> to switch files or <b>Esc</b> to cancel.<br><br>Type to filter filenames.<br><br>Use <b>:number</b> to go to a line, e.g. <b><code>main:42</code></b><br>Use <b>@symbol_text</b> to go to a symbol, e.g. <b><code>@init</code></b><br><br> Press <b>Ctrl+W</b> to close current tab.<br>"
+msgstr ""
+
+#: spyder/widgets/fileswitcher.py:508
+msgid "lines"
+msgstr ""
+
+#: spyder/widgets/findinfiles.py:158
+msgid "Unexpected error: see internal console"
+msgstr ""
+
+#: spyder/widgets/findinfiles.py:209 spyder/widgets/findinfiles.py:233
+#: spyder/widgets/findinfiles.py:280
+msgid "invalid regular expression"
+msgstr ""
+
+#: spyder/widgets/findinfiles.py:278
+msgid "permission denied errors were encountered"
+msgstr ""
+
+#: spyder/widgets/findinfiles.py:315
+msgid "Search pattern"
+msgstr ""
+
+#: spyder/widgets/findinfiles.py:318 spyder/widgets/findinfiles.py:352
+#: spyder/widgets/findinfiles.py:364 spyder/widgets/findreplace.py:81
+msgid "Regular expression"
+msgstr ""
+
+#: spyder/widgets/findinfiles.py:327
+msgid "Search"
+msgstr ""
+
+#: spyder/widgets/findinfiles.py:330
+msgid "Start search"
+msgstr ""
+
+#: spyder/widgets/findinfiles.py:336
+msgid "Stop search"
+msgstr ""
+
+#: spyder/widgets/findinfiles.py:346
+msgid "Included filenames pattern"
+msgstr ""
+
+#: spyder/widgets/findinfiles.py:355
+msgid "Include:"
+msgstr ""
+
+#: spyder/widgets/findinfiles.py:358
+msgid "Excluded filenames pattern"
+msgstr ""
+
+#: spyder/widgets/findinfiles.py:367
+msgid "Exclude:"
+msgstr ""
+
+#: spyder/widgets/findinfiles.py:377
+msgid "PYTHONPATH"
+msgstr ""
+
+#: spyder/widgets/findinfiles.py:379
+msgid "Search in all directories listed in sys.path which are outside the Python installation directory"
+msgstr ""
+
+#: spyder/widgets/findinfiles.py:382
+msgid "Hg repository"
+msgstr ""
+
+#: spyder/widgets/findinfiles.py:385
+msgid "Search in current directory hg repository"
+msgstr ""
+
+#: spyder/widgets/findinfiles.py:386
+msgid "Here:"
+msgstr ""
+
+#: spyder/widgets/findinfiles.py:390
+msgid "Search recursively in this directory"
+msgstr ""
+
+#: spyder/widgets/findinfiles.py:395
+msgid "Browse a search directory"
+msgstr ""
+
+#: spyder/widgets/findinfiles.py:425
+msgid "Hide advanced options"
+msgstr ""
+
+#: spyder/widgets/findinfiles.py:428
+msgid "Show advanced options"
+msgstr ""
+
+#: spyder/widgets/findinfiles.py:569
+msgid "Search canceled"
+msgstr ""
+
+#: spyder/widgets/findinfiles.py:573
+msgid "String not found"
+msgstr ""
+
+#: spyder/widgets/findinfiles.py:575
+msgid "matches in"
+msgstr ""
+
+#: spyder/widgets/findinfiles.py:576
+msgid "file"
+msgstr ""
+
+#: spyder/widgets/findinfiles.py:584
+msgid "interrupted"
+msgstr ""
+
+#: spyder/widgets/findreplace.py:63
+msgid "Search string"
+msgstr ""
+
+#: spyder/widgets/findreplace.py:87
+msgid "Case Sensitive"
+msgstr ""
+
+#: spyder/widgets/findreplace.py:93
+msgid "Whole words"
+msgstr ""
+
+#: spyder/widgets/findreplace.py:99
+msgid "Highlight matches"
+msgstr ""
+
+#: spyder/widgets/findreplace.py:113
+msgid "Replace with:"
+msgstr ""
+
+#: spyder/widgets/findreplace.py:115
+msgid "Replace string"
+msgstr ""
+
+#: spyder/widgets/findreplace.py:118
+msgid "Replace/find"
+msgstr ""
+
+#: spyder/widgets/findreplace.py:125
+msgid "Replace all"
+msgstr ""
+
+#: spyder/widgets/internalshell.py:262
+msgid "Help..."
+msgstr ""
+
+#: spyder/widgets/internalshell.py:279
+msgid "Shell special commands:"
+msgstr ""
+
+#: spyder/widgets/internalshell.py:280
+msgid "Internal editor:"
+msgstr ""
+
+#: spyder/widgets/internalshell.py:281
+msgid "External editor:"
+msgstr ""
+
+#: spyder/widgets/internalshell.py:282
+msgid "Run script:"
+msgstr ""
+
+#: spyder/widgets/internalshell.py:283
+msgid "Remove references:"
+msgstr ""
+
+#: spyder/widgets/internalshell.py:284
+msgid "System commands:"
+msgstr ""
+
+#: spyder/widgets/internalshell.py:285
+msgid "Python help:"
+msgstr ""
+
+#: spyder/widgets/internalshell.py:286
+msgid "GUI-based editor:"
+msgstr ""
+
+#: spyder/widgets/ipythonconsole/client.py:187
+msgid "An error ocurred while starting the kernel"
+msgstr ""
+
+#: spyder/widgets/ipythonconsole/client.py:218
+msgid "Restart kernel"
+msgstr ""
+
+#: spyder/widgets/ipythonconsole/client.py:238
+msgid "Stop the current command"
+msgstr ""
+
+#: spyder/widgets/ipythonconsole/client.py:261
+msgid "Inspect current object"
+msgstr ""
+
+#: spyder/widgets/ipythonconsole/client.py:266
+msgid "Clear line or block"
+msgstr ""
+
+#: spyder/widgets/ipythonconsole/client.py:270
+msgid "Reset namespace"
+msgstr ""
+
+#: spyder/widgets/ipythonconsole/client.py:273
+msgid "Clear console"
+msgstr ""
+
+#: spyder/widgets/ipythonconsole/client.py:314
+msgid "Are you sure you want to restart the kernel?"
+msgstr ""
+
+#: spyder/widgets/ipythonconsole/client.py:316
+msgid "Restart kernel?"
+msgstr ""
+
+#: spyder/widgets/ipythonconsole/client.py:325
+msgid ""
+"Error restarting kernel: %s\n"
+msgstr ""
+
+#: spyder/widgets/ipythonconsole/client.py:329
+msgid ""
+"<br>Restarting kernel...\n"
+"<hr><br>"
+msgstr ""
+
+#: spyder/widgets/ipythonconsole/client.py:334
+msgid ""
+"Cannot restart a kernel not started by Spyder\n"
+msgstr ""
+
+#: spyder/widgets/ipythonconsole/client.py:374
+msgid "Changing backend to Qt for Mayavi"
+msgstr ""
+
+#: spyder/widgets/ipythonconsole/client.py:385
+msgid "Connecting to kernel..."
+msgstr ""
+
+#: spyder/widgets/ipythonconsole/namespacebrowser.py:76
+msgid "Inspecting and setting values while debugging in IPython consoles is not supported yet by Spyder."
+msgstr ""
+
+#: spyder/widgets/ipythonconsole/shell.py:135
+msgid "Reset IPython namespace"
+msgstr ""
+
+#: spyder/widgets/ipythonconsole/shell.py:136
+msgid "All user-defined variables will be removed.<br>Are you sure you want to reset the namespace?"
+msgstr ""
+
+#: spyder/widgets/onecolumntree.py:52
+msgid "Collapse all"
+msgstr ""
+
+#: spyder/widgets/onecolumntree.py:56
+msgid "Expand all"
+msgstr ""
+
+#: spyder/widgets/onecolumntree.py:60
+msgid "Restore"
+msgstr ""
+
+#: spyder/widgets/onecolumntree.py:61
+msgid "Restore original tree layout"
+msgstr ""
+
+#: spyder/widgets/onecolumntree.py:65
+msgid "Collapse selection"
+msgstr ""
+
+#: spyder/widgets/onecolumntree.py:69
+msgid "Expand selection"
+msgstr ""
+
+#: spyder/widgets/pathmanager.py:87
+msgid "Move to top"
+msgstr ""
+
+#: spyder/widgets/pathmanager.py:93
+msgid "Move up"
+msgstr ""
+
+#: spyder/widgets/pathmanager.py:99
+msgid "Move down"
+msgstr ""
+
+#: spyder/widgets/pathmanager.py:105
+msgid "Move to bottom"
+msgstr ""
+
+#: spyder/widgets/pathmanager.py:116 spyder/widgets/pathmanager.py:231
+msgid "Add path"
+msgstr ""
+
+#: spyder/widgets/pathmanager.py:121 spyder/widgets/pathmanager.py:214
+msgid "Remove path"
+msgstr ""
+
+#: spyder/widgets/pathmanager.py:131
+msgid "Synchronize..."
+msgstr ""
+
+#: spyder/widgets/pathmanager.py:133
+msgid "Synchronize Spyder's path list with PYTHONPATH environment variable"
+msgstr ""
+
+#: spyder/widgets/pathmanager.py:145
+msgid "Synchronize"
+msgstr ""
+
+#: spyder/widgets/pathmanager.py:146
+msgid "This will synchronize Spyder's path list with <b>PYTHONPATH</b> environment variable for current user, allowing you to run your Python modules outside Spyder without having to configure sys.path. <br>Do you want to clear contents of PYTHONPATH before adding Spyder's path list?"
+msgstr ""
+
+#: spyder/widgets/pathmanager.py:215
+msgid "Do you really want to remove selected path?"
+msgstr ""
+
+#: spyder/widgets/pathmanager.py:232
+msgid "This directory is already included in Spyder path list.<br>Do you want to move it to the top of the list?"
+msgstr ""
+
+#: spyder/widgets/projects/configdialog.py:30
+msgid "Project preferences"
+msgstr ""
+
+#: spyder/widgets/projects/configdialog.py:82
+#: spyder/widgets/projects/configdialog.py:119
+msgid "Restore data on startup"
+msgstr ""
+
+#: spyder/widgets/projects/configdialog.py:84
+#: spyder/widgets/projects/configdialog.py:121
+msgid "Save data on exit"
+msgstr ""
+
+#: spyder/widgets/projects/configdialog.py:86
+#: spyder/widgets/projects/configdialog.py:123
+msgid "Save history"
+msgstr ""
+
+#: spyder/widgets/projects/configdialog.py:88
+#: spyder/widgets/projects/configdialog.py:125
+msgid "Save non project files opened"
+msgstr ""
+
+#: spyder/widgets/projects/configdialog.py:111
+msgid "Code"
+msgstr ""
+
+#: spyder/widgets/projects/configdialog.py:118
+msgid "Workspace"
+msgstr ""
+
+#: spyder/widgets/projects/configdialog.py:148
+#: spyder/widgets/projects/configdialog.py:155
+msgid "Version control"
+msgstr ""
+
+#: spyder/widgets/projects/configdialog.py:156
+msgid "Use version control"
+msgstr ""
+
+#: spyder/widgets/projects/configdialog.py:161
+msgid "Version control system"
+msgstr ""
+
+#: spyder/widgets/projects/explorer.py:50
+msgid "Show horizontal scrollbar"
+msgstr ""
+
+#: spyder/widgets/projects/explorer.py:112
+msgid "File <b>%s</b> already exists.<br>Do you want to overwrite it?"
+msgstr ""
+
+#: spyder/widgets/projects/explorer.py:126
+msgid "Folder <b>%s</b> already exists."
+msgstr ""
+
+#: spyder/widgets/projects/explorer.py:144
+msgid "copy"
+msgstr ""
+
+#: spyder/widgets/projects/explorer.py:146
+msgid "move"
+msgstr ""
+
+#: spyder/widgets/projects/projectdialog.py:69
+msgid "New directory"
+msgstr ""
+
+#: spyder/widgets/projects/projectdialog.py:70
+msgid "Existing directory"
+msgstr ""
+
+#: spyder/widgets/projects/projectdialog.py:72
+msgid "Project name"
+msgstr ""
+
+#: spyder/widgets/projects/projectdialog.py:73
+msgid "Location"
+msgstr ""
+
+#: spyder/widgets/projects/projectdialog.py:74
+msgid "Project type"
+msgstr ""
+
+#: spyder/widgets/projects/projectdialog.py:75
+msgid "Python version"
+msgstr ""
+
+#: spyder/widgets/projects/projectdialog.py:83
+#: spyder/widgets/variableexplorer/importwizard.py:519
+msgid "Cancel"
+msgstr ""
+
+#: spyder/widgets/projects/projectdialog.py:84
+msgid "Create"
+msgstr ""
+
+#: spyder/widgets/projects/projectdialog.py:102
+msgid "Create new project"
+msgstr ""
+
+#: spyder/widgets/projects/type/__init__.py:215
+msgid "Empty project"
+msgstr ""
+
+#: spyder/widgets/projects/type/python.py:20
+msgid "Python project"
+msgstr ""
+
+#: spyder/widgets/projects/type/python.py:76
+msgid "Python package"
+msgstr ""
+
+#: spyder/widgets/pydocgui.py:110
+msgid "Module or package:"
+msgstr ""
+
+#: spyder/widgets/shell.py:129
+msgid "Save history log..."
+msgstr ""
+
+#: spyder/widgets/shell.py:131
+msgid "Save current history log (i.e. all inputs and outputs) in a text file"
+msgstr ""
+
+#: spyder/widgets/shell.py:257
+msgid "Save history log"
+msgstr ""
+
+#: spyder/widgets/shell.py:260
+msgid "History logs"
+msgstr ""
+
+#: spyder/widgets/shell.py:271
+msgid "<b>Unable to save file '%s'</b><br><br>Error message:<br>%s"
+msgstr ""
+
+#: spyder/widgets/shell.py:713
+msgid "Copy without prompts"
+msgstr ""
+
+#: spyder/widgets/shell.py:716 spyder/widgets/shell.py:720
+msgid "Clear line"
+msgstr ""
+
+#: spyder/widgets/shell.py:722
+msgid "Clear shell"
+msgstr ""
+
+#: spyder/widgets/shell.py:726
+msgid "Clear shell contents ('cls' command)"
+msgstr ""
+
+#: spyder/widgets/sourcecode/codeeditor.py:100
+msgid "Go to line:"
+msgstr ""
+
+#: spyder/widgets/sourcecode/codeeditor.py:108
+msgid "Line count:"
+msgstr ""
+
+#: spyder/widgets/sourcecode/codeeditor.py:1296
+msgid "Breakpoint"
+msgstr ""
+
+#: spyder/widgets/sourcecode/codeeditor.py:1297
+msgid "Condition:"
+msgstr ""
+
+#: spyder/widgets/sourcecode/codeeditor.py:1703
+msgid "Code analysis"
+msgstr ""
+
+#: spyder/widgets/sourcecode/codeeditor.py:1757
+msgid "To do"
+msgstr ""
+
+#: spyder/widgets/sourcecode/codeeditor.py:1994
+msgid "Removal error"
+msgstr ""
+
+#: spyder/widgets/sourcecode/codeeditor.py:1995
+msgid ""
+"It was not possible to remove outputs from this notebook. The error is:\n"
+"\n"
+msgstr ""
+
+#: spyder/widgets/sourcecode/codeeditor.py:2487
+msgid "Clear all ouput"
+msgstr ""
+
+#: spyder/widgets/sourcecode/codeeditor.py:2493
+msgid "Go to definition"
+msgstr ""
+
+#: spyder/widgets/sourcecode/codeeditor.py:2522
+msgid "Zoom reset"
+msgstr ""
+
+#: spyder/widgets/status.py:25
+msgid "CPU and memory usage info in the status bar"
+msgstr ""
+
+#: spyder/widgets/status.py:94
+msgid "Memory:"
+msgstr ""
+
+#: spyder/widgets/status.py:95
+msgid "Memory usage status: requires the `psutil` (>=v0.3) library on non-Windows platforms"
+msgstr ""
+
+#: spyder/widgets/status.py:107
+msgid "CPU:"
+msgstr ""
+
+#: spyder/widgets/status.py:108
+msgid "CPU usage status: requires the `psutil` (>=v0.3) library"
+msgstr ""
+
+#: spyder/widgets/status.py:130
+msgid "Permissions:"
+msgstr ""
+
+#: spyder/widgets/status.py:144
+msgid "End-of-lines:"
+msgstr ""
+
+#: spyder/widgets/status.py:158
+msgid "Encoding:"
+msgstr ""
+
+#: spyder/widgets/status.py:171
+msgid "Line:"
+msgstr ""
+
+#: spyder/widgets/status.py:175
+msgid "Column:"
+msgstr ""
+
+#: spyder/widgets/tabs.py:146
+msgid "Browse tabs"
+msgstr ""
+
+#: spyder/widgets/tabs.py:275
+msgid "Close current tab"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/arrayeditor.py:497
+msgid "It was not possible to copy values for this array"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/arrayeditor.py:532
+#: spyder/widgets/variableexplorer/arrayeditor.py:565
+#: spyder/widgets/variableexplorer/dataframeeditor.py:544
+#: spyder/widgets/variableexplorer/dataframeeditor.py:584
+msgid "Format"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/arrayeditor.py:537
+#: spyder/widgets/variableexplorer/dataframeeditor.py:548
+msgid "Resize"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/arrayeditor.py:566
+#: spyder/widgets/variableexplorer/dataframeeditor.py:585
+msgid "Float formatting"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/arrayeditor.py:574
+#: spyder/widgets/variableexplorer/dataframeeditor.py:594
+msgid "Format (%s) is incorrect"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/arrayeditor.py:609
+msgid "Array is empty"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/arrayeditor.py:612
+msgid "Arrays with more than 3 dimensions are not supported"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/arrayeditor.py:615
+msgid "The 'xlabels' argument length do no match array column number"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/arrayeditor.py:619
+msgid "The 'ylabels' argument length do no match array row number"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/arrayeditor.py:626
+msgid "%s arrays"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/arrayeditor.py:627
+msgid "%s are currently not supported"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/arrayeditor.py:634
+msgid "NumPy array"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/arrayeditor.py:636
+#: spyder/widgets/variableexplorer/arrayeditor.py:790
+msgid "Array editor"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/arrayeditor.py:638
+msgid "read only"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/arrayeditor.py:668
+msgid "Record array fields:"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/arrayeditor.py:680
+msgid "Data"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/arrayeditor.py:680
+msgid "Mask"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/arrayeditor.py:680
+msgid "Masked data"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/arrayeditor.py:691
+msgid "Axis:"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/arrayeditor.py:696
+msgid "Index:"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/arrayeditor.py:709
+msgid "<u>Warning</u>: changes are applied separately"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/arrayeditor.py:710
+msgid "For performance reasons, changes applied to masked array won't be reflected in array's data (and vice-versa)."
+msgstr ""
+
+#: spyder/widgets/variableexplorer/collectionseditor.py:116
+msgid "Index"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/collectionseditor.py:121
+msgid "Tuple"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/collectionseditor.py:124
+msgid "List"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/collectionseditor.py:127
+msgid "Dictionary"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/collectionseditor.py:129
+msgid "Key"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/collectionseditor.py:135
+msgid "Attribute"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/collectionseditor.py:137
+msgid "elements"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/collectionseditor.py:313
+msgid "Size"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/collectionseditor.py:313
+msgid "Type"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/collectionseditor.py:313
+msgid "Value"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/collectionseditor.py:411
+msgid ""
+"Opening this variable can be slow\n"
+"\n"
+"Do you want to continue anyway?"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/collectionseditor.py:420
+msgid "Spyder was unable to retrieve the value of this variable from the console.<br><br>The error mesage was:<br><i>%s</i>"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/collectionseditor.py:579
+msgid "Edit item"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/collectionseditor.py:580
+msgid "<b>Unable to assign data to item.</b><br><br>Error message:<br>%s"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/collectionseditor.py:642
+msgid "Resize rows to contents"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/collectionseditor.py:653
+#: spyder/widgets/variableexplorer/collectionseditor.py:998
+#: spyder/widgets/variableexplorer/collectionseditor.py:1015
+msgid "Plot"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/collectionseditor.py:657
+msgid "Histogram"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/collectionseditor.py:661
+msgid "Show image"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/collectionseditor.py:665
+#: spyder/widgets/variableexplorer/collectionseditor.py:1023
+msgid "Save array"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/collectionseditor.py:669
+#: spyder/widgets/variableexplorer/collectionseditor.py:962
+#: spyder/widgets/variableexplorer/collectionseditor.py:970
+msgid "Insert"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/collectionseditor.py:672
+#: spyder/widgets/variableexplorer/collectionseditor.py:906
+msgid "Remove"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/collectionseditor.py:686
+#: spyder/widgets/variableexplorer/collectionseditor.py:927
+msgid "Duplicate"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/collectionseditor.py:904
+msgid "Do you want to remove the selected item?"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/collectionseditor.py:905
+msgid "Do you want to remove all selected items?"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/collectionseditor.py:925
+msgid "New variable name:"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/collectionseditor.py:928
+msgid "Variable name:"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/collectionseditor.py:962
+msgid "Key:"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/collectionseditor.py:970
+msgid "Value:"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/collectionseditor.py:986
+msgid "Import error"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/collectionseditor.py:987
+msgid "Please install <b>matplotlib</b> or <b>guiqwt</b>."
+msgstr ""
+
+#: spyder/widgets/variableexplorer/collectionseditor.py:999
+msgid "<b>Unable to plot data.</b><br><br>Error message:<br>%s"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/collectionseditor.py:1016
+msgid "<b>Unable to show image.</b><br><br>Error message:<br>%s"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/collectionseditor.py:1039
+msgid "<b>Unable to save array</b><br><br>Error message:<br>%s"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/collectionseditor.py:1064
+msgid "It was not possible to copy this array"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/collectionseditor.py:1089
+msgid "Clipboard contents"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/collectionseditor.py:1104
+msgid "Import from clipboard"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/collectionseditor.py:1106
+msgid "Empty clipboard"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/collectionseditor.py:1107
+msgid "Nothing to be imported from clipboard."
+msgstr ""
+
+#: spyder/widgets/variableexplorer/dataframeeditor.py:450
+msgid "To bool"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/dataframeeditor.py:450
+msgid "To complex"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/dataframeeditor.py:451
+msgid "To float"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/dataframeeditor.py:451
+msgid "To int"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/dataframeeditor.py:452
+msgid "To str"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/dataframeeditor.py:526
+msgid "%s editor"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/dataframeeditor.py:558
+msgid "Column min/max"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/importwizard.py:116
+#: spyder/widgets/variableexplorer/importwizard.py:431
+msgid "Import as"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/importwizard.py:118
+msgid "data"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/importwizard.py:122
+msgid "code"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/importwizard.py:125
+#: spyder/widgets/variableexplorer/importwizard.py:504
+msgid "text"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/importwizard.py:138
+msgid "Column separator:"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/importwizard.py:142
+msgid "Tab"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/importwizard.py:145
+#: spyder/widgets/variableexplorer/importwizard.py:163
+msgid "other"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/importwizard.py:156
+msgid "Row separator:"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/importwizard.py:160
+msgid "EOL"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/importwizard.py:175
+msgid "Additional options"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/importwizard.py:179
+msgid "Skip rows:"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/importwizard.py:190
+msgid "Comments:"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/importwizard.py:196
+msgid "Transpose"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/importwizard.py:434
+msgid "array"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/importwizard.py:439
+msgid "list"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/importwizard.py:444
+msgid "DataFrame"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/importwizard.py:487
+#: spyder/widgets/variableexplorer/importwizard.py:571
+msgid "Import wizard"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/importwizard.py:492
+msgid "Raw text"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/importwizard.py:495
+msgid "variable_name"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/importwizard.py:506
+msgid "table"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/importwizard.py:507
+msgid "Preview"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/importwizard.py:511
+msgid "Variable Name"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/importwizard.py:534
+msgid "Done"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/importwizard.py:572
+msgid "<b>Unable to proceed to next step</b><br><br>Please check your entries.<br><br>Error message:<br>%s"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/namespacebrowser.py:199
+msgid "Refresh"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/namespacebrowser.py:203
+msgid "Refresh periodically"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/namespacebrowser.py:210
+#: spyder/widgets/variableexplorer/namespacebrowser.py:490
+msgid "Import data"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/namespacebrowser.py:213
+#: spyder/widgets/variableexplorer/namespacebrowser.py:568
+#: spyder/widgets/variableexplorer/namespacebrowser.py:587
+msgid "Save data"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/namespacebrowser.py:218
+msgid "Save data as..."
+msgstr ""
+
+#: spyder/widgets/variableexplorer/namespacebrowser.py:230
+msgid "Exclude references which name starts with an underscore"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/namespacebrowser.py:238
+msgid "Exclude references which name is uppercase"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/namespacebrowser.py:245
+msgid "Exclude references which name starts with an uppercase character"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/namespacebrowser.py:253
+msgid "Exclude references to unsupported data types (i.e. which won't be handled/saved correctly)"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/namespacebrowser.py:348
+msgid "Object <b>%s</b> is not picklable"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/namespacebrowser.py:510
+msgid "<b>Unsupported file extension '%s'</b><br><br>Would you like to import it anyway (by selecting a known file format)?"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/namespacebrowser.py:518
+msgid "Open file as:"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/namespacebrowser.py:556
+msgid "<b>Unable to load '%s'</b><br><br>Error message:<br>%s"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/namespacebrowser.py:588
+msgid "<b>Unable to save current workspace</b><br><br>Error message:<br>%s"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/texteditor.py:74
+msgid "Text editor"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/utils.py:29
+msgid "View and edit DataFrames and Series in the Variable Explorer"
+msgstr ""
+
+#: spyder/widgets/variableexplorer/utils.py:34
+msgid "View and edit two and three dimensional arrays in the Variable Explorer"
+msgstr ""
+
+#: spyder/workers/updates.py:89 spyder/workers/updates.py:91
+msgid "Unable to retrieve information."
+msgstr ""
+
+#: spyder/workers/updates.py:93
+msgid "Unable to connect to the internet. <br><br>Make sure the connection is working properly."
+msgstr ""
+
+#: spyder/workers/updates.py:96
+msgid "Unable to check for updates."
+msgstr ""
+
diff --git a/spyderlib/otherplugins.py b/spyder/otherplugins.py
similarity index 92%
rename from spyderlib/otherplugins.py
rename to spyder/otherplugins.py
index 10ffb03..7fd8496 100644
--- a/spyderlib/otherplugins.py
+++ b/spyder/otherplugins.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2011 Pierre Raybaut
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """
 Spyder third-party plugins configuration management
@@ -14,8 +14,8 @@ import sys
 import traceback
 
 # Local imports
-from spyderlib.config.base import get_conf_path
-from spyderlib.py3compat import PY2
+from spyder.config.base import get_conf_path
+from spyder.py3compat import PY2
 
 if PY2:
     import imp
diff --git a/spyderlib/pil_patch.py b/spyder/pil_patch.py
similarity index 93%
rename from spyderlib/pil_patch.py
rename to spyder/pil_patch.py
index 38779d9..885c5a2 100644
--- a/spyderlib/pil_patch.py
+++ b/spyder/pil_patch.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2011 Pierre Raybaut
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """
 Patching PIL (Python Imaging Library) to avoid triggering the error:
diff --git a/spyderlib/plugins/__init__.py b/spyder/plugins/__init__.py
similarity index 92%
rename from spyderlib/plugins/__init__.py
rename to spyder/plugins/__init__.py
index ce0aaf7..a665b90 100644
--- a/spyderlib/plugins/__init__.py
+++ b/spyder/plugins/__init__.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009-2010 Pierre Raybaut
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """
-spyderlib.plugins
-=================
+spyder.plugins
+==============
 
 Here, 'plugins' are widgets designed specifically for Spyder
 These plugins inherit the following classes
@@ -30,31 +30,13 @@ from qtpy.QtWidgets import (QApplication, QDockWidget, QMainWindow,
                             QShortcut, QTabBar, QWidget)
 
 # Local imports
-from spyderlib.config.base import _
-from spyderlib.config.gui import get_color_scheme, get_font
-from spyderlib.config.main import CONF
-from spyderlib.config.user import NoDefault
-from spyderlib.plugins.configdialog import SpyderConfigPage
-from spyderlib.py3compat import configparser, is_text_string
-from spyderlib.utils import icon_manager as ima
-from spyderlib.utils.qthelpers import create_action, toggle_actions
-
-
-class PluginConfigPage(SpyderConfigPage):
-    """Plugin configuration dialog box page widget"""
-    def __init__(self, plugin, parent):
-        self.plugin = plugin
-        self.get_option = plugin.get_option
-        self.set_option = plugin.set_option
-        self.get_font = plugin.get_plugin_font
-        self.apply_settings = plugin.apply_plugin_settings
-        SpyderConfigPage.__init__(self, parent)
-    
-    def get_name(self):
-        return self.plugin.get_plugin_title()
-
-    def get_icon(self):
-        return self.plugin.get_plugin_icon()
+from spyder.config.base import _
+from spyder.config.gui import get_color_scheme, get_font
+from spyder.config.main import CONF
+from spyder.config.user import NoDefault
+from spyder.py3compat import configparser, is_text_string
+from spyder.utils import icon_manager as ima
+from spyder.utils.qthelpers import create_action, toggle_actions
 
 
 class TabFilter(QObject):
@@ -77,7 +59,8 @@ class TabFilter(QObject):
     def _get_plugin(self, index):
         """Get plugin reference based on tab index."""
         for plugin in self.main.widgetlist:
-            if plugin.get_plugin_title() == self.dock_tabbar.tabText(index):
+            tab_text = self.dock_tabbar.tabText(index).replace('&', '')
+            if plugin.get_plugin_title() == tab_text:
                 return plugin
 
     def _get_plugins(self):
@@ -296,6 +279,7 @@ class SpyderPluginMixin(object):
         
     def initialize_plugin(self):
         """Initialize plugin: connect signals, setup actions, ..."""
+        self.create_toggle_view_action()
         self.plugin_actions = self.get_plugin_actions()
         if self.show_message is not None:
             self.show_message.connect(self.__show_message)
@@ -304,7 +288,6 @@ class SpyderPluginMixin(object):
         if self.sig_option_changed is not None:
             self.sig_option_changed.connect(self.set_option)
         self.setWindowTitle(self.get_plugin_title())
-        self.create_toggle_view_action()
 
     def on_first_registration(self):
         """Action to be performed on first plugin registration"""
@@ -535,6 +518,8 @@ class SpyderPluginMixin(object):
     
     def toggle_view(self, checked):
         """Toggle view"""
+        if not self.dockwidget:
+            return
         if checked:
             self.dockwidget.show()
             self.dockwidget.raise_()
diff --git a/spyderlib/plugins/configdialog.py b/spyder/plugins/configdialog.py
similarity index 94%
rename from spyderlib/plugins/configdialog.py
rename to spyder/plugins/configdialog.py
index 623309f..7e08adb 100644
--- a/spyderlib/plugins/configdialog.py
+++ b/spyder/plugins/configdialog.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """
 Configuration dialog / Preferences.
@@ -26,17 +26,17 @@ from qtpy.QtWidgets import (QButtonGroup, QCheckBox, QComboBox, QDialog,
                             QStyleFactory, QTabWidget, QVBoxLayout, QWidget)
 
 # Local imports
-from spyderlib.config.base import (_, LANGUAGE_CODES, load_lang_conf,
-                                   running_in_mac_app, save_lang_conf)
-from spyderlib.config.gui import get_font, set_font
-from spyderlib.config.main import CONF
-from spyderlib.config.user import NoDefault
-from spyderlib.config.utils import is_gtk_desktop
-from spyderlib.py3compat import to_text_string, is_text_string, getcwd
-from spyderlib.utils import icon_manager as ima
-from spyderlib.utils import syntaxhighlighters
-from spyderlib.widgets.colors import ColorLayout
-from spyderlib.widgets.sourcecode.codeeditor import CodeEditor
+from spyder.config.base import (_, LANGUAGE_CODES, load_lang_conf,
+                                running_in_mac_app, save_lang_conf)
+from spyder.config.gui import get_font, set_font
+from spyder.config.main import CONF
+from spyder.config.user import NoDefault
+from spyder.config.utils import is_gtk_desktop
+from spyder.py3compat import to_text_string, is_text_string, getcwd
+from spyder.utils import icon_manager as ima
+from spyder.utils import syntaxhighlighters
+from spyder.widgets.colors import ColorLayout
+from spyder.widgets.sourcecode.codeeditor import CodeEditor
 
 
 class ConfigAccessMixin(object):
@@ -171,7 +171,8 @@ class ConfigDialog(QDialog):
         self.setLayout(vlayout)
 
         # Signals and slots
-        self.button_reset.clicked.connect(self.main.reset_spyder)
+        if self.main:
+            self.button_reset.clicked.connect(self.main.reset_spyder)
         self.pages_widget.currentChanged.connect(self.current_page_changed)
         self.contents_widget.currentRowChanged.connect(
                                              self.pages_widget.setCurrentIndex)
@@ -231,7 +232,10 @@ class ConfigDialog(QDialog):
         scrollarea.setWidget(widget)
         self.pages_widget.addWidget(scrollarea)
         item = QListWidgetItem(self.contents_widget)
-        item.setIcon(widget.get_icon())
+        try:
+            item.setIcon(widget.get_icon())
+        except TypeError:
+            pass
         item.setText(widget.get_name())
         item.setFlags(Qt.ItemIsSelectable|Qt.ItemIsEnabled)
         item.setSizeHint(QSize(0, 25))
@@ -717,6 +721,23 @@ class SpyderConfigPage(ConfigPage, ConfigAccessMixin):
         return widget
 
 
+class PluginConfigPage(SpyderConfigPage):
+    """Plugin configuration dialog box page widget"""
+    def __init__(self, plugin, parent):
+        self.plugin = plugin
+        self.get_option = plugin.get_option
+        self.set_option = plugin.set_option
+        self.get_font = plugin.get_plugin_font
+        self.apply_settings = plugin.apply_plugin_settings
+        SpyderConfigPage.__init__(self, parent)
+
+    def get_name(self):
+        return self.plugin.get_plugin_title()
+
+    def get_icon(self):
+        return self.plugin.get_plugin_icon()
+
+
 class GeneralConfigPage(SpyderConfigPage):
     """Config page that maintains reference to main Spyder window
        and allows to specify page name and icon declaratively
@@ -773,11 +794,10 @@ class GeneralConfigPage(SpyderConfigPage):
 
 class MainConfigPage(GeneralConfigPage):
     CONF_SECTION = "main"
-    
     NAME = _("General")
-    ICON = ima.icon('genprefs')
 
     def setup_page(self):
+        self.ICON = ima.icon('genprefs')
         newcb = self.create_checkbox
 
         # --- Interface
@@ -842,7 +862,7 @@ class MainConfigPage(GeneralConfigPage):
                                    "menu from the main window"))
         margin_box = newcb(_("Custom margin for panes:"),
                            'use_custom_margin')
-        margin_spin = self.create_spinbox("", "pixels", 'custom_margin',
+        margin_spin = self.create_spinbox("", _("pixels"), 'custom_margin',
                                           0, 0, 30)
         margin_box.toggled.connect(margin_spin.setEnabled)
         margin_spin.setEnabled(self.get_option('use_custom_margin'))
@@ -875,7 +895,7 @@ class MainConfigPage(GeneralConfigPage):
 
         memory_box = newcb(_("Show memory usage every"), 'memory_usage/enable',
                            tip=self.main.mem_status.toolTip())
-        memory_spin = self.create_spinbox("", " ms", 'memory_usage/timeout',
+        memory_spin = self.create_spinbox("", _(" ms"), 'memory_usage/timeout',
                                           min_=100, max_=1000000, step=100)
         memory_box.toggled.connect(memory_spin.setEnabled)
         memory_spin.setEnabled(self.get_option('memory_usage/enable'))
@@ -884,7 +904,7 @@ class MainConfigPage(GeneralConfigPage):
 
         cpu_box = newcb(_("Show CPU usage every"), 'cpu_usage/enable',
                         tip=self.main.cpu_status.toolTip())
-        cpu_spin = self.create_spinbox("", " ms", 'cpu_usage/timeout',
+        cpu_spin = self.create_spinbox("", _(" ms"), 'cpu_usage/timeout',
                                        min_=100, max_=1000000, step=100)
         cpu_box.toggled.connect(cpu_spin.setEnabled)
         cpu_spin.setEnabled(self.get_option('cpu_usage/enable'))
@@ -978,11 +998,11 @@ class MainConfigPage(GeneralConfigPage):
 
 class ColorSchemeConfigPage(GeneralConfigPage):
     CONF_SECTION = "color_schemes"
-
     NAME = _("Syntax coloring")
-    ICON = ima.icon('eyedropper')
 
     def setup_page(self):
+        self.ICON = ima.icon('eyedropper')
+
         names = self.get_option("names")
         try:
             names.pop(names.index(u'Custom'))
diff --git a/spyderlib/plugins/console.py b/spyder/plugins/console.py
similarity index 92%
rename from spyderlib/plugins/console.py
rename to spyder/plugins/console.py
index d7475f6..e839284 100644
--- a/spyderlib/plugins/console.py
+++ b/spyder/plugins/console.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """Internal Console Plugin"""
 
@@ -23,18 +23,18 @@ from qtpy.QtCore import Signal, Slot
 from qtpy.QtWidgets import QInputDialog, QLineEdit, QMenu, QVBoxLayout
 
 # Local imports
-from spyderlib.config.base import _, debug_print
-from spyderlib.config.main import CONF
-from spyderlib.utils import icon_manager as ima
-from spyderlib.utils.environ import EnvDialog
-from spyderlib.utils.misc import get_error_match, remove_backslashes
-from spyderlib.utils.qthelpers import (add_actions, create_action,
-                                       DialogManager, mimedata2url)
-from spyderlib.widgets.internalshell import InternalShell
-from spyderlib.widgets.findreplace import FindReplace
-from spyderlib.widgets.variableexplorer.collectionseditor import CollectionsEditor
-from spyderlib.plugins import SpyderPluginWidget
-from spyderlib.py3compat import getcwd, to_text_string
+from spyder.config.base import _, debug_print
+from spyder.config.main import CONF
+from spyder.utils import icon_manager as ima
+from spyder.utils.environ import EnvDialog
+from spyder.utils.misc import get_error_match, remove_backslashes
+from spyder.utils.qthelpers import (add_actions, create_action,
+                                    DialogManager, mimedata2url)
+from spyder.widgets.internalshell import InternalShell
+from spyder.widgets.findreplace import FindReplace
+from spyder.widgets.variableexplorer.collectionseditor import CollectionsEditor
+from spyder.plugins import SpyderPluginWidget
+from spyder.py3compat import getcwd, to_text_string
 
 
 class Console(SpyderPluginWidget):
diff --git a/spyderlib/plugins/editor.py b/spyder/plugins/editor.py
similarity index 93%
rename from spyderlib/plugins/editor.py
rename to spyder/plugins/editor.py
index dbc7023..a2b915c 100644
--- a/spyderlib/plugins/editor.py
+++ b/spyder/plugins/editor.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009-2010 Pierre Raybaut
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """Editor Plugin"""
 
@@ -15,7 +15,6 @@
 import os
 import os.path as osp
 import re
-import sys
 import time
 
 # Third party imports
@@ -30,28 +29,28 @@ from qtpy.QtWidgets import (QAction, QActionGroup, QApplication, QDialog,
                             QToolBar, QVBoxLayout, QWidget)
 
 # Local imports
-from spyderlib.config.base import _, get_conf_path
-from spyderlib.config.gui import (RUN_CELL_SHORTCUT,
-                                  RUN_CELL_AND_ADVANCE_SHORTCUT)
-from spyderlib.config.main import CONF
-from spyderlib.config.utils import (get_edit_filetypes, get_edit_filters,
-                                    get_filter)
-from spyderlib.py3compat import getcwd, PY2, qbytearray_to_str, to_text_string
-from spyderlib.utils import codeanalysis, encoding, programs, sourcecode
-from spyderlib.utils import icon_manager as ima
-from spyderlib.utils.introspection.manager import IntrospectionManager
-from spyderlib.utils.qthelpers import (add_actions, create_action,
-                                       get_filetype_icon)
-from spyderlib.widgets.findreplace import FindReplace
-from spyderlib.widgets.editor import (EditorMainWindow, EditorSplitter,
-                                      EditorStack, Printer)
-from spyderlib.widgets.sourcecode.codeeditor import CodeEditor
-from spyderlib.widgets.status import (CursorPositionStatus, EncodingStatus,
-                                      EOLStatus, ReadWriteStatus)
-from spyderlib.plugins import PluginConfigPage, SpyderPluginWidget
-from spyderlib.plugins.runconfig import (ALWAYS_OPEN_FIRST_RUN_OPTION,
-                                         get_run_configuration,
-                                         RunConfigDialog, RunConfigOneDialog)
+from spyder.config.base import _, get_conf_path
+from spyder.config.gui import (RUN_CELL_SHORTCUT,
+                               RUN_CELL_AND_ADVANCE_SHORTCUT)
+from spyder.config.main import CONF
+from spyder.config.utils import (get_edit_filetypes, get_edit_filters,
+                                 get_filter)
+from spyder.py3compat import getcwd, PY2, qbytearray_to_str, to_text_string
+from spyder.utils import codeanalysis, encoding, programs, sourcecode
+from spyder.utils import icon_manager as ima
+from spyder.utils.introspection.manager import IntrospectionManager
+from spyder.utils.qthelpers import add_actions, create_action
+from spyder.widgets.findreplace import FindReplace
+from spyder.widgets.editor import (EditorMainWindow, EditorSplitter,
+                                   EditorStack, Printer)
+from spyder.widgets.sourcecode.codeeditor import CodeEditor
+from spyder.widgets.status import (CursorPositionStatus, EncodingStatus,
+                                   EOLStatus, ReadWriteStatus)
+from spyder.plugins import SpyderPluginWidget
+from spyder.plugins.configdialog import PluginConfigPage
+from spyder.plugins.runconfig import (ALWAYS_OPEN_FIRST_RUN_OPTION,
+                                      get_run_configuration,
+                                      RunConfigDialog, RunConfigOneDialog)
 
 
 def _load_all_breakpoints():
@@ -131,7 +130,7 @@ class EditorConfigPage(PluginConfigPage):
                                 'highlight_current_cell')
         occurrence_box = newcb(_("Highlight occurrences after"),
                               'occurrence_highlighting')
-        occurrence_spin = self.create_spinbox("", " ms",
+        occurrence_spin = self.create_spinbox("", _(" ms"),
                                              'occurrence_highlighting/timeout',
                                              min_=100, max_=1000000, step=100)
         occurrence_box.toggled.connect(occurrence_spin.setEnabled)
@@ -259,7 +258,7 @@ class EditorConfigPage(PluginConfigPage):
                                             _("Perform analysis only "
                                                     "when saving file"),
                                             'onsave_analysis')
-        af_spin = self.create_spinbox("", " ms", 'realtime_analysis/timeout',
+        af_spin = self.create_spinbox("", _(" ms"), 'realtime_analysis/timeout',
                                       min_=100, max_=1000000, step=100)
         af_layout = QHBoxLayout()
         af_layout.addWidget(realtime_radio)
@@ -383,7 +382,7 @@ class Editor(SpyderPluginWidget):
                 '@author: %(username)s', '"""', '']
             encoding.write(os.linesep.join(header), self.TEMPLATE_PATH, 'utf-8')
 
-        self.projectexplorer = None
+        self.projects = None
         self.outlineexplorer = None
         self.help = None
 
@@ -469,23 +468,8 @@ class Editor(SpyderPluginWidget):
                     str(state).encode('utf-8')) )
         
         self.recent_files = self.get_option('recent_files', [])
-        
         self.untitled_num = 0
-                
-        filenames = self.get_option('filenames', [])
-        if filenames and not ignore_last_opened_files:
-            self.load(filenames)
-            layout = self.get_option('layout_settings', None)
-            if layout is not None:
-                self.editorsplitter.set_layout_settings(layout)
-            win_layout = self.get_option('windows_layout_settings', None)
-            if win_layout:
-                for layout_settings in win_layout:
-                    self.editorwindows_to_be_created.append(layout_settings)
-            self.set_last_focus_editorstack(self, self.editorstacks[0])
-        else:
-            self.__load_temp_file()
-                
+
         # Parameters of last file execution:
         self.__last_ic_exec = None # internal console
         self.__last_ec_exec = None # external console
@@ -503,13 +487,13 @@ class Editor(SpyderPluginWidget):
         self.update_cursorpos_actions()
         self.set_path()
         
-    def set_projectexplorer(self, projectexplorer):
-        self.projectexplorer = projectexplorer
+    def set_projects(self, projects):
+        self.projects = projects
 
     @Slot()
-    def show_hide_project_explorer(self):
-        if self.projectexplorer is not None:
-            dw = self.projectexplorer.dockwidget
+    def show_hide_projects(self):
+        if self.projects is not None:
+            dw = self.projects.dockwidget
             if dw.isVisible():
                 dw.hide()
             else:
@@ -597,12 +581,21 @@ class Editor(SpyderPluginWidget):
         self.set_option('splitter_state', qbytearray_to_str(state))
         filenames = []
         editorstack = self.editorstacks[0]
-        filenames += [finfo.filename for finfo in editorstack.data]
+
+        active_project_path = None
+        if self.projects is not None:
+             active_project_path = self.projects.get_active_project_path()
+        if not active_project_path:
+            self.set_open_filenames()
+        else:
+            self.projects.set_project_filenames(
+                [finfo.filename for finfo in editorstack.data])
+
         self.set_option('layout_settings',
                         self.editorsplitter.get_layout_settings())
         self.set_option('windows_layout_settings',
                     [win.get_layout_settings() for win in self.editorwindows])
-        self.set_option('filenames', filenames)
+#        self.set_option('filenames', filenames)
         self.set_option('recent_files', self.recent_files)
         try:
             if not editorstack.save_if_changed(cancelable) and cancelable:
@@ -624,7 +617,7 @@ class Editor(SpyderPluginWidget):
                                name="Show/hide outline")
         self.toggle_project_action = create_action(self,
                                 _("Show/hide project explorer"),
-                                triggered=self.show_hide_project_explorer,
+                                triggered=self.show_hide_projects,
                                 context=Qt.WidgetWithChildrenShortcut)
         self.register_shortcut(self.toggle_project_action, context="Editor",
                                name="Show/hide project explorer")
@@ -972,13 +965,25 @@ class Editor(SpyderPluginWidget):
         self.recent_file_menu = QMenu(_("Open &recent"), self)
         self.recent_file_menu.aboutToShow.connect(self.update_recent_file_menu)
 
-        file_menu_actions = [self.new_action, self.open_action,
-                             self.recent_file_menu, self.save_action,
-                             self.save_all_action, save_as_action,
-                             self.file_switcher_action, self.revert_action,
-                             None, print_preview_action, self.print_action,
-                             None, self.close_action,
-                             self.close_all_action, None]
+        file_menu_actions = [self.new_action,
+                             None,
+                             self.open_action,
+                             self.recent_file_menu,
+                             None,
+                             None,
+                             self.save_action,
+                             self.save_all_action,
+                             save_as_action,
+                             self.file_switcher_action,
+                             self.revert_action,
+                             None,
+                             print_preview_action,
+                             self.print_action,
+                             None,
+                             self.close_action,
+                             self.close_all_action,
+                             None]                     
+
         self.main.file_menu_actions += file_menu_actions
         file_toolbar_actions = [self.new_action, self.open_action,
                                 self.save_action, self.save_all_action,
@@ -1691,13 +1696,9 @@ class Editor(SpyderPluginWidget):
                 recent_files.append(fname)
         self.recent_file_menu.clear()
         if recent_files:
-            for i, fname in enumerate(recent_files):
-                if i < 10:
-                    accel = "%d" % ((i+1) % 10)
-                else:
-                    accel = chr(i-10+ord('a'))
-                action = create_action(self, "&%s %s" % (accel, fname),
-                                       icon=get_filetype_icon(fname),
+            for fname in recent_files:
+                action = create_action(self, fname,
+                                       icon=ima.icon('FileIcon'),
                                        triggered=self.load)
                 action.setData(to_qvariant(fname))
                 self.recent_file_menu.addAction(action)
@@ -2193,14 +2194,14 @@ class Editor(SpyderPluginWidget):
         """Debug actions"""
         if self.main.ipyconsole is not None:
             if self.main.last_console_plugin_focus_was_python:
-                self.main.extconsole.execute_python_code(command)
+                self.main.extconsole.execute_code(command)
             else:
                 self.main.ipyconsole.write_to_stdin(command)
                 focus_widget = self.main.ipyconsole.get_focus_widget()
                 if focus_widget:
                     focus_widget.setFocus()
         else:
-            self.main.extconsole.execute_python_code(command)
+            self.main.extconsole.execute_code(command)
     
     #------ Run Python script
     @Slot()
@@ -2277,10 +2278,13 @@ class Editor(SpyderPluginWidget):
     def debug_file(self):
         """Debug current script"""
         self.run_file(debug=True)
-        editor = self.get_current_editor()
-        if editor.get_breakpoints():
-            time.sleep(0.5)
-            self.debug_command('continue')
+        # Fixes 2034
+        # FIXME: Stop doing this for now because it breaks debugging
+        # for IPython consoles
+        #editor = self.get_current_editor()
+        #if editor.get_breakpoints():
+        #    time.sleep(0.5)
+        #    self.debug_command('continue')
 
     @Slot()
     def re_run_file(self):
@@ -2504,3 +2508,59 @@ class Editor(SpyderPluginWidget):
                     finfo.run_todo_finder()
                 if pyflakes_n in options or pep8_n in options:
                     finfo.run_code_analysis(pyflakes_o, pep8_o)
+
+    # --- Open files
+    def get_open_filenames(self):
+        """Get the list of open files in the current stack"""
+        editorstack = self.editorstacks[0]
+        filenames = []
+        filenames += [finfo.filename for finfo in editorstack.data]
+        return filenames
+        
+    def set_open_filenames(self):
+        """
+        Set the recent opened files on editor based on active project.
+
+        If no project is active, then editor filenames are saved, otherwise
+        the opened filenames are stored in the project config info.
+        """
+        if self.projects is not None:
+            if not self.projects.get_active_project():
+                filenames = self.get_open_filenames()
+                self.set_option('filenames', filenames)
+ 
+    def setup_open_files(self):
+        """Open the list of saved files per project"""
+        self.set_create_new_file_if_empty(False)
+        active_project_path = None
+        if self.projects is not None:
+             active_project_path = self.projects.get_active_project_path()
+
+        if active_project_path:
+            filenames = self.projects.get_project_filenames()
+        else:
+            filenames = self.get_option('filenames', default=[])
+        self.close_all_files()
+ 
+        if filenames and any([osp.isfile(f) for f in filenames]):
+            self.load(filenames)
+            layout = self.get_option('layout_settings', None)
+            if layout is not None:
+                self.editorsplitter.set_layout_settings(layout)
+            win_layout = self.get_option('windows_layout_settings', None)
+            if win_layout:
+                for layout_settings in win_layout:
+                    self.editorwindows_to_be_created.append(layout_settings)
+            self.set_last_focus_editorstack(self, self.editorstacks[0])
+        else:
+            self.__load_temp_file()
+        self.set_create_new_file_if_empty(True)
+
+    def save_open_files(self):
+        """Save the list of open files"""
+        self.set_option('filenames', self.get_open_filenames())
+
+    def set_create_new_file_if_empty(self, value):
+        """Change the value of create_new_file_if_empty"""
+        for editorstack in self.editorstacks:
+            editorstack.create_new_file_if_empty = value
diff --git a/spyderlib/plugins/explorer.py b/spyder/plugins/explorer.py
similarity index 90%
rename from spyderlib/plugins/explorer.py
rename to spyder/plugins/explorer.py
index 81e8cd2..0eaab2b 100644
--- a/spyderlib/plugins/explorer.py
+++ b/spyder/plugins/explorer.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009-2010 Pierre Raybaut
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """Files and Directories Explorer Plugin"""
 
@@ -18,10 +18,10 @@ import os.path as osp
 from qtpy.QtCore import Signal
 
 # Local imports
-from spyderlib.config.base import _
-from spyderlib.plugins import SpyderPluginMixin
-from spyderlib.py3compat import to_text_string
-from spyderlib.widgets.explorer import ExplorerWidget
+from spyder.config.base import _
+from spyder.plugins import SpyderPluginMixin
+from spyder.py3compat import to_text_string
+from spyder.widgets.explorer import ExplorerWidget
 
 
 class Explorer(ExplorerWidget, SpyderPluginMixin):
diff --git a/spyderlib/plugins/externalconsole.py b/spyder/plugins/externalconsole.py
similarity index 64%
rename from spyderlib/plugins/externalconsole.py
rename to spyder/plugins/externalconsole.py
index d1285f1..6e1dd59 100644
--- a/spyderlib/plugins/externalconsole.py
+++ b/spyder/plugins/externalconsole.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009-2010 Pierre Raybaut
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """External Console plugin"""
 
@@ -12,7 +12,6 @@
 # pylint: disable=R0201
 
 # Standard library imports
-import atexit
 import os
 import os.path as osp
 import sys
@@ -21,26 +20,26 @@ import sys
 from qtpy import PYQT5
 from qtpy.compat import getopenfilename
 from qtpy.QtCore import Qt, Signal, Slot
-from qtpy.QtWidgets import (QButtonGroup, QGroupBox, QHBoxLayout, QInputDialog,
-                            QLabel, QLineEdit, QMessageBox, QPushButton,
-                            QTabWidget, QVBoxLayout, QWidget)
+from qtpy.QtWidgets import (QButtonGroup, QGroupBox, QHBoxLayout, QLabel,
+                            QMessageBox, QTabWidget, QVBoxLayout, QWidget)
 
 # Local imports
-from spyderlib import dependencies
-from spyderlib.config.base import _, running_in_mac_app, SCIENTIFIC_STARTUP
-from spyderlib.config.main import CONF
-from spyderlib.utils import encoding, programs
-from spyderlib.utils import icon_manager as ima
-from spyderlib.utils.misc import (get_error_match, get_python_executable,
-                                  is_python_script, remove_backslashes)
-from spyderlib.utils.qthelpers import create_action, mimedata2url
-from spyderlib.plugins import PluginConfigPage, SpyderPluginWidget
-from spyderlib.plugins.runconfig import get_run_configuration
-from spyderlib.py3compat import to_text_string, is_text_string, getcwd
-from spyderlib.widgets.externalshell.pythonshell import ExternalPythonShell
-from spyderlib.widgets.externalshell.systemshell import ExternalSystemShell
-from spyderlib.widgets.findreplace import FindReplace
-from spyderlib.widgets.tabs import Tabs
+from spyder import dependencies
+from spyder.config.base import _, SCIENTIFIC_STARTUP
+from spyder.config.main import CONF
+from spyder.utils import encoding, programs
+from spyder.utils import icon_manager as ima
+from spyder.utils.misc import (get_error_match, get_python_executable,
+                               is_python_script, remove_backslashes)
+from spyder.utils.qthelpers import create_action, mimedata2url
+from spyder.plugins import SpyderPluginWidget
+from spyder.plugins.configdialog import PluginConfigPage
+from spyder.plugins.runconfig import get_run_configuration
+from spyder.py3compat import to_text_string, is_text_string, getcwd
+from spyder.widgets.externalshell.pythonshell import ExternalPythonShell
+from spyder.widgets.externalshell.systemshell import ExternalSystemShell
+from spyder.widgets.findreplace import FindReplace
+from spyder.widgets.tabs import Tabs
 
 
 MPL_REQVER = '>=1.0'
@@ -52,14 +51,7 @@ class ExternalConsoleConfigPage(PluginConfigPage):
 
     def __init__(self, plugin, parent):
         PluginConfigPage.__init__(self, plugin, parent)
-        self.get_name = lambda: _("Console")
-        self.cus_exec_radio = None
-        self.pyexec_edit = None
-
-    def initialize(self):
-        PluginConfigPage.initialize(self)
-        self.pyexec_edit.textChanged.connect(self.python_executable_changed)
-        self.cus_exec_radio.toggled.connect(self.python_executable_switched)
+        self.get_name = lambda: _("Python console")
 
     def setup_page(self):
         interface_group = QGroupBox(_("Interface"))
@@ -134,74 +126,6 @@ class ExternalConsoleConfigPage(PluginConfigPage):
         source_layout.addWidget(comp_enter_box)
         source_layout.addWidget(calltips_box)
         source_group.setLayout(source_layout)
-
-        # UMR Group
-        umr_group = QGroupBox(_("User Module Reloader (UMR)"))
-        umr_label = QLabel(_("UMR forces Python to reload modules which were "
-                             "imported when executing a \nscript in the "
-                             "external console with the 'runfile' function."))
-        umr_enabled_box = newcb(_("Enable UMR"), 'umr/enabled',
-                                msg_if_enabled=True, msg_warning=_(
-                        "This option will enable the User Module Reloader (UMR) "
-                        "in Python/IPython consoles. UMR forces Python to "
-                        "reload deeply modules during import when running a "
-                        "Python script using the Spyder's builtin function "
-                        "<b>runfile</b>."
-                        "<br><br><b>1.</b> UMR may require to restart the "
-                        "console in which it will be called "
-                        "(otherwise only newly imported modules will be "
-                        "reloaded when executing scripts)."
-                        "<br><br><b>2.</b> If errors occur when re-running a "
-                        "PyQt-based program, please check that the Qt objects "
-                        "are properly destroyed (e.g. you may have to use the "
-                        "attribute <b>Qt.WA_DeleteOnClose</b> on your main "
-                        "window, using the <b>setAttribute</b> method)"),
-                                )
-        umr_verbose_box = newcb(_("Show reloaded modules list"),
-                                'umr/verbose', msg_info=_(
-                                "Please note that these changes will "
-                                "be applied only to new consoles"))
-        umr_namelist_btn = QPushButton(
-                            _("Set UMR excluded (not reloaded) modules"))
-        umr_namelist_btn.clicked.connect(self.plugin.set_umr_namelist)
-        
-        umr_layout = QVBoxLayout()
-        umr_layout.addWidget(umr_label)
-        umr_layout.addWidget(umr_enabled_box)
-        umr_layout.addWidget(umr_verbose_box)
-        umr_layout.addWidget(umr_namelist_btn)
-        umr_group.setLayout(umr_layout)
-        
-        # Python executable Group
-        pyexec_group = QGroupBox(_("Python executable"))
-        pyexec_bg = QButtonGroup(pyexec_group)
-        pyexec_label = QLabel(_("Select the Python interpreter executable "
-                                "binary in which Spyder will run scripts:"))
-        def_exec_radio = self.create_radiobutton(
-                                _("Default (i.e. the same as Spyder's)"),
-                                'pythonexecutable/default', 
-                                button_group=pyexec_bg)
-        self.cus_exec_radio = self.create_radiobutton(
-                                _("Use the following Python interpreter:"),
-                                'pythonexecutable/custom',
-                                button_group=pyexec_bg)
-        if os.name == 'nt':
-            filters = _("Executables")+" (*.exe)"
-        else:
-            filters = None
-        pyexec_file = self.create_browsefile('', 'pythonexecutable',
-                                             filters=filters)
-        for le in self.lineedits:
-            if self.lineedits[le][0] == 'pythonexecutable':
-                self.pyexec_edit = le
-        def_exec_radio.toggled.connect(pyexec_file.setDisabled)
-        self.cus_exec_radio.toggled.connect(pyexec_file.setEnabled)
-        pyexec_layout = QVBoxLayout()
-        pyexec_layout.addWidget(pyexec_label)
-        pyexec_layout.addWidget(def_exec_radio)
-        pyexec_layout.addWidget(self.cus_exec_radio)
-        pyexec_layout.addWidget(pyexec_file)
-        pyexec_group.setLayout(pyexec_layout)
         
         # PYTHONSTARTUP replacement
         pystartup_group = QGroupBox(_("PYTHONSTARTUP replacement"))
@@ -281,7 +205,7 @@ class ExternalConsoleConfigPage(PluginConfigPage):
                               "an IPython console."))
         mpl_label.setWordWrap(True)
 
-        backends = [("Automatic", 0), ("None", 1)]
+        backends = [(_("Automatic"), 0), (_("None"), 1)]
         if not os.name == 'nt' and programs.is_module_installed('_tkinter'):
             backends.append( ("Tkinter", 2) )
         backends = tuple(backends)
@@ -312,10 +236,10 @@ class ExternalConsoleConfigPage(PluginConfigPage):
         ets_layout.addWidget(ets_edit)
         ets_group.setLayout(ets_layout)
 
-        if self.get_option('pythonexecutable/default'):
+        if CONF.get('main_interpreter','default'):
             interpreter = get_python_executable()
         else:
-            interpreter = self.get_option('pythonexecutable')
+            interpreter = CONF.get('main_interpreter', 'executable')
         ets_group.setEnabled(programs.is_module_installed(
                                                     "enthought.etsconfig.api",
                                                     interpreter=interpreter))
@@ -326,8 +250,7 @@ class ExternalConsoleConfigPage(PluginConfigPage):
                     _("Display"))
         tabs.addTab(self.create_tab(monitor_group, source_group),
                     _("Introspection"))
-        tabs.addTab(self.create_tab(pyexec_group, pystartup_group, umr_group),
-                    _("Advanced settings"))
+        tabs.addTab(self.create_tab(pystartup_group), _("Advanced settings"))
         tabs.addTab(self.create_tab(qt_group, mpl_group, ets_group),
                     _("External modules"))
         
@@ -335,44 +258,6 @@ class ExternalConsoleConfigPage(PluginConfigPage):
         vlayout.addWidget(tabs)
         self.setLayout(vlayout)
 
-    def python_executable_changed(self, pyexec):
-        """Custom Python executable value has been changed"""
-        if not self.cus_exec_radio.isChecked():
-            return
-        if not is_text_string(pyexec):
-            pyexec = to_text_string(pyexec.toUtf8(), 'utf-8')
-        self.warn_python_compatibility(pyexec)
-
-    def python_executable_switched(self, custom):
-        """Python executable default/custom radio button has been toggled"""
-        def_pyexec = get_python_executable()
-        cust_pyexec = self.pyexec_edit.text()
-        if not is_text_string(cust_pyexec):
-            cust_pyexec = to_text_string(cust_pyexec.toUtf8(), 'utf-8')
-        if def_pyexec != cust_pyexec:
-            if custom:
-                self.warn_python_compatibility(cust_pyexec)
-
-    def warn_python_compatibility(self, pyexec):
-        if not osp.isfile(pyexec):
-            return
-        spyder_version = sys.version_info[0]
-        try:
-            args = ["-c", "import sys; print(sys.version_info[0])"]
-            proc = programs.run_program(pyexec, args)
-            console_version = int(proc.communicate()[0])
-        except IOError:
-            console_version = spyder_version
-        if spyder_version != console_version:
-            QMessageBox.warning(self, _('Warning'),
-                _("You selected a <b>Python %d</b> interpreter for the console "
-                  "but Spyder is running on <b>Python %d</b>!.<br><br>"
-                  "Although this is possible, we recommend you to install and "
-                  "run Spyder directly with your selected interpreter, to avoid "
-                  "seeing false warnings and errors due to the incompatible "
-                  "syntax between these two Python versions."
-                  ) % (console_version, spyder_version), QMessageBox.Ok)
-
 
 class ExternalConsole(SpyderPluginWidget):
     """
@@ -385,13 +270,12 @@ class ExternalConsole(SpyderPluginWidget):
     edit_goto = Signal((str, int, str), (str, int, str, bool))
     focus_changed = Signal()
     redirect_stdio = Signal(bool)
-    
-    def __init__(self, parent, light_mode):
+
+    def __init__(self, parent):
         if PYQT5:
             SpyderPluginWidget.__init__(self, parent, main = parent)
         else:
             SpyderPluginWidget.__init__(self, parent)
-        self.light_mode = light_mode
         self.tabwidget = None
         self.menu_actions = None
 
@@ -401,12 +285,6 @@ class ExternalConsole(SpyderPluginWidget):
 
         self.python_count = 0
         self.terminal_count = 0
-
-        # Python executable selection (initializing default values as well)
-        executable = self.get_option('pythonexecutable',
-                                     get_python_executable())
-        if self.get_option('pythonexecutable/default'):
-            executable = get_python_executable()
         
         # Python startup file selection
         if not osp.isfile(self.get_option('pythonstartup', '')):
@@ -414,20 +292,7 @@ class ExternalConsole(SpyderPluginWidget):
         # default/custom settings are mutually exclusive:
         self.set_option('pythonstartup/custom',
                         not self.get_option('pythonstartup/default'))
-        
-        if not osp.isfile(executable):
-            # This is absolutely necessary, in case the Python interpreter
-            # executable has been moved since last Spyder execution (following
-            # a Python distribution upgrade for example)
-            self.set_option('pythonexecutable', get_python_executable())
-        elif executable.endswith('pythonw.exe'):
-            # That should not be necessary because this case is already taken
-            # care of by the `get_python_executable` function but, this was
-            # implemented too late, so we have to fix it here too, in case
-            # the Python executable has already been set with pythonw.exe:
-            self.set_option('pythonexecutable',
-                            executable.replace("pythonw.exe", "python.exe"))
-        
+
         self.shellwidgets = []
         self.filenames = []
         self.icons = []
@@ -490,59 +355,30 @@ class ExternalConsole(SpyderPluginWidget):
         for index, shell in enumerate(self.shellwidgets):
             if id(shell) == shell_id:
                 return index
-        
-    def close_console(self, index=None, from_ipyclient=False):
+
+    def close_console(self, index=None):
         """Close console tab from index or widget (or close current tab)"""
         # Get tab index
         if not self.tabwidget.count():
             return
         if index is None:
             index = self.tabwidget.currentIndex()
-        
-        # Detect what widget we are trying to close
-        for i, s in enumerate(self.shellwidgets):
-            if index == i:
-                shellwidget = s
-        
-        # If the tab is an IPython kernel, try to detect if it has a client
-        # connected to it
-        if shellwidget.is_ipykernel:
-            ipyclients = self.main.ipyconsole.get_clients()
-            if ipyclients:
-                for ic in ipyclients:
-                    if ic.kernel_widget_id == id(shellwidget):
-                        connected_ipyclient = True
-                        break
-                else:
-                    connected_ipyclient = False
-            else:
-                connected_ipyclient = False
-        
+
         # Closing logic
-        if not shellwidget.is_ipykernel or from_ipyclient or \
-          not connected_ipyclient:
-            self.tabwidget.widget(index).close()
-            self.tabwidget.removeTab(index)
-            self.filenames.pop(index)
-            self.shellwidgets.pop(index)
-            self.icons.pop(index)
-            self.update_plugin_title.emit()
-        else:
-            QMessageBox.question(self, _('Trying to kill a kernel?'),
-                _("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 the second button from right to left."),
-                  QMessageBox.Ok)
-                                 
-        
+        self.tabwidget.widget(index).close()
+        self.tabwidget.removeTab(index)
+        self.filenames.pop(index)
+        self.shellwidgets.pop(index)
+        self.icons.pop(index)
+        self.update_plugin_title.emit()
+
     def set_variableexplorer(self, variableexplorer):
         """Set variable explorer plugin"""
         self.variableexplorer = variableexplorer
     
     def set_path(self):
         """Set consoles PYTHONPATH if changed by the user"""
-        from spyderlib.widgets.externalshell import pythonshell
+        from spyder.widgets.externalshell import pythonshell
         for sw in self.shellwidgets:
             if isinstance(sw, pythonshell.ExternalPythonShell):
                 if sw.is_interpreter and sw.is_running():
@@ -553,7 +389,7 @@ class ExternalConsole(SpyderPluginWidget):
         current_index = self.tabwidget.currentIndex()
         if current_index == -1:
             return
-        from spyderlib.widgets.externalshell import pythonshell
+        from spyder.widgets.externalshell import pythonshell
         for index in [current_index]+list(range(self.tabwidget.count())):
             shellwidget = self.tabwidget.widget(index)
             if isinstance(shellwidget, pythonshell.ExternalPythonShell):
@@ -579,7 +415,7 @@ class ExternalConsole(SpyderPluginWidget):
         current_index = self.tabwidget.currentIndex()
         if current_index == -1:
             return
-        from spyderlib.widgets.externalshell import pythonshell
+        from spyder.widgets.externalshell import pythonshell
         shellwidgets = [self.tabwidget.widget(index)
                         for index in range(self.tabwidget.count())]
         shellwidgets = [_w for _w in shellwidgets
@@ -606,7 +442,7 @@ class ExternalConsole(SpyderPluginWidget):
         if post_mortem:
             line += ', post_mortem=True'
         line += ")"
-        if not self.execute_python_code(line, interpreter_only=True):
+        if not self.execute_code(line, interpreter_only=True):
             QMessageBox.warning(self, _('Warning'),
                 _("No Python console is currently selected to run <b>%s</b>."
                   "<br><br>Please select or open a new Python console "
@@ -623,44 +459,37 @@ class ExternalConsole(SpyderPluginWidget):
             directory = encoding.to_unicode_from_fs(directory)
             shellwidget.shell.set_cwd(directory)
 
-    def execute_python_code(self, lines, interpreter_only=False):
-        """Execute Python code in an already opened Python interpreter"""
+    def execute_code(self, lines, interpreter_only=False):
+        """Execute code in an already opened Python interpreter"""
         shellwidget = self.__find_python_shell(
                                         interpreter_only=interpreter_only)
-        if (shellwidget is not None) and (not shellwidget.is_ipykernel):
+        if shellwidget is not None:
             shellwidget.shell.execute_lines(to_text_string(lines))
             self.activateWindow()
             shellwidget.shell.setFocus()
             return True
         else:
             return False
-            
+
     def pdb_has_stopped(self, fname, lineno, shellwidget):
-        """Python debugger has just stopped at frame (fname, lineno)"""      
-        # This is a unique form of the edit_goto signal that is intended to 
+        """Python debugger has just stopped at frame (fname, lineno)"""
+        # This is a unique form of the edit_goto signal that is intended to
         # prevent keyboard input from accidentally entering the editor
-        # during repeated, rapid entry of debugging commands.    
+        # during repeated, rapid entry of debugging commands.
         self.edit_goto[str, int, str, bool].emit(fname, lineno, '', False)
-        if shellwidget.is_ipykernel:
-            # Focus client widget, not kernel
-            ipw = self.main.ipyconsole.get_focus_widget()
-            self.main.ipyconsole.activateWindow()
-            ipw.setFocus()
-        else:
-            self.activateWindow()
-            shellwidget.shell.setFocus()
-    
+        self.activateWindow()
+        shellwidget.shell.setFocus()
+
     def set_spyder_breakpoints(self):
         """Set all Spyder breakpoints into all shells"""
         for shellwidget in self.shellwidgets:
-            shellwidget.shell.set_spyder_breakpoints()    
-    
+            shellwidget.shell.set_spyder_breakpoints()
+
     def start(self, fname, wdir=None, args='', interact=False, debug=False,
-              python=True, ipykernel=False, ipyclient=None,
-              give_ipyclient_focus=True, python_args='', post_mortem=True):
+              python=True, python_args='', post_mortem=True):
         """
         Start new console
-        
+
         fname:
           string: filename of script to run
           None: open an interpreter
@@ -669,8 +498,6 @@ class ExternalConsole(SpyderPluginWidget):
         interact: inspect script interactively after its execution
         debug: run pdb
         python: True: Python interpreter, False: terminal
-        ipykernel: True: IPython kernel
-        ipyclient: True: Automatically create an IPython client
         python_args: additionnal Python interpreter command line options
                    (option "-u" is mandatory, see widgets.externalshell package)
         """
@@ -709,13 +536,13 @@ class ExternalConsole(SpyderPluginWidget):
         light_background = self.get_option('light_background')
         show_elapsed_time = self.get_option('show_elapsed_time')
         if python:
-            if self.get_option('pythonexecutable/default'):
+            if CONF.get('main_interpreter', 'default'):
                 pythonexecutable = get_python_executable()
                 external_interpreter = False
             else:
-                pythonexecutable = self.get_option('pythonexecutable')
+                pythonexecutable = CONF.get('main_interpreter', 'executable')
                 external_interpreter = True
-            if self.get_option('pythonstartup/default') or ipykernel:
+            if self.get_option('pythonstartup/default'):
                 pythonstartup = None
             else:
                 pythonstartup = self.get_option('pythonstartup', None)
@@ -727,32 +554,17 @@ class ExternalConsole(SpyderPluginWidget):
                 qt_api = None
             merge_output_channels = self.get_option('merge_output_channels')
             colorize_sys_stderr = self.get_option('colorize_sys_stderr')
-            umr_enabled = self.get_option('umr/enabled')
-            umr_namelist = self.get_option('umr/namelist')
-            umr_verbose = self.get_option('umr/verbose')
+            umr_enabled = CONF.get('main_interpreter', 'umr/enabled')
+            umr_namelist = CONF.get('main_interpreter', 'umr/namelist')
+            umr_verbose = CONF.get('main_interpreter', 'umr/verbose')
             ar_timeout = CONF.get('variable_explorer', 'autorefresh/timeout')
             ar_state = CONF.get('variable_explorer', 'autorefresh')
 
-            # CRUCIAL NOTE FOR IPYTHON KERNELS:
-            # autorefresh needs to be on so that our monitor
-            # can find __ipythonkernel__ in the globals namespace
-            # *after* the kernel has been started.
-            # Without the ns refresh provided by autorefresh, a
-            # client is *never* started (although the kernel is)
-            # Fix Issue 1595
-            if not ar_state and ipykernel:
-                ar_state = True
-
-            if self.light_mode:
-                from spyderlib.plugins.variableexplorer import VariableExplorer
-                sa_settings = VariableExplorer.get_settings()
-            else:
-                sa_settings = None
+            sa_settings = None
             shellwidget = ExternalPythonShell(self, fname, wdir,
-                           interact, debug, post_mortem=post_mortem, 
+                           interact, debug, post_mortem=post_mortem,
                            path=pythonpath,
                            python_args=python_args,
-                           ipykernel=ipykernel,
                            arguments=args, stand_alone=sa_settings,
                            pythonstartup=pythonstartup,
                            pythonexecutable=pythonexecutable,
@@ -821,60 +633,10 @@ class ExternalConsole(SpyderPluginWidget):
             if self.main.editor is not None:
                 shellwidget.open_file.connect(self.open_file_in_spyder)
             if fname is None:
-                if ipykernel:
-                    # Connect client to any possible error while starting the
-                    # kernel
-                    shellwidget.ipython_kernel_start_error.connect(
-                              lambda error: ipyclient.show_kernel_error(error))
-                    
-                    # Detect if kernel and frontend match or not
-                    # Don't apply this for our Mac app because it's
-                    # failing, see Issue 2006
-                    if self.get_option('pythonexecutable/custom') and \
-                      not running_in_mac_app():
-                        frontend_ver = programs.get_module_version('IPython')
-                        old_vers = ['1', '2']
-                        if any([frontend_ver.startswith(v) for v in old_vers]):
-                            frontend_ver = '<3.0'
-                        else:
-                            frontend_ver = '>=3.0'
-                        kernel_and_frontend_match = \
-                          programs.is_module_installed('IPython',
-                                                  version=frontend_ver,
-                                                  interpreter=pythonexecutable)
-                    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 = ima.icon('ipython_console')
-                        tab_icon2 = ima.icon('ipython_console_t')
-                        shellwidget.create_ipython_client.connect(
-                                     lambda cf: self.register_ipyclient(cf,
-                                              ipyclient,
-                                              shellwidget,
-                                              give_focus=give_ipyclient_focus))
-                    else:
-                        shellwidget.ipython_kernel_start_error.emit(
-                          _("Either:"
-                            "<ol>"
-                            "<li>Your IPython frontend and kernel versions "
-                            "are <b>incompatible</b> or</li>"
-                            "<li>You <b>don't have</b> IPython installed in "
-                            "your external interpreter.</li>"
-                            "</ol>"
-                            "In any case, we're sorry but we can't create a "
-                            "console for you."))
-                        shellwidget.deleteLater()
-                        shellwidget = None
-                        return
-                else:
-                    self.python_count += 1
-                    tab_name = "Python %d" % self.python_count
-                    tab_icon1 = ima.icon('python')
-                    tab_icon2 = ima.icon('python_t')
+                self.python_count += 1
+                tab_name = "Python %d" % self.python_count
+                tab_icon1 = ima.icon('python')
+                tab_icon2 = ima.icon('python_t')
             else:
                 tab_name = osp.basename(fname)
                 tab_icon1 = ima.icon('run')
@@ -904,66 +666,15 @@ class ExternalConsole(SpyderPluginWidget):
         self.find_widget.set_editor(shellwidget.shell)
         self.tabwidget.setTabToolTip(index, fname if wdir is None else wdir)
         self.tabwidget.setCurrentIndex(index)
-        if self.dockwidget and not self.ismaximized and not ipykernel:
+        if self.dockwidget and not self.ismaximized:
             self.dockwidget.setVisible(True)
             self.dockwidget.raise_()
-        
+
         shellwidget.set_icontext_visible(self.get_option('show_icontext'))
-        
+
         # Start process and give focus to console
         shellwidget.start_shell()
-        if not ipykernel:
-            self.activateWindow()
-            shellwidget.shell.setFocus()
-    
-    def set_ipykernel_attrs(self, connection_file, kernel_widget, name):
-        """Add the pid of the kernel process to an IPython kernel tab"""
-        # Set connection file
-        kernel_widget.connection_file = connection_file
-        
-        # If we've reached this point then it's safe to assume IPython
-        # is available, and this import should be valid.
-        from IPython.core.application import get_ipython_dir
-        # For each kernel we launch, setup to delete the associated
-        # connection file at the time Spyder exits.
-        def cleanup_connection_file(connection_file):
-            connection_file = osp.join(get_ipython_dir(), 'profile_default',
-                                       'security', connection_file)
-            try:
-                os.remove(connection_file)
-            except OSError:
-                pass
-        atexit.register(cleanup_connection_file, connection_file)   
-        
-        # Set tab name according to client master name
-        index = self.get_shell_index_from_id(id(kernel_widget))
-        tab_name = _("Kernel %s") % name
-        self.tabwidget.setTabText(index, tab_name)
-    
-    def register_ipyclient(self, connection_file, ipyclient, kernel_widget,
-                           give_focus=True):
-        """
-        Register `ipyclient` to be connected to `kernel_widget`
-        """
-        # Check if our client already has a connection_file and kernel_widget_id
-        # which means that we are asking for a kernel restart
-        if ipyclient.connection_file is not None \
-          and ipyclient.kernel_widget_id is not None:
-            restart_kernel = True
-        else:
-            restart_kernel = False
-        
-        # Setting kernel widget attributes
-        name = ipyclient.name.split('/')[0]
-        self.set_ipykernel_attrs(connection_file, kernel_widget, name)
-        
-        # Creating the client
-        ipyconsole = self.main.ipyconsole
-        ipyclient.connection_file = connection_file
-        ipyclient.kernel_widget_id = id(kernel_widget)
-        ipyconsole.register_client(ipyclient, restart=restart_kernel,
-                                   give_focus=give_focus)
-        
+
     def open_file_in_spyder(self, fname, lineno):
         """Open file in Spyder's editor from remote process"""
         self.main.editor.activateWindow()
@@ -995,7 +706,7 @@ class ExternalConsole(SpyderPluginWidget):
     #------ SpyderPluginWidget API --------------------------------------------
     def get_plugin_title(self):
         """Return widget title"""
-        title = _('Console')
+        title = _('Python console')
         if self.filenames:
             index = self.tabwidget.currentIndex()
             fname = self.filenames[index]
@@ -1046,8 +757,6 @@ class ExternalConsole(SpyderPluginWidget):
         """Register plugin in Spyder's main window"""
         self.main.add_dockwidget(self)
         self.help = self.main.help
-        if self.help is not None:
-            self.help.set_external_console(self)
         self.historylog = self.main.historylog
         self.edit_goto.connect(self.main.editor.load)
         self.edit_goto[str, int, str, bool].connect(
@@ -1070,7 +779,7 @@ class ExternalConsole(SpyderPluginWidget):
         if expl is not None:
             expl.open_terminal.connect(self.open_terminal)
             expl.open_interpreter.connect(self.open_interpreter)
-        pexpl = self.main.projectexplorer
+        pexpl = self.main.projects
         if pexpl is not None:
             pexpl.open_terminal.connect(self.open_terminal)
             pexpl.open_interpreter.connect(self.open_interpreter)
@@ -1080,7 +789,19 @@ class ExternalConsole(SpyderPluginWidget):
         for shellwidget in self.shellwidgets:
             shellwidget.close()
         return True
-    
+
+    def restart(self):
+        """
+        Restart the console
+
+        This is needed when we switch project to update PYTHONPATH
+        and the selected interpreter
+        """
+        self.python_count = 0
+        for i in range(len(self.shellwidgets)):
+            self.close_console()
+        self.open_interpreter()
+
     def refresh_plugin(self):
         """Refresh tabwidget"""
         shellwidget = None
@@ -1097,6 +818,8 @@ class ExternalConsole(SpyderPluginWidget):
         self.tabwidget.set_corner_widgets({Qt.TopRightCorner: widgets})
         if shellwidget:
             shellwidget.update_time_label_visibility()
+            self.variableexplorer.set_shellwidget_from_id(id(shellwidget))
+            self.help.set_shell(shellwidget.shell)
         self.main.last_console_plugin_focus_was_python = True
         self.update_plugin_title.emit()
 
@@ -1157,13 +880,12 @@ class ExternalConsole(SpyderPluginWidget):
             self.dockwidget.show()
             self.dockwidget.raise_()
             # Start a console in case there are none shown
-            from spyderlib.widgets.externalshell import pythonshell
+            from spyder.widgets.externalshell import pythonshell
             consoles = None
             for sw in self.shellwidgets:
                 if isinstance(sw, pythonshell.ExternalPythonShell):
-                    if not sw.is_ipykernel:
-                        consoles = True
-                        break
+                    consoles = True
+                    break
             if not consoles:
                 self.open_interpreter()
         else:
@@ -1180,21 +902,6 @@ class ExternalConsole(SpyderPluginWidget):
         self.start(fname=None, wdir=to_text_string(wdir), args='',
                    interact=True, debug=False, python=True)
 
-    def start_ipykernel(self, client, wdir=None, give_focus=True):
-        """Start new IPython kernel"""
-        if not self.get_option('monitor/enabled'):
-            QMessageBox.warning(self, _('Open an IPython console'),
-                _("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."), QMessageBox.Ok)
-        
-        if not wdir:
-            wdir = getcwd()
-        self.main.ipyconsole.visibility_changed(True)
-        self.start(fname=None, wdir=to_text_string(wdir), args='',
-                   interact=True, debug=False, python=True, ipykernel=True,
-                   ipyclient=client, give_ipyclient_focus=give_focus)
-
     @Slot(bool)
     @Slot(str)
     def open_terminal(self, wdir=None):
@@ -1214,34 +921,7 @@ class ExternalConsole(SpyderPluginWidget):
         if filename:
             self.start(fname=filename, wdir=None, args='',
                        interact=False, debug=False)
-        
-    def set_umr_namelist(self):
-        """Set UMR excluded modules name list"""
-        arguments, valid = QInputDialog.getText(self, _('UMR'),
-                                  _('UMR excluded modules:\n'
-                                          '(example: guidata, guiqwt)'),
-                                  QLineEdit.Normal,
-                                  ", ".join(self.get_option('umr/namelist')))
-        if valid:
-            arguments = to_text_string(arguments)
-            if arguments:
-                namelist = arguments.replace(' ', '').split(',')
-                fixed_namelist = [module_name for module_name in namelist
-                                  if programs.is_module_installed(module_name)]
-                invalid = ", ".join(set(namelist)-set(fixed_namelist))
-                if invalid:
-                    QMessageBox.warning(self, _('UMR'),
-                                        _("The following modules are not "
-                                          "installed on your machine:\n%s"
-                                          ) % invalid, QMessageBox.Ok)
-                QMessageBox.information(self, _('UMR'),
-                                    _("Please note that these changes will "
-                                      "be applied only to new Python/IPython "
-                                      "consoles"), QMessageBox.Ok)
-            else:
-                fixed_namelist = []
-            self.set_option('umr/namelist', fixed_namelist)
-        
+
     def go_to_error(self, text):
         """Go to error if relevant"""
         match = get_error_match(to_text_string(text))
diff --git a/spyderlib/plugins/findinfiles.py b/spyder/plugins/findinfiles.py
similarity index 91%
rename from spyderlib/plugins/findinfiles.py
rename to spyder/plugins/findinfiles.py
index 5c7dade..b892e00 100644
--- a/spyderlib/plugins/findinfiles.py
+++ b/spyder/plugins/findinfiles.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009-2010 Pierre Raybaut
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """Find in Files Plugin"""
 
@@ -19,13 +19,13 @@ from qtpy.QtWidgets import QApplication
 from qtpy.QtCore import Signal, Slot
 
 # Local imports
-from spyderlib.config.base import _
-from spyderlib.config.utils import get_edit_extensions
-from spyderlib.py3compat import getcwd
-from spyderlib.utils import icon_manager as ima
-from spyderlib.utils.qthelpers import create_action
-from spyderlib.widgets.findinfiles import FindInFilesWidget
-from spyderlib.plugins import SpyderPluginMixin
+from spyder.config.base import _
+from spyder.config.utils import get_edit_extensions
+from spyder.py3compat import getcwd
+from spyder.utils import icon_manager as ima
+from spyder.utils.qthelpers import create_action
+from spyder.widgets.findinfiles import FindInFilesWidget
+from spyder.plugins import SpyderPluginMixin
 
 
 class FindInFiles(FindInFilesWidget, SpyderPluginMixin):
@@ -186,7 +186,7 @@ class FindInFiles(FindInFilesWidget, SpyderPluginMixin):
 
 
 def test():
-    from spyderlib.utils.qthelpers import qapplication
+    from spyder.utils.qthelpers import qapplication
     app = qapplication()
     widget = FindInFiles()
     widget.show()
diff --git a/spyderlib/plugins/help.py b/spyder/plugins/help.py
similarity index 90%
rename from spyderlib/plugins/help.py
rename to spyder/plugins/help.py
index 4dc630d..b17b631 100644
--- a/spyderlib/plugins/help.py
+++ b/spyder/plugins/help.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009-2010 Pierre Raybaut
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """Help Plugin"""
 
@@ -21,23 +21,23 @@ from qtpy.QtWidgets import (QActionGroup, QComboBox, QGroupBox, QHBoxLayout,
 from qtpy.QtWebEngineWidgets import QWebEnginePage, WEBENGINE
 
 # Local imports
-from spyderlib import dependencies
-from spyderlib.config.base import _, get_conf_path, get_module_source_path
-from spyderlib.config.fonts import DEFAULT_SMALL_DELTA
-from spyderlib.config.ipython import QTCONSOLE_INSTALLED
-from spyderlib.plugins import PluginConfigPage, SpyderPluginWidget
-from spyderlib.py3compat import get_meth_class_inst, to_text_string
-from spyderlib.utils import icon_manager as ima
-from spyderlib.utils import programs
-from spyderlib.utils.help.sphinxify import (CSS_PATH, generate_context,
-                                            sphinxify, usage, warning)
-from spyderlib.utils.qthelpers import (add_actions, create_action,
-                                       create_toolbutton)
-from spyderlib.widgets.browser import FrameWebView
-from spyderlib.widgets.comboboxes import EditableComboBox
-from spyderlib.widgets.externalshell.pythonshell import ExtPythonShellWidget
-from spyderlib.widgets.findreplace import FindReplace
-from spyderlib.widgets.sourcecode import codeeditor
+from spyder import dependencies
+from spyder.config.base import _, get_conf_path, get_module_source_path
+from spyder.config.fonts import DEFAULT_SMALL_DELTA
+from spyder.config.ipython import QTCONSOLE_INSTALLED
+from spyder.plugins import SpyderPluginWidget
+from spyder.plugins.configdialog import PluginConfigPage
+from spyder.py3compat import get_meth_class_inst, to_text_string
+from spyder.utils import icon_manager as ima
+from spyder.utils import programs
+from spyder.utils.help.sphinxify import (CSS_PATH, generate_context,
+                                         sphinxify, usage, warning)
+from spyder.utils.qthelpers import (add_actions, create_action,
+                                    create_toolbutton)
+from spyder.widgets.browser import FrameWebView
+from spyder.widgets.comboboxes import EditableComboBox
+from spyder.widgets.findreplace import FindReplace
+from spyder.widgets.sourcecode import codeeditor
 
 
 # Sphinx dependency
@@ -46,13 +46,6 @@ dependencies.add("sphinx", _("Show help for objects in the Editor and "
                  required_version='>=0.6.6')
 
 
-#XXX: Hardcoded dependency on optional IPython plugin component
-#     that requires the hack to make this work without IPython
-if QTCONSOLE_INSTALLED:
-    from spyderlib.widgets.ipython import IPythonControlWidget
-else:
-    IPythonControlWidget = None  # analysis:ignore
-
 
 class ObjectComboBox(EditableComboBox):
     """
@@ -266,7 +259,7 @@ class SphinxThread(QThread):
     doc : str or dict
         A string containing a raw rst text or a dict containing
         the doc string components to be rendered.
-        See spyderlib.utils.dochelpers.getdoc for description.
+        See spyder.utils.dochelpers.getdoc for description.
     context : dict
         A dict containing the substitution variables for the
         layout template
@@ -311,10 +304,11 @@ class SphinxThread(QThread):
                                                math=self.math_option,
                                                img_path=self.img_path)
                     html_text = sphinxify(doc['docstring'], context)
-                    if doc['docstring'] == '':
+                    if doc['docstring'] == '' and \
+                      any([doc['name'], doc['argspec'], doc['note']]):
+                        msg = _("No further documentation available")
                         html_text += '<div class="hr"></div>'
-                        html_text += self.html_text_no_doc
-
+                        html_text += '<div id="doc-warning">%s</div>' % msg
                 except Exception as error:
                     self.error_msg.emit(to_text_string(error))
                     return
@@ -350,7 +344,7 @@ class Help(SpyderPluginWidget):
         # Initialize plugin
         self.initialize_plugin()
 
-        self.no_doc_string = _("No further documentation available")
+        self.no_doc_string = _("No documentation available")
 
         self._last_console_cb = None
         self._last_editor_cb = None
@@ -373,8 +367,6 @@ class Help(SpyderPluginWidget):
 
         self.shell = None
 
-        self.external_console = None
-
         # locked = disable link with Console
         self.locked = False
         self._last_texts = [None, None]
@@ -746,7 +738,7 @@ class Help(SpyderPluginWidget):
 
     @Slot()
     def show_tutorial(self):
-        tutorial_path = get_module_source_path('spyderlib.utils.help')
+        tutorial_path = get_module_source_path('spyder.utils.help')
         tutorial = osp.join(tutorial_path, 'tutorial.rst')
         text = open(tutorial).read()
         self.show_rich_text(text, collapse=True)
@@ -761,9 +753,6 @@ class Help(SpyderPluginWidget):
             self.rich_text.webview.load(QUrl(url))
 
     #------ Public API ---------------------------------------------------------
-    def set_external_console(self, external_console):
-        self.external_console = external_console
-
     def force_refresh(self):
         if self.source_is_console():
             self.set_object_text(None, force_refresh=True)
@@ -899,23 +888,21 @@ class Help(SpyderPluginWidget):
 
     def set_shell(self, shell):
         """Bind to shell"""
-        if IPythonControlWidget is not None:
-            # XXX(anatoli): hack to make Spyder run on systems without IPython
-            #               there should be a better way
-            if isinstance(shell, IPythonControlWidget):
-                # XXX: this ignores passed argument completely
-                self.shell = self.external_console.get_current_shell()
-        else:
-            self.shell = shell
+        self.shell = shell
 
     def get_shell(self):
-        """Return shell which is currently bound to Help,
-        or another running shell if it has been terminated"""
-        if not isinstance(self.shell, ExtPythonShellWidget) \
-           or not self.shell.externalshell.is_running():
+        """
+        Return shell which is currently bound to Help,
+        or another running shell if it has been terminated
+        """
+        if not hasattr(self.shell, 'get_doc') or not self.shell.is_running():
             self.shell = None
-            if self.external_console is not None:
-                self.shell = self.external_console.get_running_python_shell()
+            if self.main.ipyconsole is not None:
+                shell = self.main.ipyconsole.get_current_shellwidget()
+                if shell is not None and shell.kernel_client is not None:
+                    self.shell = shell
+            if self.shell is None and self.main.extconsole is not None:
+                self.shell = self.main.extconsole.get_running_python_shell()
             if self.shell is None:
                 self.shell = self.internal_shell
         return self.shell
@@ -954,7 +941,7 @@ class Help(SpyderPluginWidget):
         obj_text = to_text_string(obj_text)
 
         if not shell.is_defined(obj_text):
-            if self.get_option('automatic_import') and\
+            if self.get_option('automatic_import') and \
                self.internal_shell.is_defined(obj_text, force_import=True):
                 shell = self.internal_shell
             else:
diff --git a/spyderlib/plugins/history.py b/spyder/plugins/history.py
similarity index 87%
rename from spyderlib/plugins/history.py
rename to spyder/plugins/history.py
index 800d5c3..a4b6e49 100644
--- a/spyderlib/plugins/history.py
+++ b/spyder/plugins/history.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009-2010 Pierre Raybaut
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """Console History Plugin"""
 
@@ -13,21 +13,22 @@ import sys
 # Third party imports
 from qtpy import PYQT5
 from qtpy.QtCore import Signal, Slot
-from qtpy.QtWidgets import (QFontDialog, QGroupBox, QHBoxLayout, QInputDialog,
-                            QMenu, QToolButton, QVBoxLayout, QWidget)
+from qtpy.QtWidgets import (QGroupBox, QHBoxLayout, QInputDialog, QMenu,
+                            QToolButton, QVBoxLayout, QWidget)
 
 
 # Local imports
-from spyderlib.utils import encoding
-from spyderlib.config.base import _
-from spyderlib.plugins import PluginConfigPage, SpyderPluginWidget
-from spyderlib.py3compat import is_text_string, to_text_string
-from spyderlib.utils import icon_manager as ima
-from spyderlib.utils.qthelpers import (add_actions, create_action,
-                                       create_toolbutton)
-from spyderlib.widgets.tabs import Tabs
-from spyderlib.widgets.sourcecode import codeeditor
-from spyderlib.widgets.findreplace import FindReplace
+from spyder.utils import encoding
+from spyder.config.base import _
+from spyder.plugins import SpyderPluginWidget
+from spyder.plugins.configdialog import PluginConfigPage
+from spyder.py3compat import is_text_string, to_text_string
+from spyder.utils import icon_manager as ima
+from spyder.utils.qthelpers import (add_actions, create_action,
+                                    create_toolbutton)
+from spyder.widgets.tabs import Tabs
+from spyder.widgets.sourcecode import codeeditor
+from spyder.widgets.findreplace import FindReplace
 
 
 class HistoryConfigPage(PluginConfigPage):
@@ -78,7 +79,6 @@ class HistoryLog(SpyderPluginWidget):
         
         self.editors = []
         self.filenames = []
-        self.icons = []
         if PYQT5:        
             SpyderPluginWidget.__init__(self, parent, main = parent)
         else:
@@ -203,11 +203,9 @@ class HistoryLog(SpyderPluginWidget):
         """
         filename = self.filenames.pop(index_from)
         editor = self.editors.pop(index_from)
-        icon = self.icons.pop(index_from)
         
         self.filenames.insert(index_to, filename)
         self.editors.insert(index_to, editor)
-        self.icons.insert(index_to, icon)
         
     #------ Public API ---------------------------------------------------------
     def add_history(self, filename):
@@ -221,10 +219,8 @@ class HistoryLog(SpyderPluginWidget):
         editor = codeeditor.CodeEditor(self)
         if osp.splitext(filename)[1] == '.py':
             language = 'py'
-            icon = ima.icon('python')
         else:
             language = 'bat'
-            icon = ima.icon('cmdprompt')
         editor.setup_editor(linenumbers=False, language=language,
                             scrollflagarea=False)
         editor.focus_changed.connect(lambda: self.focus_changed.emit())
@@ -239,11 +235,9 @@ class HistoryLog(SpyderPluginWidget):
         
         self.editors.append(editor)
         self.filenames.append(filename)
-        self.icons.append(icon)
         index = self.tabwidget.addTab(editor, osp.basename(filename))
         self.find_widget.set_editor(editor)
         self.tabwidget.setTabToolTip(index, filename)
-        self.tabwidget.setTabIcon(index, icon)
         self.tabwidget.setCurrentIndex(index)
         
     def append_to_history(self, filename, command):
diff --git a/spyderlib/plugins/ipythonconsole.py b/spyder/plugins/ipythonconsole.py
similarity index 64%
rename from spyderlib/plugins/ipythonconsole.py
rename to spyder/plugins/ipythonconsole.py
index 88cc8c5..0eeefde 100644
--- a/spyderlib/plugins/ipythonconsole.py
+++ b/spyder/plugins/ipythonconsole.py
@@ -1,13 +1,12 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2012 Pierre Raybaut
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
-"""IPython Console plugin
-
-Handles IPython clients (and in the future, will handle IPython kernels too
--- meanwhile, the external console plugin is handling them)"""
+"""
+IPython Console plugin based on QtConsole
+"""
 
 # pylint: disable=C0103
 # pylint: disable=R0903
@@ -18,11 +17,14 @@ Handles IPython clients (and in the future, will handle IPython kernels too
 import atexit
 import os
 import os.path as osp
+import uuid
 import sys
 
 # Third party imports
-from IPython.core.application import get_ipython_dir
 from jupyter_client.connect import find_connection_file
+from jupyter_client.kernelspec import KernelSpec
+from jupyter_core.paths import jupyter_config_dir, jupyter_runtime_dir
+from qtconsole.client import QtKernelClient
 from qtconsole.manager import QtKernelManager
 from qtpy import PYQT5
 from qtpy.compat import getopenfilename
@@ -32,6 +34,7 @@ from qtpy.QtWidgets import (QApplication, QCheckBox, QDialog, QDialogButtonBox,
                             QFormLayout, QGridLayout, QGroupBox, QHBoxLayout,
                             QLabel, QLineEdit, QMessageBox, QPushButton,
                             QTabWidget, QVBoxLayout, QWidget)
+from traitlets.config.loader import Config, load_pyconfig_files
 from zmq.ssh import tunnel as zmqtunnel
 try:
     import pexpect
@@ -39,18 +42,22 @@ except ImportError:
     pexpect = None
 
 # Local imports
-from spyderlib import dependencies
-from spyderlib.config.base import _
-from spyderlib.config.main import CONF
-from spyderlib.plugins import PluginConfigPage, SpyderPluginWidget
-from spyderlib.py3compat import to_text_string
-from spyderlib.utils import icon_manager as ima
-from spyderlib.utils import programs
-from spyderlib.utils.misc import get_error_match, remove_backslashes
-from spyderlib.utils.qthelpers import create_action
-from spyderlib.widgets.findreplace import FindReplace
-from spyderlib.widgets.ipython import IPythonClient
-from spyderlib.widgets.tabs import Tabs
+from spyder import dependencies
+from spyder.config.base import (_, DEV, get_home_dir, get_module_path,
+                                get_module_source_path)
+from spyder.config.main import CONF
+from spyder.plugins import SpyderPluginWidget
+from spyder.plugins.configdialog import PluginConfigPage
+from spyder.py3compat import (iteritems, PY2, to_binary_string,
+                              to_text_string)
+from spyder.utils.qthelpers import create_action
+from spyder.utils import icon_manager as ima
+from spyder.utils import programs
+from spyder.utils.misc import (add_pathlist_to_PYTHONPATH, get_error_match,
+                               get_python_executable, remove_backslashes)
+from spyder.widgets.findreplace import FindReplace
+from spyder.widgets.ipythonconsole import ClientWidget
+from spyder.widgets.tabs import Tabs
 
 
 SYMPY_REQVER = '>=0.7.3'
@@ -58,6 +65,9 @@ dependencies.add("sympy", _("Symbolic mathematics in the IPython Console"),
                  required_version=SYMPY_REQVER, optional=True)
 
 
+#------------------------------------------------------------------------------
+# Existing kernels
+#------------------------------------------------------------------------------
 # Replacing pyzmq openssh_tunnel method to work around the issue
 # https://github.com/zeromq/pyzmq/issues/589 which was solved in pyzmq
 # https://github.com/zeromq/pyzmq/pull/615
@@ -139,15 +149,125 @@ def openssh_tunnel(self, lport, rport, server, remoteip='127.0.0.1',
             failed = True
 
 
-class IPythonConsoleConfigPage(PluginConfigPage):
+class KernelConnectionDialog(QDialog):
+    """Dialog to connect to existing kernels (either local or remote)"""
     
+    def __init__(self, parent=None):
+        super(KernelConnectionDialog, self).__init__(parent)
+        self.setWindowTitle(_('Connect to an existing kernel'))
+        
+        main_label = QLabel(_("Please enter the connection info of the kernel "
+                              "you want to connect to. For that you can "
+                              "either select its JSON connection file using "
+                              "the <tt>Browse</tt> button, or write directly "
+                              "its id, in case it's a local kernel (for "
+                              "example <tt>kernel-3764.json</tt> or just "
+                              "<tt>3764</tt>)."))
+        main_label.setWordWrap(True)
+        main_label.setAlignment(Qt.AlignJustify)
+        
+        # connection file
+        cf_label = QLabel(_('Connection info:'))
+        self.cf = QLineEdit()
+        self.cf.setPlaceholderText(_('Path to connection file or kernel id'))
+        self.cf.setMinimumWidth(250)
+        cf_open_btn = QPushButton(_('Browse'))
+        cf_open_btn.clicked.connect(self.select_connection_file)
+
+        cf_layout = QHBoxLayout()
+        cf_layout.addWidget(cf_label)
+        cf_layout.addWidget(self.cf)
+        cf_layout.addWidget(cf_open_btn)
+        
+        # remote kernel checkbox 
+        self.rm_cb = QCheckBox(_('This is a remote kernel'))
+        
+        # ssh connection 
+        self.hn = QLineEdit()
+        self.hn.setPlaceholderText(_('username at hostname:port'))
+        
+        self.kf = QLineEdit()
+        self.kf.setPlaceholderText(_('Path to ssh key file'))
+        kf_open_btn = QPushButton(_('Browse'))
+        kf_open_btn.clicked.connect(self.select_ssh_key)
+
+        kf_layout = QHBoxLayout()
+        kf_layout.addWidget(self.kf)
+        kf_layout.addWidget(kf_open_btn)
+        
+        self.pw = QLineEdit()
+        self.pw.setPlaceholderText(_('Password or ssh key passphrase'))
+        self.pw.setEchoMode(QLineEdit.Password)
+
+        ssh_form = QFormLayout()
+        ssh_form.addRow(_('Host name'), self.hn)
+        ssh_form.addRow(_('Ssh key'), kf_layout)
+        ssh_form.addRow(_('Password'), self.pw)
+        
+        # Ok and Cancel buttons
+        accept_btns = QDialogButtonBox(
+            QDialogButtonBox.Ok | QDialogButtonBox.Cancel,
+            Qt.Horizontal, self)
+
+        accept_btns.accepted.connect(self.accept)
+        accept_btns.rejected.connect(self.reject)
+
+        # Dialog layout
+        layout = QVBoxLayout(self)
+        layout.addWidget(main_label)
+        layout.addLayout(cf_layout)
+        layout.addWidget(self.rm_cb)
+        layout.addLayout(ssh_form)
+        layout.addWidget(accept_btns)
+                
+        # remote kernel checkbox enables the ssh_connection_form
+        def ssh_set_enabled(state):
+            for wid in [self.hn, self.kf, kf_open_btn, self.pw]:
+                wid.setEnabled(state)
+            for i in range(ssh_form.rowCount()):
+                ssh_form.itemAt(2 * i).widget().setEnabled(state)
+       
+        ssh_set_enabled(self.rm_cb.checkState())
+        self.rm_cb.stateChanged.connect(ssh_set_enabled)
+
+    def select_connection_file(self):
+        cf = getopenfilename(self, _('Open connection file'),
+                             jupyter_runtime_dir(), '*.json;;*.*')[0]
+        self.cf.setText(cf)
+
+    def select_ssh_key(self):
+        kf = getopenfilename(self, _('Select ssh key'),
+                             get_home_dir(), '*.pem;;*.*')[0]
+        self.kf.setText(kf)
+
+    @staticmethod
+    def get_connection_parameters(parent=None):
+        dialog = KernelConnectionDialog(parent)
+        result = dialog.exec_()
+        is_remote = bool(dialog.rm_cb.checkState())
+        accepted = result == QDialog.Accepted
+        if is_remote:
+            falsy_to_none = lambda arg: arg if arg else None
+            return (dialog.cf.text(),            # connection file
+                falsy_to_none(dialog.hn.text()), # host name
+                falsy_to_none(dialog.kf.text()), # ssh key file
+                falsy_to_none(dialog.pw.text()), # ssh password
+                accepted)                        # ok
+        else:
+            return (dialog.cf.text(), None, None, None, accepted)
+
+
+#------------------------------------------------------------------------------
+# Config page
+#------------------------------------------------------------------------------
+class IPythonConsoleConfigPage(PluginConfigPage):
+
     def __init__(self, plugin, parent):
         PluginConfigPage.__init__(self, plugin, parent)
         self.get_name = lambda: _("IPython console")
 
     def setup_page(self):
         newcb = self.create_checkbox
-        mpl_present = programs.is_module_installed("matplotlib")
         
         # Interface Group
         interface_group = QGroupBox(_("Interface"))
@@ -174,7 +294,7 @@ class IPythonConsoleConfigPage(PluginConfigPage):
         comp_group = QGroupBox(_("Completion Type"))
         comp_label = QLabel(_("Decide what type of completion to use"))
         comp_label.setWordWrap(True)
-        completers = [("Graphical", 0), ("Terminal", 1), ("Plain", 2)]
+        completers = [(_("Graphical"), 0), (_("Terminal"), 1), (_("Plain"), 2)]
         comp_box = self.create_combobox(_("Completion:")+"   ", completers,
                                         'completion_type')
         comp_layout = QVBoxLayout()
@@ -218,7 +338,7 @@ class IPythonConsoleConfigPage(PluginConfigPage):
                                      "plotting libraries different to "
                                      "Matplotlib or to develop \nGUIs with "
                                      "Spyder."))
-        autoload_pylab_box.setEnabled(self.get_option('pylab') and mpl_present)
+        autoload_pylab_box.setEnabled(self.get_option('pylab'))
         pylab_box.toggled.connect(autoload_pylab_box.setEnabled)
         
         pylab_layout = QVBoxLayout()
@@ -226,14 +346,6 @@ class IPythonConsoleConfigPage(PluginConfigPage):
         pylab_layout.addWidget(autoload_pylab_box)
         pylab_group.setLayout(pylab_layout)
         
-        if not mpl_present:
-            self.set_option('pylab', False)
-            self.set_option('pylab/autoload', False)
-            pylab_group.setEnabled(False)
-            pylab_tip = _("This feature requires the Matplotlib library.\n"
-                          "It seems you don't have it installed.")
-            pylab_box.setToolTip(pylab_tip)
-        
         # Pylab backend Group
         inline = _("Inline")
         automatic = _("Automatic")
@@ -246,16 +358,16 @@ class IPythonConsoleConfigPage(PluginConfigPage):
                               "separate window.") % (inline, automatic))
         bend_label.setWordWrap(True)
 
-        backends = [(inline, 0), (automatic, 1), ("Qt", 2)]
-        # TODO: Add gtk3 when 0.13 is released
+        backends = [(inline, 0), (automatic, 1), ("Qt5", 2), ("Qt4", 3)]
+
         if sys.platform == 'darwin':
-            backends.append( ("Mac OSX", 3) )
-        if programs.is_module_installed('pygtk'):
-            backends.append( ("Gtk", 4) )
-        if programs.is_module_installed('wxPython'):
-            backends.append( ("Wx", 5) )
-        if programs.is_module_installed('_tkinter'):
-            backends.append( ("Tkinter", 6) )
+            backends.append( ("OS X", 4) )
+        if sys.platform.startswith('linux'):
+            backends.append( ("Gtk3", 5) )
+            backends.append( ("Gtk", 6) )
+        if PY2:
+            backends.append( ("Wx", 7) )
+        backends.append( ("Tkinter", 8) )
         backends = tuple(backends)
         
         backend_box = self.create_combobox( _("Backend:")+"   ", backends,
@@ -267,7 +379,7 @@ class IPythonConsoleConfigPage(PluginConfigPage):
         backend_layout.addWidget(bend_label)
         backend_layout.addWidget(backend_box)
         backend_group.setLayout(backend_layout)
-        backend_group.setEnabled(self.get_option('pylab') and mpl_present)
+        backend_group.setEnabled(self.get_option('pylab'))
         pylab_box.toggled.connect(backend_group.setEnabled)
         
         # Inline backend Group
@@ -311,7 +423,7 @@ class IPythonConsoleConfigPage(PluginConfigPage):
         inline_h_layout.addStretch(1)
         inline_v_layout.addLayout(inline_h_layout)
         inline_group.setLayout(inline_v_layout)
-        inline_group.setEnabled(self.get_option('pylab') and mpl_present)
+        inline_group.setEnabled(self.get_option('pylab'))
         pylab_box.toggled.connect(inline_group.setEnabled)
 
         # --- Startup ---
@@ -400,7 +512,7 @@ class IPythonConsoleConfigPage(PluginConfigPage):
         sympy_label = QLabel(_("Perfom symbolic operations in the console "
                                "(e.g. integrals, derivatives, vector calculus, "
                                "etc) and get the outputs in a beautifully "
-                               "printed style."))
+                               "printed style (it requires the Sympy module)."))
         sympy_label.setWordWrap(True)
         sympy_box = newcb(_("Use symbolic math"), "symbolic_math",
                           tip=_("This option loads the Sympy library to work "
@@ -411,15 +523,7 @@ class IPythonConsoleConfigPage(PluginConfigPage):
         sympy_layout.addWidget(sympy_label)
         sympy_layout.addWidget(sympy_box)
         sympy_group.setLayout(sympy_layout)
-        
-        sympy_present = programs.is_module_installed("sympy")
-        if not sympy_present:
-            self.set_option("symbolic_math", False)
-            sympy_box.setEnabled(False)
-            sympy_tip = _("This feature requires the Sympy library.\n"
-                          "It seems you don't have it installed.")
-            sympy_box.setToolTip(sympy_tip)
-        
+
         # Prompts group
         prompts_group = QGroupBox(_("Prompts"))
         prompts_label = QLabel(_("Modify how Input and Output prompts are "
@@ -464,120 +568,14 @@ class IPythonConsoleConfigPage(PluginConfigPage):
         self.setLayout(vlayout)
 
 
-class KernelConnectionDialog(QDialog):
-    """Dialog to connect to existing kernels (either local or remote)"""
-    
-    def __init__(self, parent=None):
-        super(KernelConnectionDialog, self).__init__(parent)
-        self.setWindowTitle(_('Connect to an existing kernel'))
-        
-        main_label = QLabel(_("Please enter the connection info of the kernel "
-                              "you want to connect to. For that you can "
-                              "either select its JSON connection file using "
-                              "the <tt>Browse</tt> button, or write directly "
-                              "its id, in case it's a local kernel (for "
-                              "example <tt>kernel-3764.json</tt> or just "
-                              "<tt>3764</tt>)."))
-        main_label.setWordWrap(True)
-        main_label.setAlignment(Qt.AlignJustify)
-        
-        # connection file
-        cf_label = QLabel(_('Connection info:'))
-        self.cf = QLineEdit()
-        self.cf.setPlaceholderText(_('Path to connection file or kernel id'))
-        self.cf.setMinimumWidth(250)
-        cf_open_btn = QPushButton(_('Browse'))
-        cf_open_btn.clicked.connect(self.select_connection_file)
-
-        cf_layout = QHBoxLayout()
-        cf_layout.addWidget(cf_label)
-        cf_layout.addWidget(self.cf)
-        cf_layout.addWidget(cf_open_btn)
-        
-        # remote kernel checkbox 
-        self.rm_cb = QCheckBox(_('This is a remote kernel'))
-        
-        # ssh connection 
-        self.hn = QLineEdit()
-        self.hn.setPlaceholderText(_('username at hostname:port'))
-        
-        self.kf = QLineEdit()
-        self.kf.setPlaceholderText(_('Path to ssh key file'))
-        kf_open_btn = QPushButton(_('Browse'))
-        kf_open_btn.clicked.connect(self.select_ssh_key)
-
-        kf_layout = QHBoxLayout()
-        kf_layout.addWidget(self.kf)
-        kf_layout.addWidget(kf_open_btn)
-        
-        self.pw = QLineEdit()
-        self.pw.setPlaceholderText(_('Password or ssh key passphrase'))
-        self.pw.setEchoMode(QLineEdit.Password)
-
-        ssh_form = QFormLayout()
-        ssh_form.addRow(_('Host name'), self.hn)
-        ssh_form.addRow(_('Ssh key'), kf_layout)
-        ssh_form.addRow(_('Password'), self.pw)
-        
-        # Ok and Cancel buttons
-        accept_btns = QDialogButtonBox(
-            QDialogButtonBox.Ok | QDialogButtonBox.Cancel,
-            Qt.Horizontal, self)
-
-        accept_btns.accepted.connect(self.accept)
-        accept_btns.rejected.connect(self.reject)
-
-        # Dialog layout
-        layout = QVBoxLayout(self)
-        layout.addWidget(main_label)
-        layout.addLayout(cf_layout)
-        layout.addWidget(self.rm_cb)
-        layout.addLayout(ssh_form)
-        layout.addWidget(accept_btns)
-                
-        # remote kernel checkbox enables the ssh_connection_form
-        def ssh_set_enabled(state):
-            for wid in [self.hn, self.kf, kf_open_btn, self.pw]:
-                wid.setEnabled(state)
-            for i in range(ssh_form.rowCount()):
-                ssh_form.itemAt(2 * i).widget().setEnabled(state)
-       
-        ssh_set_enabled(self.rm_cb.checkState())
-        self.rm_cb.stateChanged.connect(ssh_set_enabled)
-
-    def select_connection_file(self):
-        cf = getopenfilename(self, _('Open IPython connection file'),
-                 osp.join(get_ipython_dir(), 'profile_default', 'security'),
-                 '*.json;;*.*')[0]
-        self.cf.setText(cf)
-
-    def select_ssh_key(self):
-        kf = getopenfilename(self, _('Select ssh key'), 
-                             get_ipython_dir(), '*.pem;;*.*')[0]
-        self.kf.setText(kf)
-
-    @staticmethod
-    def get_connection_parameters(parent=None):
-        dialog = KernelConnectionDialog(parent)
-        result = dialog.exec_()
-        is_remote = bool(dialog.rm_cb.checkState())
-        accepted = result == QDialog.Accepted
-        if is_remote:
-            falsy_to_none = lambda arg: arg if arg else None
-            return (dialog.cf.text(),            # connection file
-                falsy_to_none(dialog.hn.text()), # host name
-                falsy_to_none(dialog.kf.text()), # ssh key file
-                falsy_to_none(dialog.pw.text()), # ssh password
-                accepted)                        # ok
-        else:
-            return (dialog.cf.text(), None, None, None, accepted)
-
-
+#------------------------------------------------------------------------------
+# Plugin widget
+#------------------------------------------------------------------------------
 class IPythonConsole(SpyderPluginWidget):
     """
     IPython Console plugin
 
-    This is a widget with tabs where each one is an IPythonClient
+    This is a widget with tabs where each one is a ClientWidget
     """
     CONF_SECTION = 'ipython_console'
     CONFIGWIDGET_CLASS = IPythonConsoleConfigPage
@@ -585,7 +583,7 @@ class IPythonConsole(SpyderPluginWidget):
     
     # Signals
     focus_changed = Signal()
-    edit_goto = Signal(str, int, str)
+    edit_goto = Signal((str, int, str), (str, int, str, bool))
 
     def __init__(self, parent):
         if PYQT5:
@@ -604,10 +602,12 @@ class IPythonConsole(SpyderPluginWidget):
 
         self.master_clients = 0
         self.clients = []
-        
+        self.mainwindow_close = False
+        self.create_new_client_if_empty = True
+
         # Initialize plugin
         self.initialize_plugin()
-        
+
         layout = QVBoxLayout()
         self.tabwidget = Tabs(self, self.menu_actions)
         if hasattr(self.tabwidget, 'setDocumentMode')\
@@ -700,10 +700,12 @@ class IPythonConsole(SpyderPluginWidget):
 
     def closing_plugin(self, cancelable=False):
         """Perform actions before parent main window is closed"""
+        self.mainwindow_close = True
         for client in self.clients:
+            client.shutdown()
             client.close()
         return True
-    
+
     def refresh_plugin(self):
         """Refresh tabwidget"""
         client = None
@@ -713,17 +715,15 @@ class IPythonConsole(SpyderPluginWidget):
             control = client.get_control()
             control.setFocus()
             widgets = client.get_toolbar_buttons()+[5]
-            
-            # Change extconsole tab to the client's kernel widget
-            idx = self.extconsole.get_shell_index_from_id(
-                                                       client.kernel_widget_id)
-            if idx is not None:
-                self.extconsole.tabwidget.setCurrentIndex(idx)
         else:
             control = None
             widgets = []
         self.find_widget.set_editor(control)
         self.tabwidget.set_corner_widgets({Qt.TopRightCorner: widgets})
+        if client:
+            sw = client.shellwidget
+            self.variableexplorer.set_shellwidget_from_id(id(sw))
+            self.help.set_shell(sw)
         self.main.last_console_plugin_focus_was_python = False
         self.update_plugin_title.emit()
 
@@ -769,21 +769,20 @@ class IPythonConsole(SpyderPluginWidget):
         self.editor = self.main.editor
         
         self.focus_changed.connect(self.main.plugin_focus_changed)
+
         if self.editor is not None:
             self.edit_goto.connect(self.editor.load)
+            self.edit_goto[str, int, str, bool].connect(
+                             lambda fname, lineno, word, processevents:
+                                 self.editor.load(fname, lineno, word,
+                                                  processevents=processevents))
             self.editor.run_in_current_ipyclient.connect(
                                              self.run_script_in_current_client)
 
     #------ Public API (for clients) ------------------------------------------
     def get_clients(self):
         """Return clients list"""
-        return [cl for cl in self.clients if isinstance(cl, IPythonClient)]
-        
-#    def get_kernels(self):
-#        """Return IPython kernel widgets list"""
-#        return [sw for sw in self.shellwidgets
-#                if isinstance(sw, IPythonKernel)]
-#        
+        return [cl for cl in self.clients if isinstance(cl, ClientWidget)]
 
     def get_focus_client(self):
         """Return current client with focus, if any"""
@@ -798,6 +797,12 @@ class IPythonConsole(SpyderPluginWidget):
         if client is not None:
             return client
 
+    def get_current_shellwidget(self):
+        """Return the shellwidget of the current client"""
+        client = self.get_current_client()
+        if client is not None:
+            return client.shellwidget
+
     def run_script_in_current_client(self, filename, wdir, args, debug,
             post_mortem):
         """Run script in current client, if any"""
@@ -805,7 +810,7 @@ class IPythonConsole(SpyderPluginWidget):
         client = self.get_current_client()
         if client is not None:
             # Internal kernels, use runfile
-            if client.kernel_widget_id is not None:
+            if client.get_kernel() is not None:
                 line = "%s('%s'" % ('debugfile' if debug else 'runfile',
                                     norm(filename))
                 if args:
@@ -822,7 +827,7 @@ class IPythonConsole(SpyderPluginWidget):
                 line += "\"%s\"" % to_text_string(filename)
                 if args:
                     line += " %s" % norm(args)
-            self.execute_python_code(line)
+            self.execute_code(line)
             self.visibility_changed(True)
             self.raise_()
         else:
@@ -832,33 +837,207 @@ class IPythonConsole(SpyderPluginWidget):
                   "<br><br>Please open a new one and try again."
                   ) % osp.basename(filename), QMessageBox.Ok)
 
-    def execute_python_code(self, lines):
-        client = self.get_current_client()
-        if client is not None:
-            client.shellwidget.execute(to_text_string(lines))
+    def execute_code(self, lines):
+        sw = self.get_current_shellwidget()
+        if sw is not None:
+            sw.execute(to_text_string(lines))
             self.activateWindow()
-            client.get_control().setFocus()
+            self.get_current_client().get_control().setFocus()
 
     def write_to_stdin(self, line):
-        client = self.get_current_client()
-        if client is not None:
-            client.shellwidget.write_to_stdin(line)
+        sw = self.get_current_shellwidget()
+        if sw is not None:
+            sw.write_to_stdin(line)
 
     @Slot()
     def create_new_client(self, give_focus=True):
         """Create a new client"""
         self.master_clients += 1
         name = "%d/A" % self.master_clients
-        client = IPythonClient(self, name=name, history_filename='history.py',
-                               menu_actions=self.menu_actions)
+        client = ClientWidget(self, name=name,
+                              history_filename='history.py',
+                              config_options=self.config_options(),
+                              additional_options=self.additional_options(),
+                              interpreter_versions=self.interpreter_versions(),
+                              connection_file=self._new_connection_file(),
+                              menu_actions=self.menu_actions)
         self.add_tab(client, name=client.get_name())
-        self.main.extconsole.start_ipykernel(client, give_focus=give_focus)
 
-    def register_client(self, client, restart=False, give_focus=True):
-        """Register new client"""
+        # Check if ipykernel is present in the external interpreter.
+        # Else we won't be able to create a client
+        if not CONF.get('main_interpreter', 'default'):
+            pyexec = CONF.get('main_interpreter', 'executable')
+            ipykernel_present = programs.is_module_installed('ipykernel',
+                                                            interpreter=pyexec)
+            if not ipykernel_present:
+                client.show_kernel_error(_("Your Python environment or "
+                                     "installation doesn't "
+                                     "have the <tt>ipykernel</tt> module "
+                                     "installed on it. Without this module is "
+                                     "not possible for Spyder to create a "
+                                     "console for you.<br><br>"
+                                     "You can install <tt>ipykernel</tt> by "
+                                     "running in a terminal:<br><br>"
+                                     "<tt>pip install ipykernel</tt><br><br>"
+                                     "or<br><br>"
+                                     "<tt>conda install ipykernel</tt>"))
+                return
+
         self.connect_client_to_kernel(client)
-        client.show_shellwidget(give_focus=give_focus)
-        
+        self.register_client(client)
+
+    @Slot()
+    def create_client_for_kernel(self):
+        """Create a client connected to an existing kernel"""
+        connect_output = KernelConnectionDialog.get_connection_parameters(self)
+        (connection_file, hostname, sshkey, password, ok) = connect_output
+        if not ok:
+            return
+        else:
+            self._create_client_for_kernel(connection_file, hostname, sshkey,
+                                           password)
+
+    def connect_client_to_kernel(self, client):
+        """Connect a client to its kernel"""
+        connection_file = client.connection_file
+        km, kc = self.create_kernel_manager_and_kernel_client(connection_file)
+
+        kc.started_channels.connect(lambda c=client: self.process_started(c))
+        kc.stopped_channels.connect(lambda c=client: self.process_finished(c))
+        kc.start_channels(shell=True, iopub=True)
+
+        shellwidget = client.shellwidget
+        shellwidget.kernel_manager = km
+        shellwidget.kernel_client = kc
+
+    def set_editor(self):
+        """Set the editor used by the %edit magic"""
+        python = sys.executable
+        if DEV:
+            spyder_start_directory = get_module_path('spyder')
+            bootstrap_script = osp.join(osp.dirname(spyder_start_directory),
+                                        'bootstrap.py')
+            editor = u'{0} {1} --'.format(python, bootstrap_script)
+        else:
+            import1 = "import sys"
+            import2 = "from spyder.app.start import send_args_to_spyder"
+            code = "send_args_to_spyder([sys.argv[-1]])"
+            editor = u"{0} -c '{1}; {2}; {3}'".format(python,
+                                                      import1,
+                                                      import2,
+                                                      code)
+        return to_text_string(editor)
+
+    def config_options(self):
+        """
+        Generate a Trailets Config instance for shell widgets using our
+        config system
+
+        This lets us create each widget with its own config
+        """
+        # ---- Jupyter config ----
+        try:
+            full_cfg = load_pyconfig_files(['jupyter_qtconsole_config.py'],
+                                           jupyter_config_dir())
+
+            # From the full config we only select the JupyterWidget section
+            # because the others have no effect here.
+            cfg = Config({'JupyterWidget': full_cfg.JupyterWidget})
+        except:
+            cfg = Config()
+
+        # ---- Spyder config ----
+        spy_cfg = Config()
+
+        # Make the pager widget a rich one (i.e a QTextEdit)
+        spy_cfg.JupyterWidget.kind = 'rich'
+
+        # Gui completion widget
+        completion_type_o = self.get_option('completion_type')
+        completions = {0: "droplist", 1: "ncurses", 2: "plain"}
+        spy_cfg.JupyterWidget.gui_completion = completions[completion_type_o]
+
+        # Pager
+        pager_o = self.get_option('use_pager')
+        if pager_o:
+            spy_cfg.JupyterWidget.paging = 'inside'
+        else:
+            spy_cfg.JupyterWidget.paging = 'none'
+
+        # Calltips
+        calltips_o = self.get_option('show_calltips')
+        spy_cfg.JupyterWidget.enable_calltips = calltips_o
+
+        # Buffer size
+        buffer_size_o = self.get_option('buffer_size')
+        spy_cfg.JupyterWidget.buffer_size = buffer_size_o
+
+        # Prompts
+        in_prompt_o = self.get_option('in_prompt')
+        out_prompt_o = self.get_option('out_prompt')
+        if in_prompt_o:
+            spy_cfg.JupyterWidget.in_prompt = in_prompt_o
+        if out_prompt_o:
+            spy_cfg.JupyterWidget.out_prompt = out_prompt_o
+
+        # Editor for %edit
+        if CONF.get('main', 'single_instance'):
+            spy_cfg.JupyterWidget.editor = self.set_editor()
+
+        # Merge QtConsole and Spyder configs. Spyder prefs will have
+        # prevalence over QtConsole ones
+        cfg._merge(spy_cfg)
+        return cfg
+
+    def interpreter_versions(self):
+        """Python and IPython versions used by clients"""
+        if CONF.get('main_interpreter', 'default'):
+            from IPython.core import release
+            versions = dict(
+                python_version = sys.version.split("\n")[0].strip(),
+                ipython_version = release.version
+            )
+        else:
+            import subprocess
+            versions = {}
+            pyexec = CONF.get('main_interpreter', 'executable')
+            py_cmd = "%s -c 'import sys; print(sys.version.split(\"\\n\")[0])'" % \
+                     pyexec
+            ipy_cmd = "%s -c 'import IPython.core.release as r; print(r.version)'" \
+                      % pyexec
+            for cmd in [py_cmd, ipy_cmd]:
+                try:
+                    proc = programs.run_shell_command(cmd)
+                    output, _err = proc.communicate()
+                except subprocess.CalledProcessError:
+                    output = ''
+                output = output.decode().split('\n')[0].strip()
+                if 'IPython' in cmd:
+                    versions['ipython_version'] = output
+                else:
+                    versions['python_version'] = output
+
+        return versions
+
+    def additional_options(self):
+        """
+        Additional options for shell widgets that are not defined
+        in JupyterWidget config options
+        """
+        options = dict(
+            pylab = self.get_option('pylab'),
+            autoload_pylab = self.get_option('pylab/autoload'),
+            sympy = self.get_option('symbolic_math'),
+            light_color = self.get_option('light_color'),
+            show_banner = self.get_option('show_banner')
+        )
+
+        return options
+
+    def register_client(self, client, give_focus=True):
+        """Register new client"""
+        client.configure_shellwidget(give_focus=give_focus)
+
         # Local vars
         shellwidget = client.shellwidget
         control = shellwidget._control
@@ -866,62 +1045,18 @@ class IPythonConsole(SpyderPluginWidget):
 
         # Create new clients with Ctrl+T shortcut
         shellwidget.new_client.connect(self.create_new_client)
-        
-        # Handle kernel interrupts
-        extconsoles = self.extconsole.shellwidgets
-        kernel_widget = None
-        if extconsoles:
-            if extconsoles[-1].connection_file == client.connection_file:
-                kernel_widget = extconsoles[-1]
-                if restart:
-                    shellwidget.custom_interrupt_requested.disconnect()
-                shellwidget.custom_interrupt_requested.connect(
-                                              kernel_widget.keyboard_interrupt)
-        if kernel_widget is None:
-            shellwidget.custom_interrupt_requested.connect(
-                                                      client.interrupt_message)
-
-        # Connect to our variable explorer
-        if kernel_widget is not None and self.variableexplorer is not None:
-            nsb = self.variableexplorer.current_widget()
-            # When the autorefresh button is active, our kernels
-            # start to consume more and more CPU during time
-            # Fix Issue 1450
-            # ----------------
-            # When autorefresh is off by default we need the next
-            # line so that kernels don't start to consume CPU
-            # Fix Issue 1595
-            nsb.auto_refresh_button.setChecked(True)
-            nsb.auto_refresh_button.setChecked(False)
-            nsb.auto_refresh_button.setEnabled(False)
-            nsb.set_ipyclient(client)
-            client.set_namespacebrowser(nsb)
-
-        # If we are restarting the kernel we need to rename
-        # the client tab and do no more from here on
-        if restart:
-            self.rename_client_tab(client)
-            return
-        
+
         # For tracebacks
         control.go_to_error.connect(self.go_to_error)
-        
-        # Handle kernel restarts asked by the user
-        if kernel_widget is not None:
-            shellwidget.custom_restart_requested.connect(
-                                 lambda cl=client: self.restart_kernel(client))
-        else:
-            shellwidget.custom_restart_requested.connect(client.restart_message)
-        
-        # Print a message if kernel dies unexpectedly
-        shellwidget.custom_restart_kernel_died.connect(
-                                            lambda t: client.if_kernel_dies(t))
+
+        shellwidget.sig_pdb_step.connect(
+                              lambda fname, lineno, shellwidget=shellwidget:
+                              self.pdb_has_stopped(fname, lineno, shellwidget))
 
         # Connect text widget to Help
-        if kernel_widget is not None and self.help is not None:
+        if self.help is not None:
             control.set_help(self.help)
-            control.set_help_enabled(CONF.get('help',
-                                              'connect/ipython_console'))
+            control.set_help_enabled(CONF.get('help', 'connect/ipython_console'))
 
         # Connect client to our history log
         if self.historylog is not None:
@@ -956,29 +1091,29 @@ class IPythonConsole(SpyderPluginWidget):
 
         # Check if related clients or kernels are opened
         # and eventually ask before closing them
-        if not force and isinstance(client, IPythonClient):
-            kernel_index = self.extconsole.get_shell_index_from_id(
-                                                       client.kernel_widget_id)
+        if not self.mainwindow_close and not force:
             close_all = True
-            if len(self.get_related_clients(client)) > 0 and \
-              self.get_option('ask_before_closing'):
-                ans = QMessageBox.question(self, self.get_plugin_title(),
-                       _("Do you want to close all other consoles connected "
-                         "to the same kernel as this one?"),
-                       QMessageBox.Yes | QMessageBox.No | QMessageBox.Cancel)
-                if ans == QMessageBox.Cancel:
+            if self.get_option('ask_before_closing'):
+                close = QMessageBox.question(self, self.get_plugin_title(),
+                                       _("Do you want to close this console?"),
+                                       QMessageBox.Yes | QMessageBox.No)
+                if close == QMessageBox.No:
                     return
-                close_all = ans == QMessageBox.Yes
-            if close_all:
-                if kernel_index is not None:
-                    self.extconsole.close_console(index=kernel_index,
-                                                  from_ipyclient=True)
+            if len(self.get_related_clients(client)) > 0:
+                close_all = QMessageBox.question(self, self.get_plugin_title(),
+                         _("Do you want to close all other consoles connected "
+                           "to the same kernel as this one?"),
+                           QMessageBox.Yes | QMessageBox.No)
+            client.shutdown()
+            if close_all == QMessageBox.Yes:
                 self.close_related_clients(client)
         client.close()
-        
+
         # Note: client index may have changed after closing related widgets
         self.tabwidget.removeTab(self.tabwidget.indexOf(client))
         self.clients.remove(client)
+        if not self.tabwidget.count() and self.create_new_client_if_empty:
+            self.create_new_client()
         self.update_plugin_title.emit()
 
     def get_client_index_from_id(self, client_id):
@@ -986,9 +1121,9 @@ class IPythonConsole(SpyderPluginWidget):
         for index, client in enumerate(self.clients):
             if id(client) == client_id:
                 return index
-    
+
     def rename_client_tab(self, client):
-        """Add the pid of the kernel process to client tab"""
+        """Rename client's tab"""
         index = self.get_client_index_from_id(id(client))
         self.tabwidget.setTabText(index, client.get_name())
 
@@ -1009,159 +1144,148 @@ class IPythonConsole(SpyderPluginWidget):
         for cl in related_clients:
             self.close_client(client=cl, force=True)
 
+    def restart(self):
+        """
+        Restart the console
+
+        This is needed when we switch projects to update PYTHONPATH
+        and the selected interpreter
+        """
+        self.master_clients = 0
+        self.create_new_client_if_empty = False
+        for i in range(len(self.clients)):
+            client = self.clients[-1]
+            client.shutdown()
+            self.close_client(client=client, force=True)
+        self.create_new_client(give_focus=False)
+        self.create_new_client_if_empty = True
+
+    def pdb_has_stopped(self, fname, lineno, shellwidget):
+        """Python debugger has just stopped at frame (fname, lineno)"""
+        # This is a unique form of the edit_goto signal that is intended to
+        # prevent keyboard input from accidentally entering the editor
+        # during repeated, rapid entry of debugging commands.
+        self.edit_goto[str, int, str, bool].emit(fname, lineno, '', False)
+        self.activateWindow()
+        shellwidget._control.setFocus()
+
     #------ Public API (for kernels) ------------------------------------------
     def ssh_tunnel(self, *args, **kwargs):
-        if sys.platform == 'win32':
+        if os.name == 'nt':
             return zmqtunnel.paramiko_tunnel(*args, **kwargs)
         else:
             return openssh_tunnel(self, *args, **kwargs)
 
-    def tunnel_to_kernel(self, ci, hostname, sshkey=None, password=None, timeout=10):
-        """tunnel connections to a kernel via ssh. remote ports are specified in
-        the connection info ci."""
+    def tunnel_to_kernel(self, connection_info, hostname, sshkey=None,
+                         password=None, timeout=10):
+        """
+        Tunnel connections to a kernel via ssh.
+
+        Remote ports are specified in the connection info ci.
+        """
         lports = zmqtunnel.select_random_ports(4)
-        rports = ci['shell_port'], ci['iopub_port'], ci['stdin_port'], ci['hb_port']
-        remote_ip = ci['ip']
+        rports = (connection_info['shell_port'], connection_info['iopub_port'],
+                  connection_info['stdin_port'], connection_info['hb_port'])
+        remote_ip = connection_info['ip']
         for lp, rp in zip(lports, rports):
-            self.ssh_tunnel(lp, rp, hostname, remote_ip, sshkey, password, timeout)
+            self.ssh_tunnel(lp, rp, hostname, remote_ip, sshkey, password,
+                            timeout)
         return tuple(lports)
 
-    def create_kernel_manager_and_client(self, connection_file=None,
-                                         hostname=None, sshkey=None,
-                                         password=None):
-        """Create kernel manager and client"""
-        cf = find_connection_file(connection_file)
-        kernel_manager = QtKernelManager(connection_file=cf, config=None)
-        kernel_client = kernel_manager.client()
-        kernel_client.load_connection_file()
-        if hostname is not None:
-            try:
-                newports = self.tunnel_to_kernel(dict(ip=kernel_client.ip,
-                                      shell_port=kernel_client.shell_port,
-                                      iopub_port=kernel_client.iopub_port,
-                                      stdin_port=kernel_client.stdin_port,
-                                      hb_port=kernel_client.hb_port),
-                                      hostname, sshkey, password)
-                (kernel_client.shell_port, kernel_client.iopub_port,
-                 kernel_client.stdin_port, kernel_client.hb_port) = newports
-            except Exception as e:
-                QMessageBox.critical(self, _('Connection error'), 
-                                   _("Could not open ssh tunnel. The "
-                                     "error was:\n\n") + to_text_string(e))
-                return None, None
-        kernel_client.start_channels()
-        # To rely on kernel's heartbeat to know when a kernel has died
-        kernel_client.hb_channel.unpause()
-        return kernel_manager, kernel_client
-
-    def connect_client_to_kernel(self, client):
-        """
-        Connect a client to its kernel
-        """
-        km, kc = self.create_kernel_manager_and_client(client.connection_file, 
-                                                       client.hostname,
-                                                       client.sshkey,
-                                                       client.password)
-        if km is not None:
-            widget = client.shellwidget
-            widget.kernel_manager = km
-            widget.kernel_client = kc
+    def create_kernel_spec(self):
+        """Create a kernel spec for our own kernels"""
+        # Paths that we need to add to PYTHONPATH:
+        # 1. sc_path: Path to our sitecustomize
+        # 2. spy_path: Path to our main module, so we can use our config
+        #    system to configure kernels started by exterrnal interpreters
+        # 3. spy_pythonpath: Paths saved by our users with our PYTHONPATH
+        #    manager
+        spy_path = get_module_source_path('spyder')
+        sc_path = osp.join(spy_path, 'utils', 'site')
+        spy_pythonpath = self.main.get_spyder_pythonpath()
+
+        default_interpreter = CONF.get('main_interpreter', 'default')
+        if default_interpreter:
+            pathlist = [sc_path] + spy_pythonpath
+        else:
+            pathlist = [sc_path, spy_path] + spy_pythonpath
+        pypath = add_pathlist_to_PYTHONPATH([], pathlist, ipyconsole=True,
+                                            drop_env=(not default_interpreter))
 
-    @Slot()
-    def create_client_for_kernel(self):
-        """Create a client connected to an existing kernel"""
-        (cf, hostname,
-         kf, pw, ok) = KernelConnectionDialog.get_connection_parameters(self)
-        if not ok:
-            return
+        # Python interpreter used to start kernels
+        if default_interpreter:
+            pyexec = get_python_executable()
         else:
-            self._create_client_for_kernel(cf, hostname, kf, pw)
+            # Avoid IPython adding the virtualenv on which Spyder is running
+            # to the kernel sys.path
+            os.environ.pop('VIRTUAL_ENV', None)
+            pyexec = CONF.get('main_interpreter', 'executable')
+
+        # Fixes Issue #3427
+        if os.name == 'nt':
+            dir_pyexec = osp.dirname(pyexec)
+            pyexec_w = osp.join(dir_pyexec, 'pythonw.exe')
+            if osp.isfile(pyexec_w):
+                pyexec = pyexec_w
+
+        # Command used to start kernels
+        utils_path = osp.join(spy_path, 'utils', 'ipython')
+        kernel_cmd = [
+            pyexec,
+            osp.join("%s" % utils_path, "start_kernel.py"),
+            '-f',
+            '{connection_file}'
+        ]
+
+        # Environment variables that we need to pass to our sitecustomize
+        env_vars = {
+            'IPYTHON_KERNEL': 'True',
+            'EXTERNAL_INTERPRETER': not default_interpreter,
+            'UMR_ENABLED': CONF.get('main_interpreter', 'umr/enabled'),
+            'UMR_VERBOSE': CONF.get('main_interpreter', 'umr/verbose'),
+            'UMR_NAMELIST': ','.join(CONF.get('main_interpreter',
+                                              'umr/namelist'))
+        }
+
+        # Add our PYTHONPATH to env_vars
+        env_vars.update(pypath)
+
+        # Making all env_vars strings
+        for k,v in iteritems(env_vars):
+            if PY2:
+                uv = to_text_string(v)
+                env_vars[k] = to_binary_string(uv, encoding='utf-8')
+            else:
+                env_vars[k] = to_text_string(v)
 
-    def _create_client_for_kernel(self, cf, hostname, kf, pw):
-        # Verifying if the connection file exists
-        cf = osp.basename(cf)
-        try:
-            find_connection_file(cf)
-        except (IOError, UnboundLocalError):
-            QMessageBox.critical(self, _('IPython'),
-                                 _("Unable to connect to IPython <b>%s") % cf)
-            return
-        
-        # Getting the master name that corresponds to the client
-        # (i.e. the i in i/A)
-        master_name = None
-        slave_ord = ord('A') - 1
-        for cl in self.get_clients():
-            if cf in cl.connection_file:
-                cf = cl.connection_file
-                if master_name is None:
-                    master_name = cl.name.split('/')[0]
-                new_slave_ord = ord(cl.name.split('/')[1])
-                if new_slave_ord > slave_ord:
-                    slave_ord = new_slave_ord
-        
-        # If we couldn't find a client with the same connection file,
-        # it means this is a new master client
-        if master_name is None:
-            self.master_clients += 1
-            master_name = to_text_string(self.master_clients)
-        
-        # Set full client name
-        name = master_name + '/' + chr(slave_ord + 1)
-        
-        # Getting kernel_widget_id from the currently open kernels.
-        kernel_widget_id = None
-        for sw in self.extconsole.shellwidgets:
-            if sw.connection_file == cf.split('/')[-1]:  
-                kernel_widget_id = id(sw)
+        # Dict for our kernel spec
+        kernel_dict = {
+            'argv': kernel_cmd,
+            'display_name': 'Spyder',
+            'language': 'python',
+            'env': env_vars
+        }
 
-        # Creating the client
-        client = IPythonClient(self, name=name, history_filename='history.py',
-                               connection_file=cf,
-                               kernel_widget_id=kernel_widget_id,
-                               menu_actions=self.menu_actions,
-                               hostname=hostname, sshkey=kf, password=pw)
-        
-        # Adding the tab
-        self.add_tab(client, name=client.get_name())
-        
-        # Connecting kernel and client
-        self.register_client(client)
+        return KernelSpec(resource_dir='', **kernel_dict)
 
-    def restart_kernel(self, client):
-        """
-        Create a new kernel and connect it to `client` if the user asks for it
-        """
-        # Took this bit of code (until if result == ) from the IPython project
-        # (qt/frontend_widget.py - restart_kernel).
-        # Licensed under the BSD license
-        message = _('Are you sure you want to restart the kernel?')
-        buttons = QMessageBox.Yes | QMessageBox.No
-        result = QMessageBox.question(self, _('Restart kernel?'),
-                                      message, buttons)
-        if result == QMessageBox.Yes:
-            client.show_restart_animation()
-            # Close old kernel tab
-            idx = self.extconsole.get_shell_index_from_id(client.kernel_widget_id)
-            self.extconsole.close_console(index=idx, from_ipyclient=True)
-            
-            # Create a new one and connect it to the client
-            self.extconsole.start_ipykernel(client)
-    
-    def get_shellwidget_by_kernelwidget_id(self, kernel_id):
-        """Return the IPython widget associated to a kernel widget id"""
-        for cl in self.clients:
-            if cl.kernel_widget_id == kernel_id:
-                return cl.shellwidget
-        else:
-            raise ValueError("Unknown kernel widget ID %r" % kernel_id)
+    def create_kernel_manager_and_kernel_client(self, connection_file):
+        """Create kernel manager and client"""
+        # Kernel manager
+        kernel_manager = QtKernelManager(connection_file=connection_file,
+                                         config=None, autorestart=True)
+        kernel_manager._kernel_spec = self.create_kernel_spec()
+        kernel_manager.start_kernel()
+
+        # Kernel client
+        kernel_client = kernel_manager.client()
+
+        return kernel_manager, kernel_client
 
     #------ Public API (for tabs) ---------------------------------------------
     def add_tab(self, widget, name):
         """Add tab"""
         self.clients.append(widget)
-        index = self.tabwidget.addTab(widget, ima.icon('ipython_console'),
-                                      name)
+        index = self.tabwidget.addTab(widget, name)
         self.tabwidget.setCurrentIndex(index)
         if self.dockwidget and not self.ismaximized:
             self.dockwidget.setVisible(True)
@@ -1203,44 +1327,110 @@ class IPythonConsole(SpyderPluginWidget):
         from IPython.core.usage import quick_reference
         self.help.show_plain_text(quick_reference)
 
-    #----Drag and drop
-    #TODO: try and reimplement this block
-    # (this is still the original code block copied from externalconsole.py)
-#    def dragEnterEvent(self, event):
-#        """Reimplement Qt method
-#        Inform Qt about the types of data that the widget accepts"""
-#        source = event.mimeData()
-#        if source.hasUrls():
-#            if mimedata2url(source):
-#                pathlist = mimedata2url(source)
-#                shellwidget = self.tabwidget.currentWidget()
-#                if all([is_python_script(unicode(qstr)) for qstr in pathlist]):
-#                    event.acceptProposedAction()
-#                elif shellwidget is None or not shellwidget.is_running():
-#                    event.ignore()
-#                else:
-#                    event.acceptProposedAction()
-#            else:
-#                event.ignore()
-#        elif source.hasText():
-#            event.acceptProposedAction()            
-#            
-#    def dropEvent(self, event):
-#        """Reimplement Qt method
-#        Unpack dropped data and handle it"""
-#        source = event.mimeData()
-#        shellwidget = self.tabwidget.currentWidget()
-#        if source.hasText():
-#            qstr = source.text()
-#            if is_python_script(unicode(qstr)):
-#                self.start(qstr)
-#            elif shellwidget:
-#                shellwidget.shell.insert_text(qstr)
-#        elif source.hasUrls():
-#            pathlist = mimedata2url(source)
-#            if all([is_python_script(unicode(qstr)) for qstr in pathlist]):
-#                for fname in pathlist:
-#                    self.start(fname)
-#            elif shellwidget:
-#                shellwidget.shell.drop_pathlist(pathlist)
-#        event.acceptProposedAction()
+    #------ Private API -------------------------------------------------------
+    def _new_connection_file(self):
+        """
+        Generate a new connection file
+
+        Taken from jupyter_client/console_app.py
+        Licensed under the BSD license
+        """
+        # Check if jupyter_runtime_dir exists (Spyder addition)
+        if not osp.isdir(jupyter_runtime_dir()):
+            os.makedirs(jupyter_runtime_dir())
+        cf = ''
+        while not cf:
+            ident = str(uuid.uuid4()).split('-')[-1]
+            cf = os.path.join(jupyter_runtime_dir(), 'kernel-%s.json' % ident)
+            cf = cf if not os.path.exists(cf) else ''
+        return cf
+
+    def process_started(self, client):
+        if self.help is not None:
+            self.help.set_shell(client.shellwidget)
+        if self.variableexplorer is not None:
+            self.variableexplorer.add_shellwidget(client.shellwidget)
+
+    def process_finished(self, client):
+        if self.variableexplorer is not None:
+            self.variableexplorer.remove_shellwidget(id(client.shellwidget))
+
+    def _create_client_for_kernel(self, connection_file, hostname, sshkey,
+                                  password):
+        # Verifying if the connection file exists
+        try:
+            find_connection_file(osp.basename(connection_file))
+        except (IOError, UnboundLocalError):
+            QMessageBox.critical(self, _('IPython'),
+                                 _("Unable to connect to "
+                                   "<b>%s</b>") % connection_file)
+            return
+
+        # Getting the master name that corresponds to the client
+        # (i.e. the i in i/A)
+        master_name = None
+        slave_ord = ord('A') - 1
+        kernel_manager = None
+        for cl in self.get_clients():
+            if connection_file in cl.connection_file:
+                if cl.get_kernel() is not None:
+                    kernel_manager = cl.get_kernel()
+                connection_file = cl.connection_file
+                if master_name is None:
+                    master_name = cl.name.split('/')[0]
+                new_slave_ord = ord(cl.name.split('/')[1])
+                if new_slave_ord > slave_ord:
+                    slave_ord = new_slave_ord
+        
+        # If we couldn't find a client with the same connection file,
+        # it means this is a new master client
+        if master_name is None:
+            self.master_clients += 1
+            master_name = to_text_string(self.master_clients)
+
+        # Set full client name
+        name = master_name + '/' + chr(slave_ord + 1)
+
+        # Creating the client
+        client = ClientWidget(self, name=name,
+                              history_filename='history.py',
+                              config_options=self.config_options(),
+                              additional_options=self.additional_options(),
+                              interpreter_versions=self.interpreter_versions(),
+                              connection_file=connection_file,
+                              menu_actions=self.menu_actions,
+                              hostname=hostname,
+                              slave=True)
+
+        # Create kernel client
+        kernel_client = QtKernelClient(connection_file=connection_file)
+        kernel_client.load_connection_file()
+        if hostname is not None:
+            try:
+                connection_info = dict(ip = kernel_client.ip,
+                                       shell_port = kernel_client.shell_port,
+                                       iopub_port = kernel_client.iopub_port,
+                                       stdin_port = kernel_client.stdin_port,
+                                       hb_port = kernel_client.hb_port)
+                newports = self.tunnel_to_kernel(connection_info, hostname,
+                                                 sshkey, password)
+                (kernel_client.shell_port,
+                 kernel_client.iopub_port,
+                 kernel_client.stdin_port,
+                 kernel_client.hb_port) = newports
+            except Exception as e:
+                QMessageBox.critical(self, _('Connection error'),
+                                   _("Could not open ssh tunnel. The "
+                                     "error was:\n\n") + to_text_string(e))
+                return
+        kernel_client.start_channels()
+
+        # Assign kernel manager and client to shellwidget
+        client.shellwidget.kernel_client = kernel_client
+        client.shellwidget.kernel_manager = kernel_manager
+
+        # Adding a new tab for the client
+        self.add_tab(client, name=client.get_name())
+
+        # Register client
+        self.register_client(client)
diff --git a/spyderlib/plugins/layoutdialog.py b/spyder/plugins/layoutdialog.py
similarity index 95%
rename from spyderlib/plugins/layoutdialog.py
rename to spyder/plugins/layoutdialog.py
index 09bf734..3f7f109 100644
--- a/spyderlib/plugins/layoutdialog.py
+++ b/spyder/plugins/layoutdialog.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2014 Gonzalo Peña (@goanpeca)
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """Layout dialogs"""
 
@@ -17,8 +17,8 @@ from qtpy.QtWidgets import (QAbstractItemView, QComboBox, QDialog,
                             QPushButton, QTableView, QVBoxLayout)
 
 # Local imports
-from spyderlib.config.base import _
-from spyderlib.py3compat import to_text_string
+from spyder.config.base import _
+from spyder.py3compat import to_text_string
 
 
 class LayoutModel(QAbstractTableModel):
@@ -328,7 +328,7 @@ class LayoutSettingsDialog(QDialog):
 
 def test():
     """Run layout test widget test"""
-    from spyderlib.utils.qthelpers import qapplication
+    from spyder.utils.qthelpers import qapplication
 
     app = qapplication()
     names = ['test', 'tester', '20', '30', '40']
diff --git a/spyder/plugins/maininterpreter.py b/spyder/plugins/maininterpreter.py
new file mode 100644
index 0000000..4091478
--- /dev/null
+++ b/spyder/plugins/maininterpreter.py
@@ -0,0 +1,204 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright © Spyder Project Contributors
+# Licensed under the terms of the MIT License
+# (see spyder/__init__.py for details)
+
+"""Shortcut management"""
+
+# Standard library imports
+from __future__ import print_function
+
+import os
+import os.path as osp
+import sys
+
+# Third party imports
+from qtpy.QtWidgets import (QButtonGroup, QGroupBox, QInputDialog, QLabel,
+                            QLineEdit, QMessageBox, QPushButton, QVBoxLayout)
+
+# Local imports
+from spyder.config.base import _
+from spyder.plugins.configdialog import GeneralConfigPage
+from spyder.py3compat import is_text_string, to_text_string
+from spyder.utils import icon_manager as ima
+from spyder.utils.misc import get_python_executable
+from spyder.utils import programs
+
+
+class MainInterpreterConfigPage(GeneralConfigPage):
+    CONF_SECTION = "main_interpreter"
+    NAME = _("Python interpreter")
+    ICON = ima.icon('python')
+
+    def __init__(self, parent, main):
+        GeneralConfigPage.__init__(self, parent, main)
+        self.cus_exec_radio = None
+        self.pyexec_edit = None
+
+        # Python executable selection (initializing default values as well)
+        executable = self.get_option('executable', get_python_executable())
+        if self.get_option('default'):
+            executable = get_python_executable()
+
+        if not osp.isfile(executable):
+            # This is absolutely necessary, in case the Python interpreter
+            # executable has been moved since last Spyder execution (following
+            # a Python distribution upgrade for example)
+            self.set_option('executable', get_python_executable())
+        elif executable.endswith('pythonw.exe'):
+            # That should not be necessary because this case is already taken
+            # care of by the `get_python_executable` function but, this was
+            # implemented too late, so we have to fix it here too, in case
+            # the Python executable has already been set with pythonw.exe:
+            self.set_option('executable',
+                            executable.replace("pythonw.exe", "python.exe"))
+
+    def initialize(self):
+        GeneralConfigPage.initialize(self)
+        self.pyexec_edit.textChanged.connect(self.python_executable_changed)
+        self.cus_exec_radio.toggled.connect(self.python_executable_switched)
+
+    def setup_page(self):
+        newcb = self.create_checkbox
+
+        # Python executable Group
+        pyexec_group = QGroupBox(_("Python interpreter"))
+        pyexec_bg = QButtonGroup(pyexec_group)
+        pyexec_label = QLabel(_("Select the Python interpreter for all Spyder "
+                                "consoles"))
+        def_exec_radio = self.create_radiobutton(
+                                _("Default (i.e. the same as Spyder's)"),
+                                'default', button_group=pyexec_bg)
+        self.cus_exec_radio = self.create_radiobutton(
+                                _("Use the following Python interpreter:"),
+                                'custom', button_group=pyexec_bg)
+        if os.name == 'nt':
+            filters = _("Executables")+" (*.exe)"
+        else:
+            filters = None
+        pyexec_file = self.create_browsefile('', 'executable', filters=filters)
+        for le in self.lineedits:
+            if self.lineedits[le][0] == 'executable':
+                self.pyexec_edit = le
+        def_exec_radio.toggled.connect(pyexec_file.setDisabled)
+        self.cus_exec_radio.toggled.connect(pyexec_file.setEnabled)
+        pyexec_layout = QVBoxLayout()
+        pyexec_layout.addWidget(pyexec_label)
+        pyexec_layout.addWidget(def_exec_radio)
+        pyexec_layout.addWidget(self.cus_exec_radio)
+        pyexec_layout.addWidget(pyexec_file)
+        pyexec_group.setLayout(pyexec_layout)
+
+        # UMR Group
+        umr_group = QGroupBox(_("User Module Reloader (UMR)"))
+        umr_label = QLabel(_("UMR forces Python to reload modules which were "
+                             "imported when executing a file in a Python or "
+                             "IPython console with the <i>runfile</i> "
+                             "function."))
+        umr_label.setWordWrap(True)
+        umr_enabled_box = newcb(_("Enable UMR"), 'umr/enabled',
+                                msg_if_enabled=True, msg_warning=_(
+                        "This option will enable the User Module Reloader (UMR) "
+                        "in Python/IPython consoles. UMR forces Python to "
+                        "reload deeply modules during import when running a "
+                        "Python script using the Spyder's builtin function "
+                        "<b>runfile</b>."
+                        "<br><br><b>1.</b> UMR may require to restart the "
+                        "console in which it will be called "
+                        "(otherwise only newly imported modules will be "
+                        "reloaded when executing files)."
+                        "<br><br><b>2.</b> If errors occur when re-running a "
+                        "PyQt-based program, please check that the Qt objects "
+                        "are properly destroyed (e.g. you may have to use the "
+                        "attribute <b>Qt.WA_DeleteOnClose</b> on your main "
+                        "window, using the <b>setAttribute</b> method)"),
+                                )
+        umr_verbose_box = newcb(_("Show reloaded modules list"),
+                                'umr/verbose', msg_info=_(
+                                "Please note that these changes will "
+                                "be applied only to new consoles"))
+        umr_namelist_btn = QPushButton(
+                            _("Set UMR excluded (not reloaded) modules"))
+        umr_namelist_btn.clicked.connect(self.set_umr_namelist)
+
+        umr_layout = QVBoxLayout()
+        umr_layout.addWidget(umr_label)
+        umr_layout.addWidget(umr_enabled_box)
+        umr_layout.addWidget(umr_verbose_box)
+        umr_layout.addWidget(umr_namelist_btn)
+        umr_group.setLayout(umr_layout)
+
+        vlayout = QVBoxLayout()
+        vlayout.addWidget(pyexec_group)
+        vlayout.addWidget(umr_group)
+        vlayout.addStretch(1)
+        self.setLayout(vlayout)
+
+    def python_executable_changed(self, pyexec):
+        """Custom Python executable value has been changed"""
+        if not self.cus_exec_radio.isChecked():
+            return
+        if not is_text_string(pyexec):
+            pyexec = to_text_string(pyexec.toUtf8(), 'utf-8')
+        self.warn_python_compatibility(pyexec)
+
+    def python_executable_switched(self, custom):
+        """Python executable default/custom radio button has been toggled"""
+        def_pyexec = get_python_executable()
+        cust_pyexec = self.pyexec_edit.text()
+        if not is_text_string(cust_pyexec):
+            cust_pyexec = to_text_string(cust_pyexec.toUtf8(), 'utf-8')
+        if def_pyexec != cust_pyexec:
+            if custom:
+                self.warn_python_compatibility(cust_pyexec)
+
+    def warn_python_compatibility(self, pyexec):
+        if not osp.isfile(pyexec):
+            return
+        spyder_version = sys.version_info[0]
+        try:
+            args = ["-c", "import sys; print(sys.version_info[0])"]
+            proc = programs.run_program(pyexec, args)
+            console_version = int(proc.communicate()[0])
+        except IOError:
+            console_version = spyder_version
+        if spyder_version != console_version:
+            QMessageBox.warning(self, _('Warning'),
+                _("You selected a <b>Python %d</b> interpreter for the console "
+                  "but Spyder is running on <b>Python %d</b>!.<br><br>"
+                  "Although this is possible, we recommend you to install and "
+                  "run Spyder directly with your selected interpreter, to avoid "
+                  "seeing false warnings and errors due to the incompatible "
+                  "syntax between these two Python versions."
+                  ) % (console_version, spyder_version), QMessageBox.Ok)
+
+    def set_umr_namelist(self):
+        """Set UMR excluded modules name list"""
+        arguments, valid = QInputDialog.getText(self, _('UMR'),
+                                  _("Set the list of excluded modules as "
+                                    "this: <i>numpy, scipy</i>"),
+                                  QLineEdit.Normal,
+                                  ", ".join(self.get_option('umr/namelist')))
+        if valid:
+            arguments = to_text_string(arguments)
+            if arguments:
+                namelist = arguments.replace(' ', '').split(',')
+                fixed_namelist = [module_name for module_name in namelist
+                                  if programs.is_module_installed(module_name)]
+                invalid = ", ".join(set(namelist)-set(fixed_namelist))
+                if invalid:
+                    QMessageBox.warning(self, _('UMR'),
+                                        _("The following modules are not "
+                                          "installed on your machine:\n%s"
+                                          ) % invalid, QMessageBox.Ok)
+                QMessageBox.information(self, _('UMR'),
+                                    _("Please note that these changes will "
+                                      "be applied only to new Python/IPython "
+                                      "consoles"), QMessageBox.Ok)
+            else:
+                fixed_namelist = []
+            self.set_option('umr/namelist', fixed_namelist)
+
+    def apply_settings(self, options):
+        self.main.apply_settings()
diff --git a/spyderlib/plugins/onlinehelp.py b/spyder/plugins/onlinehelp.py
similarity index 88%
rename from spyderlib/plugins/onlinehelp.py
rename to spyder/plugins/onlinehelp.py
index 150b9ca..770a84c 100644
--- a/spyderlib/plugins/onlinehelp.py
+++ b/spyder/plugins/onlinehelp.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009-2010 Pierre Raybaut
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """Online Help Plugin"""
 
@@ -13,10 +13,10 @@ import os.path as osp
 from qtpy.QtCore import Signal
 
 # Local imports
-from spyderlib.config.base import _, get_conf_path
-from spyderlib.plugins import SpyderPluginMixin
-from spyderlib.py3compat import to_text_string
-from spyderlib.widgets.pydocgui import PydocBrowser
+from spyder.config.base import _, get_conf_path
+from spyder.plugins import SpyderPluginMixin
+from spyder.py3compat import to_text_string
+from spyder.widgets.pydocgui import PydocBrowser
 
 
 class OnlineHelp(PydocBrowser, SpyderPluginMixin):
diff --git a/spyderlib/plugins/outlineexplorer.py b/spyder/plugins/outlineexplorer.py
similarity index 88%
rename from spyderlib/plugins/outlineexplorer.py
rename to spyder/plugins/outlineexplorer.py
index b07f813..d09c298 100644
--- a/spyderlib/plugins/outlineexplorer.py
+++ b/spyder/plugins/outlineexplorer.py
@@ -1,25 +1,25 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """Outline Explorer Plugin
 
 Data for outline are provided by method .get_outlineexplorer_data() of
 highlighter of assigned editor. For example, for Python files code editor uses
-highlighter spyderlib.utils.syntaxhighlighters.PythonSH
+highlighter spyder.utils.syntaxhighlighters.PythonSH
 """
 
 # Third party imports
 from qtpy.QtCore import Signal
 
 # Local imports
-from spyderlib.config.base import _
-from spyderlib.plugins import SpyderPluginMixin
-from spyderlib.py3compat import is_text_string
-from spyderlib.utils import icon_manager as ima
-from spyderlib.widgets.editortools import OutlineExplorerWidget
+from spyder.config.base import _
+from spyder.plugins import SpyderPluginMixin
+from spyder.py3compat import is_text_string
+from spyder.utils import icon_manager as ima
+from spyder.widgets.editortools import OutlineExplorerWidget
 
 
 class OutlineExplorer(OutlineExplorerWidget, SpyderPluginMixin):
diff --git a/spyder/plugins/projects.py b/spyder/plugins/projects.py
new file mode 100644
index 0000000..ca3c8bf
--- /dev/null
+++ b/spyder/plugins/projects.py
@@ -0,0 +1,395 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright © Spyder Project Contributors
+# Licensed under the terms of the MIT License
+# (see spyder/__init__.py for details)
+
+"""
+Projects Plugin
+
+It handles closing, opening and switching among projetcs and also
+updating the file tree explorer associated with a project
+"""
+
+# Standard library imports
+import os.path as osp
+
+# Third party imports
+from qtpy.compat import getexistingdirectory
+from qtpy.QtCore import Signal, Slot
+from qtpy.QtWidgets import QMenu, QMessageBox
+
+# Local imports
+from spyder.config.base import _, get_home_dir
+from spyder.plugins import SpyderPluginMixin
+from spyder.py3compat import is_text_string, getcwd
+from spyder.utils import icon_manager as ima
+from spyder.utils.qthelpers import add_actions, create_action
+from spyder.widgets.projects.explorer import ProjectExplorerWidget
+from spyder.widgets.projects.projectdialog import ProjectDialog
+from spyder.widgets.projects import EmptyProject
+
+
+class Projects(ProjectExplorerWidget, SpyderPluginMixin):
+    """Projects plugin"""
+
+    CONF_SECTION = 'project_explorer'
+
+    open_terminal = Signal(str)
+    open_interpreter = Signal(str)
+    pythonpath_changed = Signal()
+
+    # File operations
+    create_module = Signal(str)
+    edit = Signal(str)
+    removed = Signal(str)
+    removed_tree = Signal(str)
+    renamed = Signal(str, str)
+    redirect_stdio = Signal(bool)
+
+    # Project handling
+    sig_project_created = Signal(object, object, object)
+    sig_project_loaded = Signal(object)
+    sig_project_closed = Signal(object)
+
+    def __init__(self, parent=None):
+        ProjectExplorerWidget.__init__(self, parent=parent,
+                    name_filters=self.get_option('name_filters'),
+                    show_all=self.get_option('show_all'),
+                    show_hscrollbar=self.get_option('show_hscrollbar'))
+        SpyderPluginMixin.__init__(self, parent)
+
+        self.recent_projects = self.get_option('recent_projects', default=[])
+        self.current_active_project = None
+        self.latest_project = None
+
+        self.editor = None
+        self.workingdirectory = None
+
+        # Initialize plugin
+        self.initialize_plugin()
+        self.setup_project(self.get_active_project_path())
+
+    #------ SpyderPluginWidget API ---------------------------------------------
+    def get_plugin_title(self):
+        """Return widget title"""
+        return _("Project explorer")
+
+    def get_focus_widget(self):
+        """
+        Return the widget to give focus to when
+        this plugin's dockwidget is raised on top-level
+        """
+        return self.treewidget
+
+    def get_plugin_actions(self):
+        """Return a list of actions related to plugin"""
+        self.new_project_action = create_action(self,
+                                    _("New Project..."),
+                                    triggered=self.create_new_project)
+        self.open_project_action = create_action(self,
+                                    _("Open Project..."),
+                                    triggered=lambda v: self.open_project())
+        self.close_project_action = create_action(self,
+                                    _("Close Project"),
+                                    triggered=self.close_project)
+        self.clear_recent_projects_action =\
+            create_action(self, _("Clear this list"),
+                          triggered=self.clear_recent_projects)
+        self.edit_project_preferences_action =\
+            create_action(self, _("Project Preferences"),
+                          triggered=self.edit_project_preferences)
+        self.recent_project_menu = QMenu(_("Recent Projects"), self)
+        explorer_action = self.toggle_view_action
+
+        self.main.projects_menu_actions += [self.new_project_action,
+                                            None,
+                                            self.open_project_action,
+                                            self.close_project_action,
+                                            None,
+                                            self.recent_project_menu,
+                                            explorer_action]
+
+        self.setup_menu_actions()
+        return []
+
+    def register_plugin(self):
+        """Register plugin in Spyder's main window"""
+        self.editor = self.main.editor
+        self.workingdirectory = self.main.workingdirectory
+
+        self.main.pythonpath_changed()
+        self.main.restore_scrollbar_position.connect(
+                                               self.restore_scrollbar_position)
+        self.pythonpath_changed.connect(self.main.pythonpath_changed)
+        self.create_module.connect(self.editor.new)
+        self.edit.connect(self.editor.load)
+        self.removed.connect(self.editor.removed)
+        self.removed_tree.connect(self.editor.removed_tree)
+        self.renamed.connect(self.editor.renamed)
+        self.editor.set_projects(self)
+        self.main.add_dockwidget(self)
+
+        self.sig_open_file.connect(self.main.open_file)
+
+        # New project connections. Order matters!
+        self.sig_project_loaded.connect(
+            lambda v: self.workingdirectory.chdir(v))
+        self.sig_project_loaded.connect(
+            lambda v: self.main.update_window_title())
+        self.sig_project_loaded.connect(
+            lambda v: self.editor.setup_open_files())
+        self.sig_project_loaded.connect(self.update_explorer)
+        self.sig_project_closed[object].connect(
+            lambda v: self.workingdirectory.chdir(self.get_last_working_dir()))
+        self.sig_project_closed.connect(
+            lambda v: self.main.update_window_title())
+        self.sig_project_closed.connect(
+            lambda v: self.editor.setup_open_files())
+        self.recent_project_menu.aboutToShow.connect(self.setup_menu_actions)
+
+    def refresh_plugin(self):
+        """Refresh project explorer widget"""
+        pass
+
+    def closing_plugin(self, cancelable=False):
+        """Perform actions before parent main window is closed"""
+        self.save_config()
+        self.closing_widget()
+        return True
+
+    #------ Public API ---------------------------------------------------------
+    def setup_menu_actions(self):
+        """Setup and update the menu actions."""
+        self.recent_project_menu.clear()
+        self.recent_projects_actions = []
+        if self.recent_projects:
+            for project in self.recent_projects:
+                if self.is_valid_project(project):
+                    name = project.replace(get_home_dir(), '~')
+                    action = create_action(self,
+                        name,
+                        icon = ima.icon('project'),
+                        triggered=lambda v, path=project: self.open_project(path=path))
+                    self.recent_projects_actions.append(action)
+                else:
+                    self.recent_projects.remove(project)
+            self.recent_projects_actions += [None,
+                                             self.clear_recent_projects_action]
+        else:
+            self.recent_projects_actions = [self.clear_recent_projects_action]
+        add_actions(self.recent_project_menu, self.recent_projects_actions)
+        self.update_project_actions()
+
+    def update_project_actions(self):
+        """Update actions of the Projects menu"""
+        if self.recent_projects:
+            self.clear_recent_projects_action.setEnabled(True)
+        else:
+            self.clear_recent_projects_action.setEnabled(False)
+
+        active = bool(self.get_active_project_path())
+        self.close_project_action.setEnabled(active)
+        self.edit_project_preferences_action.setEnabled(active)
+
+    def edit_project_preferences(self):
+        """Edit Spyder active project preferences"""
+        from spyder.widgets.projects.configdialog import ProjectPreferences
+        if self.project_active:
+            active_project = self.project_list[0]
+            dlg = ProjectPreferences(self, active_project)
+#            dlg.size_change.connect(self.set_project_prefs_size)
+#            if self.projects_prefs_dialog_size is not None:
+#                dlg.resize(self.projects_prefs_dialog_size)
+            dlg.show()
+#        dlg.check_all_settings()
+#        dlg.pages_widget.currentChanged.connect(self.__preference_page_changed)
+            dlg.exec_()
+
+    @Slot()
+    def create_new_project(self):
+        """Create new project"""
+        active_project = self.current_active_project
+        dlg = ProjectDialog(self)
+        dlg.sig_project_creation_requested.connect(self._create_project)
+        dlg.sig_project_creation_requested.connect(self.sig_project_created)
+        if dlg.exec_():
+            pass
+            if active_project is None:
+                self.show_explorer()
+            self.pythonpath_changed.emit()
+            self.restart_consoles()
+
+    def _create_project(self, path):
+        """Create a new project."""
+        self.open_project(path=path)
+        self.setup_menu_actions()
+        self.add_to_recent(path)
+
+    def open_project(self, path=None, restart_consoles=True):
+        """Open the project located in `path`"""
+        if path is None:
+            basedir = get_home_dir()
+            path = getexistingdirectory(parent=self,
+                                        caption=_("Open project"),
+                                        basedir=basedir)
+            if not self.is_valid_project(path):
+                if path:
+                    QMessageBox.critical(self, _('Error'),
+                                _("<b>%s</b> is not a Spyder project!") % path)
+                return
+            else:
+                self.add_to_recent(path)
+
+        # A project was not open before
+        if self.current_active_project is None:
+            self.editor.save_open_files()
+            self.editor.set_option('last_working_dir', getcwd())
+            self.show_explorer()
+        else: # we are switching projects
+            self.set_project_filenames(self.editor.get_open_filenames())
+
+        self.current_active_project = EmptyProject(path)
+        self.latest_project = EmptyProject(path)
+        self.set_option('current_project_path', self.get_active_project_path())
+        self.setup_menu_actions()
+        self.sig_project_loaded.emit(path)
+        self.pythonpath_changed.emit()
+        if restart_consoles:
+            self.restart_consoles()
+
+    def close_project(self):
+        """
+        Close current project and return to a window without an active
+        project
+        """
+        if self.current_active_project:
+            path = self.current_active_project.root_path
+            self.set_project_filenames(self.editor.get_open_filenames())
+            self.current_active_project = None
+            self.set_option('current_project_path', None)
+            self.setup_menu_actions()
+            self.sig_project_closed.emit(path)
+            self.pythonpath_changed.emit()
+            self.dockwidget.close()
+            self.clear()
+            self.restart_consoles()
+
+    def clear_recent_projects(self):
+        """Clear the list of recent projects"""
+        self.recent_projects = []
+        self.setup_menu_actions()
+
+    def get_active_project(self):
+        """Get the active project"""
+        return self.current_active_project
+
+    def reopen_last_project(self):
+        """
+        Reopen the active project when Spyder was closed last time, if any
+        """
+        current_project_path = self.get_option('current_project_path',
+                                               default=None)
+
+        # Needs a safer test of project existence!
+        if current_project_path and \
+          self.is_valid_project(current_project_path):
+            self.open_project(path=current_project_path,
+                              restart_consoles=False)
+            self.load_config()
+
+    def get_project_filenames(self):
+        """Get the list of recent filenames of a project"""
+        recent_files = []
+        if self.current_active_project:
+            recent_files = self.current_active_project.get_recent_files()
+        elif self.latest_project:
+            recent_files = self.latest_project.get_recent_files()
+        return recent_files
+
+    def set_project_filenames(self, recent_files):
+        """Set the list of open file names in a project"""
+        if self.current_active_project:
+            self.current_active_project.set_recent_files(recent_files)
+
+    def get_active_project_path(self):
+        """Get path of the active project"""
+        active_project_path = None
+        if self.current_active_project:
+            active_project_path = self.current_active_project.root_path
+        return active_project_path
+
+    def get_pythonpath(self, at_start=False):
+        """Get project path as a list to be added to PYTHONPATH"""
+        if at_start:
+            current_path = self.get_option('current_project_path',
+                                           default=None)
+        else:
+            current_path = self.get_active_project_path()
+        if current_path is None:
+            return []
+        else:
+            return [current_path]
+
+    def get_last_working_dir(self):
+        """Get the path of the last working directory"""
+        return self.editor.get_option('last_working_dir', default=getcwd())
+
+    def save_config(self):
+        """Save configuration: opened projects & tree widget state"""
+        self.set_option('recent_projects', self.recent_projects)
+        self.set_option('expanded_state', self.treewidget.get_expanded_state())
+        self.set_option('scrollbar_position',
+                        self.treewidget.get_scrollbar_position())
+
+    def load_config(self):
+        """Load configuration: opened projects & tree widget state"""
+        expanded_state = self.get_option('expanded_state', None)
+        # Sometimes the expanded state option may be truncated in .ini file
+        # (for an unknown reason), in this case it would be converted to a
+        # string by 'userconfig':
+        if is_text_string(expanded_state):
+            expanded_state = None
+        if expanded_state is not None:
+            self.treewidget.set_expanded_state(expanded_state)
+
+    def restore_scrollbar_position(self):
+        """Restoring scrollbar position after main window is visible"""
+        scrollbar_pos = self.get_option('scrollbar_position', None)
+        if scrollbar_pos is not None:
+            self.treewidget.set_scrollbar_position(scrollbar_pos)
+
+    def update_explorer(self):
+        """Update explorer tree"""
+        self.setup_project(self.get_active_project_path())
+
+    def show_explorer(self):
+        """Show the explorer"""
+        if self.dockwidget.isHidden():
+            self.dockwidget.show()
+        self.dockwidget.raise_()
+        self.dockwidget.update()
+
+    def restart_consoles(self):
+        """Restart consoles when closing, opening and switching projects"""
+        self.main.extconsole.restart()
+        if self.main.ipyconsole:
+            self.main.ipyconsole.restart()
+
+    def is_valid_project(self, path):
+        """Check if a directory is a valid Spyder project"""
+        spy_project_dir = osp.join(path, '.spyproject')
+        if osp.isdir(path) and osp.isdir(spy_project_dir):
+            return True
+        else:
+            return False
+
+    def add_to_recent(self, project):
+        """
+        Add an entry to recent projetcs
+
+        We only maintain the list of the 10 most recent projects
+        """
+        if project not in self.recent_projects:
+            self.recent_projects.insert(0, project)
+            self.recent_projects = self.recent_projects[:10]
diff --git a/spyderlib/plugins/runconfig.py b/spyder/plugins/runconfig.py
similarity index 95%
rename from spyderlib/plugins/runconfig.py
rename to spyder/plugins/runconfig.py
index ddab854..64a90f8 100644
--- a/spyderlib/plugins/runconfig.py
+++ b/spyder/plugins/runconfig.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2010 Pierre Raybaut
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """Run configurations related dialogs and widgets and data models"""
 
@@ -19,11 +19,11 @@ from qtpy.QtWidgets import (QButtonGroup, QCheckBox, QComboBox, QDialog,
                             QStackedWidget, QVBoxLayout, QWidget)
 
 # Local imports
-from spyderlib.config.base import _
-from spyderlib.config.main import CONF
-from spyderlib.plugins.configdialog import GeneralConfigPage
-from spyderlib.py3compat import getcwd, to_text_string
-from spyderlib.utils import icon_manager as ima
+from spyder.config.base import _
+from spyder.config.main import CONF
+from spyder.plugins.configdialog import GeneralConfigPage
+from spyder.py3compat import getcwd, to_text_string
+from spyder.utils import icon_manager as ima
 
 
 CURRENT_INTERPRETER = _("Execute in current Python or IPython console")
@@ -471,7 +471,7 @@ class RunConfigPage(GeneralConfigPage):
         interpreter_layout.addWidget(self.dedicated_radio)
         interpreter_layout.addWidget(self.systerm_radio)
         
-        general_group = QGroupBox("General settings")
+        general_group = QGroupBox(_("General settings"))
         wdir_bg = QButtonGroup(general_group)
         wdir_label = QLabel(_("Default working directory is:"))
         wdir_label.setWordWrap(True)
diff --git a/spyderlib/plugins/shortcuts.py b/spyder/plugins/shortcuts.py
similarity index 95%
rename from spyderlib/plugins/shortcuts.py
rename to spyder/plugins/shortcuts.py
index 012f4a2..bd044f6 100644
--- a/spyderlib/plugins/shortcuts.py
+++ b/spyder/plugins/shortcuts.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2010 Pierre Raybaut
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """Shortcut management"""
 
@@ -24,15 +24,15 @@ from qtpy.QtWidgets import (QAbstractItemView, QApplication, QDialog,
                             QTableView, QVBoxLayout)
 
 # Local imports
-from spyderlib.config.base import _, debug_print
-from spyderlib.config.gui import (get_shortcut, iter_shortcuts,
-                                  reset_shortcuts, set_shortcut)
-from spyderlib.plugins.configdialog import GeneralConfigPage
-from spyderlib.utils import icon_manager as ima
-from spyderlib.utils.qthelpers import get_std_icon
-from spyderlib.utils.stringmatching import get_search_scores, get_search_regex
-from spyderlib.widgets.helperwidgets import HTMLDelegate
-from spyderlib.widgets.helperwidgets import HelperToolButton
+from spyder.config.base import _, debug_print
+from spyder.config.gui import (get_shortcut, iter_shortcuts,
+                               reset_shortcuts, set_shortcut)
+from spyder.plugins.configdialog import GeneralConfigPage
+from spyder.utils import icon_manager as ima
+from spyder.utils.qthelpers import get_std_icon
+from spyder.utils.stringmatching import get_search_scores, get_search_regex
+from spyder.widgets.helperwidgets import HTMLDelegate
+from spyder.widgets.helperwidgets import HelperToolButton
 
 
 MODIFIERS = {Qt.Key_Shift: Qt.SHIFT,
@@ -830,7 +830,7 @@ class ShortcutsConfigPage(GeneralConfigPage):
 
 
 def test():
-    from spyderlib.utils.qthelpers import qapplication
+    from spyder.utils.qthelpers import qapplication
     app = qapplication()
     table = ShortcutsTable()
     table.show()
diff --git a/spyderlib/plugins/variableexplorer.py b/spyder/plugins/variableexplorer.py
similarity index 91%
rename from spyderlib/plugins/variableexplorer.py
rename to spyder/plugins/variableexplorer.py
index 03f52fb..cc84fea 100644
--- a/spyderlib/plugins/variableexplorer.py
+++ b/spyder/plugins/variableexplorer.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """Variable Explorer Plugin"""
 
@@ -11,13 +11,14 @@ from qtpy.QtCore import Signal
 from qtpy.QtWidgets import QGroupBox, QStackedWidget, QVBoxLayout, QWidget
 
 # Local imports
-from spyderlib.config.base import _
-from spyderlib.config.main import CONF
-from spyderlib.plugins import PluginConfigPage, SpyderPluginMixin
-from spyderlib.utils import programs
-from spyderlib.utils import icon_manager as ima
-from spyderlib.widgets.externalshell.monitor import REMOTE_SETTINGS
-from spyderlib.widgets.variableexplorer.namespacebrowser import NamespaceBrowser
+from spyder.config.base import _
+from spyder.config.main import CONF
+from spyder.plugins import SpyderPluginMixin
+from spyder.plugins.configdialog import PluginConfigPage
+from spyder.utils import programs
+from spyder.utils import icon_manager as ima
+from spyder.widgets.variableexplorer.namespacebrowser import NamespaceBrowser
+from spyder.widgets.variableexplorer.utils import REMOTE_SETTINGS
 
 
 class VariableExplorerConfigPage(PluginConfigPage):
@@ -133,7 +134,7 @@ class VariableExplorer(QWidget, SpyderPluginMixin):
         shellwidget_id = id(shellwidget)
         # Add shell only once: this method may be called two times in a row
         # by the External console plugin (dev. convenience)
-        from spyderlib.widgets.externalshell import systemshell
+        from spyder.widgets.externalshell import systemshell
         if isinstance(shellwidget, systemshell.ExternalSystemShell):
             return
         if shellwidget_id not in self.shellwidgets:
diff --git a/spyderlib/plugins/workingdirectory.py b/spyder/plugins/workingdirectory.py
similarity index 94%
rename from spyderlib/plugins/workingdirectory.py
rename to spyder/plugins/workingdirectory.py
index 12426ea..46627f2 100644
--- a/spyderlib/plugins/workingdirectory.py
+++ b/spyder/plugins/workingdirectory.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009-2010 Pierre Raybaut
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """Working Directory Plugin"""
 
@@ -23,13 +23,14 @@ from qtpy.QtWidgets import (QButtonGroup, QGroupBox, QHBoxLayout, QLabel,
                             QToolBar, QVBoxLayout)
 
 # Local imports
-from spyderlib.config.base import _, get_conf_path, get_home_dir
-from spyderlib.plugins import PluginConfigPage, SpyderPluginMixin
-from spyderlib.py3compat import to_text_string, getcwd
-from spyderlib.utils import encoding
-from spyderlib.utils import icon_manager as ima
-from spyderlib.utils.qthelpers import create_action
-from spyderlib.widgets.comboboxes import PathComboBox
+from spyder.config.base import _, get_conf_path, get_home_dir
+from spyder.plugins import SpyderPluginMixin
+from spyder.plugins.configdialog import PluginConfigPage
+from spyder.py3compat import to_text_string, getcwd
+from spyder.utils import encoding
+from spyder.utils import icon_manager as ima
+from spyder.utils.qthelpers import create_action
+from spyder.widgets.comboboxes import PathComboBox
 
 
 class WorkingDirectoryConfigPage(PluginConfigPage):
diff --git a/spyderlib/py3compat.py b/spyder/py3compat.py
similarity index 94%
rename from spyderlib/py3compat.py
rename to spyder/py3compat.py
index 1fbea85..548b293 100644
--- a/spyderlib/py3compat.py
+++ b/spyder/py3compat.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2012-2013 Pierre Raybaut
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """
-spyderlib.py3compat
--------------------
+spyder.py3compat
+----------------
 
 Transitional module providing compatibility functions intended to help
 migrating from Python 2 to Python 3.
diff --git a/spyderlib/pyplot.py b/spyder/pyplot.py
similarity index 100%
rename from spyderlib/pyplot.py
rename to spyder/pyplot.py
diff --git a/spyderlib/requirements.py b/spyder/requirements.py
similarity index 91%
rename from spyderlib/requirements.py
rename to spyder/requirements.py
index 24d393e..49d9bb6 100644
--- a/spyderlib/requirements.py
+++ b/spyder/requirements.py
@@ -1,9 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009-2013 Pierre Raybaut
-#           © 2012-2014 anatoly techtonik
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """Module checking Spyder installation requirements"""
 
diff --git a/spyderlib/rope_patch.py b/spyder/rope_patch.py
similarity index 93%
rename from spyderlib/rope_patch.py
rename to spyder/rope_patch.py
index 769482d..c7c74e6 100644
--- a/spyderlib/rope_patch.py
+++ b/spyder/rope_patch.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2011 Pierre Raybaut
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """
 Patching rope:
@@ -31,21 +31,21 @@ def apply():
     """Monkey patching rope
 
     See [1], [2], [3], [4] and [5] in module docstring."""
-    from spyderlib.utils.programs import is_module_installed
+    from spyder.utils.programs import is_module_installed
     if is_module_installed('rope', '<0.9.4'):
         import rope
         raise ImportError("rope %s can't be patched" % rope.VERSION)
 
     # [1] Patching project.Project for compatibility with py2exe/cx_Freeze
     #     distributions
-    from spyderlib.config.base import is_py2exe_or_cx_Freeze
+    from spyder.config.base import is_py2exe_or_cx_Freeze
     if is_py2exe_or_cx_Freeze():
         from rope.base import project
         class PatchedProject(project.Project):
             def _default_config(self):
                 # py2exe/cx_Freeze distribution
-                from spyderlib.config.base import get_module_source_path
-                fname = get_module_source_path('spyderlib',
+                from spyder.config.base import get_module_source_path
+                fname = get_module_source_path('spyder',
                                                'default_config.py')
                 return open(fname, 'rb').read()
         project.Project = PatchedProject
@@ -130,7 +130,7 @@ def apply():
     # 3. get_calltip
     # To easily get calltips of forced builtins
     from rope.contrib import codeassist
-    from spyderlib.utils.dochelpers import getdoc
+    from spyder.utils.dochelpers import getdoc
     from rope.base import exceptions
     class PatchedPyDocExtractor(codeassist.PyDocExtractor):
         def get_builtin_doc(self, pyobject):
diff --git a/spyderlib/scientific_startup.py b/spyder/scientific_startup.py
similarity index 95%
rename from spyderlib/scientific_startup.py
rename to spyder/scientific_startup.py
index cca5661..db2975c 100644
--- a/spyderlib/scientific_startup.py
+++ b/spyder/scientific_startup.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2011 Pierre Raybaut
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """
 Scientific Python startup script
diff --git a/spyder/utils/__init__.py b/spyder/utils/__init__.py
new file mode 100644
index 0000000..f226b18
--- /dev/null
+++ b/spyder/utils/__init__.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright © Spyder Project Contributors
+# Licensed under the terms of the MIT License
+# (see spyder/__init__.py for details)
+
+"""
+spyder.utils
+============
+
+Spyder utilities
+"""
diff --git a/spyderlib/utils/bsdsocket.py b/spyder/utils/bsdsocket.py
similarity index 94%
rename from spyderlib/utils/bsdsocket.py
rename to spyder/utils/bsdsocket.py
index 10946ce..ff7ccf6 100644
--- a/spyderlib/utils/bsdsocket.py
+++ b/spyder/utils/bsdsocket.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2011 Pierre Raybaut
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """BSD socket interface communication utilities"""
 
@@ -18,9 +18,9 @@ import errno
 import traceback
 
 # Local imports
-from spyderlib.config.base import DEBUG, STDERR
+from spyder.config.base import DEBUG, STDERR
 DEBUG_EDITOR = DEBUG >= 3
-from spyderlib.py3compat import pickle
+from spyder.py3compat import pickle
 PICKLE_HIGHEST_PROTOCOL = 2
 
 
diff --git a/spyderlib/utils/codeanalysis.py b/spyder/utils/codeanalysis.py
similarity index 91%
rename from spyderlib/utils/codeanalysis.py
rename to spyder/utils/codeanalysis.py
index 57bd21a..894fd0f 100644
--- a/spyderlib/utils/codeanalysis.py
+++ b/spyder/utils/codeanalysis.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2011 Pierre Raybaut
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """
 Source code analysis utilities
@@ -15,10 +15,10 @@ import tempfile
 import traceback
 
 # Local import
-from spyderlib.config.base import _, DEBUG
-from spyderlib.utils import programs, encoding
-from spyderlib.py3compat import to_text_string, to_binary_string, PY3
-from spyderlib import dependencies
+from spyder.config.base import _, DEBUG
+from spyder.utils import programs, encoding
+from spyder.py3compat import to_text_string, to_binary_string, PY3
+from spyder import dependencies
 DEBUG_EDITOR = DEBUG >= 3
 
 #==============================================================================
@@ -78,7 +78,7 @@ def check_with_pyflakes(source_code, filename=None):
                     results.append((warning.message % warning.message_args,
                                     warning.lineno))
     except Exception:
-        # Never return None to avoid lock in spyderlib/widgets/editor.py
+        # Never return None to avoid lock in spyder/widgets/editor.py
         # See Issue 1547
         results = []
         if DEBUG_EDITOR:
@@ -170,7 +170,7 @@ def check_with_pep8(source_code, filename=None):
         args = get_checker_executable('pep8')
         results = check(args, source_code, filename=filename, options=['-r'])
     except Exception:
-        # Never return None to avoid lock in spyderlib/widgets/editor.py
+        # Never return None to avoid lock in spyder/widgets/editor.py
         # See Issue 1547
         results = []
         if DEBUG_EDITOR:
diff --git a/spyderlib/utils/debug.py b/spyder/utils/debug.py
similarity index 93%
rename from spyderlib/utils/debug.py
rename to spyder/utils/debug.py
index 86af242..3b7dcc2 100644
--- a/spyderlib/utils/debug.py
+++ b/spyder/utils/debug.py
@@ -1,15 +1,14 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009-2013 Pierre Raybaut
-# Copyright © 2012-2013 anatoly techtonik
+# Copyright © Spyder Project Contributors
 #
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """
 Debug utilities that are independent of Spyder code.
 
-See spyderlib.config.base for other helpers.
+See spyder.config.base for other helpers.
 """
 
 from __future__ import print_function
diff --git a/spyderlib/utils/dochelpers.py b/spyder/utils/dochelpers.py
similarity index 94%
rename from spyderlib/utils/dochelpers.py
rename to spyder/utils/dochelpers.py
index 0e2801b..50c090c 100644
--- a/spyderlib/utils/dochelpers.py
+++ b/spyder/utils/dochelpers.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009-2010 Pierre Raybaut
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """Utilities and wrappers around inspect module"""
 
@@ -12,10 +12,10 @@ import inspect
 import re
 
 # Local imports:
-from spyderlib.utils import encoding
-from spyderlib.py3compat import (is_text_string, builtins, get_meth_func,
-                                 get_meth_class_inst, get_meth_class,
-                                 get_func_defaults, to_text_string)
+from spyder.utils import encoding
+from spyder.py3compat import (is_text_string, builtins, get_meth_func,
+                              get_meth_class_inst, get_meth_class,
+                              get_func_defaults, to_text_string)
 
 
 SYMBOLS = r"[^\'\"a-zA-Z0-9_.]"
diff --git a/spyderlib/utils/encoding.py b/spyder/utils/encoding.py
similarity index 94%
rename from spyderlib/utils/encoding.py
rename to spyder/utils/encoding.py
index 2d5058c..9ea16ab 100644
--- a/spyderlib/utils/encoding.py
+++ b/spyder/utils/encoding.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009-2010 Pierre Raybaut
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """
 Text encoding utilities, text file I/O
@@ -18,8 +18,8 @@ import sys
 from codecs import BOM_UTF8, BOM_UTF16, BOM_UTF32, getincrementaldecoder
 
 # Local imports
-from spyderlib.py3compat import (is_string, to_text_string, is_binary_string,
-                                 is_unicode)
+from spyder.py3compat import (is_string, to_text_string, is_binary_string,
+                              is_unicode)
 
 
 PREFERRED_ENCODING = locale.getpreferredencoding()
diff --git a/spyderlib/utils/environ.py b/spyder/utils/environ.py
similarity index 90%
rename from spyderlib/utils/environ.py
rename to spyder/utils/environ.py
index 0e45244..27ab813 100644
--- a/spyderlib/utils/environ.py
+++ b/spyder/utils/environ.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """
 Environment variable utilities
@@ -15,9 +15,9 @@ import os
 from qtpy.QtWidgets import QDialog, QMessageBox
 
 # Local imports
-from spyderlib.config.base import _
-from spyderlib.utils import icon_manager as ima
-from spyderlib.widgets.variableexplorer.collectionseditor import CollectionsEditor
+from spyder.config.base import _
+from spyder.utils import icon_manager as ima
+from spyder.widgets.variableexplorer.collectionseditor import CollectionsEditor
 
 
 def envdict2listdict(envdict):
@@ -62,7 +62,7 @@ class EnvDialog(RemoteEnvDialog):
 
 # For Windows only
 try:
-    from spyderlib.py3compat import winreg
+    from spyder.py3compat import winreg
 
     def get_user_env():
         """Return HKCU (current user) environment variables"""
@@ -132,7 +132,7 @@ except ImportError:
 
 def main():
     """Run Windows environment variable editor"""
-    from spyderlib.utils.qthelpers import qapplication
+    from spyder.utils.qthelpers import qapplication
     app = qapplication()
     if os.name == 'nt':
         dialog = WinUserEnvDialog()
diff --git a/spyderlib/utils/external/__init__.py b/spyder/utils/external/__init__.py
similarity index 69%
rename from spyderlib/utils/external/__init__.py
rename to spyder/utils/external/__init__.py
index 0f2afcf..3c9c93d 100644
--- a/spyderlib/utils/external/__init__.py
+++ b/spyder/utils/external/__init__.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2011 Pierre Raybaut
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """
-spyderlib.utils.external
-========================
+spyder.utils.external
+=====================
 
 External libraries needed for Spyder to work.
 Put here only untouched libraries, else put them in utils.
@@ -19,7 +19,7 @@ import os
 if os.name == 'nt':
     import os.path as osp
     import sys
-    from spyderlib.config.base import get_module_source_path
+    from spyder.config.base import get_module_source_path
 
     dirname = get_module_source_path(__name__)
     if osp.isdir(osp.join(dirname, 'rope')):
diff --git a/spyderlib/utils/external/lockfile.py b/spyder/utils/external/lockfile.py
similarity index 95%
rename from spyderlib/utils/external/lockfile.py
rename to spyder/utils/external/lockfile.py
index f05d2c4..fdb043c 100644
--- a/spyderlib/utils/external/lockfile.py
+++ b/spyder/utils/external/lockfile.py
@@ -1,6 +1,6 @@
 # Copyright (c) 2005 Divmod, Inc.
 # Copyright (c) Twisted Matrix Laboratories.
-# Copyright (c) 2013 The Spyder Development Team
+# Copyright (c) Spyder Project Contributors
 # Twisted is distributed under the MIT license.
 
 """
@@ -16,7 +16,7 @@ import errno, os
 
 from time import time as _uniquefloat
 
-from spyderlib.py3compat import PY2, to_binary_string
+from spyder.py3compat import PY2, to_binary_string
 
 def unique():
     if PY2:
diff --git a/spyderlib/utils/fixtures.py b/spyder/utils/fixtures.py
similarity index 83%
rename from spyderlib/utils/fixtures.py
rename to spyder/utils/fixtures.py
index 380d651..63a0c86 100644
--- a/spyderlib/utils/fixtures.py
+++ b/spyder/utils/fixtures.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
 #
 
@@ -16,8 +16,8 @@ import tempfile
 import pytest
 
 # Local imports
-from spyderlib.config.user import UserConfig
-from spyderlib.config.main import CONF_VERSION, DEFAULTS
+from spyder.config.user import UserConfig
+from spyder.config.main import CONF_VERSION, DEFAULTS
 
 
 @pytest.fixture
diff --git a/spyderlib/utils/help/__init__.py b/spyder/utils/help/__init__.py
similarity index 60%
rename from spyderlib/utils/help/__init__.py
rename to spyder/utils/help/__init__.py
index a87a85c..982e94a 100644
--- a/spyderlib/utils/help/__init__.py
+++ b/spyder/utils/help/__init__.py
@@ -1,16 +1,16 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- Spyder Development team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT or BSD Licenses
 # (See every file for its license)
 
 """
-spyderlib.utils.help
-====================
+spyder.utils.help
+=================
 
 Configuration files for the Help plugin rich text mode
 """
 
 import sys
-from spyderlib.config.base import get_module_source_path
+from spyder.config.base import get_module_source_path
 sys.path.insert(0, get_module_source_path(__name__))
diff --git a/spyderlib/utils/help/conf.py b/spyder/utils/help/conf.py
similarity index 95%
rename from spyderlib/utils/help/conf.py
rename to spyder/utils/help/conf.py
index f06a2ff..134ed46 100644
--- a/spyderlib/utils/help/conf.py
+++ b/spyder/utils/help/conf.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2009 Tim Dumol <tim at timdumol.com>
-# Copyright (C) 2009- The Spyder Development Team
+# Copyright (C) Spyder Project Contributors
 # Distributed under the terms of the BSD License
 
 """Sphinx conf file for the Help plugin rich text mode"""
@@ -10,8 +10,8 @@
 from sphinx import __version__ as sphinx_version
 
 # Local imports
-from spyderlib.config.main import CONF
-from spyderlib.py3compat import u
+from spyder.config.main import CONF
+from spyder.py3compat import u
 
 #==============================================================================
 # General configuration
@@ -54,7 +54,7 @@ master_doc = 'docstring'
 
 # General information about the project.
 project = u("Spyder Help plugin")
-copyright = u('2009--2013, The Spyder Development Team')
+copyright = u('The Spyder Project Contributors')
 
 # List of directories, relative to source directory, that shouldn't be searched
 # for source files.
diff --git a/spyderlib/utils/help/js/collapse_sections.js b/spyder/utils/help/js/collapse_sections.js
similarity index 100%
rename from spyderlib/utils/help/js/collapse_sections.js
rename to spyder/utils/help/js/collapse_sections.js
diff --git a/spyderlib/utils/help/js/copy_button.js b/spyder/utils/help/js/copy_button.js
similarity index 100%
rename from spyderlib/utils/help/js/copy_button.js
rename to spyder/utils/help/js/copy_button.js
diff --git a/spyderlib/utils/help/js/fix_image_paths.js b/spyder/utils/help/js/fix_image_paths.js
similarity index 92%
rename from spyderlib/utils/help/js/fix_image_paths.js
rename to spyder/utils/help/js/fix_image_paths.js
index 5c2c995..8e3a10b 100644
--- a/spyderlib/utils/help/js/fix_image_paths.js
+++ b/spyder/utils/help/js/fix_image_paths.js
@@ -1,7 +1,7 @@
 //----------------------------------------------------------------------------
 //  Set absolute path for images
 //
-//  Copyright 2014 by The Spyder development team
+//  Copyright (c) Spyder Project Contributors
 //
 //  Distributed under the terms of the MIT License
 //----------------------------------------------------------------------------
diff --git a/spyderlib/utils/help/js/math_config.js b/spyder/utils/help/js/math_config.js
similarity index 98%
rename from spyderlib/utils/help/js/math_config.js
rename to spyder/utils/help/js/math_config.js
index f380625..3e5dcce 100644
--- a/spyderlib/utils/help/js/math_config.js
+++ b/spyder/utils/help/js/math_config.js
@@ -1,7 +1,7 @@
 //----------------------------------------------------------------------------
 //  Math configuration options and hacks
 //
-//  Copyright (C) 2012 - The Spyder Team
+//  Copyright (C) Spyder Project Contributors
 //
 //  Distributed under the terms of the MIT License.
 //----------------------------------------------------------------------------
diff --git a/spyderlib/utils/help/js/move_outline.js b/spyder/utils/help/js/move_outline.js
similarity index 92%
rename from spyderlib/utils/help/js/move_outline.js
rename to spyder/utils/help/js/move_outline.js
index 40202ae..f880644 100644
--- a/spyderlib/utils/help/js/move_outline.js
+++ b/spyder/utils/help/js/move_outline.js
@@ -1,7 +1,7 @@
 //----------------------------------------------------------------------------
 //  Move Outline section to be the first one
 //
-//  Copyright 2014 by The Spyder development team
+//  Copyright (c) Spyder Project Contributors
 //
 //  Distributed under the terms of the MIT License
 //----------------------------------------------------------------------------
diff --git a/spyderlib/utils/help/js/utils.js b/spyder/utils/help/js/utils.js
similarity index 96%
rename from spyderlib/utils/help/js/utils.js
rename to spyder/utils/help/js/utils.js
index eb1fa71..513d938 100644
--- a/spyderlib/utils/help/js/utils.js
+++ b/spyder/utils/help/js/utils.js
@@ -2,7 +2,7 @@
 //  Several utility functions to modify docstring webpages while they are
 //  rendered
 //
-//  Copyright (C) 2012 - The Spyder Team
+//  Copyright (C) Spyder Project Contributors
 //
 //  Distributed under the terms of the MIT License.
 //----------------------------------------------------------------------------
diff --git a/spyderlib/utils/help/sphinxify.py b/spyder/utils/help/sphinxify.py
similarity index 93%
rename from spyderlib/utils/help/sphinxify.py
rename to spyder/utils/help/sphinxify.py
index a9c0027..9145bed 100644
--- a/spyderlib/utils/help/sphinxify.py
+++ b/spyder/utils/help/sphinxify.py
@@ -5,10 +5,10 @@ Process docstrings with Sphinx
 
 AUTHORS:
 - Tim Joseph Dumol (2009-09-29): initial version
-- The Spyder Development Team: Several changes to make it work with Spyder
+- The Spyder Project Contributors: Several changes to make it work with Spyder
 
 Copyright (C) 2009 Tim Dumol <tim at timdumol.com>
-Copyright (C) 2009- The Spyder Development Team
+Copyright (C) Spyder Project Contributors
 Distributed under the terms of the BSD License
 
 Taken from the Sage project (www.sagemath.org).
@@ -32,9 +32,9 @@ import sphinx
 from sphinx.application import Sphinx
 
 # Local imports
-from spyderlib.config.base import (_, get_module_data_path,
-                                  get_module_source_path)
-from spyderlib.utils import encoding
+from spyder.config.base import (_, get_module_data_path,
+                                get_module_source_path)
+from spyder.utils import encoding
 
 
 #-----------------------------------------------------------------------------
@@ -43,18 +43,18 @@ from spyderlib.utils import encoding
 
 # Note: we do not use __file__ because it won't be working in the stand-alone
 # version of Spyder (i.e. the py2exe or cx_Freeze build)
-CONFDIR_PATH = get_module_source_path('spyderlib.utils.help')
+CONFDIR_PATH = get_module_source_path('spyder.utils.help')
 CSS_PATH = osp.join(CONFDIR_PATH, 'static', 'css')
 JS_PATH = osp.join(CONFDIR_PATH, 'js')
 
 # To let Debian packagers redefine the MathJax and JQuery locations so they can
 # use their own packages for them. See Issue 1230, comment #7.
-MATHJAX_PATH = get_module_data_path('spyderlib',
+MATHJAX_PATH = get_module_data_path('spyder',
                                     relpath=osp.join('utils', 'help',
                                                      JS_PATH, 'mathjax'),
                                     attr_name='MATHJAXPATH')
 
-JQUERY_PATH = get_module_data_path('spyderlib',
+JQUERY_PATH = get_module_data_path('spyder',
                                    relpath=osp.join('utils', 'help',
                                                     JS_PATH),
                                    attr_name='JQUERYPATH')
@@ -202,7 +202,7 @@ def sphinxify(docstring, context, buildername='html'):
         confdir = encoding.to_unicode_from_fs(confdir)
         generate_configuration(confdir)
     else:
-        confdir = osp.join(get_module_source_path('spyderlib.utils.help'))
+        confdir = osp.join(get_module_source_path('spyder.utils.help'))
 
     confoverrides = {'html_context': context}
 
@@ -247,7 +247,7 @@ def generate_configuration(directory):
     """
     
     # conf.py file for Sphinx
-    conf = osp.join(get_module_source_path('spyderlib.utils.help'),
+    conf = osp.join(get_module_source_path('spyder.utils.help'),
                     'conf.py')
 
     # Docstring layout page (in Jinja):
diff --git a/spyderlib/utils/help/static/css/default.css b/spyder/utils/help/static/css/default.css
similarity index 100%
rename from spyderlib/utils/help/static/css/default.css
rename to spyder/utils/help/static/css/default.css
diff --git a/spyderlib/utils/help/static/css/pygments.css b/spyder/utils/help/static/css/pygments.css
similarity index 100%
rename from spyderlib/utils/help/static/css/pygments.css
rename to spyder/utils/help/static/css/pygments.css
diff --git a/spyderlib/utils/help/static/images/collapse_expand.png b/spyder/utils/help/static/images/collapse_expand.png
similarity index 100%
rename from spyderlib/utils/help/static/images/collapse_expand.png
rename to spyder/utils/help/static/images/collapse_expand.png
diff --git a/spyderlib/utils/help/static/images/debug-continue.png b/spyder/utils/help/static/images/debug-continue.png
similarity index 100%
rename from spyderlib/utils/help/static/images/debug-continue.png
rename to spyder/utils/help/static/images/debug-continue.png
diff --git a/spyderlib/utils/help/static/images/debug-step-in.png b/spyder/utils/help/static/images/debug-step-in.png
similarity index 100%
rename from spyderlib/utils/help/static/images/debug-step-in.png
rename to spyder/utils/help/static/images/debug-step-in.png
diff --git a/spyderlib/utils/help/static/images/debug-step-out.png b/spyder/utils/help/static/images/debug-step-out.png
similarity index 100%
rename from spyderlib/utils/help/static/images/debug-step-out.png
rename to spyder/utils/help/static/images/debug-step-out.png
diff --git a/spyderlib/utils/help/static/images/debug-step-over.png b/spyder/utils/help/static/images/debug-step-over.png
similarity index 100%
rename from spyderlib/utils/help/static/images/debug-step-over.png
rename to spyder/utils/help/static/images/debug-step-over.png
diff --git a/spyderlib/utils/help/static/images/spyder-hello-docstring.png b/spyder/utils/help/static/images/spyder-hello-docstring.png
similarity index 100%
rename from spyderlib/utils/help/static/images/spyder-hello-docstring.png
rename to spyder/utils/help/static/images/spyder-hello-docstring.png
diff --git a/spyderlib/utils/help/static/images/spyder-nice-docstring-rendering.png b/spyder/utils/help/static/images/spyder-nice-docstring-rendering.png
similarity index 100%
rename from spyderlib/utils/help/static/images/spyder-nice-docstring-rendering.png
rename to spyder/utils/help/static/images/spyder-nice-docstring-rendering.png
diff --git a/spyderlib/utils/help/static/images/spyder-sympy-example.png b/spyder/utils/help/static/images/spyder-sympy-example.png
similarity index 100%
rename from spyderlib/utils/help/static/images/spyder-sympy-example.png
rename to spyder/utils/help/static/images/spyder-sympy-example.png
diff --git a/spyderlib/utils/help/templates/layout.html b/spyder/utils/help/templates/layout.html
similarity index 97%
rename from spyderlib/utils/help/templates/layout.html
rename to spyder/utils/help/templates/layout.html
index 93f7265..d56d044 100644
--- a/spyderlib/utils/help/templates/layout.html
+++ b/spyder/utils/help/templates/layout.html
@@ -4,7 +4,7 @@
 
     Layout template for the Help plugin
 
-    :copyright: Copyright 2009- by the Spyder Development Team.
+    :copyright: Copyright (c) Spyder Project Contributors.
     :copyright: Copyright 2009 by Tim Dumol <tim at timdumol.com>
     :license: BSD license
 #}
diff --git a/spyderlib/utils/help/templates/usage.html b/spyder/utils/help/templates/usage.html
similarity index 93%
rename from spyderlib/utils/help/templates/usage.html
rename to spyder/utils/help/templates/usage.html
index d94231f..04b9e15 100644
--- a/spyderlib/utils/help/templates/usage.html
+++ b/spyder/utils/help/templates/usage.html
@@ -4,7 +4,7 @@
 
     A simple page to inform users how to get help on the Help plugin
 
-    :copyright: Copyright 2009- by the Spyder Development Team.
+    :copyright: Copyright (c) Spyder Project Contributors.
     :license: MIT license
 #}
 
diff --git a/spyder/utils/help/templates/warning.html b/spyder/utils/help/templates/warning.html
new file mode 100644
index 0000000..bf86280
--- /dev/null
+++ b/spyder/utils/help/templates/warning.html
@@ -0,0 +1,26 @@
+{#
+    warning.html
+    ~~~~~~~~~~~
+
+    A simple page to emit a warning when no docstring text was found for the
+    one a user was looking for
+
+    :copyright: Copyright (c) Spyder Project Contributors
+    :license: MIT license
+#}
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html>
+
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <link rel="stylesheet" href="file:///{{css_path}}/default.css" type="text/css" />
+</head>
+
+<body>
+  <div id="doc-warning">{{text}}</div>
+</body>
+
+</html>
diff --git a/spyderlib/utils/help/tutorial.rst b/spyder/utils/help/tutorial.rst
similarity index 100%
rename from spyderlib/utils/help/tutorial.rst
rename to spyder/utils/help/tutorial.rst
diff --git a/spyderlib/utils/icon_manager.py b/spyder/utils/icon_manager.py
similarity index 98%
rename from spyderlib/utils/icon_manager.py
rename to spyder/utils/icon_manager.py
index 9b49b05..2fbea0f 100644
--- a/spyderlib/utils/icon_manager.py
+++ b/spyder/utils/icon_manager.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 # Standard library imports
 import os.path as osp
@@ -12,8 +12,8 @@ from qtpy.QtGui import QIcon
 from qtpy.QtWidgets import QStyle, QWidget
 
 # Local imports
-from spyderlib.config.base import get_image_path
-from spyderlib.config.main import CONF
+from spyder.config.base import get_image_path
+from spyder.config.main import CONF
 import qtawesome as qta
 
 
@@ -173,6 +173,7 @@ _qtaargs = {
     'MessageBoxInformation':   [('fa.info',), {'color': '3775a9'}],
     'DirOpenIcon':             [('fa.folder-open',), {}],
     'FileIcon':                [('fa.file-o',), {}],
+    'project':                 [('fa.folder-open-o',), {}],
     'DriveHDIcon':             [('fa.hdd-o',), {}],
     'arrow':                   [('fa.arrow-right',), {}],
     'collapse':                [('spyder.inward',), {}],
diff --git a/spyderlib/widgets/externalshell/inputhooks.py b/spyder/utils/inputhooks.py
similarity index 100%
rename from spyderlib/widgets/externalshell/inputhooks.py
rename to spyder/utils/inputhooks.py
diff --git a/spyderlib/utils/introspection/__init__.py b/spyder/utils/introspection/__init__.py
similarity index 54%
rename from spyderlib/utils/introspection/__init__.py
rename to spyder/utils/introspection/__init__.py
index 76f4784..0a12ff5 100644
--- a/spyderlib/utils/introspection/__init__.py
+++ b/spyder/utils/introspection/__init__.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2013 The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """
 Introspection utilities used by Spyder
diff --git a/spyderlib/utils/introspection/fallback_plugin.py b/spyder/utils/introspection/fallback_plugin.py
similarity index 93%
rename from spyderlib/utils/introspection/fallback_plugin.py
rename to spyder/utils/introspection/fallback_plugin.py
index 1e6cc2d..4dbca69 100644
--- a/spyderlib/utils/introspection/fallback_plugin.py
+++ b/spyder/utils/introspection/fallback_plugin.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2013 The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """
 Introspection utilities used by Spyder
@@ -17,11 +17,11 @@ import time
 
 from pygments.token import Token
 
-from spyderlib.utils.debug import log_dt
-from spyderlib.utils import sourcecode, encoding
-from spyderlib.utils.introspection.manager import (
+from spyder.utils.debug import log_dt
+from spyder.utils import sourcecode, encoding
+from spyder.utils.introspection.manager import (
     DEBUG_EDITOR, LOG_FILENAME, IntrospectionPlugin)
-from spyderlib.utils.introspection.utils import (
+from spyder.utils.introspection.utils import (
     get_parent_until, memoize, find_lexer_for_filename, get_keywords)
 
 
@@ -308,7 +308,7 @@ def _complete_path(path=None):
 
 
 if __name__ == '__main__':
-    from spyderlib.utils.introspection.manager import CodeInfo
+    from spyder.utils.introspection.manager import CodeInfo
 
     p = FallbackPlugin()
 
@@ -356,9 +356,9 @@ if __name__ == '__main__':
     assert '.cpp' in ext and '.html' in ext
 
     path = get_parent_until(os.path.abspath(__file__))
-    assert path == 'spyderlib.utils.introspection.fallback_plugin'
+    assert path == 'spyder.utils.introspection.fallback_plugin'
 
-    line = 'from spyderlib.widgets.sourcecode.codeeditor import CodeEditor'
+    line = 'from spyder.widgets.sourcecode.codeeditor import CodeEditor'
     path = python_like_mod_finder(line)
     assert path.endswith('codeeditor.py')
     path = python_like_mod_finder(line, stop_token='sourcecode')
diff --git a/spyderlib/utils/introspection/jedi_plugin.py b/spyder/utils/introspection/jedi_plugin.py
similarity index 94%
rename from spyderlib/utils/introspection/jedi_plugin.py
rename to spyder/utils/introspection/jedi_plugin.py
index 34caeea..63135b7 100644
--- a/spyderlib/utils/introspection/jedi_plugin.py
+++ b/spyder/utils/introspection/jedi_plugin.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """
 Jedi Introspection Plugin
@@ -12,14 +12,14 @@ import os.path as osp
 import sys
 import time
 
-from spyderlib.config.base import debug_print
-from spyderlib.utils import programs
-from spyderlib.utils.debug import log_last_error, log_dt
-from spyderlib.utils.dochelpers import getsignaturefromtext
-from spyderlib.utils.introspection.manager import (
+from spyder.config.base import debug_print
+from spyder.utils import programs
+from spyder.utils.debug import log_last_error, log_dt
+from spyder.utils.dochelpers import getsignaturefromtext
+from spyder.utils.introspection.manager import (
     DEBUG_EDITOR, LOG_FILENAME, IntrospectionPlugin)
-from spyderlib.utils.introspection.utils import get_parent_until
-from spyderlib.utils.introspection.manager import JEDI_REQVER
+from spyder.utils.introspection.utils import get_parent_until
+from spyder.utils.introspection.manager import JEDI_REQVER
 
 try:
     import jedi
@@ -235,7 +235,7 @@ class JediPlugin(IntrospectionPlugin):
 
 if __name__ == '__main__':
 
-    from spyderlib.utils.introspection.manager import CodeInfo
+    from spyder.utils.introspection.manager import CodeInfo
 
     p = JediPlugin()
     p.load_plugin()
diff --git a/spyderlib/utils/introspection/manager.py b/spyder/utils/introspection/manager.py
similarity index 94%
rename from spyderlib/utils/introspection/manager.py
rename to spyder/utils/introspection/manager.py
index 9c68728..edce2da 100644
--- a/spyderlib/utils/introspection/manager.py
+++ b/spyder/utils/introspection/manager.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2015 The Spyder development team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 # Standard library imports
 from __future__ import print_function
@@ -14,11 +14,11 @@ from qtpy.QtCore import QObject, QTimer, Signal
 from qtpy.QtWidgets import QApplication
 
 # Local imports
-from spyderlib import dependencies
-from spyderlib.config.base import _, DEBUG, debug_print, get_conf_path
-from spyderlib.utils import sourcecode
-from spyderlib.utils.introspection.plugin_client import PluginClient
-from spyderlib.utils.introspection.utils import CodeInfo
+from spyder import dependencies
+from spyder.config.base import _, DEBUG, debug_print, get_conf_path
+from spyder.utils import sourcecode
+from spyder.utils.introspection.plugin_client import PluginClient
+from spyder.utils.introspection.utils import CodeInfo
 
 
 PLUGINS = ['rope', 'jedi', 'fallback']
diff --git a/spyderlib/utils/introspection/module_completion.py b/spyder/utils/introspection/module_completion.py
similarity index 95%
rename from spyderlib/utils/introspection/module_completion.py
rename to spyder/utils/introspection/module_completion.py
index b87c6fc..ae9beea 100644
--- a/spyderlib/utils/introspection/module_completion.py
+++ b/spyder/utils/introspection/module_completion.py
@@ -14,7 +14,7 @@
 #
 #  Distributed under the terms of the BSD License.
 #  Copyright (C) 2010-2011 The IPython Development Team.
-#  Copyright (C) 2013 The Spyder Development Team
+#  Copyright (C) Spyder Project Contributors
 #
 #------------------------------------------------------------------------------
 
@@ -27,8 +27,8 @@ from time import time
 import sys
 from zipimport import zipimporter
 
-from spyderlib.config.base import get_conf_path, running_in_mac_app
-from spyderlib.py3compat import PY3
+from spyder.config.base import get_conf_path, running_in_mac_app
+from spyder.py3compat import PY3
 
 from pickleshare import PickleShareDB
 
diff --git a/spyderlib/utils/introspection/plugin_client.py b/spyder/utils/introspection/plugin_client.py
similarity index 96%
rename from spyderlib/utils/introspection/plugin_client.py
rename to spyder/utils/introspection/plugin_client.py
index befef03..6398d35 100644
--- a/spyderlib/utils/introspection/plugin_client.py
+++ b/spyder/utils/introspection/plugin_client.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2016 The Spyder development team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 # Local imports
 import imp
@@ -18,7 +18,7 @@ from qtpy.QtWidgets import QApplication
 import zmq
 
 # Local imports
-from spyderlib.config.base import debug_print, DEV, get_module_path
+from spyder.config.base import debug_print, DEV, get_module_path
 
 
 # Heartbeat timer in milliseconds
@@ -78,7 +78,7 @@ class AsyncClient(QObject):
         processEnvironment = QProcessEnvironment()
         env = self.process.systemEnvironment()
         if (self.env and 'PYTHONPATH' not in self.env) or DEV:
-            python_path = osp.dirname(get_module_path('spyderlib'))
+            python_path = osp.dirname(get_module_path('spyder'))
             # Add the libs to the python path.
             for lib in self.libs:
                 try:
diff --git a/spyderlib/utils/introspection/plugin_server.py b/spyder/utils/introspection/plugin_server.py
similarity index 95%
rename from spyderlib/utils/introspection/plugin_server.py
rename to spyder/utils/introspection/plugin_server.py
index fb2f595..f4f555d 100644
--- a/spyderlib/utils/introspection/plugin_server.py
+++ b/spyder/utils/introspection/plugin_server.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2016 The Spyder development team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 import sys
 import time
@@ -111,7 +111,7 @@ class PluginServer(AsyncServer):
         """Initialize the object and return it.
         """
         mod_name = plugin_name + '_plugin'
-        mod = __import__('spyderlib.utils.introspection.' + mod_name,
+        mod = __import__('spyder.utils.introspection.' + mod_name,
                          fromlist=[mod_name])
         cls = getattr(mod, '%sPlugin' % plugin_name.capitalize())
         plugin = cls()
diff --git a/spyderlib/utils/introspection/rope_plugin.py b/spyder/utils/introspection/rope_plugin.py
similarity index 91%
rename from spyderlib/utils/introspection/rope_plugin.py
rename to spyder/utils/introspection/rope_plugin.py
index 3b10539..c6ab303 100644
--- a/spyderlib/utils/introspection/rope_plugin.py
+++ b/spyder/utils/introspection/rope_plugin.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2013 The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """
 Rope introspection plugin
@@ -11,21 +11,21 @@ Rope introspection plugin
 import time
 import imp
 
-from spyderlib.config.base import get_conf_path, STDERR
-from spyderlib.utils import encoding, programs
-from spyderlib.py3compat import PY2
-from spyderlib.utils.dochelpers import getsignaturefromtext
-from spyderlib.utils import sourcecode
-from spyderlib.utils.debug import log_last_error, log_dt
-from spyderlib.utils.introspection.manager import (
+from spyder.config.base import get_conf_path, STDERR
+from spyder.utils import encoding, programs
+from spyder.py3compat import PY2
+from spyder.utils.dochelpers import getsignaturefromtext
+from spyder.utils import sourcecode
+from spyder.utils.debug import log_last_error, log_dt
+from spyder.utils.introspection.manager import (
     DEBUG_EDITOR, LOG_FILENAME, IntrospectionPlugin)
-from spyderlib.utils.introspection.module_completion import (
+from spyder.utils.introspection.module_completion import (
     get_preferred_submodules)
-from spyderlib.utils.introspection.manager import ROPE_REQVER
+from spyder.utils.introspection.manager import ROPE_REQVER
 
 try:
     try:
-        from spyderlib import rope_patch
+        from spyder import rope_patch
         rope_patch.apply()
     except ImportError:
         # rope is not installed
@@ -285,7 +285,7 @@ class RopePlugin(IntrospectionPlugin):
 
 if __name__ == '__main__':
 
-    from spyderlib.utils.introspection.manager import CodeInfo
+    from spyder.utils.introspection.manager import CodeInfo
 
     p = RopePlugin()
     p.load_plugin()
diff --git a/spyderlib/utils/introspection/utils.py b/spyder/utils/introspection/utils.py
similarity index 97%
rename from spyderlib/utils/introspection/utils.py
rename to spyder/utils/introspection/utils.py
index a4e049b..1e9270d 100644
--- a/spyderlib/utils/introspection/utils.py
+++ b/spyder/utils/introspection/utils.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2013 The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """
 Introspection utilities used by Spyder
@@ -14,9 +14,9 @@ import pickle
 import os.path as osp
 import re
 
-from spyderlib.utils.misc import memoize
+from spyder.utils.misc import memoize
 
-from spyderlib.utils.syntaxhighlighters import (
+from spyder.utils.syntaxhighlighters import (
     custom_extension_lexer_mapping
 )
 
diff --git a/spyderlib/utils/iofuncs.py b/spyder/utils/iofuncs.py
similarity index 84%
rename from spyderlib/utils/iofuncs.py
rename to spyder/utils/iofuncs.py
index da4a9e4..d2600e7 100644
--- a/spyderlib/utils/iofuncs.py
+++ b/spyder/utils/iofuncs.py
@@ -1,8 +1,8 @@
 # -*- coding:utf-8 -*-
 #
-# Copyright © 2009-2010 Pierre Raybaut
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """
 Input/Output Utilities
@@ -33,8 +33,8 @@ except:
     pd = None            #analysis:ignore
 
 # Local imports
-from spyderlib.config.base import get_conf_path
-from spyderlib.py3compat import pickle, to_text_string, getcwd, PY2
+from spyder.config.base import _, get_conf_path
+from spyder.py3compat import pickle, to_text_string, getcwd, PY2
 
 
 class MatlabStruct(dict):
@@ -46,7 +46,7 @@ class MatlabStruct(dict):
 
     Examples
     ========
-    >>> from spyderlib.utils.iofuncs import MatlabStruct
+    >>> from spyder.utils.iofuncs import MatlabStruct
     >>> a = MatlabStruct()
     >>> a.b = 'spam'  # a["b"] == 'spam'
     >>> a.c["d"] = 'eggs'  # a.c.d == 'eggs'
@@ -215,7 +215,7 @@ except:
 
 
 try:
-    from spyderlib.pil_patch import Image
+    from spyder.pil_patch import Image
 
     if sys.byteorder == 'little':
         _ENDIAN = '<'
@@ -272,7 +272,11 @@ def load_pickle(filename):
 def load_json(filename):
     """Load a json file as a dictionary"""
     try:
-        with open(filename, 'rb') as fid:
+        if PY2:
+            args = 'rb'
+        else:
+            args = 'r'
+        with open(filename, args) as fid:
             data = json.load(fid)
         return data, None
     except Exception as err:
@@ -372,77 +376,6 @@ def load_dictionary(filename):
     return data, error_message
 
 
-def save_session(filename):
-    """Save Spyder session"""
-    local_fname = get_conf_path(osp.basename(filename))
-    filename = osp.abspath(filename)
-    old_cwd = getcwd()
-    os.chdir(get_conf_path())
-    error_message = None
-    try:
-        tar = tarfile.open(local_fname, "w")
-        for fname in SAVED_CONFIG_FILES:
-            if osp.isfile(fname):
-                tar.add(fname)
-        tar.close()
-        shutil.move(local_fname, filename)
-    except Exception as error:
-        error_message = to_text_string(error)
-    os.chdir(old_cwd)
-    return error_message
-
-
-def load_session(filename):
-    """Load Spyder session"""
-    filename = osp.abspath(filename)
-    old_cwd = getcwd()
-    os.chdir(osp.dirname(filename))
-    error_message = None
-    renamed = False
-    try:
-        tar = tarfile.open(filename, "r")
-        extracted_files = tar.getnames()
-
-        # Rename original config files
-        for fname in extracted_files:
-            orig_name = get_conf_path(fname)
-            bak_name = get_conf_path(fname+'.bak')
-            if osp.isfile(bak_name):
-                os.remove(bak_name)
-            if osp.isfile(orig_name):
-                os.rename(orig_name, bak_name)
-        renamed = True
-
-        tar.extractall()
-
-        for fname in extracted_files:
-            shutil.move(fname, get_conf_path(fname))
-
-    except Exception as error:
-        error_message = to_text_string(error)
-        if renamed:
-            # Restore original config files
-            for fname in extracted_files:
-                orig_name = get_conf_path(fname)
-                bak_name = get_conf_path(fname+'.bak')
-                if osp.isfile(orig_name):
-                    os.remove(orig_name)
-                if osp.isfile(bak_name):
-                    os.rename(bak_name, orig_name)
-
-    finally:
-        # Removing backup config files
-        for fname in extracted_files:
-            bak_name = get_conf_path(fname+'.bak')
-            if osp.isfile(bak_name):
-                os.remove(bak_name)
-
-    os.chdir(old_cwd)
-    return error_message
-
-
-from spyderlib.config.base import _
-
 class IOFunctions(object):
     def __init__(self):
         self.load_extensions = None
@@ -502,7 +435,7 @@ class IOFunctions(object):
 
     def get_3rd_party_funcs(self):
         other_funcs = []
-        from spyderlib.otherplugins import get_spyderplugins_mods
+        from spyder.otherplugins import get_spyderplugins_mods
         for mod in get_spyderplugins_mods(io=True):
             try:
                 other_funcs.append((mod.FORMAT_EXT, mod.FORMAT_NAME,
@@ -535,7 +468,7 @@ def save_auto(data, filename):
 
 
 if __name__ == "__main__":
-    from spyderlib.py3compat import u
+    from spyder.py3compat import u
     import datetime
     testdict = {'d': 1, 'a': np.random.rand(10, 10), 'b': [1, 2]}
     testdate = datetime.date(1945, 5, 8)
diff --git a/spyder/utils/ipython/__init__.py b/spyder/utils/ipython/__init__.py
new file mode 100644
index 0000000..c657887
--- /dev/null
+++ b/spyder/utils/ipython/__init__.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright © Spyder Project Contributors
+# Licensed under the terms of the MIT License
+# (see spyder/__init__.py for details)
+
+"""
+Utilities for the IPython console
+"""
diff --git a/spyder/utils/ipython/spyder_kernel.py b/spyder/utils/ipython/spyder_kernel.py
new file mode 100644
index 0000000..324afc9
--- /dev/null
+++ b/spyder/utils/ipython/spyder_kernel.py
@@ -0,0 +1,330 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright © Spyder Project Contributors
+# Licensed under the terms of the MIT License
+# (see spyder/__init__.py for details)
+
+"""
+Spyder kernel for Jupyter
+"""
+
+# Standard library imports
+import os
+
+# Third-party imports
+from ipykernel.datapub import publish_data
+from ipykernel.ipkernel import IPythonKernel
+import ipykernel.pickleutil
+from ipykernel.pickleutil import CannedObject
+from ipykernel.serialize import deserialize_object
+
+# Check if we are running under an external interpreter
+IS_EXT_INTERPRETER = os.environ.get('EXTERNAL_INTERPRETER', '').lower() == "true"
+
+# Local imports
+if not IS_EXT_INTERPRETER:
+    from spyder.py3compat import is_text_string
+    from spyder.utils.dochelpers import isdefined, getdoc, getsource
+    from spyder.utils.iofuncs import iofunctions
+    from spyder.utils.misc import fix_reference_name
+    from spyder.widgets.variableexplorer.utils import (get_remote_data,
+                                                       make_remote_view)
+else:
+    # We add "spyder" to sys.path for external interpreters, so this works!
+    # See create_kernel_spec of plugins/ipythonconsole
+    from py3compat import is_text_string
+    from utils.dochelpers import isdefined, getdoc, getsource
+    from utils.iofuncs import iofunctions
+    from utils.misc import fix_reference_name
+    from widgets.variableexplorer.utils import (get_remote_data,
+                                                make_remote_view)
+
+
+# XXX --- Disable canning for Numpy arrays for now ---
+# This allows getting values between a Python 3 frontend
+# and a Python 2 kernel, and viceversa, for several types of
+# arrays.
+# See this link for interesting ideas on how to solve this
+# in the future:
+# http://stackoverflow.com/q/30698004/438386
+ipykernel.pickleutil.can_map.pop('numpy.ndarray')
+
+
+class SpyderKernel(IPythonKernel):
+    """Spyder kernel for Jupyter"""
+
+    def __init__(self, *args, **kwargs):
+        super(SpyderKernel, self).__init__(*args, **kwargs)
+
+        self.namespace_view_settings = {}
+        self._pdb_obj = None
+        self._pdb_step = None
+
+    @property
+    def _pdb_frame(self):
+        """Return current Pdb frame if there is any"""
+        if self._pdb_obj is not None and self._pdb_obj.curframe is not None:
+            return self._pdb_obj.curframe
+
+    @property
+    def _pdb_locals(self):
+        """
+        Return current Pdb frame locals if available. Otherwise
+        return an empty dictionary
+        """
+        if self._pdb_frame:
+            return self._pdb_obj.curframe_locals
+        else:
+            return {}
+
+    # -- Public API ---------------------------------------------------
+    # For the Variable Explorer
+    def get_namespace_view(self):
+        """
+        Return the namespace view
+
+        This is a dictionary with the following structure
+
+        {'a': {'color': '#800000', 'size': 1, 'type': 'str', 'view': '1'}}
+
+        Here:
+        * 'a' is the variable name
+        * 'color' is the color used to show it
+        * 'size' and 'type' are self-evident
+        * and'view' is its value or the text shown in the last column
+        """
+        settings = self.namespace_view_settings
+        if settings:
+            ns = self._get_current_namespace()
+            more_excluded_names = ['In', 'Out']
+            view = make_remote_view(ns, settings, more_excluded_names)
+            return view
+
+    def get_var_properties(self):
+        """
+        Get some properties of the variables in the current
+        namespace
+        """
+        settings = self.namespace_view_settings
+        if settings:
+            ns = self._get_current_namespace()
+            data = get_remote_data(ns, settings, mode='editable',
+                                   more_excluded_names=['In', 'Out'])
+
+            properties = {}
+            for name, value in list(data.items()):
+                properties[name] = {
+                    'is_list':  isinstance(value, (tuple, list)),
+                    'is_dict':  isinstance(value, dict),
+                    'len': self._get_len(value),
+                    'is_array': self._is_array(value),
+                    'is_image': self._is_image(value),
+                    'is_data_frame': self._is_data_frame(value),
+                    'is_series': self._is_series(value),
+                    'array_shape': self._get_array_shape(value),
+                    'array_ndim': self._get_array_ndim(value)
+                }
+
+            return properties
+        else:
+            return {}
+
+    def get_value(self, name):
+        """Get the value of a variable"""
+        ns = self._get_current_namespace()
+        value = ns[name]
+        publish_data({'__spy_data__': value})
+
+    def set_value(self, name, value):
+        """Set the value of a variable"""
+        ns = self._get_reference_namespace(name)
+        value = deserialize_object(value)[0]
+        if isinstance(value, CannedObject):
+            value = value.get_object()
+        ns[name] = value
+
+    def remove_value(self, name):
+        """Remove a variable"""
+        ns = self._get_reference_namespace(name)
+        ns.pop(name)
+
+    def copy_value(self, orig_name, new_name):
+        """Copy a variable"""
+        ns = self._get_reference_namespace(orig_name)
+        ns[new_name] = ns[orig_name]
+
+    def load_data(self, filename, ext):
+        """Load data from filename"""
+        glbs = self._mglobals()
+
+        load_func = iofunctions.load_funcs[ext]
+        data, error_message = load_func(filename)
+
+        if error_message:
+            return error_message
+
+        for key in list(data.keys()):
+            new_key = fix_reference_name(key, blacklist=list(glbs.keys()))
+            if new_key != key:
+                data[new_key] = data.pop(key)
+
+        try:
+            glbs.update(data)
+        except Exception as error:
+            return str(error)
+
+        return None
+
+    def save_namespace(self, filename):
+        """Save namespace into filename"""
+        ns = self._get_current_namespace()
+        settings = self.namespace_view_settings
+        data = get_remote_data(ns, settings, mode='picklable',
+                               more_excluded_names=['In', 'Out']).copy()
+        return iofunctions.save(data, filename)
+
+    # --- For Pdb
+    def get_pdb_step(self):
+        """Return info about pdb current frame"""
+        return self._pdb_step
+
+    # --- For the Help plugin
+    def is_defined(self, obj, force_import=False):
+        """Return True if object is defined in current namespace"""
+        ns = self._get_current_namespace(with_magics=True)
+        return isdefined(obj, force_import=force_import, namespace=ns)
+
+    def get_doc(self, objtxt):
+        """Get object documentation dictionary"""
+        obj, valid = self._eval(objtxt)
+        if valid:
+            return getdoc(obj)
+
+    def get_source(self, objtxt):
+        """Get object source"""
+        obj, valid = self._eval(objtxt)
+        if valid:
+            return getsource(obj)
+
+    # -- Private API ---------------------------------------------------
+    # --- For the Variable Explorer
+    def _get_current_namespace(self, with_magics=False):
+        """
+        Return current namespace
+
+        This is globals() if not debugging, or a dictionary containing
+        both locals() and globals() for current frame when debugging
+        """
+        ns = {}
+        glbs = self._mglobals()
+
+        if self._pdb_frame is None:
+            ns.update(glbs)
+        else:
+            ns.update(glbs)
+            ns.update(self._pdb_locals)
+
+        # Add magics to ns so we can show help about them on the Help
+        # plugin
+        if with_magics:
+            line_magics = self.shell.magics_manager.magics['line']
+            cell_magics = self.shell.magics_manager.magics['cell']
+            ns.update(line_magics)
+            ns.update(cell_magics)
+
+        return ns
+
+    def _get_reference_namespace(self, name):
+        """
+        Return namespace where reference name is defined
+
+        It returns the globals() if reference has not yet been defined
+        """
+        glbs = self._mglobals()
+        if self._pdb_frame is None:
+            return glbs
+        else:
+            lcls = self._pdb_locals
+            if name in lcls:
+                return lcls
+            else:
+                return glbs
+
+    def _mglobals(self):
+        """Return current globals -- handles Pdb frames"""
+        if self._pdb_frame is not None:
+            return self._pdb_frame.f_globals
+        else:
+            return self.shell.user_ns
+
+    def _get_len(self, var):
+        """Return sequence length"""
+        try:
+            return len(var)
+        except TypeError:
+            return None
+
+    def _is_array(self, var):
+        """Return True if variable is a NumPy array"""
+        try:
+            import numpy
+            return isinstance(var, numpy.ndarray)
+        except ImportError:
+            return False
+
+    def _is_image(self, var):
+        """Return True if variable is a PIL.Image image"""
+        try:
+            from PIL import Image
+            return isinstance(var, Image.Image)
+        except ImportError:
+            return False
+
+    def _is_data_frame(self, var):
+        """Return True if variable is a DataFrame"""
+        try:
+            from pandas import DataFrame
+            return isinstance(var, DataFrame)
+        except:
+            return False
+
+    def _is_series(self, var):
+        """Return True if variable is a Series"""
+        try:
+            from pandas import Series
+            return isinstance(var, Series)
+        except:
+            return False
+
+    def _get_array_shape(self, var):
+        """Return array's shape"""
+        try:
+            return var.shape
+        except AttributeError:
+            return None
+
+    def _get_array_ndim(self, var):
+        """Return array's ndim"""
+        try:
+            return var.ndim
+        except AttributeError:
+            return None
+
+    # --- For Pdb
+    def _register_pdb_session(self, pdb_obj):
+        """Register Pdb session to use it later"""
+        self._pdb_obj = pdb_obj
+
+    # --- For the Help plugin
+    def _eval(self, text):
+        """
+        Evaluate text and return (obj, valid)
+        where *obj* is the object represented by *text*
+        and *valid* is True if object evaluation did not raise any exception
+        """
+        assert is_text_string(text)
+        ns = self._get_current_namespace(with_magics=True)
+        try:
+            return eval(text, ns), True
+        except:
+            return None, False
diff --git a/spyderlib/widgets/externalshell/start_ipython_kernel.py b/spyder/utils/ipython/start_kernel.py
similarity index 56%
rename from spyderlib/widgets/externalshell/start_ipython_kernel.py
rename to spyder/utils/ipython/start_kernel.py
index 2862eab..21841f7 100644
--- a/spyderlib/widgets/externalshell/start_ipython_kernel.py
+++ b/spyder/utils/ipython/start_kernel.py
@@ -1,14 +1,21 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009-2012 Pierre Raybaut
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
-"""Startup file used by ExternalPythonShell exclusively for IPython kernels
-(see spyderlib/widgets/externalshell/pythonshell.py)"""
+"""
+File used to start kernels for the IPython Console
+"""
 
-import sys
+# Standard library imports
+import os
 import os.path as osp
+import sys
+
+
+# Check if we are running under an external interpreter
+IS_EXT_INTERPRETER = os.environ.get('EXTERNAL_INTERPRETER', '').lower() == "true"
 
 
 def sympy_config(mpl_backend):
@@ -30,56 +37,62 @@ init_session()
 
 def kernel_config():
     """Create a config object with IPython kernel options"""
-    import os
-
     from IPython.core.application import get_ipython_dir
-    from spyderlib.config.main import CONF
-    from spyderlib.utils.programs import is_module_installed
     from traitlets.config.loader import Config, load_pyconfig_files
+    if not IS_EXT_INTERPRETER:
+        from spyder.config.main import CONF
+        from spyder.utils.programs import is_module_installed
+    else:
+        # We add "spyder" to sys.path for external interpreters,
+        # so this works!
+        # See create_kernel_spec of plugins/ipythonconsole
+        from config.main import CONF
+        from utils.programs import is_module_installed
 
     # ---- IPython config ----
     try:
         profile_path = osp.join(get_ipython_dir(), 'profile_default')
-        ip_cfg = load_pyconfig_files(['ipython_config.py',
-                                      'ipython_qtconsole_config.py'],
-                                      profile_path)
+        cfg = load_pyconfig_files(['ipython_config.py',
+                                   'ipython_kernel_config.py'],
+                                  profile_path)
     except:
-        ip_cfg = Config()
-    
+        cfg = Config()
+
     # ---- Spyder config ----
     spy_cfg = Config()
-    
+
     # Until we implement Issue 1052
     spy_cfg.InteractiveShell.xmode = 'Plain'
-    
+
     # Run lines of code at startup
     run_lines_o = CONF.get('ipython_console', 'startup/run_lines')
     if run_lines_o:
         spy_cfg.IPKernelApp.exec_lines = [x.strip() for x in run_lines_o.split(',')]
     else:
         spy_cfg.IPKernelApp.exec_lines = []
-    
+
     # Pylab configuration
     mpl_backend = None
     mpl_installed = is_module_installed('matplotlib')
     pylab_o = CONF.get('ipython_console', 'pylab')
-    external_interpreter = \
-                   os.environ.get('EXTERNAL_INTERPRETER', '').lower() == "true"
 
     if mpl_installed and pylab_o:
         # Get matplotlib backend
-        if not external_interpreter:
-            if os.environ["QT_API"] == 'pyqt5':
-                qt_backend = 'qt5'
+        backend_o = CONF.get('ipython_console', 'pylab/backend')
+        if backend_o == 1:
+            if is_module_installed('PyQt5'):
+                auto_backend = 'qt5'
+            elif is_module_installed('PyQt4'):
+                auto_backend = 'qt4'
+            elif is_module_installed('_tkinter'):
+                auto_backend = 'tk'
             else:
-                qt_backend = 'qt'
-
-            backend_o = CONF.get('ipython_console', 'pylab/backend', 0)
-            backends = {0: 'inline', 1: qt_backend, 2: qt_backend, 3: 'osx',
-                        4: 'gtk', 5: 'wx', 6: 'tk'}
-            mpl_backend = backends[backend_o]
+                auto_backend = 'inline'
         else:
-            mpl_backend = 'inline'
+            auto_backend = ''
+        backends = {0: 'inline', 1: auto_backend, 2: 'qt5', 3: 'qt4',
+                    4: 'osx', 5: 'gtk3', 6: 'gtk', 7: 'wx', 8: 'tk'}
+        mpl_backend = backends[backend_o]
 
         # Automatically load Pylab and Numpy, or only set Matplotlib
         # backend
@@ -98,7 +111,7 @@ def kernel_config():
                                'pylab/inline/figure_format', 0)
            formats = {0: 'png', 1: 'svg'}
            spy_cfg.InlineBackend.figure_format = formats[format_o]
-           
+
            # Resolution
            spy_cfg.InlineBackend.rc = {'figure.figsize': (6.0, 4.0),
                                    'savefig.dpi': 72,
@@ -107,103 +120,104 @@ def kernel_config():
                                    'figure.facecolor': 'white',
                                    'figure.edgecolor': 'white'
                                    }
-           resolution_o = CONF.get('ipython_console', 
+           resolution_o = CONF.get('ipython_console',
                                    'pylab/inline/resolution')
            spy_cfg.InlineBackend.rc['savefig.dpi'] = resolution_o
-           
+
            # Figure size
            width_o = float(CONF.get('ipython_console', 'pylab/inline/width'))
            height_o = float(CONF.get('ipython_console', 'pylab/inline/height'))
            spy_cfg.InlineBackend.rc['figure.figsize'] = (width_o, height_o)
-    
+
     # Run a file at startup
     use_file_o = CONF.get('ipython_console', 'startup/use_run_file')
     run_file_o = CONF.get('ipython_console', 'startup/run_file')
     if use_file_o and run_file_o:
         spy_cfg.IPKernelApp.file_to_run = run_file_o
-    
+
     # Autocall
     autocall_o = CONF.get('ipython_console', 'autocall')
     spy_cfg.ZMQInteractiveShell.autocall = autocall_o
-    
+
     # To handle the banner by ourselves in IPython 3+
     spy_cfg.ZMQInteractiveShell.banner1 = ''
-    
+
     # Greedy completer
     greedy_o = CONF.get('ipython_console', 'greedy_completer')
     spy_cfg.IPCompleter.greedy = greedy_o
-    
+
     # Sympy loading
     sympy_o = CONF.get('ipython_console', 'symbolic_math')
-    if sympy_o:
+    if sympy_o and is_module_installed('sympy'):
         lines = sympy_config(mpl_backend)
         spy_cfg.IPKernelApp.exec_lines.append(lines)
 
     # Merge IPython and Spyder configs. Spyder prefs will have prevalence
     # over IPython ones
-    ip_cfg._merge(spy_cfg)
-    return ip_cfg
+    cfg._merge(spy_cfg)
+    return cfg
 
 
-def change_edit_magic(shell):
-    """Use %edit to open files in Spyder"""
-    try:
-        shell.magics_manager.magics['line']['ed'] = \
-          shell.magics_manager.magics['line']['edit']
-        shell.magics_manager.magics['line']['edit'] = open_in_spyder  #analysis:ignore
-    except:
-        pass
-
 def varexp(line):
     """
     Spyder's variable explorer magic
-    
+
     Used to generate plots, histograms and images of the variables displayed
     on it.
     """
     ip = get_ipython()       #analysis:ignore
     funcname, name = line.split()
-    import spyderlib.pyplot
-    __fig__ = spyderlib.pyplot.figure();
-    __items__ = getattr(spyderlib.pyplot, funcname[2:])(ip.user_ns[name])
-    spyderlib.pyplot.show()
+    import spyder.pyplot
+    __fig__ = spyder.pyplot.figure();
+    __items__ = getattr(spyder.pyplot, funcname[2:])(ip.user_ns[name])
+    spyder.pyplot.show()
     del __fig__, __items__
 
-# Remove this module's path from sys.path:
-try:
-    sys.path.remove(osp.dirname(__file__))
-except ValueError:
-    pass
-
-locals().pop('__file__')
-__doc__ = ''
-__name__ = '__main__'
-
-# Add current directory to sys.path (like for any standard Python interpreter
-# executed in interactive mode):
-sys.path.insert(0, '')
-
-# Fire up the kernel instance.
-from ipykernel.kernelapp import IPKernelApp
-ipk_temp = IPKernelApp.instance()
-ipk_temp.config = kernel_config()
-ipk_temp.initialize()
-
-# Grabbing the kernel's shell to share its namespace with our
-# Variable Explorer
-__ipythonshell__ = ipk_temp.shell
-
-# Issue 977 : Since kernel.initialize() has completed execution, 
-# we can now allow the monitor to communicate the availablility of 
-# the kernel to accept front end connections.
-__ipythonkernel__ = ipk_temp
-del ipk_temp
-
-# Change %edit to open files inside Spyder
-# NOTE: Leave this and other magic modifications *after* setting
-# __ipythonkernel__ to not have problems while starting kernels
-change_edit_magic(__ipythonshell__)
-__ipythonshell__.register_magic_function(varexp)
-
-# Start the (infinite) kernel event loop.
-__ipythonkernel__.start()
+
+def main():
+    # Remove this module's path from sys.path:
+    try:
+        sys.path.remove(osp.dirname(__file__))
+    except ValueError:
+        pass
+
+    try:
+        locals().pop('__file__')
+    except KeyError:
+        pass
+    __doc__ = ''
+    __name__ = '__main__'
+
+    # Add current directory to sys.path (like for any standard Python interpreter
+    # executed in interactive mode):
+    sys.path.insert(0, '')
+
+    # Fire up the kernel instance.
+    from ipykernel.kernelapp import IPKernelApp
+
+    if not IS_EXT_INTERPRETER:
+        from spyder.utils.ipython.spyder_kernel import SpyderKernel
+    else:
+        # We add "spyder" to sys.path for external interpreters,
+        # so this works!
+        # See create_kernel_spec of plugins/ipythonconsole
+        from utils.ipython.spyder_kernel import SpyderKernel
+
+    kernel = IPKernelApp.instance()
+    kernel.kernel_class = SpyderKernel
+    try:
+        kernel.config = kernel_config()
+    except:
+        pass
+    kernel.initialize()
+
+    # NOTE: Leave this and other magic modifications *after* setting
+    # __ipythonkernel__ to not have problems while starting kernels
+    kernel.shell.register_magic_function(varexp)
+
+    # Start the (infinite) kernel event loop.
+    kernel.start()
+
+
+if __name__ == '__main__':
+    main()
diff --git a/spyderlib/utils/ipython/templates/blank.html b/spyder/utils/ipython/templates/blank.html
similarity index 84%
rename from spyderlib/utils/ipython/templates/blank.html
rename to spyder/utils/ipython/templates/blank.html
index e66a7f7..b75a70e 100644
--- a/spyderlib/utils/ipython/templates/blank.html
+++ b/spyder/utils/ipython/templates/blank.html
@@ -4,7 +4,7 @@
 
     Blank page for the IPython Console
 
-    :copyright: Copyright 2014 by the Spyder Development Team
+    :copyright: Copyright by the Spyder Project Contributors
     :license: MIT license
 -->
 
diff --git a/spyderlib/utils/ipython/templates/kernel_error.html b/spyder/utils/ipython/templates/kernel_error.html
similarity index 91%
rename from spyderlib/utils/ipython/templates/kernel_error.html
rename to spyder/utils/ipython/templates/kernel_error.html
index a8c8306..e70274d 100644
--- a/spyderlib/utils/ipython/templates/kernel_error.html
+++ b/spyder/utils/ipython/templates/kernel_error.html
@@ -4,7 +4,7 @@
 
     Kernel error template for the IPython Console
 
-    :copyright: Copyright 2014 by the Spyder Development Team
+    :copyright: Copyright by the Spyder Project Contributors
     :license: MIT license
 -->
 
diff --git a/spyderlib/utils/ipython/templates/loading.html b/spyder/utils/ipython/templates/loading.html
similarity index 97%
rename from spyderlib/utils/ipython/templates/loading.html
rename to spyder/utils/ipython/templates/loading.html
index 0928ed7..b4895d5 100644
--- a/spyderlib/utils/ipython/templates/loading.html
+++ b/spyder/utils/ipython/templates/loading.html
@@ -4,7 +4,7 @@
 
     Loading template for the IPython console
 
-    :copyright: Copyright 2014 by the Spyder Development Team
+    :copyright: Copyright by the Spyder Project Contributors
     :license: MIT license
 -->
 
diff --git a/spyderlib/utils/misc.py b/spyder/utils/misc.py
similarity index 80%
rename from spyderlib/utils/misc.py
rename to spyder/utils/misc.py
index e11fc98..46bc62a 100644
--- a/spyderlib/utils/misc.py
+++ b/spyder/utils/misc.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009-2010 Pierre Raybaut
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """Miscellaneous utilities"""
 
@@ -12,6 +12,8 @@ import os.path as osp
 import sys
 import stat
 
+from spyder.py3compat import is_text_string
+
 
 def __remove_pyc_pyo(fname):
     """Eventually remove .pyc and .pyo files associated to a Python script"""
@@ -20,6 +22,7 @@ def __remove_pyc_pyo(fname):
             if osp.exists(fname+ending):
                 os.remove(fname+ending)
 
+
 def rename_file(source, dest):
     """
     Rename file from *source* to *dest*
@@ -28,6 +31,7 @@ def rename_file(source, dest):
     os.rename(source, dest)
     __remove_pyc_pyo(source)
 
+
 def remove_file(fname):
     """
     Remove file *fname*
@@ -36,6 +40,7 @@ def remove_file(fname):
     os.remove(fname)
     __remove_pyc_pyo(fname)
 
+
 def move_file(source, dest):
     """
     Move file from *source* to *dest*
@@ -229,6 +234,33 @@ def get_common_path(pathlist):
                 return osp.abspath(common)
 
 
+def add_pathlist_to_PYTHONPATH(env, pathlist, drop_env=False,
+                               ipyconsole=False):
+    # PyQt API 1/2 compatibility-related tests:
+    assert isinstance(env, list)
+    assert all([is_text_string(path) for path in env])
+    
+    pypath = "PYTHONPATH"
+    pathstr = os.pathsep.join(pathlist)
+    if os.environ.get(pypath) is not None and not drop_env:
+        old_pypath = os.environ[pypath]
+        if not ipyconsole:
+            for index, var in enumerate(env[:]):
+                if var.startswith(pypath+'='):
+                    env[index] = var.replace(pypath+'=',
+                                             pypath+'='+pathstr+os.pathsep)
+            env.append('OLD_PYTHONPATH='+old_pypath)
+        else:
+            pypath =  {'PYTHONPATH': pathstr + os.pathsep + old_pypath,
+                       'OLD_PYTHONPATH': old_pypath}
+            return pypath
+    else:
+        if not ipyconsole:
+            env.append(pypath+'='+pathstr)
+        else:
+            return {'PYTHONPATH': pathstr}
+
+
 def memoize(obj):
     """
     Memoize objects to trade memory for execution speed
@@ -251,18 +283,19 @@ def memoize(obj):
         return cache[key]
     return memoizer
 
+
 if __name__ == '__main__':
     if os.name == 'nt':
         assert get_common_path([
-                                'D:\\Python\\spyder-v21\\spyderlib\\widgets',
-                                'D:\\Python\\spyder\\spyderlib\\utils',
-                                'D:\\Python\\spyder\\spyderlib\\widgets',
-                                'D:\\Python\\spyder-v21\\spyderlib\\utils',
+                                'D:\\Python\\spyder-v21\\spyder\\widgets',
+                                'D:\\Python\\spyder\\spyder\\utils',
+                                'D:\\Python\\spyder\\spyder\\widgets',
+                                'D:\\Python\\spyder-v21\\spyder\\utils',
                                 ]) == 'D:\\Python'
     else:
         assert get_common_path([
-                                '/Python/spyder-v21/spyderlib/widgets',
-                                '/Python/spyder/spyderlib/utils',
-                                '/Python/spyder/spyderlib/widgets',
-                                '/Python/spyder-v21/spyderlib/utils',
+                                '/Python/spyder-v21/spyder.widgets',
+                                '/Python/spyder/spyder.utils',
+                                '/Python/spyder/spyder.widgets',
+                                '/Python/spyder-v21/spyder.utils',
                                 ]) == '/Python'
diff --git a/spyderlib/utils/programs.py b/spyder/utils/programs.py
similarity index 95%
rename from spyderlib/utils/programs.py
rename to spyder/utils/programs.py
index 02e669a..07e254d 100644
--- a/spyderlib/utils/programs.py
+++ b/spyder/utils/programs.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009-2011 Pierre Raybaut
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """Running programs utilities"""
 
@@ -19,8 +19,8 @@ import sys
 import tempfile
 
 # Local imports
-from spyderlib.utils import encoding
-from spyderlib.py3compat import PY2, is_text_string
+from spyder.utils import encoding
+from spyder.py3compat import PY2, is_text_string
 
 
 class ProgramError(Exception):
@@ -281,9 +281,7 @@ def run_python_script_in_terminal(fname, wdir, args, interact,
             run_shell_command(cmd, cwd=wdir)
         except WindowsError:
             from qtpy.QtWidgets import QMessageBox
-
-            from spyderlib.config.base import _
-
+            from spyder.config.base import _
             QMessageBox.critical(None, _('Run'),
                                  _("It was not possible to run this file in "
                                    "an external terminal"),
diff --git a/spyderlib/utils/qthelpers.py b/spyder/utils/qthelpers.py
similarity index 93%
rename from spyderlib/utils/qthelpers.py
rename to spyder/utils/qthelpers.py
index 33bf359..dbca83f 100644
--- a/spyderlib/utils/qthelpers.py
+++ b/spyder/utils/qthelpers.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """Qt utilities"""
 
@@ -22,12 +22,12 @@ from qtpy.QtWidgets import (QAction, QApplication, QHBoxLayout, QLabel,
                             QWidget)
 
 # Local imports
-from spyderlib.config.base import get_image_path, running_in_mac_app
-from spyderlib.config.gui import get_shortcut
-from spyderlib.utils import programs
-from spyderlib.utils import icon_manager as ima
-from spyderlib.utils.icon_manager import get_icon, get_std_icon
-from spyderlib.py3compat import is_text_string, to_text_string
+from spyder.config.base import get_image_path, running_in_mac_app
+from spyder.config.gui import get_shortcut
+from spyder.utils import programs
+from spyder.utils import icon_manager as ima
+from spyder.utils.icon_manager import get_icon, get_std_icon
+from spyder.py3compat import is_text_string, to_text_string
 
 # Note: How to redirect a signal from widget *a* to widget *b* ?
 # ----
@@ -86,8 +86,8 @@ def qapplication(translate=True, test_time=3):
     if translate:
         install_translator(app)
 
-    test_travis = os.environ.get('TEST_CI_WIDGETS', None)
-    if test_travis is not None:
+    test_ci = os.environ.get('TEST_CI_WIDGETS', None)
+    if test_ci is not None:
         timer_shutdown = QTimer(app)
         timer_shutdown.timeout.connect(app.quit)
         timer_shutdown.start(test_time*1000)
diff --git a/spyder/utils/site/__init__.py b/spyder/utils/site/__init__.py
new file mode 100644
index 0000000..c3976ea
--- /dev/null
+++ b/spyder/utils/site/__init__.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright © Spyder Project Contributors
+# Licensed under the terms of the MIT License
+# (see spyder/__init__.py for details)
+
+"""
+spyder.utils.site
+=================
+
+Site packages for Spyder consoles
+
+NOTE: This package shouldn't be imported at **any** place.
+      It's only used to set additional functionality for
+      our consoles.
+"""
diff --git a/spyderlib/widgets/externalshell/osx_app_site.py b/spyder/utils/site/osx_app_site.py
similarity index 100%
rename from spyderlib/widgets/externalshell/osx_app_site.py
rename to spyder/utils/site/osx_app_site.py
diff --git a/spyderlib/widgets/externalshell/sitecustomize.py b/spyder/utils/site/sitecustomize.py
similarity index 87%
rename from spyderlib/widgets/externalshell/sitecustomize.py
rename to spyder/utils/site/sitecustomize.py
index 63eeda1..0f9653b 100644
--- a/spyderlib/widgets/externalshell/sitecustomize.py
+++ b/spyder/utils/site/sitecustomize.py
@@ -1,12 +1,12 @@
 #
-# Copyright (c) 2009- The Spyder Development Team)
+# Copyright (c) Spyder Project Contributors)
 # Licensed under the terms of the MIT License)
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 #
 # IMPORTANT NOTE: Don't add a coding line here! It's not necessary for
 # site files
 #
-# Spyder's ExternalPythonShell sitecustomize
+# Spyder consoles sitecustomize
 #
 
 import sys
@@ -34,14 +34,14 @@ if not hasattr(sys, 'argv'):
 #==============================================================================
 # Main constants
 #==============================================================================
-IS_IPYTHON = os.environ.get("IPYTHON_KERNEL", "").lower() == "true"
+IS_IPYKERNEL = os.environ.get("IPYTHON_KERNEL", "").lower() == "true"
 IS_EXT_INTERPRETER = os.environ.get('EXTERNAL_INTERPRETER', '').lower() == "true"
 
 
 #==============================================================================
 # Important Note:
 #
-# We avoid importing spyderlib here, so we are handling Python 3 compatiblity
+# We avoid importing spyder here, so we are handling Python 3 compatiblity
 # by hand.
 #==============================================================================
 def _print(*objects, **options):
@@ -49,7 +49,7 @@ def _print(*objects, **options):
     file = options.get('file', sys.stdout)
     sep = options.get('sep', ' ')
     string = sep.join([str(obj) for obj in objects])
-    if sys.version[0] == '3':
+    if not PY2:
         # Python 3
         local_dict = {}
         exec('printf = print', local_dict) # to avoid syntax error in Python 2
@@ -64,9 +64,8 @@ def _print(*objects, **options):
 
 #==============================================================================
 # Execfile functions
-# 
-# The definitions for Python 2 on Windows were taken from the IPython
-# project (present in IPython.utils.py3compat)
+#
+# The definitions for Python 2 on Windows were taken from the IPython project
 # Copyright (C) The IPython Development Team
 # Distributed under the terms of the modified BSD license
 #==============================================================================
@@ -104,7 +103,7 @@ except ImportError:
 
 
 #==============================================================================
-# Colorization of sys.stderr (standard Python interpreter) 
+# Colorization of sys.stderr (standard Python interpreter)
 #==============================================================================
 if os.environ.get("COLORIZE_SYS_STDERR", "").lower() == "true":
     class StderrProxy(object):
@@ -138,20 +137,20 @@ if os.environ.get("COLORIZE_SYS_STDERR", "").lower() == "true":
 
 
 #==============================================================================
-# Prepending this spyderlib package's path to sys.path to be sure
-# that another version of spyderlib won't be imported instead:
+# Prepending this spyder package's path to sys.path to be sure
+# that another version of spyder won't be imported instead:
 #==============================================================================
-spyderlib_path = osp.dirname(__file__)
-while not osp.isdir(osp.join(spyderlib_path, 'spyderlib')):
-    spyderlib_path = osp.abspath(osp.join(spyderlib_path, os.pardir))
-if not spyderlib_path.startswith(sys.prefix):
+spyder_path = osp.dirname(__file__)
+while not osp.isdir(osp.join(spyder_path, 'spyder')):
+    spyder_path = osp.abspath(osp.join(spyder_path, os.pardir))
+if not spyder_path.startswith(sys.prefix):
     # Spyder is not installed: moving its parent directory to the top of
-    # sys.path to be sure that this spyderlib package will be imported in
+    # sys.path to be sure that this spyder package will be imported in
     # the remote process (instead of another installed version of Spyder)
-    while spyderlib_path in sys.path:
-        sys.path.remove(spyderlib_path)
-    sys.path.insert(0, spyderlib_path)
-os.environ['SPYDER_PARENT_DIR'] = spyderlib_path
+    while spyder_path in sys.path:
+        sys.path.remove(spyder_path)
+    sys.path.insert(0, spyder_path)
+os.environ['SPYDER_PARENT_DIR'] = spyder_path
 
 
 #==============================================================================
@@ -177,10 +176,10 @@ if os.name == 'nt' and PY2:
 # Settings for our MacOs X app
 #==============================================================================
 if sys.platform == 'darwin':
-    from spyderlib.config.base import MAC_APP_NAME
+    from spyder.config.base import MAC_APP_NAME
     if MAC_APP_NAME in __file__:
         if IS_EXT_INTERPRETER.lower() == "true":
-            # Add a minimal library (with spyderlib) at the end of sys.path to
+            # Add a minimal library (with spyder) at the end of sys.path to
             # be able to connect our monitor to the external console
             py_ver = '%s.%s' % (sys.version_info[0], sys.version_info[1])
             app_pythonpath = '%s/Contents/Resources/lib/python%s' % (MAC_APP_NAME,
@@ -247,10 +246,10 @@ except ImportError:
 #==============================================================================
 # Monitor-based functionality
 #==============================================================================
-if os.environ.get('SPYDER_SHELL_ID') is None:
+if IS_IPYKERNEL or os.environ.get('SPYDER_SHELL_ID') is None:
     monitor = None
 else:
-    from spyderlib.widgets.externalshell.monitor import Monitor
+    from spyder.widgets.externalshell.monitor import Monitor
     monitor = Monitor("127.0.0.1",
                       int(os.environ['SPYDER_I_PORT']),
                       int(os.environ['SPYDER_N_PORT']),
@@ -286,18 +285,21 @@ else:
     builtins.open_in_spyder = open_in_spyder
 
     # Our own input hook, monitor based and for Windows only
-    if os.name == 'nt' and matplotlib and not IS_IPYTHON:
+    if os.name == 'nt' and matplotlib and not IS_IPYKERNEL:
         # Qt imports
         if os.environ["QT_API"] == 'pyqt5':
             from PyQt5 import QtCore
+            from PyQt5 import QtWidgets
         elif os.environ["QT_API"] == 'pyqt':
             from PyQt4 import QtCore           # analysis:ignore
+            from PyQt4 import QtGui as QtWidgets
         elif os.environ["QT_API"] == 'pyside':
             from PySide import QtCore          # analysis:ignore
+            from PySide import QtGui as QtWidgets
 
         def qt_nt_inputhook():
             """Qt input hook for Windows
-            
+
             This input hook wait for available stdin data (notified by
             ExternalPythonShell through the monitor's inputhook_flag
             attribute), and in the meantime it processes Qt events.
@@ -305,28 +307,36 @@ else:
             # Refreshing variable explorer, except on first input hook call:
             # (otherwise, on slow machines, this may freeze Spyder)
             monitor.refresh_from_inputhook()
-            try:
+
+            # NOTE: This is making the inputhoook to fail completely!!
+            #       That's why it's commented.
+            #try:
                 # This call fails for Python without readline support
                 # (or on Windows platforms) when PyOS_InputHook is called
                 # for the second consecutive time, because the 100-bytes
                 # stdin buffer is full.
                 # For more details, see the `PyOS_StdioReadline` function
                 # in Python source code (Parser/myreadline.c)
-                sys.stdin.tell()
-            except IOError:
-                return 0
-    
+            #    sys.stdin.tell()
+            #except IOError:
+            #    return 0
+
             # Input hook
             app = QtCore.QCoreApplication.instance()
+            if app is None:
+                app = QtWidgets.QApplication([" "])
             if app and app.thread() is QtCore.QThread.currentThread():
-                timer = QtCore.QTimer()
-                timer.timeout.connect(app.quit)
-                monitor.toggle_inputhook_flag(False)
-                while not monitor.inputhook_flag:
-                    timer.start(50)
-                    QtCore.QCoreApplication.exec_()
-                    timer.stop()
-    
+                try:
+                    timer = QtCore.QTimer()
+                    timer.timeout.connect(app.quit)
+                    monitor.toggle_inputhook_flag(False)
+                    while not monitor.inputhook_flag:
+                        timer.start(50)
+                        QtCore.QCoreApplication.exec_()
+                        timer.stop()
+                except KeyboardInterrupt:
+                    _print("\nKeyboardInterrupt - Press Enter for new prompt")
+
                 # Socket-based alternative:
                 #socket = QtNetwork.QLocalSocket()
                 #socket.connectToServer(os.environ['SPYDER_SHELL_ID'])
@@ -344,7 +354,7 @@ else:
 # Matplotlib settings
 #==============================================================================
 if matplotlib is not None:
-    if not IS_IPYTHON:
+    if not IS_IPYKERNEL:
         mpl_backend = os.environ.get("SPY_MPL_BACKEND", "")
         mpl_ion = os.environ.get("MATPLOTLIB_ION", "")
 
@@ -379,7 +389,7 @@ if matplotlib is not None:
                             ('PySide', 'Qt4Agg', 'pyqt')]
                 if not os.name == 'nt':
                      backends.append( ('_tkinter', 'TkAgg', None) )
-    
+
                 for b in backends:
                     mpl_backend = set_mpl_backend(b)
                     if mpl_backend:
@@ -396,7 +406,7 @@ if matplotlib is not None:
         if mpl_ion.lower() == "true":
             matplotlib.rcParams['interactive'] = True
 
-        from spyderlib.widgets.externalshell import inputhooks
+        from spyder.utils import inputhooks
         if mpl_backend:
             import ctypes
 
@@ -444,9 +454,9 @@ if matplotlib is not None:
 
 
 #==============================================================================
-# IPython adjustments
+# IPython kernel adjustments
 #==============================================================================
-if IS_IPYTHON:
+if IS_IPYKERNEL:
     # Use ipydb as the debugger to patch on IPython consoles
     from IPython.core.debugger import Pdb as ipyPdb
     pdb.Pdb = ipyPdb
@@ -469,7 +479,7 @@ if IS_IPYTHON:
 # Pandas adjustments
 #==============================================================================
 try:
-    # Make Pandas recognize our IPython consoles as proper qtconsoles
+    # Make Pandas recognize our Jupyter consoles as proper qtconsoles
     # Fixes Issue 2015
     def in_qtconsole():
         return True
@@ -513,7 +523,7 @@ class SpyderPdb(pdb.Pdb):
         bdb.Breakpoint.bplist = {}
         bdb.Breakpoint.bpbynumber = [None]
         #------
-        from spyderlib.config.main import CONF
+        from spyder.config.main import CONF
         CONF.load_from_ini()
         if CONF.get('run', 'breakpoints/enabled', True):
             breakpoints = CONF.get('run', 'breakpoints', {})
@@ -528,21 +538,28 @@ class SpyderPdb(pdb.Pdb):
         if not frame:
             return
         fname = self.canonic(frame.f_code.co_filename)
-        if sys.version[0] == '2':
+        if PY2:
             try:
                 fname = unicode(fname, "utf-8")
             except TypeError:
                 pass
         lineno = frame.f_lineno
         if isinstance(fname, basestring) and isinstance(lineno, int):
-            if osp.isfile(fname) and monitor is not None:
-                monitor.notify_pdb_step(fname, lineno)
-                time.sleep(0.1)
-                
+            if osp.isfile(fname):
+                if IS_IPYKERNEL:
+                    from IPython.core.getipython import get_ipython
+                    ipython_shell = get_ipython()
+                    if ipython_shell:
+                        step = dict(fname=fname, lineno=lineno)
+                        ipython_shell.kernel._pdb_step = step
+                elif monitor is not None:
+                    monitor.notify_pdb_step(fname, lineno)
+                    time.sleep(0.1)
+
 pdb.Pdb = SpyderPdb
 
 #XXX: I know, this function is now also implemented as is in utils/misc.py but
-#     I'm kind of reluctant to import spyderlib in sitecustomize, even if this
+#     I'm kind of reluctant to import spyder in sitecustomize, even if this
 #     import is very clean.
 def monkeypatch_method(cls, patch_name):
     # This function's code was inspired from the following thread:
@@ -598,7 +615,12 @@ def interaction(self, frame, traceback):
 @monkeypatch_method(pdb.Pdb, 'Pdb')
 def reset(self):
     self._old_Pdb_reset()
-    if monitor is not None:
+    if IS_IPYKERNEL:
+        from IPython.core.getipython import get_ipython
+        ipython_shell = get_ipython()
+        if ipython_shell:
+            ipython_shell.kernel._register_pdb_session(self)
+    elif monitor is not None:
         monitor.register_pdb_session(self)
     self.set_spyder_breakpoints()
 
@@ -611,7 +633,7 @@ def postcmd(self, stop, line):
 
 # Breakpoints don't work for files with non-ascii chars in Python 2
 # Fixes Issue 1484
-if sys.version[0] == '2':
+if PY2:
     @monkeypatch_method(pdb.Pdb, 'Pdb')
     def break_here(self, frame):
         from bdb import effective
@@ -629,7 +651,7 @@ if sys.version[0] == '2':
             lineno = frame.f_code.co_firstlineno
             if not lineno in self.breaks[filename]:
                 return False
-    
+
         # flag says ok to delete temp. bp
         (bp, flag) = effective(filename, lineno, frame)
         if bp:
@@ -644,13 +666,13 @@ if sys.version[0] == '2':
 #==============================================================================
 # Restoring (almost) original sys.path:
 #
-# NOTE: do not remove spyderlib_path from sys.path because if Spyder has been
+# NOTE: do not remove spyder_path from sys.path because if Spyder has been
 # installed using python setup.py install, then this could remove the
 # 'site-packages' directory from sys.path!
 #==============================================================================
 try:
-    sys.path.remove(osp.join(spyderlib_path,
-                             "spyderlib", "widgets", "externalshell"))
+    sys.path.remove(osp.join(spyder_path, "spyder", "widgets",
+                             "externalshell"))
 except ValueError:
     pass
 
@@ -660,7 +682,7 @@ except ValueError:
 #==============================================================================
 class UserModuleReloader(object):
     """
-    User Module Reloader (UMR) aims at deleting user modules 
+    User Module Reloader (UMR) aims at deleting user modules
     to force Python to deeply reload them during import
 
     pathlist [list]: blacklist in terms of module path
@@ -669,7 +691,7 @@ class UserModuleReloader(object):
     def __init__(self, namelist=None, pathlist=None):
         if namelist is None:
             namelist = []
-        spy_modules = ['sitecustomize', 'spyderlib', 'spyderplugins']
+        spy_modules = ['sitecustomize', 'spyder', 'spyderplugins']
         mpl_modules = ['matplotlib', 'tkinter', 'Tkinter']
         self.namelist = namelist + spy_modules + mpl_modules
 
@@ -712,15 +734,14 @@ class UserModuleReloader(object):
 __umr__ = None
 
 
-#===============================================================================
+#==============================================================================
 # Handle Post Mortem Debugging and Traceback Linkage to Spyder
-#===============================================================================
-
+#==============================================================================
 def clear_post_mortem():
     """
     Remove the post mortem excepthook and replace with a standard one.
     """
-    if IS_IPYTHON:
+    if IS_IPYKERNEL:
         from IPython.core.getipython import get_ipython
         ipython_shell = get_ipython()
         if ipython_shell:
@@ -735,7 +756,7 @@ def post_mortem_excepthook(type, value, tb):
     mortem debugging.
     """
     clear_post_mortem()
-    if IS_IPYTHON:
+    if IS_IPYKERNEL:
         from IPython.core.getipython import get_ipython
         ipython_shell = get_ipython()
         ipython_shell.showtraceback((type, value, tb))
@@ -768,7 +789,7 @@ def set_post_mortem():
     """
     Enable the post mortem debugging excepthook.
     """
-    if IS_IPYTHON:
+    if IS_IPYKERNEL:
         from IPython.core.getipython import get_ipython
         def ipython_post_mortem_debug(shell, etype, evalue, tb,
                    tb_offset=None):
@@ -876,7 +897,7 @@ def evalsc(command):
     """Evaluate special commands
     (analog to IPython's magic commands but far less powerful/complete)"""
     assert command.startswith('%')
-    from spyderlib.utils import programs
+    from spyder.utils import programs
 
     namespace = _get_globals()
     command = command[1:].strip()  # Remove leading %
@@ -907,7 +928,7 @@ def evalsc(command):
             programs.run_shell_command('ls')
             _print('\n')
     elif command == 'scientific':
-        from spyderlib.config import base
+        from spyder.config import base
         execfile(base.SCIENTIFIC_STARTUP, namespace)
     else:
         raise NotImplementedError("Unsupported command: '%s'" % command)
@@ -924,4 +945,3 @@ try:
 except KeyError:
     if os.environ.get('PYTHONPATH') is not None:
         del os.environ['PYTHONPATH']
-
diff --git a/spyderlib/utils/sourcecode.py b/spyder/utils/sourcecode.py
similarity index 93%
rename from spyderlib/utils/sourcecode.py
rename to spyder/utils/sourcecode.py
index 74f3b1d..af6074b 100644
--- a/spyderlib/utils/sourcecode.py
+++ b/spyder/utils/sourcecode.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """
 Source code text utilities
@@ -72,7 +72,7 @@ def fix_indentation(text):
     
 def is_builtin(text):
     """Test if passed string is the name of a Python builtin object"""
-    from spyderlib.py3compat import builtins
+    from spyder.py3compat import builtins
     return text in [str(name) for name in dir(builtins)
                     if not name.startswith('_')]
 
diff --git a/spyderlib/utils/stringmatching.py b/spyder/utils/stringmatching.py
similarity index 99%
rename from spyderlib/utils/stringmatching.py
rename to spyder/utils/stringmatching.py
index 4f43a07..8708322 100644
--- a/spyderlib/utils/stringmatching.py
+++ b/spyder/utils/stringmatching.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2015 The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """
 String search and match utilities usefull when filtering a list of texts.
diff --git a/spyderlib/utils/syntaxhighlighters.py b/spyder/utils/syntaxhighlighters.py
similarity index 98%
rename from spyderlib/utils/syntaxhighlighters.py
rename to spyder/utils/syntaxhighlighters.py
index 6d7e952..4bf481b 100644
--- a/spyderlib/utils/syntaxhighlighters.py
+++ b/spyder/utils/syntaxhighlighters.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """
 Editor widget syntax highlighters based on QtGui.QSyntaxHighlighter
@@ -22,11 +22,11 @@ from qtpy.QtGui import (QColor, QCursor, QFont, QSyntaxHighlighter,
 from qtpy.QtWidgets import QApplication
 
 # Local imports
-from spyderlib import dependencies
-from spyderlib.config.base import _
-from spyderlib.config.main import CONF
-from spyderlib.py3compat import builtins, is_text_string, to_text_string
-from spyderlib.utils.sourcecode import CELL_LANGUAGES
+from spyder import dependencies
+from spyder.config.base import _
+from spyder.config.main import CONF
+from spyder.py3compat import builtins, is_text_string, to_text_string
+from spyder.utils.sourcecode import CELL_LANGUAGES
 
 
 PYGMENTS_REQVER = '>=2.0'
diff --git a/spyderlib/utils/system.py b/spyder/utils/system.py
similarity index 90%
rename from spyderlib/utils/system.py
rename to spyder/utils/system.py
index 53db752..ad894ae 100644
--- a/spyderlib/utils/system.py
+++ b/spyder/utils/system.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2012 Pierre Raybaut
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """Operating system utilities"""
 
@@ -10,7 +10,7 @@
 import os
 
 # Local imports
-from spyderlib.utils import programs
+from spyder.utils import programs
 
 
 def windows_memory_usage():
diff --git a/spyderlib/utils/vcs.py b/spyder/utils/vcs.py
similarity index 93%
rename from spyderlib/utils/vcs.py
rename to spyder/utils/vcs.py
index b56686a..6f09390 100644
--- a/spyderlib/utils/vcs.py
+++ b/spyder/utils/vcs.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2011 Pierre Raybaut
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """Utilities for version control systems"""
 
@@ -13,9 +13,9 @@ import os.path as osp
 import subprocess
 
 # Local imports
-from spyderlib.utils import programs
-from spyderlib.utils.misc import abspardir
-from spyderlib.py3compat import PY3
+from spyder.utils import programs
+from spyder.utils.misc import abspardir
+from spyder.py3compat import PY3
 
 
 SUPPORTED = [
diff --git a/spyderlib/utils/windows.py b/spyder/utils/windows.py
similarity index 89%
rename from spyderlib/utils/windows.py
rename to spyder/utils/windows.py
index eda193c..0fa9255 100644
--- a/spyderlib/utils/windows.py
+++ b/spyder/utils/windows.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2012 Pierre Raybaut
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """Windows-specific utilities"""
 
@@ -39,7 +39,7 @@ def is_attached_console_visible():
 def set_windows_appusermodelid():
     """Make sure correct icon is used on Windows 7 taskbar"""
     try:
-        return windll.shell32.SetCurrentProcessExplicitAppUserModelID("spyderlib.Spyder")
+        return windll.shell32.SetCurrentProcessExplicitAppUserModelID("spyder.Spyder")
     except AttributeError:
         return "SetCurrentProcessExplicitAppUserModelID not found"
 
diff --git a/spyderlib/widgets/__init__.py b/spyder/widgets/__init__.py
similarity index 56%
rename from spyderlib/widgets/__init__.py
rename to spyder/widgets/__init__.py
index 652d1c5..9db34f4 100644
--- a/spyderlib/widgets/__init__.py
+++ b/spyder/widgets/__init__.py
@@ -1,15 +1,15 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """
-spyderlib.widgets
-=================
+spyder.widgets
+==============
 
 Widgets defined in this module may be used in any other Qt-based application
 
 They are also used in Spyder through the Plugin interface
-(see spyderlib.plugins)
+(see spyder.plugins)
 """
diff --git a/spyderlib/widgets/arraybuilder.py b/spyder/widgets/arraybuilder.py
similarity index 94%
rename from spyderlib/widgets/arraybuilder.py
rename to spyder/widgets/arraybuilder.py
index 5cb7826..f49b712 100644
--- a/spyderlib/widgets/arraybuilder.py
+++ b/spyder/widgets/arraybuilder.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """
 Numpy Matrix/Array Builder Widget.
@@ -24,9 +24,9 @@ from qtpy.QtWidgets import (QDialog, QHBoxLayout, QLineEdit, QTableWidget,
                             QWidget)
 
 # Local imports
-from spyderlib.config.base import _
-from spyderlib.utils import icon_manager as ima
-from spyderlib.widgets.helperwidgets import HelperToolButton
+from spyder.config.base import _
+from spyder.utils import icon_manager as ima
+from spyder.widgets.helperwidgets import HelperToolButton
 
 
 # Constants
@@ -390,7 +390,7 @@ class NumpyArrayDialog(QDialog):
 
 
 def test():  # pragma: no cover
-    from spyderlib.utils.qthelpers import qapplication
+    from spyder.utils.qthelpers import qapplication
     app = qapplication()
     dlg_table = NumpyArrayDialog(None, inline=False)
     dlg_inline = NumpyArrayDialog(None, inline=True)
diff --git a/spyderlib/widgets/browser.py b/spyder/widgets/browser.py
similarity index 92%
rename from spyderlib/widgets/browser.py
rename to spyder/widgets/browser.py
index caa0435..d4a171f 100644
--- a/spyderlib/widgets/browser.py
+++ b/spyder/widgets/browser.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """Simple web browser widget"""
 
@@ -17,13 +17,13 @@ from qtpy.QtWebEngineWidgets import (QWebEnginePage, QWebEngineSettings,
                                      QWebEngineView, WEBENGINE)
 
 # Local imports
-from spyderlib.config.base import _, DEV
-from spyderlib.py3compat import is_text_string, to_text_string
-from spyderlib.utils.qthelpers import (action2button, add_actions,
-                                       create_action, create_toolbutton)
-from spyderlib.utils import icon_manager as ima
-from spyderlib.widgets.comboboxes import UrlComboBox
-from spyderlib.widgets.findreplace import FindReplace
+from spyder.config.base import _, DEV
+from spyder.py3compat import is_text_string, to_text_string
+from spyder.utils.qthelpers import (action2button, add_actions,
+                                    create_action, create_toolbutton)
+from spyder.utils import icon_manager as ima
+from spyder.widgets.comboboxes import UrlComboBox
+from spyder.widgets.findreplace import FindReplace
 
 
 class WebPage(QWebEnginePage):
@@ -305,7 +305,7 @@ class FrameWebView(QFrame):
 
 def test():
     """Run web browser"""
-    from spyderlib.utils.qthelpers import qapplication
+    from spyder.utils.qthelpers import qapplication
     app = qapplication(test_time=8)
     widget = WebBrowser()
     widget.show()
diff --git a/spyderlib/widgets/calltip.py b/spyder/widgets/calltip.py
similarity index 99%
rename from spyderlib/widgets/calltip.py
rename to spyder/widgets/calltip.py
index 94882ef..5d73a23 100644
--- a/spyderlib/widgets/calltip.py
+++ b/spyder/widgets/calltip.py
@@ -21,7 +21,7 @@ from qtpy.QtWidgets import (QFrame, QLabel, QTextEdit, QPlainTextEdit, QStyle,
                             QStyleOptionFrame, QStylePainter, QToolTip)
 
 # Local imports
-from spyderlib.py3compat import to_text_string
+from spyder.py3compat import to_text_string
 
 
 class CallTipWidget(QLabel):
diff --git a/spyderlib/widgets/colors.py b/spyder/widgets/colors.py
similarity index 92%
rename from spyderlib/widgets/colors.py
rename to spyder/widgets/colors.py
index 6ccd814..34e5d6c 100644
--- a/spyderlib/widgets/colors.py
+++ b/spyder/widgets/colors.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 # Third party imports
 from qtpy.QtCore import Property, QSize, Signal, Slot
@@ -10,7 +10,7 @@ from qtpy.QtGui import QColor, QIcon, QPixmap
 from qtpy.QtWidgets import QColorDialog, QHBoxLayout, QLineEdit, QPushButton
 
 # Local imports
-from spyderlib.py3compat import is_text_string
+from spyder.py3compat import is_text_string
 
 
 class ColorButton(QPushButton):
diff --git a/spyderlib/widgets/comboboxes.py b/spyder/widgets/comboboxes.py
similarity index 94%
rename from spyderlib/widgets/comboboxes.py
rename to spyder/widgets/comboboxes.py
index 6eff48b..86756e5 100644
--- a/spyderlib/widgets/comboboxes.py
+++ b/spyder/widgets/comboboxes.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """Customized combobox widgets."""
 
@@ -23,9 +23,9 @@ from qtpy.QtGui import QFont
 from qtpy.QtWidgets import QComboBox, QCompleter, QSizePolicy, QToolTip
 
 # Local imports
-from spyderlib.config.base import _
-from spyderlib.py3compat import to_text_string
-from spyderlib.widgets.helperwidgets import IconLineEdit
+from spyder.config.base import _
+from spyder.py3compat import to_text_string
+from spyder.widgets.helperwidgets import IconLineEdit
 
 
 class BaseComboBox(QComboBox):
diff --git a/spyderlib/widgets/dependencies.py b/spyder/widgets/dependencies.py
similarity index 91%
rename from spyderlib/widgets/dependencies.py
rename to spyder/widgets/dependencies.py
index 5aca0e4..75372a3 100644
--- a/spyderlib/widgets/dependencies.py
+++ b/spyder/widgets/dependencies.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """Module checking Spyder runtime dependencies"""
 
@@ -18,9 +18,9 @@ from qtpy.QtWidgets import (QApplication, QDialog, QDialogButtonBox,
                             QTableView, QVBoxLayout)
 
 # Local imports
-from spyderlib import __version__
-from spyderlib.config.base import _
-from spyderlib.utils import icon_manager as ima
+from spyder import __version__
+from spyder.config.base import _
+from spyder.utils import icon_manager as ima
 
 
 class DependenciesTableModel(QAbstractTableModel):
@@ -87,7 +87,7 @@ class DependenciesTableModel(QAbstractTableModel):
         elif role == Qt.TextAlignmentRole:
             return to_qvariant(int(Qt.AlignLeft|Qt.AlignVCenter))
         elif role == Qt.BackgroundColorRole:
-            from spyderlib.dependencies import Dependency
+            from spyder.dependencies import Dependency
             status = dep.get_status()
             if status == Dependency.NOK:
                 color = QColor(Qt.red)
@@ -174,13 +174,13 @@ class DependenciesDialog(QDialog):
         self.view.sortByColumn(0, Qt.DescendingOrder)
     
     def copy_to_clipboard(self):
-        from spyderlib.dependencies import status
+        from spyder.dependencies import status
         QApplication.clipboard().setText(status())
 
 
 def test():
     """Run dependency widget test"""
-    from spyderlib import dependencies
+    from spyder import dependencies
     
     # Test sample
     dependencies.add("IPython", "Enhanced Python interpreter", ">=0.13")
@@ -188,7 +188,7 @@ def test():
     dependencies.add("sympy", "Symbolic Mathematics", ">=10.0")
     dependencies.add("foo", "Non-existent module", ">=1.0")
     
-    from spyderlib.utils.qthelpers import qapplication
+    from spyder.utils.qthelpers import qapplication
     app = qapplication()
     dlg = DependenciesDialog(None)
     dlg.set_data(dependencies.DEPENDENCIES)
diff --git a/spyderlib/widgets/editor.py b/spyder/widgets/editor.py
similarity index 95%
rename from spyderlib/widgets/editor.py
rename to spyder/widgets/editor.py
index 0f5156e..88cdaf3 100644
--- a/spyderlib/widgets/editor.py
+++ b/spyder/widgets/editor.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """Editor Widget"""
 
@@ -28,28 +28,26 @@ from qtpy.QtWidgets import (QAction, QApplication, QHBoxLayout, QMainWindow,
                             QWidget)
 
 # Local imports
-from spyderlib.config.base import _, DEBUG, STDERR, STDOUT
-from spyderlib.config.gui import (config_shortcut, fixed_shortcut,
-                                  RUN_CELL_SHORTCUT,
-                                  RUN_CELL_AND_ADVANCE_SHORTCUT)
-from spyderlib.config.utils import get_edit_extensions
-from spyderlib.py3compat import qbytearray_to_str, to_text_string, u
-from spyderlib.utils import icon_manager as ima
-from spyderlib.utils import (codeanalysis, encoding, sourcecode,
-                             syntaxhighlighters)
-from spyderlib.utils.qthelpers import (add_actions, create_action,
-                                       create_toolbutton, get_filetype_icon,
-                                       mimedata2url)
-from spyderlib.widgets.editortools import OutlineExplorerWidget
-from spyderlib.widgets.fileswitcher import FileSwitcher
-from spyderlib.widgets.findreplace import FindReplace
-from spyderlib.widgets.sourcecode import codeeditor
-from spyderlib.widgets.sourcecode.base import TextEditBaseWidget  # analysis:ignore
-from spyderlib.widgets.sourcecode.codeeditor import Printer       # analysis:ignore
-from spyderlib.widgets.sourcecode.codeeditor import get_file_language
-from spyderlib.widgets.status import (CursorPositionStatus, EncodingStatus,
-                                      EOLStatus, ReadWriteStatus)
-from spyderlib.widgets.tabs import BaseTabs
+from spyder.config.base import _, DEBUG, STDERR, STDOUT
+from spyder.config.gui import (config_shortcut, fixed_shortcut,
+                               RUN_CELL_SHORTCUT,
+                               RUN_CELL_AND_ADVANCE_SHORTCUT)
+from spyder.py3compat import qbytearray_to_str, to_text_string, u
+from spyder.utils import icon_manager as ima
+from spyder.utils import (codeanalysis, encoding, sourcecode,
+                          syntaxhighlighters)
+from spyder.utils.qthelpers import (add_actions, create_action,
+                                    create_toolbutton, mimedata2url)
+from spyder.widgets.editortools import OutlineExplorerWidget
+from spyder.widgets.fileswitcher import FileSwitcher
+from spyder.widgets.findreplace import FindReplace
+from spyder.widgets.sourcecode import codeeditor
+from spyder.widgets.sourcecode.base import TextEditBaseWidget  # analysis:ignore
+from spyder.widgets.sourcecode.codeeditor import Printer       # analysis:ignore
+from spyder.widgets.sourcecode.codeeditor import get_file_language
+from spyder.widgets.status import (CursorPositionStatus, EncodingStatus,
+                                   EOLStatus, ReadWriteStatus)
+from spyder.widgets.tabs import BaseTabs
 
 DEBUG_EDITOR = DEBUG >= 3
 
@@ -403,6 +401,7 @@ class EditorStack(QWidget):
         self.fullpath_sorting_enabled = None
         self.focus_to_editor = True
         self.set_fullpath_sorting_enabled(False)
+        self.create_new_file_if_empty = True
         ccs = 'Spyder'
         if ccs not in syntaxhighlighters.COLOR_SCHEME_NAMES:
             ccs = syntaxhighlighters.COLOR_SCHEME_NAMES[0]
@@ -978,8 +977,7 @@ class EditorStack(QWidget):
         self.data.sort(key=self.__get_sorting_func())
         index = self.data.index(finfo)
         fname, editor = finfo.filename, finfo.editor
-        self.tabs.insertTab(index, editor, get_filetype_icon(fname),
-                            self.get_tab_text(fname))
+        self.tabs.insertTab(index, editor, self.get_tab_text(fname))
         self.set_stack_title(index, False)
         if set_current:
             self.set_stack_index(index)
@@ -991,14 +989,13 @@ class EditorStack(QWidget):
         self.tabs.blockSignals(True)
         self.tabs.clear()
         for finfo in self.data:
-            icon = get_filetype_icon(finfo.filename)
             if finfo.newly_created:
                 is_modified = True
             else:
                 is_modified = None
             tab_text = self.get_tab_text(finfo.filename, is_modified)
             tab_tip = self.get_tab_tip(finfo.filename)
-            index = self.tabs.addTab(finfo.editor, icon, tab_text)
+            index = self.tabs.addTab(finfo.editor, tab_text)
             self.tabs.setTabToolTip(index, tab_tip)
         self.tabs.blockSignals(False)
         self.update_fileswitcher_dlg()
@@ -1169,7 +1166,7 @@ class EditorStack(QWidget):
                     new_index -= 1
                 self.set_stack_index(new_index)
 
-        if self.get_stack_count() == 0:
+        if self.get_stack_count() == 0 and self.create_new_file_if_empty:
             self.sig_new_file[()].emit()
             return False
 
@@ -2028,7 +2025,11 @@ class EditorSplitter(QSplitter):
             editorstack = splitter.widget(0)
             for index, finfo in enumerate(editorstack.data):
                 editor = finfo.editor
-                editor.go_to_line(clines[index])
+                # FIXME: Temporal fix
+                try:
+                    editor.go_to_line(clines[index])
+                except IndexError:
+                    pass
             editorstack.set_current_filename(cfname)
         hexstate = settings.get('hexstate')
         if hexstate is not None:
@@ -2377,11 +2378,11 @@ class EditorPluginExample(QSplitter):
 
 
 def test():
-    from spyderlib.utils.qthelpers import qapplication
-    from spyderlib.config.base import get_module_path
-    from spyderlib.utils.introspection.manager import IntrospectionManager
+    from spyder.utils.qthelpers import qapplication
+    from spyder.config.base import get_module_path
+    from spyder.utils.introspection.manager import IntrospectionManager
 
-    cur_dir = osp.join(get_module_path('spyderlib'), 'widgets')
+    cur_dir = osp.join(get_module_path('spyder'), 'widgets')
     app = qapplication(test_time=8)
     introspector = IntrospectionManager()
 
diff --git a/spyderlib/widgets/editortools.py b/spyder/widgets/editortools.py
similarity index 95%
rename from spyderlib/widgets/editortools.py
rename to spyder/widgets/editortools.py
index 55ba360..5a9a60a 100644
--- a/spyderlib/widgets/editortools.py
+++ b/spyder/widgets/editortools.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2010 Pierre Raybaut
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """Editor tools: outline explorer, etc."""
 
@@ -17,12 +17,12 @@ from qtpy.QtCore import Qt, Signal, Slot
 from qtpy.QtWidgets import QHBoxLayout, QTreeWidgetItem, QVBoxLayout, QWidget
 
 # Local imports
-from spyderlib.config.base import _, STDOUT
-from spyderlib.py3compat import to_text_string
-from spyderlib.utils import icon_manager as ima
-from spyderlib.utils.qthelpers import (create_action, create_toolbutton,
-                                       set_item_user_text)
-from spyderlib.widgets.onecolumntree import OneColumnTree
+from spyder.config.base import _, STDOUT
+from spyder.py3compat import to_text_string
+from spyder.utils import icon_manager as ima
+from spyder.utils.qthelpers import (create_action, create_toolbutton,
+                                    set_item_user_text)
+from spyder.widgets.onecolumntree import OneColumnTree
 
 
 #===============================================================================
diff --git a/spyderlib/widgets/explorer.py b/spyder/widgets/explorer.py
similarity index 92%
rename from spyderlib/widgets/explorer.py
rename to spyder/widgets/explorer.py
index e43eabd..5cfb441 100644
--- a/spyderlib/widgets/explorer.py
+++ b/spyder/widgets/explorer.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """Files and Directories Explorer"""
 
@@ -21,20 +21,21 @@ import shutil
 # Third party imports
 from qtpy import API, is_pyqt46
 from qtpy.compat import getsavefilename, getexistingdirectory
-from qtpy.QtCore import (QDir, QMimeData, QSize, QSortFilterProxyModel, Qt,
-                         QTimer, QUrl, Signal, Slot)
+from qtpy.QtCore import (QDir, QFileInfo, QMimeData, QSize,
+                         QSortFilterProxyModel, Qt, QTimer, QUrl,
+                         Signal, Slot)
 from qtpy.QtGui import QDrag
-from qtpy.QtWidgets import (QFileSystemModel, QHBoxLayout, QInputDialog,
-                            QLabel, QLineEdit, QMenu, QMessageBox, QToolButton,
-                            QTreeView, QVBoxLayout, QWidget)
-
+from qtpy.QtWidgets import (QFileSystemModel, QHBoxLayout, QFileIconProvider,
+                            QInputDialog, QLabel, QLineEdit, QMenu,
+                            QMessageBox, QToolButton, QTreeView, QVBoxLayout,
+                            QWidget)
 # Local imports
-from spyderlib.config.base import _
-from spyderlib.py3compat import (getcwd, str_lower, to_binary_string,
-                                 to_text_string, PY2)
-from spyderlib.utils import icon_manager as ima
-from spyderlib.utils import encoding, misc, programs, vcs
-from spyderlib.utils.qthelpers import add_actions, create_action, file_uri
+from spyder.config.base import _
+from spyder.py3compat import (getcwd, str_lower, to_binary_string,
+                              to_text_string, PY2)
+from spyder.utils import icon_manager as ima
+from spyder.utils import encoding, misc, programs, vcs
+from spyder.utils.qthelpers import add_actions, create_action, file_uri
 
 try:
     from nbconvert import PythonExporter as nbexporter
@@ -82,6 +83,27 @@ def has_subdirectories(path, include, exclude, show_all):
         return False
 
 
+class IconProvider(QFileIconProvider):
+    """Project tree widget icon provider"""
+    def __init__(self, treeview):
+        super(IconProvider, self).__init__()
+        self.treeview = treeview
+
+    @Slot(int)
+    @Slot(QFileInfo)
+    def icon(self, icontype_or_qfileinfo):
+        """Reimplement Qt method"""
+        if isinstance(icontype_or_qfileinfo, QFileIconProvider.IconType):
+            return super(IconProvider, self).icon(icontype_or_qfileinfo)
+        else:
+            qfileinfo = icontype_or_qfileinfo
+            fname = osp.normpath(to_text_string(qfileinfo.absoluteFilePath()))
+            if osp.isdir(fname):
+                return ima.icon('DirOpenIcon')
+            else:
+                return ima.icon('FileIcon')
+
+
 class DirView(QTreeView):
     """Base file/directory tree view"""
     def __init__(self, parent=None):
@@ -118,6 +140,8 @@ class DirView(QTreeView):
         self.setAnimated(False)
         self.setSortingEnabled(True)
         self.sortByColumn(0, Qt.AscendingOrder)
+        self.fsmodel.modelReset.connect(self.reset_icon_provider)
+        self.reset_icon_provider()
         
     def set_name_filters(self, name_filters):
         """Set name filters"""
@@ -160,13 +184,18 @@ class DirView(QTreeView):
     def setup(self, name_filters=['*.py', '*.pyw'], show_all=False):
         """Setup tree widget"""
         self.setup_view()
-        
+
         self.set_name_filters(name_filters)
         self.show_all = show_all
         
         # Setup context menu
         self.menu = QMenu(self)
         self.common_actions = self.setup_common_actions()
+
+    def reset_icon_provider(self):
+        """Reset file system model icon provider
+        The purpose of this is to refresh files/directories icons"""
+        self.fsmodel.setIconProvider(IconProvider(self))
         
     #---- Context menu
     def setup_common_actions(self):
@@ -686,6 +715,9 @@ class DirView(QTreeView):
         filters = _("Python scripts")+" (*.py *.pyw *.ipy)"
         create_func = lambda fname: self.parent_widget.create_module.emit(fname)
         self.create_new_file(basedir, title, filters, create_func)
+
+    def go_to_parent_directory(self):
+        pass
         
     #----- VCS actions
     def vcs_command(self, fnames, action):
@@ -818,6 +850,13 @@ class ProxyModel(QSortFilterProxyModel):
             else:
                 return False
 
+    def data(self, index, role):
+        """Show tooltip with full path only for the root directory"""
+        if role == Qt.ToolTipRole:
+            root_dir = self.path_list[0].split(osp.sep)[-1]
+            if index.data() == root_dir:
+                return osp.join(self.root_path, root_dir)
+        return QSortFilterProxyModel.data(self, index, role)
 
 class FilteredDirView(DirView):
     """Filtered file/directory tree view"""
@@ -836,7 +875,6 @@ class FilteredDirView(DirView):
     def install_model(self):
         """Install proxy model"""
         if self.root_path is not None:
-            self.fsmodel.setNameFilters(self.name_filters)
             self.setModel(self.proxymodel)
         
     def set_root_path(self, root_path):
@@ -865,6 +903,12 @@ class FilteredDirView(DirView):
             path = self.fsmodel.filePath(self.proxymodel.mapToSource(index))
             return osp.normpath(to_text_string(path))
 
+    def setup_project_view(self):
+        """Setup view for projects"""
+        for i in [1, 2, 3]:
+            self.hideColumn(i)
+        self.setHeaderHidden(True)
+
 
 class ExplorerTreeWidget(DirView):
     """File/directory explorer tree widget
@@ -1146,12 +1190,13 @@ class ProjectExplorerTest(QWidget):
         self.treewidget = FilteredDirView(self)
         self.treewidget.setup_view()
         self.treewidget.set_root_path(osp.dirname(osp.abspath(__file__)))
-        self.treewidget.set_folder_names(['variableexplorer', 'sourcecode'])
+        self.treewidget.set_folder_names(['variableexplorer'])
+        self.treewidget.setup_project_view()
         vlayout.addWidget(self.treewidget)
 
 
 def test(file_explorer):
-    from spyderlib.utils.qthelpers import qapplication
+    from spyder.utils.qthelpers import qapplication
     app = qapplication()
     if file_explorer:
         test = FileExplorerTest()
diff --git a/spyderlib/widgets/externalshell/__init__.py b/spyder/widgets/externalshell/__init__.py
similarity index 50%
rename from spyderlib/widgets/externalshell/__init__.py
rename to spyder/widgets/externalshell/__init__.py
index 54b037f..042ce5d 100644
--- a/spyderlib/widgets/externalshell/__init__.py
+++ b/spyder/widgets/externalshell/__init__.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009-2010 Pierre Raybaut
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """
-spyderlib.widgets.externalshell
-===============================
+spyder.widgets.externalshell
+============================
 
 External Shell widget: execute Python script/terminal in a separate process
 """
diff --git a/spyderlib/widgets/externalshell/baseshell.py b/spyder/widgets/externalshell/baseshell.py
similarity index 88%
rename from spyderlib/widgets/externalshell/baseshell.py
rename to spyder/widgets/externalshell/baseshell.py
index 2ccc24b..6dd7869 100644
--- a/spyderlib/widgets/externalshell/baseshell.py
+++ b/spyder/widgets/externalshell/baseshell.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 # pylint: disable=C0103
 # pylint: disable=R0903
@@ -11,7 +11,6 @@
 
 # Standard library imports
 from time import time, strftime, gmtime
-import os
 import os.path as osp
 
 # Third party imports
@@ -21,33 +20,16 @@ from qtpy.QtWidgets import (QHBoxLayout, QInputDialog, QLabel, QLineEdit,
                             QMenu, QToolButton, QVBoxLayout, QWidget)
 
 # Local imports
-from spyderlib.config.base import _, get_conf_path
-from spyderlib.py3compat import is_text_string, to_text_string
-from spyderlib.utils import icon_manager as ima
-from spyderlib.utils.qthelpers import (add_actions, create_action,
-                                       create_toolbutton)
+from spyder.config.base import _, get_conf_path
+from spyder.py3compat import to_text_string
+from spyder.utils import icon_manager as ima
+from spyder.utils.qthelpers import (add_actions, create_action,
+                                    create_toolbutton)
 
 
 LOCALE_CODEC = QTextCodec.codecForLocale()
 
 
-def add_pathlist_to_PYTHONPATH(env, pathlist, drop_env=False):
-    # PyQt API 1/2 compatibility-related tests:
-    assert isinstance(env, list)
-    assert all([is_text_string(path) for path in env])
-    
-    pypath = "PYTHONPATH"
-    pathstr = os.pathsep.join(pathlist)
-    if os.environ.get(pypath) is not None and not drop_env:
-        for index, var in enumerate(env[:]):
-            if var.startswith(pypath+'='):
-                env[index] = var.replace(pypath+'=',
-                                         pypath+'='+pathstr+os.pathsep)
-        env.append('OLD_PYTHONPATH='+os.environ[pypath])
-    else:
-        env.append(pypath+'='+pathstr)
-    
-
 #TODO: code refactoring/cleaning (together with systemshell.py and pythonshell.py)
 class ExternalShellBase(QWidget):
     """External Shell widget: execute Python script in a separate process"""
@@ -235,7 +217,7 @@ class ExternalShellBase(QWidget):
                 pass
 
     def set_buttons_runnning_state(self, state):
-        self.run_button.setVisible(not state and not self.is_ipykernel)
+        self.run_button.setVisible(not state)
         self.kill_button.setVisible(state)
 
     @Slot(bool)
diff --git a/spyderlib/widgets/externalshell/introspection.py b/spyder/widgets/externalshell/introspection.py
similarity index 91%
rename from spyderlib/widgets/externalshell/introspection.py
rename to spyder/widgets/externalshell/introspection.py
index c8dbc1b..2705331 100644
--- a/spyderlib/widgets/externalshell/introspection.py
+++ b/spyder/widgets/externalshell/introspection.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2011 Pierre Raybaut
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """External shell's introspection and notification servers"""
 
@@ -16,10 +16,10 @@ import threading
 from qtpy.QtCore import QThread, Signal
 
 # Local imports
-from spyderlib.config.base import get_conf_path, DEBUG
-from spyderlib.utils.debug import log_last_error
-from spyderlib.utils.bsdsocket import read_packet, write_packet
-from spyderlib.utils.misc import select_port
+from spyder.config.base import get_conf_path, DEBUG
+from spyder.utils.debug import log_last_error
+from spyder.utils.bsdsocket import read_packet, write_packet
+from spyder.utils.misc import select_port
 
 
 LOG_FILENAME = get_conf_path('introspection.log')
@@ -143,9 +143,8 @@ class NotificationThread(QThread):
     sig_process_remote_view = Signal(object)
     sig_pdb = Signal(str, int)
     open_file = Signal(str, int)
-    new_ipython_kernel = Signal(str)
     refresh_namespace_browser = Signal()
-    
+
     def __init__(self):
         QThread.__init__(self)
         self.notify_socket = None
@@ -187,8 +186,6 @@ class NotificationThread(QThread):
                     self.refresh_namespace_browser.emit()
                 elif command == 'remote_view':
                     self.sig_process_remote_view.emit(data)
-                elif command == 'ipykernel':
-                    self.new_ipython_kernel.emit(data)
                 elif command == 'open_file':
                     fname, lineno = data
                     self.open_file.emit(fname, lineno)
diff --git a/spyderlib/widgets/externalshell/monitor.py b/spyder/widgets/externalshell/monitor.py
similarity index 76%
rename from spyderlib/widgets/externalshell/monitor.py
rename to spyder/widgets/externalshell/monitor.py
index 0f64af3..3fdceea 100644
--- a/spyderlib/widgets/externalshell/monitor.py
+++ b/spyder/widgets/externalshell/monitor.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """External shell's monitor"""
 
@@ -17,77 +17,26 @@ import struct
 import threading
 
 # Local imports
-from spyderlib.utils.misc import fix_reference_name
-from spyderlib.utils.debug import log_last_error
-from spyderlib.utils.dochelpers import (getargtxt, getdoc, getsource,
-                                        getobjdir, isdefined)
-from spyderlib.utils.bsdsocket import (communicate, read_packet, write_packet,
-                                       PACKET_NOT_RECEIVED, PICKLE_HIGHEST_PROTOCOL)
-from spyderlib.utils.introspection.module_completion import module_completion
-from spyderlib.config.base import get_conf_path, get_supported_types, DEBUG
-from spyderlib.py3compat import getcwd, is_text_string, pickle, _thread
+from spyder.config.base import get_conf_path, DEBUG
+from spyder.py3compat import getcwd, is_text_string, pickle, _thread
+from spyder.utils.misc import fix_reference_name
+from spyder.utils.debug import log_last_error
+from spyder.utils.dochelpers import (getargtxt, getdoc, getsource,
+                                     getobjdir, isdefined)
+from spyder.utils.bsdsocket import (communicate, read_packet, write_packet,
+                                    PACKET_NOT_RECEIVED, PICKLE_HIGHEST_PROTOCOL)
+from spyder.utils.introspection.module_completion import module_completion
+from spyder.widgets.variableexplorer.utils import (get_remote_data,
+                                                   make_remote_view)
 
 
-SUPPORTED_TYPES = {}
-
 LOG_FILENAME = get_conf_path('monitor.log')
-
 DEBUG_MONITOR = DEBUG >= 2
-
 if DEBUG_MONITOR:
     import logging
     logging.basicConfig(filename=get_conf_path('monitor_debug.log'),
                         level=logging.DEBUG)
 
-REMOTE_SETTINGS = ('check_all', 'exclude_private', 'exclude_uppercase',
-                   'exclude_capitalized', 'exclude_unsupported',
-                   'excluded_names', 'truncate', 'minmax',
-                   'remote_editing', 'autorefresh')
-
-def get_remote_data(data, settings, mode, more_excluded_names=None):
-    """
-    Return globals according to filter described in *settings*:
-        * data: data to be filtered (dictionary)
-        * settings: variable explorer settings (dictionary)
-        * mode (string): 'editable' or 'picklable'
-        * more_excluded_names: additional excluded names (list)
-    """
-    from spyderlib.widgets.variableexplorer.utils import globalsfilter
-    global SUPPORTED_TYPES
-    if not SUPPORTED_TYPES:
-        SUPPORTED_TYPES = get_supported_types()
-    assert mode in list(SUPPORTED_TYPES.keys())
-    excluded_names = settings['excluded_names']
-    if more_excluded_names is not None:
-        excluded_names += more_excluded_names
-    return globalsfilter(data, check_all=settings['check_all'],
-                         filters=tuple(SUPPORTED_TYPES[mode]),
-                         exclude_private=settings['exclude_private'],
-                         exclude_uppercase=settings['exclude_uppercase'],
-                         exclude_capitalized=settings['exclude_capitalized'],
-                         exclude_unsupported=settings['exclude_unsupported'],
-                         excluded_names=excluded_names)
-
-def make_remote_view(data, settings, more_excluded_names=None):
-    """
-    Make a remote view of dictionary *data*
-    -> globals explorer
-    """
-    from spyderlib.widgets.variableexplorer.utils import (get_human_readable_type,
-                                    get_size, get_color_name, value_to_display)
-    assert all([name in REMOTE_SETTINGS for name in settings])
-    data = get_remote_data(data, settings, mode='editable',
-                           more_excluded_names=more_excluded_names)
-    remote = {}
-    for key, value in list(data.items()):
-        view = value_to_display(value, truncate=settings['truncate'],
-                                minmax=settings['minmax'])
-        remote[key] = {'type':  get_human_readable_type(value),
-                       'size':  get_size(value),
-                       'color': get_color_name(value),
-                       'view':  view}
-    return remote
-    
 
 def monitor_save_globals(sock, settings, filename):
     """Save globals() to file"""
@@ -116,20 +65,17 @@ def monitor_copy_global(sock, orig_name, new_name):
     return communicate(sock, '__copy_global__("%s", "%s")' \
                        % (orig_name, new_name))
 
-
 def _getcdlistdir():
     """Return current directory list dir"""
     return os.listdir(getcwd())
 
+
 class Monitor(threading.Thread):
     """Monitor server"""
     def __init__(self, host, introspection_port, notification_port,
                  shell_id, timeout, auto_refresh):
         threading.Thread.__init__(self)
         self.setDaemon(True)
-
-        self.ipykernel = None
-        self.ipython_shell = None
         
         self.pdb_obj = None
         
@@ -142,9 +88,6 @@ class Monitor(threading.Thread):
         self.inputhook_flag = False
         self.first_inputhook_call = True
         
-        # To grab the IPython internal namespace
-        self.ip = None
-        
         # Connecting to introspection server
         self.i_request = socket.socket( socket.AF_INET )
         self.i_request.connect( (host, introspection_port) )
@@ -223,20 +166,10 @@ class Monitor(threading.Thread):
                 self._mglobals = glbs
             else:
                 glbs = self._mglobals
-            if self.ipykernel is None and '__ipythonkernel__' in glbs:
-                self.ipykernel = glbs['__ipythonkernel__']
-                communicate(self.n_request,
-                            dict(command="ipykernel",
-                                 data=self.ipykernel.connection_file))
-            if self.ipython_shell is None and '__ipythonshell__' in glbs:
-                # IPython kernel
-                self.ipython_shell = glbs['__ipythonshell__']
-                glbs = self.ipython_shell.user_ns
-                self.ip = self.ipython_shell.get_ipython()
             self._mglobals = glbs
             return glbs
     
-    def get_current_namespace(self, with_magics=False):
+    def get_current_namespace(self):
         """Return current namespace, i.e. globals() if not debugging,
         or a dictionary containing both locals() and globals() 
         for current frame when debugging"""
@@ -249,14 +182,6 @@ class Monitor(threading.Thread):
             ns.update(glbs)
             ns.update(self.pdb_locals)
 
-        # Add magics to ns so we can show help about them on the Help
-        # plugin
-        if self.ip and with_magics:
-            line_magics = self.ip.magics_manager.magics['line']
-            cell_magics = self.ip.magics_manager.magics['cell']
-            ns.update(line_magics)
-            ns.update(cell_magics)
-        
         return ns
     
     def get_reference_namespace(self, name):
@@ -279,7 +204,7 @@ class Monitor(threading.Thread):
     
     def isdefined(self, obj, force_import=False):
         """Return True if object is defined in current namespace"""
-        ns = self.get_current_namespace(with_magics=True)
+        ns = self.get_current_namespace()
         return isdefined(obj, force_import=force_import, namespace=ns)
 
     def toggle_inputhook_flag(self, state):
@@ -342,7 +267,7 @@ class Monitor(threading.Thread):
         and *valid* is True if object evaluation did not raise any exception
         """
         assert is_text_string(text)
-        ns = self.get_current_namespace(with_magics=True)
+        ns = self.get_current_namespace()
         try:
             return eval(text, ns), True
         except:
@@ -402,7 +327,7 @@ class Monitor(threading.Thread):
         """Return True if object is an instance of class PIL.Image.Image"""
         ns = self.get_current_namespace()
         try:
-            from spyderlib.pil_patch import Image
+            from spyder.pil_patch import Image
             return isinstance(ns[name], Image.Image)
         except ImportError:
             return False
@@ -451,26 +376,23 @@ class Monitor(threading.Thread):
         settings = self.remote_view_settings
         if settings:
             ns = self.get_current_namespace()
-            more_excluded_names = ['In', 'Out'] if self.ipython_shell else None
-            remote_view = make_remote_view(ns, settings, more_excluded_names)
+            remote_view = make_remote_view(ns, settings)
             communicate(self.n_request,
                         dict(command="remote_view", data=remote_view))
         
     def saveglobals(self):
         """Save globals() into filename"""
         ns = self.get_current_namespace()
-        from spyderlib.utils.iofuncs import iofunctions
+        from spyder.utils.iofuncs import iofunctions
         settings = read_packet(self.i_request)
         filename = read_packet(self.i_request)
-        more_excluded_names = ['In', 'Out'] if self.ipython_shell else None
-        data = get_remote_data(ns, settings, mode='picklable',
-                               more_excluded_names=more_excluded_names).copy()
+        data = get_remote_data(ns, settings, mode='picklable').copy()
         return iofunctions.save(data, filename)
         
     def loadglobals(self):
         """Load globals() from filename"""
         glbs = self.mglobals()
-        from spyderlib.utils.iofuncs import iofunctions
+        from spyder.utils.iofuncs import iofunctions
         filename = read_packet(self.i_request)
         ext = read_packet(self.i_request)
         load_func = iofunctions.load_funcs[ext]
@@ -519,7 +441,6 @@ class Monitor(threading.Thread):
         self.refresh_after_eval = True
         
     def run(self):
-        self.ipython_shell = None
         while True:
             output = pickle.dumps(None, PICKLE_HIGHEST_PROTOCOL)
             glbs = self.mglobals()
diff --git a/spyderlib/widgets/externalshell/pythonshell.py b/spyder/widgets/externalshell/pythonshell.py
similarity index 87%
rename from spyderlib/widgets/externalshell/pythonshell.py
rename to spyder/widgets/externalshell/pythonshell.py
index ad653c1..09e9b82 100644
--- a/spyderlib/widgets/externalshell/pythonshell.py
+++ b/spyder/widgets/externalshell/pythonshell.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """External Python Shell widget: execute Python script in a separate process"""
 
@@ -18,22 +18,21 @@ from qtpy.QtCore import QProcess, QProcessEnvironment, Qt, Signal, Slot
 from qtpy.QtWidgets import QApplication, QMenu, QMessageBox, QSplitter
 
 # Local imports
-from spyderlib.config.base import (_, DEBUG, get_module_source_path,
-                                   MAC_APP_NAME, running_in_mac_app)
-from spyderlib.py3compat import (is_text_string, to_binary_string,
-                                 to_text_string)
-from spyderlib.utils import icon_manager as ima
-from spyderlib.utils.bsdsocket import communicate, write_packet
-from spyderlib.utils.environ import RemoteEnvDialog
-from spyderlib.utils.misc import get_python_executable
-from spyderlib.utils.programs import get_python_args
-from spyderlib.utils.qthelpers import (add_actions, create_action,
-                                       create_toolbutton, DialogManager)
-from spyderlib.widgets.externalshell.baseshell import (ExternalShellBase,
-                                                       add_pathlist_to_PYTHONPATH)
-from spyderlib.widgets.shell import PythonShellWidget
-from spyderlib.widgets.variableexplorer.namespacebrowser import NamespaceBrowser
-from spyderlib.widgets.variableexplorer.collectionseditor import CollectionsEditor
+from spyder.config.base import (_, DEBUG, get_module_source_path,
+                                MAC_APP_NAME, running_in_mac_app)
+from spyder.py3compat import (is_text_string, to_binary_string,
+                              to_text_string)
+from spyder.utils import icon_manager as ima
+from spyder.utils.bsdsocket import communicate, write_packet
+from spyder.utils.environ import RemoteEnvDialog
+from spyder.utils.misc import add_pathlist_to_PYTHONPATH, get_python_executable
+from spyder.utils.programs import get_python_args
+from spyder.utils.qthelpers import (add_actions, create_action,
+                                    create_toolbutton, DialogManager)
+from spyder.widgets.externalshell.baseshell import ExternalShellBase
+from spyder.widgets.shell import PythonShellWidget
+from spyder.widgets.variableexplorer.namespacebrowser import NamespaceBrowser
+from spyder.widgets.variableexplorer.collectionseditor import CollectionsEditor
 
 
 class ExtPythonShellWidget(PythonShellWidget):
@@ -155,6 +154,10 @@ class ExtPythonShellWidget(PythonShellWidget):
     def set_spyder_breakpoints(self):
         """Set Spyder breakpoints into debugging session"""
         return self.ask_monitor("set_spyder_breakpoints()")
+
+    def is_running(self):
+        """Check if parent is running"""
+        return self.parent().is_running()
         
 
 class ExternalPythonShell(ExternalShellBase):
@@ -162,15 +165,13 @@ class ExternalPythonShell(ExternalShellBase):
     SHELL_CLASS = ExtPythonShellWidget
     sig_pdb = Signal(str, int)
     open_file = Signal(str, int)
-    ipython_kernel_start_error = Signal(str)
-    create_ipython_client = Signal(str)
     started = Signal()
     sig_finished = Signal()
-    
+
     def __init__(self, parent=None, fname=None, wdir=None,
                  interact=False, debug=False, post_mortem=False,
                  path=[], python_args='',
-                 ipykernel=False, arguments='', stand_alone=None,
+                 arguments='', stand_alone=None,
                  umr_enabled=True, umr_namelist=[], umr_verbose=True,
                  pythonstartup=None, pythonexecutable=None,
                  external_interpreter=False,
@@ -188,7 +189,6 @@ class ExternalPythonShell(ExternalShellBase):
 
         self.stand_alone = stand_alone # stand alone settings (None: plugin)
         self.interact = interact
-        self.is_ipykernel = ipykernel
         self.pythonstartup = pythonstartup
         self.pythonexecutable = pythonexecutable
         self.external_interpreter = external_interpreter
@@ -226,19 +226,11 @@ class ExternalPythonShell(ExternalShellBase):
         if python_args:
             assert is_text_string(python_args)
             self.python_args = python_args
-        
+
         assert is_text_string(arguments)
         self.arguments = arguments
-        
-        self.connection_file = None
-
-        if self.is_ipykernel:
-            self.interact = False
-            # Running our custom startup script for IPython kernels:
-            # (see spyderlib/widgets/externalshell/start_ipython_kernel.py)
-            self.fname = get_module_source_path(
-                'spyderlib.widgets.externalshell', 'start_ipython_kernel.py')
-        
+
+        self.connection_file = None        
         self.shell.set_externalshell(self)
 
         self.toggle_globals_explorer(False)
@@ -434,18 +426,16 @@ class ExternalPythonShell(ExternalShellBase):
             env.append('SPYDER_EXCEPTHOOK=True')
 
         # Set standard input/output encoding for Python consoles
-        # (IPython handles it on its own)
         # See http://stackoverflow.com/q/26312400/438386, specifically
         # the comments of Martijn Pieters
-        if not self.is_ipykernel:
-            env.append('PYTHONIOENCODING=UTF-8')
+        env.append('PYTHONIOENCODING=UTF-8')
 
         # Monitor
         if self.monitor_enabled:
             env.append('SPYDER_SHELL_ID=%s' % id(self))
             env.append('SPYDER_AR_TIMEOUT=%d' % self.autorefresh_timeout)
             env.append('SPYDER_AR_STATE=%r' % self.autorefresh_state)
-            from spyderlib.widgets.externalshell import introspection
+            from spyder.widgets.externalshell import introspection
             introspection_server = introspection.start_introspection_server()
             introspection_server.register(self)
             notification_server = introspection.start_notification_server()
@@ -453,9 +443,6 @@ class ExternalPythonShell(ExternalShellBase):
             self.notification_thread.sig_pdb.connect(
                                               lambda fname, lineno:
                                               self.sig_pdb.emit(fname, lineno))
-            self.notification_thread.new_ipython_kernel.connect(
-                                         lambda args:
-                                         self.create_ipython_client.emit(args))
             self.notification_thread.open_file.connect(
                                             lambda fname, lineno:
                                             self.open_file.emit(fname, lineno))
@@ -465,12 +452,11 @@ class ExternalPythonShell(ExternalShellBase):
             env.append('SPYDER_N_PORT=%d' % notification_server.port)
 
         # External modules options
-        if not self.is_ipykernel:
-            env.append('ETS_TOOLKIT=%s' % self.ets_backend)
+        env.append('ETS_TOOLKIT=%s' % self.ets_backend)
         if self.mpl_backend is not None:
             backends = {0: 'Automatic', 1: 'None', 2: 'TkAgg'}
             env.append('SPY_MPL_BACKEND=%s' % backends[self.mpl_backend])
-        if self.qt_api and not self.is_ipykernel:
+        if self.qt_api:
             env.append('QT_API=%s' % self.qt_api)
         env.append('COLORIZE_SYS_STDERR=%s' % self.colorize_sys_stderr)
 #        # Socket-based alternative (see input hook in sitecustomize.py):
@@ -491,16 +477,14 @@ class ExternalPythonShell(ExternalShellBase):
             else:
                 env.append('MATPLOTLIB_ION=False')
 
-        # IPython kernel
-        env.append('IPYTHON_KERNEL=%r' % self.is_ipykernel)
-
         # External interpreter
         env.append('EXTERNAL_INTERPRETER=%r' % self.external_interpreter)
 
         # Add sitecustomize path to path list
         pathlist = []
-        scpath = osp.dirname(osp.abspath(__file__))
-        pathlist.append(scpath)
+        spy_path = get_module_source_path('spyder')
+        sc_path = osp.join(spy_path, 'utils', 'site')
+        pathlist.append(sc_path)
         
         # Adding Spyder path
         pathlist += self.path
@@ -546,13 +530,8 @@ class ExternalPythonShell(ExternalShellBase):
         running = self.process.waitForStarted(3000)
         self.set_running_state(running)
         if not running:
-            if self.is_ipykernel:
-                self.ipython_kernel_start_error.emit(
-                          _("The kernel failed to start!! That's all we know... "
-                            "Please close this console and open a new one."))
-            else:
-                QMessageBox.critical(self, _("Error"),
-                                     _("A Python console failed to start!"))
+            QMessageBox.critical(self, _("Error"),
+                                 _("A Python console failed to start!"))
         else:
             self.shell.setFocus()
             self.started.emit()
@@ -560,8 +539,6 @@ class ExternalPythonShell(ExternalShellBase):
 
     def finished(self, exit_code, exit_status):
         """Reimplement ExternalShellBase method"""
-        if self.is_ipykernel and exit_code == 1:
-            self.ipython_kernel_start_error.emit(self.shell.get_text_with_eol())
         ExternalShellBase.finished(self, exit_code, exit_status)
         self.introspection_socket = None
 
@@ -658,10 +635,10 @@ class ExternalPythonShell(ExternalShellBase):
 
 
 def test():
-    from spyderlib.utils.qthelpers import qapplication
+    from spyder.utils.qthelpers import qapplication
     app = qapplication()
 
-    from spyderlib.plugins.variableexplorer import VariableExplorer
+    from spyder.plugins.variableexplorer import VariableExplorer
     settings = VariableExplorer.get_settings()
 
     shell = ExternalPythonShell(pythonexecutable=sys.executable,
@@ -671,7 +648,7 @@ def test():
                                 mpl_backend=0,
                                 light_background=False)
 
-    from spyderlib.config.gui import get_font
+    from spyder.config.gui import get_font
     
     font = get_font()
     shell.shell.set_font(font)
diff --git a/spyderlib/widgets/externalshell/systemshell.py b/spyder/widgets/externalshell/systemshell.py
similarity index 88%
rename from spyderlib/widgets/externalshell/systemshell.py
rename to spyder/widgets/externalshell/systemshell.py
index 31b15d9..838a50f 100644
--- a/spyderlib/widgets/externalshell/systemshell.py
+++ b/spyder/widgets/externalshell/systemshell.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """External System Shell widget: execute terminal in a separate process"""
 
@@ -15,13 +15,12 @@ from qtpy.QtCore import QProcess, QProcessEnvironment, QTextCodec, Signal
 from qtpy.QtWidgets import QMessageBox
 
 # Local imports
-from spyderlib.config.base import _
-from spyderlib.py3compat import is_text_string, to_text_string
-from spyderlib.utils import icon_manager as ima
-from spyderlib.utils.programs import shell_split
-from spyderlib.widgets.externalshell.baseshell import (add_pathlist_to_PYTHONPATH,
-                                                       ExternalShellBase)
-from spyderlib.widgets.shell import TerminalWidget
+from spyder.config.base import _
+from spyder.py3compat import is_text_string, to_text_string
+from spyder.utils import icon_manager as ima
+from spyder.utils.misc import add_pathlist_to_PYTHONPATH
+from spyder.widgets.externalshell.baseshell import ExternalShellBase
+from spyder.widgets.shell import TerminalWidget
 
 
 LOCALE_CODEC = QTextCodec.codecForLocale()
@@ -42,13 +41,12 @@ class ExternalSystemShell(ExternalShellBase):
                                    menu_actions=menu_actions,
                                    show_buttons_inside=show_buttons_inside,
                                    show_elapsed_time=show_elapsed_time)
-        
+
         # Additional python path list
         self.path = path
-        
+
         # For compatibility with the other shells that can live in the external
         # console
-        self.is_ipykernel = False
         self.connection_file = None
 
     def get_icon(self):
@@ -164,7 +162,7 @@ class ExternalSystemShell(ExternalShellBase):
 #==============================================================================
 def test():
     import os.path as osp
-    from spyderlib.utils.qthelpers import qapplication
+    from spyder.utils.qthelpers import qapplication
     app = qapplication(test_time=5)
     shell = ExternalSystemShell(wdir=osp.dirname(__file__),
                                 light_background=False)
diff --git a/spyderlib/widgets/fileswitcher.py b/spyder/widgets/fileswitcher.py
similarity index 92%
rename from spyderlib/widgets/fileswitcher.py
rename to spyder/widgets/fileswitcher.py
index 8c28ee8..179dcfc 100644
--- a/spyderlib/widgets/fileswitcher.py
+++ b/spyder/widgets/fileswitcher.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 # Standard library imports
 from __future__ import print_function
@@ -16,11 +16,11 @@ from qtpy.QtWidgets import (QDialog, QHBoxLayout, QLabel, QLineEdit,
                             QListWidget, QListWidgetItem, QVBoxLayout)
 
 # Local imports
-from spyderlib.config.base import _
-from spyderlib.py3compat import iteritems, to_text_string
-from spyderlib.utils import icon_manager as ima
-from spyderlib.utils.stringmatching import get_search_scores
-from spyderlib.widgets.helperwidgets import HelperToolButton, HTMLDelegate
+from spyder.config.base import _
+from spyder.py3compat import iteritems, to_text_string
+from spyder.utils import icon_manager as ima
+from spyder.utils.stringmatching import get_search_scores
+from spyder.widgets.helperwidgets import HelperToolButton, HTMLDelegate
 
 
 # --- Python Outline explorer helpers
@@ -364,7 +364,10 @@ class FileSwitcher(QDialog):
         self.move(left, top + self.tabs.tabBar().geometry().height() + 1)
 
     def fix_size(self, content, extra=50):
-        """Adjusts the width of the file switcher, based on the content."""
+        """
+        Adjusts the width and height of the file switcher,
+        based on its content.
+        """
         # Update size of dialog based on longest shortened path
         strings = []
         if content:
@@ -373,8 +376,20 @@ class FileSwitcher(QDialog):
                 label.setTextFormat(Qt.PlainText)
                 strings.append(label.text())
                 fm = label.fontMetrics()
-            max_width = max([fm.width(s)*1.3 for s in strings])
+
+            # Max width
+            max_width = max([fm.width(s) * 1.3 for s in strings])
             self.list.setMinimumWidth(max_width + extra)
+
+            # Max height
+            if len(strings) < 8:
+                max_entries = len(strings)
+            else:
+                max_entries = 8
+            max_height = fm.height() * max_entries * 2.5
+            self.list.setMinimumHeight(max_height)
+
+            # Set position according to size
             self.set_dialog_position()
 
     # --- Helper methods: List widget
@@ -442,8 +457,12 @@ class FileSwitcher(QDialog):
 
     # --- Helper methods: Outline explorer
     def get_symbol_list(self):
-        """Get the object explorer data."""
-        return self.get_editor().highlighter.get_outlineexplorer_data()
+        """Get the list of symbols present in the file."""
+        try:
+            oedata = self.get_editor().get_outlineexplorer_data()
+        except AttributeError:
+            oedata = {}
+        return oedata
 
     # --- Handlers
     def item_selection_changed(self):
@@ -483,13 +502,11 @@ class FileSwitcher(QDialog):
         for index, score in enumerate(scores):
             text, rich_text, score_value = score
             if score_value != -1:
-                text_item = '<big>' + rich_text + '</big>'
+                text_item = '<big>' + rich_text.replace('&', '') + '</big>'
                 if trying_for_line_number:
                     text_item += " [{0:} {1:}]".format(self.line_count[index],
                                                        _("lines"))
-                text_item += "<br><i>{0:}</i>".format(
-                    short_paths[index])
-
+                text_item += "<br><i>{0:}</i>".format(short_paths[index])
                 results.append((score_value, index, text_item))
 
         # Sort the obtained scores and populate the list widget
@@ -498,18 +515,21 @@ class FileSwitcher(QDialog):
             index = result[1]
             text = result[-1]
             path = paths[index]
-            item = QListWidgetItem(self.tabs.tabIcon(index), text)
+            item = QListWidgetItem(ima.icon('FileIcon'), text)
             item.setToolTip(path)
             item.setSizeHint(QSize(0, 25))
             self.list.addItem(item)
             self.filtered_path.append(path)
 
+        # To adjust the delegate layout for KDE themes
+        self.list.files_list = True
+
         # Move selected item in list accordingly and update list size
         if current_path in self.filtered_path:
             self.set_current_row(self.filtered_path.index(current_path))
         elif self.filtered_path:
             self.set_current_row(0)
-        self.fix_size(short_paths)
+        self.fix_size(short_paths, extra=200)
 
         # If a line number is searched look for it
         self.line_number = line_number
@@ -541,20 +561,21 @@ class FileSwitcher(QDialog):
                 results.append((score_value, line, text, rich_text,
                                 fold_level, icons[index], token))
 
-        template_1 = '<code>{0}<big>{1} {2}</big></code>'
-        template_2 = '<br><code>{0}</code><i>[Line {1}]</i>'
+        template = '{0}{1}'
 
         for (score, line, text, rich_text, fold_level, icon,
              token) in sorted(results):
             fold_space = ' '*(fold_level)
             line_number = line + 1
             self.filtered_symbol_lines.append(line_number)
-            textline = template_1.format(fold_space, token, rich_text)
-            textline += template_2.format(fold_space, line_number)
+            textline = template.format(fold_space, rich_text)
             item = QListWidgetItem(icon, textline)
             item.setSizeHint(QSize(0, 16))
             self.list.addItem(item)
 
+        # To adjust the delegate layout for KDE themes
+        self.list.files_list = False
+
         # Move selected item in list accordingly
         # NOTE: Doing this is causing two problems:
         # 1. It makes the cursor to auto-jump to the last selected
diff --git a/spyderlib/widgets/findinfiles.py b/spyder/widgets/findinfiles.py
similarity index 95%
rename from spyderlib/widgets/findinfiles.py
rename to spyder/widgets/findinfiles.py
index 9440c63..1a8cd1e 100644
--- a/spyderlib/widgets/findinfiles.py
+++ b/spyder/widgets/findinfiles.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """Find in files widget"""
 
@@ -27,15 +27,15 @@ from qtpy.QtWidgets import (QHBoxLayout, QLabel, QRadioButton, QSizePolicy,
                             QTreeWidgetItem, QVBoxLayout, QWidget)
 
 # Local imports
-from spyderlib.config.base import _
-from spyderlib.py3compat import getcwd, to_text_string
-from spyderlib.utils import programs
-from spyderlib.utils import icon_manager as ima
-from spyderlib.utils.misc import abspardir, get_common_path
-from spyderlib.utils.qthelpers import create_toolbutton, get_filetype_icon
-from spyderlib.utils.vcs import is_hg_installed, get_vcs_root
-from spyderlib.widgets.comboboxes import PathComboBox, PatternComboBox
-from spyderlib.widgets.onecolumntree import OneColumnTree
+from spyder.config.base import _
+from spyder.py3compat import getcwd, to_text_string
+from spyder.utils import programs
+from spyder.utils import icon_manager as ima
+from spyder.utils.misc import abspardir, get_common_path
+from spyder.utils.qthelpers import create_toolbutton, get_filetype_icon
+from spyder.utils.vcs import is_hg_installed, get_vcs_root
+from spyder.widgets.comboboxes import PathComboBox, PatternComboBox
+from spyder.widgets.onecolumntree import OneColumnTree
 
 
 #def find_files_in_hg_manifest(rootpath, include, exclude):
@@ -786,7 +786,7 @@ class FindInFilesWidget(QWidget):
             
 def test():
     """Run Find in Files widget test"""
-    from spyderlib.utils.qthelpers import qapplication
+    from spyder.utils.qthelpers import qapplication
     app = qapplication()
     widget = FindInFilesWidget(None)
     widget.resize(640, 480)
diff --git a/spyderlib/widgets/findreplace.py b/spyder/widgets/findreplace.py
similarity index 94%
rename from spyderlib/widgets/findreplace.py
rename to spyder/widgets/findreplace.py
index bdd2ec8..8ab620e 100644
--- a/spyderlib/widgets/findreplace.py
+++ b/spyder/widgets/findreplace.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009-2010 Pierre Raybaut
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """Find/Replace widget"""
 
@@ -21,12 +21,12 @@ from qtpy.QtWidgets import (QCheckBox, QGridLayout, QHBoxLayout, QLabel,
                             QSizePolicy, QWidget)
 
 # Local imports
-from spyderlib.config.base import _
-from spyderlib.config.gui import config_shortcut, fixed_shortcut
-from spyderlib.py3compat import to_text_string
-from spyderlib.utils import icon_manager as ima
-from spyderlib.utils.qthelpers import create_toolbutton, get_icon
-from spyderlib.widgets.comboboxes import PatternComboBox
+from spyder.config.base import _
+from spyder.config.gui import config_shortcut, fixed_shortcut
+from spyder.py3compat import to_text_string
+from spyder.utils import icon_manager as ima
+from spyder.utils.qthelpers import create_toolbutton, get_icon
+from spyder.widgets.comboboxes import PatternComboBox
 
 
 def is_position_sup(pos1, pos2):
@@ -272,7 +272,7 @@ class FindReplace(QWidget):
             QWebEngineView = type(None)
         self.words_button.setVisible(not isinstance(editor, QWebEngineView))
         self.re_button.setVisible(not isinstance(editor, QWebEngineView))
-        from spyderlib.widgets.sourcecode.codeeditor import CodeEditor
+        from spyder.widgets.sourcecode.codeeditor import CodeEditor
         self.is_code_editor = isinstance(editor, CodeEditor)
         self.highlight_button.setVisible(self.is_code_editor)
         if refresh:
diff --git a/spyderlib/widgets/formlayout.py b/spyder/widgets/formlayout.py
similarity index 99%
rename from spyderlib/widgets/formlayout.py
rename to spyder/widgets/formlayout.py
index d7ac4f1..d069537 100644
--- a/spyderlib/widgets/formlayout.py
+++ b/spyder/widgets/formlayout.py
@@ -66,8 +66,8 @@ from qtpy.QtWidgets import (QApplication, QCheckBox, QColorDialog, QComboBox,
                             QTextEdit, QVBoxLayout, QWidget)
 
 # Local imports
-from spyderlib.config.base import _, DEBUG, STDERR
-from spyderlib.py3compat import is_string, is_text_string, to_text_string
+from spyder.config.base import _, DEBUG, STDERR
+from spyder.py3compat import is_string, is_text_string, to_text_string
 
 
 __version__ = '1.0.15'
@@ -537,7 +537,7 @@ def fedit(data, title="", comment="", icon=None, parent=None, apply=None):
     # (e.g. if the module is used directly from the interpreter)
     test_travis = os.environ.get('TEST_CI_WIDGETS', None)
     if test_travis is not None:
-        from spyderlib.utils.qthelpers import qapplication
+        from spyder.utils.qthelpers import qapplication
         _app = qapplication(test_time=1)
     elif QApplication.startingUp():
         _app = QApplication([])
diff --git a/spyderlib/widgets/helperwidgets.py b/spyder/widgets/helperwidgets.py
similarity index 88%
rename from spyderlib/widgets/helperwidgets.py
rename to spyder/widgets/helperwidgets.py
index e2d4a61..51ac248 100644
--- a/spyderlib/widgets/helperwidgets.py
+++ b/spyder/widgets/helperwidgets.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2013-2015 The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """
 Helper widgets.
@@ -17,9 +17,9 @@ from qtpy.QtWidgets import (QApplication, QCheckBox, QLineEdit, QMessageBox,
                             QVBoxLayout)
 
 # Local imports
-from spyderlib.config.base import _
-from spyderlib.utils import icon_manager as ima
-from spyderlib.utils.qthelpers import get_std_icon
+from spyder.config.base import _
+from spyder.utils import icon_manager as ima
+from spyder.utils.qthelpers import get_std_icon
 
 
 class HelperToolButton(QToolButton):
@@ -122,13 +122,22 @@ class HTMLDelegate(QStyledItemDelegate):
 
         textRect = style.subElementRect(QStyle.SE_ItemViewItemText, options)
         painter.save()
-        if style.objectName() == 'oxygen':
-            painter.translate(textRect.topLeft() + QPoint(5, -9))
+
+        # Adjustments for the file switcher
+        if hasattr(options.widget, 'files_list'):
+            if style.objectName() in ['oxygen', 'qtcurve', 'breeze']:
+                if options.widget.files_list:
+                    painter.translate(textRect.topLeft() + QPoint(4, -9))
+                else:
+                    painter.translate(textRect.topLeft())
+            else:
+                if options.widget.files_list:
+                    painter.translate(textRect.topLeft() + QPoint(4, 4))
+                else:
+                    painter.translate(textRect.topLeft() + QPoint(2, 4))
         else:
-            painter.translate(textRect.topLeft())
-            painter.setClipRect(textRect.translated(-textRect.topLeft()))
+            painter.translate(textRect.topLeft() + QPoint(0, -3))
         doc.documentLayout().draw(painter, ctx)
-
         painter.restore()
 
     def sizeHint(self, option, index):
@@ -137,9 +146,8 @@ class HTMLDelegate(QStyledItemDelegate):
 
         doc = QTextDocument()
         doc.setHtml(options.text)
-        doc.setTextWidth(options.rect.width())
 
-        return QSize(doc.idealWidth(), doc.size().height())
+        return QSize(doc.idealWidth(), doc.size().height() - 2)
 
 
 class IconLineEdit(QLineEdit):
@@ -236,7 +244,7 @@ class IconLineEdit(QLineEdit):
 
 
 def test_msgcheckbox():
-    from spyderlib.utils.qthelpers import qapplication
+    from spyder.utils.qthelpers import qapplication
     app = qapplication()
     box = MessageCheckBox()
     box.setWindowTitle(_("Spyder updates"))
diff --git a/spyderlib/widgets/internalshell.py b/spyder/widgets/internalshell.py
similarity index 91%
rename from spyderlib/widgets/internalshell.py
rename to spyder/widgets/internalshell.py
index f0b7d8c..8ac960b 100644
--- a/spyderlib/widgets/internalshell.py
+++ b/spyder/widgets/internalshell.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """Internal shell widget : PythonShellWidget + Interpreter"""
 
@@ -23,22 +23,22 @@ from qtpy.QtCore import QEventLoop, QObject, Signal, Slot
 from qtpy.QtWidgets import QMessageBox
 
 # Local imports
-from spyderlib import get_versions
-from spyderlib.interpreter import Interpreter
-from spyderlib.py3compat import (builtins, getcwd, to_binary_string,
-                                 to_text_string, u)
-from spyderlib.utils import icon_manager as ima
-from spyderlib.utils import programs
-from spyderlib.utils.dochelpers import getargtxt, getdoc, getobjdir, getsource
-from spyderlib.utils.misc import get_error_match
-from spyderlib.utils.qthelpers import create_action
-from spyderlib.widgets.shell import PythonShellWidget
-from spyderlib.widgets.variableexplorer.objecteditor import oedit
+from spyder import get_versions
+from spyder.interpreter import Interpreter
+from spyder.py3compat import (builtins, getcwd, to_binary_string,
+                              to_text_string, u)
+from spyder.utils import icon_manager as ima
+from spyder.utils import programs
+from spyder.utils.dochelpers import getargtxt, getdoc, getobjdir, getsource
+from spyder.utils.misc import get_error_match
+from spyder.utils.qthelpers import create_action
+from spyder.widgets.shell import PythonShellWidget
+from spyder.widgets.variableexplorer.objecteditor import oedit
 # TODO: remove the CONF object and make it work anyway
-# In fact, this 'CONF' object has nothing to do in package spyderlib.widgets
+# In fact, this 'CONF' object has nothing to do in package spyder/widgets
 # which should not contain anything directly related to Spyder's main app
-from spyderlib.config.base import _, DEBUG, get_conf_path
-from spyderlib.config.main import CONF
+from spyder.config.base import _, DEBUG, get_conf_path
+from spyder.config.main import CONF
 
 
 builtins.oedit = oedit
@@ -143,13 +143,10 @@ class InternalShell(PythonShellWidget):
         self.set_light_background(light_background)
         self.multithreaded = multithreaded
         self.setMaximumBlockCount(max_line_count)
-        
-        # For compatibility with ExtPythonShellWidget
-        self.is_ipykernel = False
-        
+
         if font is not None:
             self.set_font(font)
-        
+
         # Allow raw_input support:
         self.input_loop = None
         self.input_mode = False
diff --git a/spyder/widgets/ipythonconsole/__init__.py b/spyder/widgets/ipythonconsole/__init__.py
new file mode 100644
index 0000000..9c2c1d6
--- /dev/null
+++ b/spyder/widgets/ipythonconsole/__init__.py
@@ -0,0 +1,19 @@
+# -*- coding:utf-8 -*-
+#
+# Copyright © Spyder Project Contributors
+# Licensed under the terms of the MIT License
+# (see spyder/__init__.py for details)
+
+"""
+Widgets for the IPython Console
+"""
+
+from .control import ControlWidget, PageControlWidget
+from .debugging import DebuggingWidget
+from .help import HelpWidget
+from .namespacebrowser import NamepaceBrowserWidget
+
+# ShellWidget contains the other widgets and ClientWidget
+# contains it
+from .shell import ShellWidget
+from .client import ClientWidget
diff --git a/spyder/widgets/ipythonconsole/client.py b/spyder/widgets/ipythonconsole/client.py
new file mode 100644
index 0000000..229f428
--- /dev/null
+++ b/spyder/widgets/ipythonconsole/client.py
@@ -0,0 +1,398 @@
+# -*- coding:utf-8 -*-
+#
+# Copyright © Spyder Project Contributors
+# Licensed under the terms of the MIT License
+# (see spyder/__init__.py for details)
+
+"""
+Client widget for the IPython Console
+
+This is the widget used on all its tabs
+"""
+
+# Standard library imports
+from __future__ import absolute_import  # Fix for Issue 1356
+
+import os
+import os.path as osp
+from string import Template
+from threading import Thread
+import time
+
+# Third party imports (qtpy)
+from qtpy.QtCore import Qt, QUrl, Signal, Slot
+from qtpy.QtGui import QKeySequence
+from qtpy.QtWidgets import (QHBoxLayout, QMenu, QMessageBox, QToolButton,
+                            QVBoxLayout, QWidget)
+
+# Local imports
+from spyder.config.base import (_, get_conf_path, get_image_path,
+                                get_module_source_path)
+from spyder.config.gui import get_font, get_shortcut
+from spyder.utils import icon_manager as ima
+from spyder.utils.qthelpers import (add_actions, create_action,
+                                    create_toolbutton)
+from spyder.widgets.browser import WebView
+from spyder.widgets.mixins import SaveHistoryMixin
+from spyder.widgets.ipythonconsole import ShellWidget
+
+
+#-----------------------------------------------------------------------------
+# Templates
+#-----------------------------------------------------------------------------
+# Using the same css file from the Help plugin for now. Maybe
+# later it'll be a good idea to create a new one.
+UTILS_PATH = get_module_source_path('spyder', 'utils')
+CSS_PATH = osp.join(UTILS_PATH, 'help', 'static', 'css')
+TEMPLATES_PATH = osp.join(UTILS_PATH, 'ipython', 'templates')
+
+BLANK = open(osp.join(TEMPLATES_PATH, 'blank.html')).read()
+LOADING = open(osp.join(TEMPLATES_PATH, 'loading.html')).read()
+KERNEL_ERROR = open(osp.join(TEMPLATES_PATH, 'kernel_error.html')).read()
+
+
+#-----------------------------------------------------------------------------
+# Auxiliary functions
+#-----------------------------------------------------------------------------
+def background(f):
+    """
+    Call a function in a simple thread, to prevent blocking
+
+    Taken from the Jupyter Qtconsole project
+    """
+    t = Thread(target=f)
+    t.start()
+    return t
+
+
+#-----------------------------------------------------------------------------
+# Client widget
+#-----------------------------------------------------------------------------
+class ClientWidget(QWidget, SaveHistoryMixin):
+    """
+    Client widget for the IPython Console
+
+    This is a widget composed of a shell widget and a WebView info widget
+    to print different messages there.
+    """
+
+    SEPARATOR = '%s##---(%s)---' % (os.linesep*2, time.ctime())
+    append_to_history = Signal(str, str)
+
+    def __init__(self, plugin, name, history_filename, config_options,
+                 additional_options, interpreter_versions,
+                 connection_file=None, hostname=None,
+                 menu_actions=None, slave=False):
+        super(ClientWidget, self).__init__(plugin)
+        SaveHistoryMixin.__init__(self)
+
+        # --- Init attrs
+        self.name = name
+        self.history_filename = get_conf_path(history_filename)
+        self.connection_file = connection_file
+        self.hostname = hostname
+        self.menu_actions = menu_actions
+        self.slave = slave
+
+        # --- Other attrs
+        self.options_button = None
+        self.stop_button = None
+        self.stop_icon = ima.icon('stop')
+        self.history = []
+
+        # --- Widgets
+        self.shellwidget = ShellWidget(config=config_options,
+                                       additional_options=additional_options,
+                                       interpreter_versions=interpreter_versions,
+                                       local_kernel=True)
+        self.shellwidget.hide()
+        self.infowidget = WebView(self)
+        self.set_infowidget_font()
+        self.loading_page = self._create_loading_page()
+        self.infowidget.setHtml(self.loading_page,
+                                QUrl.fromLocalFile(CSS_PATH))
+
+        # --- Layout
+        vlayout = QVBoxLayout()
+        toolbar_buttons = self.get_toolbar_buttons()
+        hlayout = QHBoxLayout()
+        for button in toolbar_buttons:
+            hlayout.addWidget(button)
+        vlayout.addLayout(hlayout)
+        vlayout.setContentsMargins(0, 0, 0, 0)
+        vlayout.addWidget(self.shellwidget)
+        vlayout.addWidget(self.infowidget)
+        self.setLayout(vlayout)
+
+        # --- Exit function
+        self.exit_callback = lambda: plugin.close_client(client=self)
+
+        # --- Signals
+        # As soon as some content is printed in the console, stop
+        # our loading animation
+        document = self.get_control().document()
+        document.contentsChange.connect(self._stop_loading_animation)
+
+    #------ Public API --------------------------------------------------------
+    def configure_shellwidget(self, give_focus=True):
+        """Configure shellwidget after kernel is started"""
+        if give_focus:
+            self.get_control().setFocus()
+
+        # Connect shellwidget to the client
+        self.shellwidget.set_ipyclient(self)
+
+        # To save history
+        self.shellwidget.executing.connect(self.add_to_history)
+
+        # For Mayavi to run correctly
+        self.shellwidget.executing.connect(self.set_backend_for_mayavi)
+
+        # To update history after execution
+        self.shellwidget.executed.connect(self.update_history)
+
+        # To update the Variable Explorer after execution
+        self.shellwidget.executed.connect(
+            self.shellwidget.refresh_namespacebrowser)
+
+        # To enable the stop button when executing a process
+        self.shellwidget.executing.connect(self.enable_stop_button)
+
+        # To disable the stop button after execution stopped
+        self.shellwidget.executed.connect(self.disable_stop_button)
+
+    def enable_stop_button(self):
+        self.stop_button.setEnabled(True)
+
+    def disable_stop_button(self):
+        self.stop_button.setDisabled(True)
+
+    @Slot()
+    def stop_button_click_handler(self):
+        """Method to handle what to do when the stop button is pressed"""
+        self.stop_button.setDisabled(True)
+        # Interrupt computations or stop debugging
+        if not self.shellwidget._reading:
+            self.interrupt_kernel()
+        else:
+            self.shellwidget.write_to_stdin('exit')
+
+    def show_kernel_error(self, error):
+        """Show kernel initialization errors in infowidget"""
+        # Don't break lines in hyphens
+        # From http://stackoverflow.com/q/7691569/438386
+        error = error.replace('-', '&#8209')
+
+        # Create error page
+        message = _("An error ocurred while starting the kernel")
+        kernel_error_template = Template(KERNEL_ERROR)
+        page = kernel_error_template.substitute(css_path=CSS_PATH,
+                                                message=message,
+                                                error=error)
+
+        # Show error
+        self.infowidget.setHtml(page)
+        self.shellwidget.hide()
+        self.infowidget.show()
+
+    def get_name(self):
+        """Return client name"""
+        return ((_("Console") if self.hostname is None else self.hostname)
+                + " " + self.name)
+
+    def get_control(self):
+        """Return the text widget (or similar) to give focus to"""
+        # page_control is the widget used for paging
+        page_control = self.shellwidget._page_control
+        if page_control and page_control.isVisible():
+            return page_control
+        else:
+            return self.shellwidget._control
+
+    def get_kernel(self):
+        """Get kernel associated with this client"""
+        return self.shellwidget.kernel_manager
+
+    def get_options_menu(self):
+        """Return options menu"""
+        restart_action = create_action(self, _("Restart kernel"),
+                                       shortcut=QKeySequence("Ctrl+."),
+                                       icon=ima.icon('restart'),
+                                       triggered=self.restart_kernel,
+                                       context=Qt.WidgetWithChildrenShortcut)
+
+        # Main menu
+        if self.menu_actions is not None:
+            actions = [restart_action, None] + self.menu_actions
+        else:
+            actions = [restart_action]
+        return actions
+
+    def get_toolbar_buttons(self):
+        """Return toolbar buttons list"""
+        buttons = []
+        # Code to add the stop button
+        if self.stop_button is None:
+            self.stop_button = create_toolbutton(self, text=_("Stop"),
+                                             icon=self.stop_icon,
+                                             tip=_("Stop the current command"))
+            self.disable_stop_button()
+            # set click event handler
+            self.stop_button.clicked.connect(self.stop_button_click_handler)
+        if self.stop_button is not None:
+            buttons.append(self.stop_button)
+
+        if self.options_button is None:
+            options = self.get_options_menu()
+            if options:
+                self.options_button = create_toolbutton(self,
+                        text=_('Options'), icon=ima.icon('tooloptions'))
+                self.options_button.setPopupMode(QToolButton.InstantPopup)
+                menu = QMenu(self)
+                add_actions(menu, options)
+                self.options_button.setMenu(menu)
+        if self.options_button is not None:
+            buttons.append(self.options_button)
+
+        return buttons
+
+    def add_actions_to_context_menu(self, menu):
+        """Add actions to IPython widget context menu"""
+        inspect_action = create_action(self, _("Inspect current object"),
+                                    QKeySequence(get_shortcut('console',
+                                                    'inspect current object')),
+                                    icon=ima.icon('MessageBoxInformation'),
+                                    triggered=self.inspect_object)
+        clear_line_action = create_action(self, _("Clear line or block"),
+                                          QKeySequence("Shift+Escape"),
+                                          icon=ima.icon('editdelete'),
+                                          triggered=self.clear_line)
+        reset_namespace_action = create_action(self, _("Reset namespace"),
+                                          QKeySequence("Ctrl+Alt+R"),
+                                          triggered=self.reset_namespace)
+        clear_console_action = create_action(self, _("Clear console"),
+                                             QKeySequence(get_shortcut('console',
+                                                               'clear shell')),
+                                             icon=ima.icon('editclear'),
+                                             triggered=self.clear_console)
+        quit_action = create_action(self, _("&Quit"), icon=ima.icon('exit'),
+                                    triggered=self.exit_callback)
+        add_actions(menu, (None, inspect_action, clear_line_action,
+                           clear_console_action, reset_namespace_action,
+                           None, quit_action))
+        return menu
+
+    def set_font(self, font):
+        """Set IPython widget's font"""
+        self.shellwidget._control.setFont(font)
+        self.shellwidget.font = font
+
+    def set_infowidget_font(self):
+        """Set font for infowidget"""
+        font = get_font(option='rich_font')
+        self.infowidget.set_font(font)
+
+    def shutdown(self):
+        """Shutdown kernel"""
+        if self.get_kernel() is not None and not self.slave:
+            self.shellwidget.kernel_manager.shutdown_kernel()
+        if self.shellwidget.kernel_client is not None:
+            background(self.shellwidget.kernel_client.stop_channels)
+
+    def interrupt_kernel(self):
+        """Interrupt the associanted Spyder kernel if it's running"""
+        self.shellwidget.request_interrupt_kernel()
+
+    @Slot()
+    def restart_kernel(self):
+        """
+        Restart the associanted kernel
+
+        Took this code from the qtconsole project
+        Licensed under the BSD license
+        """
+        message = _('Are you sure you want to restart the kernel?')
+        buttons = QMessageBox.Yes | QMessageBox.No
+        result = QMessageBox.question(self, _('Restart kernel?'),
+                                      message, buttons)
+        if result == QMessageBox.Yes:
+            sw = self.shellwidget
+            if sw.kernel_manager:
+                try:
+                    sw.kernel_manager.restart_kernel()
+                except RuntimeError as e:
+                    sw._append_plain_text(
+                        _('Error restarting kernel: %s\n') % e,
+                        before_prompt=True
+                    )
+                else:
+                    sw._append_html(_("<br>Restarting kernel...\n<hr><br>"),
+                        before_prompt=True,
+                    )
+            else:
+                sw._append_plain_text(
+                    _('Cannot restart a kernel not started by Spyder\n'),
+                    before_prompt=True
+                )
+
+    @Slot()
+    def inspect_object(self):
+        """Show how to inspect an object with our Help plugin"""
+        self.shellwidget._control.inspect_current_object()
+
+    @Slot()
+    def clear_line(self):
+        """Clear a console line"""
+        self.shellwidget._keyboard_quit()
+
+    @Slot()
+    def clear_console(self):
+        """Clear the whole console"""
+        self.shellwidget.clear_console()
+
+    @Slot()
+    def reset_namespace(self):
+        """Resets the namespace by removing all names defined by the user"""
+        self.shellwidget.reset_namespace()
+
+    def update_history(self):
+        self.history = self.shellwidget._history
+
+    def set_backend_for_mayavi(self, command):
+        """
+        Mayavi plots require the Qt backend, so we try to detect if one is
+        generated to change backends
+        """
+        calling_mayavi = False
+        lines = command.splitlines()
+        for l in lines:
+            if not l.startswith('#'):
+                if 'import mayavi' in l or 'from mayavi' in l:
+                    calling_mayavi = True
+                    break
+        if calling_mayavi:
+            message = _("Changing backend to Qt for Mayavi")
+            self.shellwidget._append_plain_text(message + '\n')
+            self.shellwidget.execute("%gui inline\n%gui qt")
+
+    #------ Private API -------------------------------------------------------
+    def _create_loading_page(self):
+        """Create html page to show while the kernel is starting"""
+        loading_template = Template(LOADING)
+        loading_img = get_image_path('loading_sprites.png')
+        if os.name == 'nt':
+            loading_img = loading_img.replace('\\', '/')
+        message = _("Connecting to kernel...")
+        page = loading_template.substitute(css_path=CSS_PATH,
+                                           loading_img=loading_img,
+                                           message=message)
+        return page
+
+    def _stop_loading_animation(self):
+        """Stop animation shown while the kernel is starting"""
+        self.infowidget.hide()
+        self.shellwidget.show()
+        self.infowidget.setHtml(BLANK)
+
+        document = self.get_control().document()
+        document.contentsChange.disconnect(self._stop_loading_animation)
diff --git a/spyder/widgets/ipythonconsole/control.py b/spyder/widgets/ipythonconsole/control.py
new file mode 100644
index 0000000..64fbcb1
--- /dev/null
+++ b/spyder/widgets/ipythonconsole/control.py
@@ -0,0 +1,109 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright © Spyder Project Contributors
+# Licensed under the terms of the MIT License
+# (see spyder/__init__.py for details)
+
+"""Control widgets used by ShellWidget"""
+
+from qtpy.QtCore import Qt, Signal
+from qtpy.QtWidgets import QTextEdit
+
+from spyder.utils.qthelpers import restore_keyevent
+from spyder.widgets.calltip import CallTipWidget
+from spyder.widgets.mixins import (BaseEditMixin, GetHelpMixin,
+                                   TracebackLinksMixin)
+
+
+class ControlWidget(TracebackLinksMixin, GetHelpMixin, QTextEdit,
+                    BaseEditMixin):
+    """
+    Subclass of QTextEdit with features from Spyder's mixins to use as the
+    control widget for IPython widgets
+    """
+    QT_CLASS = QTextEdit
+    visibility_changed = Signal(bool)
+    go_to_error = Signal(str)
+    focus_changed = Signal()
+
+    def __init__(self, parent=None):
+        QTextEdit.__init__(self, parent)
+        BaseEditMixin.__init__(self)
+        TracebackLinksMixin.__init__(self)
+        GetHelpMixin.__init__(self)
+
+        self.calltip_widget = CallTipWidget(self, hide_timer_on=True)
+        self.found_results = []
+
+        # To not use Spyder calltips obtained through the monitor
+        self.calltips = False
+
+    def showEvent(self, event):
+        """Reimplement Qt Method"""
+        self.visibility_changed.emit(True)
+
+    def _key_paren_left(self, text):
+        """ Action for '(' """
+        self.current_prompt_pos = self.parentWidget()._prompt_pos
+        if self.get_current_line_to_cursor():
+            last_obj = self.get_last_obj()
+            if last_obj and not last_obj.isdigit():
+                self.show_object_info(last_obj)
+        self.insert_text(text)
+
+    def keyPressEvent(self, event):
+        """Reimplement Qt Method - Basic keypress event handler"""
+        event, text, key, ctrl, shift = restore_keyevent(event)
+        if key == Qt.Key_ParenLeft and not self.has_selected_text() \
+          and self.help_enabled:
+            self._key_paren_left(text)
+        else:
+            # Let the parent widget handle the key press event
+            QTextEdit.keyPressEvent(self, event)
+
+    def focusInEvent(self, event):
+        """Reimplement Qt method to send focus change notification"""
+        self.focus_changed.emit()
+        return super(ControlWidget, self).focusInEvent(event)
+
+    def focusOutEvent(self, event):
+        """Reimplement Qt method to send focus change notification"""
+        self.focus_changed.emit()
+        return super(ControlWidget, self).focusOutEvent(event)
+
+
+class PageControlWidget(QTextEdit, BaseEditMixin):
+    """
+    Subclass of QTextEdit with features from Spyder's mixins.BaseEditMixin to
+    use as the paging widget for IPython widgets
+    """
+    QT_CLASS = QTextEdit
+    visibility_changed = Signal(bool)
+    show_find_widget = Signal()
+    focus_changed = Signal()
+
+    def __init__(self, parent=None):
+        QTextEdit.__init__(self, parent)
+        BaseEditMixin.__init__(self)
+        self.found_results = []
+
+    def showEvent(self, event):
+        """Reimplement Qt Method"""
+        self.visibility_changed.emit(True)
+
+    def keyPressEvent(self, event):
+        """Reimplement Qt Method - Basic keypress event handler"""
+        event, text, key, ctrl, shift = restore_keyevent(event)
+
+        if key == Qt.Key_Slash and self.isVisible():
+            self.show_find_widget.emit()
+
+    def focusInEvent(self, event):
+        """Reimplement Qt method to send focus change notification"""
+        self.focus_changed.emit()
+        return super(PageControlWidget, self).focusInEvent(event)
+
+    def focusOutEvent(self, event):
+        """Reimplement Qt method to send focus change notification"""
+        self.focus_changed.emit()
+        return super(PageControlWidget, self).focusOutEvent(event)
diff --git a/spyder/widgets/ipythonconsole/debugging.py b/spyder/widgets/ipythonconsole/debugging.py
new file mode 100644
index 0000000..36745aa
--- /dev/null
+++ b/spyder/widgets/ipythonconsole/debugging.py
@@ -0,0 +1,140 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright © Spyder Project Contributors
+# Licensed under the terms of the MIT License
+# (see spyder/__init__.py for details)
+
+"""
+Widget that handles communications between a console in debugging
+mode and Spyder
+"""
+
+import ast
+
+from qtpy.QtCore import QEventLoop
+
+from qtconsole.rich_jupyter_widget import RichJupyterWidget
+
+from spyder.py3compat import to_text_string
+
+
+class DebuggingWidget(RichJupyterWidget):
+    """
+    Widget with the necessary attributes and methods to handle
+    communications between a console in debugging mode and
+    Spyder
+    """
+
+    _input_reply = None
+
+    # --- Public API --------------------------------------------------
+    def silent_exec_input(self, code):
+        """Silently execute code through stdin"""
+        self._hidden = True
+
+        # Wait until the kernel returns an answer
+        wait_loop = QEventLoop()
+        self.sig_input_reply.connect(wait_loop.quit)
+        self.kernel_client.iopub_channel.flush()
+        self.kernel_client.input(code)
+        wait_loop.exec_()
+
+        # Remove loop connection and loop
+        self.sig_input_reply.disconnect(wait_loop.quit)
+        wait_loop = None
+
+        # Restore hidden state
+        self._hidden = False
+
+        # Emit signal
+        if 'pdb_step' in code and self._input_reply is not None:
+            fname = self._input_reply['fname']
+            lineno = self._input_reply['lineno']
+            self.sig_pdb_step.emit(fname, lineno)
+        elif 'get_namespace_view' in code:
+            view = self._input_reply
+            self.sig_namespace_view.emit(view)
+        elif 'get_var_properties' in code:
+            properties = self._input_reply
+            self.sig_var_properties.emit(properties)
+
+    def write_to_stdin(self, line):
+        """Send raw characters to the IPython kernel through stdin"""
+        wait_loop = QEventLoop()
+        self.sig_prompt_ready.connect(wait_loop.quit)
+        self.kernel_client.input(line)
+        wait_loop.exec_()
+
+        # Remove loop connection and loop
+        self.sig_prompt_ready.disconnect(wait_loop.quit)
+        wait_loop = None
+
+        # Run post exec commands
+        self._post_exec_input(line)
+
+    # ---- Private API (defined by us) -------------------------------
+    def _post_exec_input(self, line):
+        """Commands to be run after writing to stdin"""
+        if self._reading:
+            pdb_commands = ['next', 'continue', 'step', 'return']
+            if any([x == line for x in pdb_commands]):
+                # To open the file where the current pdb frame points to
+                self.silent_exec_input("!get_ipython().kernel.get_pdb_step()")
+
+                # To refresh the Variable Explorer
+                self.silent_exec_input(
+                    "!get_ipython().kernel.get_namespace_view()")
+                self.silent_exec_input(
+                    "!get_ipython().kernel.get_var_properties()")
+
+    # ---- Private API (overrode by us) -------------------------------
+    def _handle_input_request(self, msg):
+        """
+        Reimplemented to be able to handle requests when we ask for
+        hidden inputs
+        """
+        self.kernel_client.iopub_channel.flush()
+        if not self._hidden:
+            def callback(line):
+                self.kernel_client.input(line)
+            if self._reading:
+                self._reading = False
+            self._readline(msg['content']['prompt'], callback=callback,
+                           password=msg['content']['password'])
+        else:
+            # This is what we added, i.e. not doing anything if
+            # Spyder asks for silent inputs
+            pass
+
+    def _handle_stream(self, msg):
+        """
+        Reimplemented to handle input replies in hidden mode
+        """
+        if not self._hidden:
+            self.flush_clearoutput()
+            self.append_stream(msg['content']['text'])
+            # This signal is a clear indication that all stdout
+            # has been handled at this point. Then Spyder can
+            # proceed to request other inputs
+            self.sig_prompt_ready.emit()
+        else:
+            # This allows Spyder to receive, transform and save the
+            # contents of a silent execution
+            content = msg.get('content', '')
+            if content:
+                name = content.get('name', '')
+                if name == 'stdout':
+                    text = content['text']
+                    text = to_text_string(text.replace('\n', ''))
+                    try:
+                        reply = ast.literal_eval(text)
+                    except:
+                        reply = None
+                    self._input_reply = reply
+                    self.sig_input_reply.emit()
+                else:
+                    self._input_reply = reply
+                    self.sig_input_reply.emit()
+            else:
+                self._input_reply = None
+                self.sig_input_reply.emit()
diff --git a/spyder/widgets/ipythonconsole/help.py b/spyder/widgets/ipythonconsole/help.py
new file mode 100644
index 0000000..dab0318
--- /dev/null
+++ b/spyder/widgets/ipythonconsole/help.py
@@ -0,0 +1,126 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright © Spyder Project Contributors
+# Licensed under the terms of the MIT License
+# (see spyder/__init__.py for details)
+
+"""
+Widget that handles communications between the IPython Console and
+the Help plugin
+"""
+
+from __future__ import absolute_import
+
+import re
+
+from qtpy.QtCore import QEventLoop
+
+from qtconsole.ansi_code_processor import ANSI_OR_SPECIAL_PATTERN
+from qtconsole.rich_jupyter_widget import RichJupyterWidget
+
+from spyder.config.base import _
+from spyder.py3compat import PY3
+from spyder.utils.dochelpers import getargspecfromtext, getsignaturefromtext
+
+
+class HelpWidget(RichJupyterWidget):
+    """
+    Widget with the necessary attributes and methods to handle communications
+    between the IPython Console and the Help plugin
+    """
+
+    def clean_invalid_var_chars(self, var):
+        """
+        Replace invalid variable chars in a string by underscores
+
+        Taken from http://stackoverflow.com/a/3305731/438386
+        """
+        if PY3:
+            return re.sub('\W|^(?=\d)', '_', var, re.UNICODE)
+        else:
+            return re.sub('\W|^(?=\d)', '_', var)
+
+    def get_signature(self, content):
+        """Get signature from inspect reply content"""
+        data = content.get('data', {})
+        text = data.get('text/plain', '')
+        if text:
+            text = ANSI_OR_SPECIAL_PATTERN.sub('', text)
+            self._control.current_prompt_pos = self._prompt_pos
+            line = self._control.get_current_line_to_cursor()
+            name = line[:-1].split('(')[-1]   # Take last token after a (
+            name = name.split('.')[-1]        # Then take last token after a .
+            # Clean name from invalid chars
+            try:
+                name = self.clean_invalid_var_chars(name).split('_')[-1]
+            except:
+                pass
+            argspec = getargspecfromtext(text)
+            if argspec:
+                # This covers cases like np.abs, whose docstring is
+                # the same as np.absolute and because of that a proper
+                # signature can't be obtained correctly
+                signature = name + argspec
+            else:
+                signature = getsignaturefromtext(text, name)
+            return signature
+        else:
+            return ''
+
+    def is_defined(self, objtxt, force_import=False):
+        """Return True if object is defined"""
+        wait_loop = QEventLoop()
+        self.sig_got_reply.connect(wait_loop.quit)
+        self.silent_exec_method(
+            "get_ipython().kernel.is_defined('%s', force_import=%s)"
+            % (objtxt, force_import))
+        wait_loop.exec_()
+
+        # Remove loop connection and loop
+        self.sig_got_reply.disconnect(wait_loop.quit)
+        wait_loop = None
+
+        return self._kernel_reply
+
+    def get_doc(self, objtxt):
+        """Get object documentation dictionary"""
+        wait_loop = QEventLoop()
+        self.sig_got_reply.connect(wait_loop.quit)
+        self.silent_exec_method("get_ipython().kernel.get_doc('%s')" % objtxt)
+        wait_loop.exec_()
+
+        # Remove loop connection and loop
+        self.sig_got_reply.disconnect(wait_loop.quit)
+        wait_loop = None
+
+        return self._kernel_reply
+
+    def get_source(self, objtxt):
+        """Get object source"""
+        wait_loop = QEventLoop()
+        self.sig_got_reply.connect(wait_loop.quit)
+        self.silent_exec_method("get_ipython().kernel.get_source('%s')" % objtxt)
+        wait_loop.exec_()
+
+        # Remove loop connection and loop
+        self.sig_got_reply.disconnect(wait_loop.quit)
+        wait_loop = None
+
+        return self._kernel_reply
+
+    #---- Private methods (overrode by us) ---------------------------------
+    def _handle_inspect_reply(self, rep):
+        """
+        Reimplement call tips to only show signatures, using the same
+        style from our Editor and External Console too
+        """
+        cursor = self._get_cursor()
+        info = self._request_info.get('call_tip')
+        if info and info.id == rep['parent_header']['msg_id'] and \
+          info.pos == cursor.position():
+            content = rep['content']
+            if content.get('status') == 'ok' and content.get('found', False):
+                signature = self.get_signature(content)
+                if signature:
+                    self._control.show_calltip(_("Arguments"), signature,
+                                               signature=True, color='#2D62FF')
diff --git a/spyder/widgets/ipythonconsole/namespacebrowser.py b/spyder/widgets/ipythonconsole/namespacebrowser.py
new file mode 100644
index 0000000..d8e3607
--- /dev/null
+++ b/spyder/widgets/ipythonconsole/namespacebrowser.py
@@ -0,0 +1,209 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright © Spyder Project Contributors
+# Licensed under the terms of the MIT License
+# (see spyder/__init__.py for details)
+
+"""
+Widget that handle communications between the IPython Console and
+the Variable Explorer
+"""
+
+from qtpy.QtCore import QEventLoop
+
+from ipykernel.pickleutil import CannedObject
+from ipykernel.serialize import deserialize_object
+from qtconsole.rich_jupyter_widget import RichJupyterWidget
+
+from spyder.config.base import _
+from spyder.py3compat import to_text_string
+
+
+class NamepaceBrowserWidget(RichJupyterWidget):
+    """
+    Widget with the necessary attributes and methods to handle communications
+    between the IPython Console and the Variable Explorer
+    """
+
+    # Reference to the nsb widget connected to this client
+    namespacebrowser = None
+
+    # To save the replies of kernel method executions (except
+    # getting values of variables)
+    _kernel_methods = {}
+
+    # To save values and messages returned by the kernel
+    _kernel_value = None
+    _kernel_is_starting = True
+
+    # --- Public API --------------------------------------------------
+    def set_namespacebrowser(self, namespacebrowser):
+        """Set namespace browser widget"""
+        self.namespacebrowser = namespacebrowser
+        self.configure_namespacebrowser()
+
+    def configure_namespacebrowser(self):
+        """Configure associated namespace browser widget"""
+        # Tell it that we are connected to client
+        self.namespacebrowser.is_ipyclient = True
+
+        # Update namespace view
+        self.sig_namespace_view.connect(lambda data:
+            self.namespacebrowser.process_remote_view(data))
+
+        # Update properties of variables
+        self.sig_var_properties.connect(lambda data:
+            self.namespacebrowser.set_var_properties(data))
+
+    def refresh_namespacebrowser(self):
+        """Refresh namespace browser"""
+        if self.namespacebrowser:
+            self.silent_exec_method(
+                'get_ipython().kernel.get_namespace_view()')
+            self.silent_exec_method(
+                'get_ipython().kernel.get_var_properties()')
+
+    def set_namespace_view_settings(self):
+        """Set the namespace view settings"""
+        settings = to_text_string(self.namespacebrowser.get_view_settings())
+        code = u"get_ipython().kernel.namespace_view_settings = %s" % settings
+        self.silent_execute(code)
+
+    def get_value(self, name):
+        """Ask kernel for a value"""
+        # Don't ask for values while reading (ipdb) is active
+        if self._reading:
+            raise ValueError(_("Inspecting and setting values while debugging "
+                               "in IPython consoles is not supported yet by "
+                               "Spyder."))
+
+        # Wait until the kernel returns the value
+        wait_loop = QEventLoop()
+        self.sig_got_reply.connect(wait_loop.quit)
+        self.silent_execute("get_ipython().kernel.get_value('%s')" % name)
+        wait_loop.exec_()
+
+        # Remove loop connection and loop
+        self.sig_got_reply.disconnect(wait_loop.quit)
+        wait_loop = None
+
+        # Handle exceptions
+        if self._kernel_value is None:
+            if self._kernel_reply:
+                msg = self._kernel_reply[:]
+                self._kernel_reply = None
+                raise ValueError(msg)
+
+        return self._kernel_value
+
+    def set_value(self, name, value):
+        """Set value for a variable"""
+        value = to_text_string(value)
+        self.silent_execute("get_ipython().kernel.set_value('%s', %s)" %
+                            (name, value))
+
+    def remove_value(self, name):
+        """Remove a variable"""
+        self.silent_execute("get_ipython().kernel.remove_value('%s')" % name)
+
+    def copy_value(self, orig_name, new_name):
+        """Copy a variable"""
+        self.silent_execute("get_ipython().kernel.copy_value('%s', '%s')" %
+                            (orig_name, new_name))
+
+    def load_data(self, filename, ext):
+        # Wait until the kernel tries to load the file
+        wait_loop = QEventLoop()
+        self.sig_got_reply.connect(wait_loop.quit)
+        self.silent_exec_method(
+                "get_ipython().kernel.load_data('%s', '%s')" % (filename, ext))
+        wait_loop.exec_()
+
+        # Remove loop connection and loop
+        self.sig_got_reply.disconnect(wait_loop.quit)
+        wait_loop = None
+
+        return self._kernel_reply
+
+    def save_namespace(self, filename):
+        # Wait until the kernel tries to save the file
+        wait_loop = QEventLoop()
+        self.sig_got_reply.connect(wait_loop.quit)
+        self.silent_exec_method("get_ipython().kernel.save_namespace('%s')" %
+                                filename)
+        wait_loop.exec_()
+
+        # Remove loop connection and loop
+        self.sig_got_reply.disconnect(wait_loop.quit)
+        wait_loop = None
+
+        return self._kernel_reply
+
+    # ---- Private API (defined by us) ------------------------------
+    def _handle_data_message(self, msg):
+        """
+        Handle raw (serialized) data sent by the kernel
+
+        We only handle data asked by Spyder, in case people use
+        publish_data for other purposes.
+        """
+        # Deserialize data
+        try:
+            data = deserialize_object(msg['buffers'])[0]
+        except Exception as msg:
+            self._kernel_value = None
+            self._kernel_reply = repr(msg)
+            self.sig_got_reply.emit()
+            return
+
+        # We only handle data asked by Spyder
+        value = data.get('__spy_data__', None)
+        if value is not None:
+            if isinstance(value, CannedObject):
+                value = value.get_object()
+            self._kernel_value = value
+            self.sig_got_reply.emit()
+
+    # ---- Private API (overrode by us) ----------------------------
+    def _handle_execute_reply(self, msg):
+        """
+        Reimplemented to handle communications between Spyder
+        and the kernel
+        """
+        msg_id = msg['parent_header']['msg_id']
+        info = self._request_info['execute'].get(msg_id)
+        # unset reading flag, because if execute finished, raw_input can't
+        # still be pending.
+        self._reading = False
+
+        # Refresh namespacebrowser after the kernel starts running
+        exec_count = msg['content']['execution_count']
+        if exec_count == 0 and self._kernel_is_starting:
+            self.set_namespace_view_settings()
+            self.refresh_namespacebrowser()
+            self._kernel_is_starting = False
+
+        # Handle silent execution of kernel methods
+        if info and info.kind == 'silent_exec_method' and not self._hidden:
+            self.handle_exec_method(msg)
+            self._request_info['execute'].pop(msg_id)
+        else:
+            super(NamepaceBrowserWidget, self)._handle_execute_reply(msg)
+
+    def _handle_status(self, msg):
+        """
+        Reimplemented to refresh the namespacebrowser after kernel
+        restarts
+        """
+        state = msg['content'].get('execution_state', '')
+        msg_type = msg['parent_header'].get('msg_type', '')
+        if state == 'starting' and not self._kernel_is_starting:
+            # This handles restarts when the kernel dies
+            # unexpectedly
+            self._kernel_is_starting = True
+        elif state == 'idle' and msg_type == 'shutdown_request':
+            # This handles restarts asked by the user
+            self.set_namespace_view_settings()
+            self.refresh_namespacebrowser()
+        else:
+            super(NamepaceBrowserWidget, self)._handle_status(msg)
diff --git a/spyder/widgets/ipythonconsole/shell.py b/spyder/widgets/ipythonconsole/shell.py
new file mode 100644
index 0000000..44d7eda
--- /dev/null
+++ b/spyder/widgets/ipythonconsole/shell.py
@@ -0,0 +1,263 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright © Spyder Project Contributors
+# Licensed under the terms of the MIT License
+# (see spyder/__init__.py for details)
+
+"""
+Shell Widget for the IPython Console
+"""
+
+import ast
+import uuid
+
+from qtpy.QtCore import Signal
+from qtpy.QtWidgets import QMessageBox
+
+from spyder.config.base import _
+from spyder.config.gui import config_shortcut, fixed_shortcut
+from spyder.py3compat import to_text_string
+from spyder.utils import programs
+from spyder.widgets.arraybuilder import SHORTCUT_INLINE, SHORTCUT_TABLE
+from spyder.widgets.ipythonconsole import (ControlWidget, DebuggingWidget,
+                                           HelpWidget, NamepaceBrowserWidget,
+                                           PageControlWidget)
+
+
+class ShellWidget(NamepaceBrowserWidget, HelpWidget, DebuggingWidget):
+    """
+    Shell widget for the IPython Console
+
+    This is the widget in charge of executing code
+    """
+    # NOTE: Signals can't be assigned separately to each widget
+    #       That's why we define all needed signals here.
+
+    # For NamepaceBrowserWidget
+    sig_namespace_view = Signal(object)
+    sig_var_properties = Signal(object)
+
+    # For DebuggingWidget
+    sig_input_reply = Signal()
+    sig_pdb_step = Signal(str, int)
+    sig_prompt_ready = Signal()
+
+    # For ShellWidget
+    focus_changed = Signal()
+    new_client = Signal()
+    sig_got_reply = Signal()
+
+    def __init__(self, additional_options, interpreter_versions, *args, **kw):
+        # To override the Qt widget used by RichJupyterWidget
+        self.custom_control = ControlWidget
+        self.custom_page_control = PageControlWidget
+        super(ShellWidget, self).__init__(*args, **kw)
+        self.additional_options = additional_options
+        self.interpreter_versions = interpreter_versions
+
+        self.set_background_color()
+
+        # --- Spyder variables ---
+        self.ipyclient = None
+
+        # --- Keyboard shortcuts ---
+        self.shortcuts = self.create_shortcuts()
+
+        # To save kernel replies in silent execution
+        self._kernel_reply = None
+
+    #---- Public API ----------------------------------------------------------
+    def set_ipyclient(self, ipyclient):
+        """Bind this shell widget to an IPython client one"""
+        self.ipyclient = ipyclient
+        self.exit_requested.connect(ipyclient.exit_callback)
+
+    def is_running(self):
+        if self.kernel_client is not None and \
+          self.kernel_client.channels_running:
+            return True
+        else:
+            return False
+
+    # --- To handle the banner
+    def long_banner(self):
+        """Banner for IPython widgets with pylab message"""
+        # Default banner
+        from IPython.core.usage import quick_guide
+        banner_parts = [
+            'Python %s\n' % self.interpreter_versions['python_version'],
+            'Type "copyright", "credits" or "license" for more information.\n\n',
+            'IPython %s -- An enhanced Interactive Python.\n' % \
+            self.interpreter_versions['ipython_version'],
+            quick_guide
+        ]
+        banner = ''.join(banner_parts)
+
+        # Pylab additions
+        pylab_o = self.additional_options['pylab']
+        autoload_pylab_o = self.additional_options['autoload_pylab']
+        mpl_installed = programs.is_module_installed('matplotlib')
+        if mpl_installed and (pylab_o and autoload_pylab_o):
+            pylab_message = ("\nPopulating the interactive namespace from "
+                             "numpy and matplotlib")
+            banner = banner + pylab_message
+
+        # Sympy additions
+        sympy_o = self.additional_options['sympy']
+        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)
+"""
+            banner = banner + lines
+        return banner
+
+    def short_banner(self):
+        """Short banner with Python and QtConsole versions"""
+        banner = 'Python %s -- IPython %s' % (
+                                  self.interpreter_versions['python_version'],
+                                  self.interpreter_versions['ipython_version'])
+        return banner
+
+    # --- To define additional shortcuts
+    def clear_console(self):
+        self.execute("%clear")
+
+    def reset_namespace(self):
+        """Resets the namespace by removing all names defined by the user"""
+
+        reply = QMessageBox.question(
+            self,
+            _("Reset IPython namespace"),
+            _("All user-defined variables will be removed."
+            "<br>Are you sure you want to reset the namespace?"),
+            QMessageBox.Yes | QMessageBox.No,
+            )
+
+        if reply == QMessageBox.Yes:
+            self.execute("%reset -f")
+
+    def set_background_color(self):
+        light_color_o = self.additional_options['light_color']
+        if not light_color_o:
+            self.set_default_style(colors='linux')
+
+    def create_shortcuts(self):
+        inspect = config_shortcut(self._control.inspect_current_object,
+                                  context='Console', name='Inspect current object',
+                                  parent=self)
+        clear_console = config_shortcut(self.clear_console, context='Console',
+                                        name='Clear shell', parent=self)
+
+        # Fixed shortcuts
+        fixed_shortcut("Ctrl+T", self, lambda: self.new_client.emit())
+        fixed_shortcut("Ctrl+Alt+R", self, lambda: self.reset_namespace())
+        fixed_shortcut(SHORTCUT_INLINE, self,
+                       lambda: self._control.enter_array_inline())
+        fixed_shortcut(SHORTCUT_TABLE, self,
+                       lambda: self._control.enter_array_table())
+
+        return [inspect, clear_console]
+
+    # --- To communicate with the kernel
+    def silent_execute(self, code):
+        """Execute code in the kernel without increasing the prompt"""
+        self.kernel_client.execute(to_text_string(code), silent=True)
+
+    def silent_exec_method(self, code):
+        """Silently execute a kernel method and save its reply
+
+        The methods passed here **don't** involve getting the value
+        of a variable but instead replies that can be handled by
+        ast.literal_eval.
+
+        To get a value see `get_value`
+
+        Parameters
+        ----------
+        code : string
+            Code that contains the kernel method as part of its
+            string
+
+        See Also
+        --------
+        handle_exec_method : Method that deals with the reply
+
+        Note
+        ----
+        This is based on the _silent_exec_callback method of
+        RichJupyterWidget. Therefore this is licensed BSD
+        """
+        # Generate uuid, which would be used as an indication of whether or
+        # not the unique request originated from here
+        local_uuid = to_text_string(uuid.uuid1())
+        code = to_text_string(code)
+        msg_id = self.kernel_client.execute('', silent=True,
+                                            user_expressions={ local_uuid:code })
+        self._kernel_methods[local_uuid] = code
+        self._request_info['execute'][msg_id] = self._ExecutionRequest(msg_id,
+                                                          'silent_exec_method')
+
+    def handle_exec_method(self, msg):
+        """
+        Handle data returned by silent executions of kernel methods
+
+        This is based on the _handle_exec_callback of RichJupyterWidget.
+        Therefore this is licensed BSD.
+        """
+        user_exp = msg['content'].get('user_expressions')
+        if not user_exp:
+            return
+        for expression in user_exp:
+            if expression in self._kernel_methods:
+                # Process kernel reply
+                method = self._kernel_methods[expression]
+                reply = user_exp[expression]
+                data = reply.get('data')
+                if 'get_namespace_view' in method:
+                    view = ast.literal_eval(data['text/plain'])
+                    self.sig_namespace_view.emit(view)
+                elif 'get_var_properties' in method:
+                    properties = ast.literal_eval(data['text/plain'])
+                    self.sig_var_properties.emit(properties)
+                else:
+                    if data is not None:
+                        self._kernel_reply = ast.literal_eval(data['text/plain'])
+                    else:
+                        self._kernel_reply = None
+                    self.sig_got_reply.emit()
+
+                # Remove method after being processed
+                self._kernel_methods.pop(expression)
+
+    #---- Private methods (overrode by us) ---------------------------------
+    def _context_menu_make(self, pos):
+        """Reimplement the IPython context menu"""
+        menu = super(ShellWidget, self)._context_menu_make(pos)
+        return self.ipyclient.add_actions_to_context_menu(menu)
+
+    def _banner_default(self):
+        """
+        Reimplement banner creation to let the user decide if he wants a
+        banner or not
+        """
+        show_banner_o = self.additional_options['show_banner']
+        if show_banner_o:
+            return self.long_banner()
+        else:
+            return self.short_banner()
+
+    #---- Qt methods ----------------------------------------------------------
+    def focusInEvent(self, event):
+        """Reimplement Qt method to send focus change notification"""
+        self.focus_changed.emit()
+        return super(ShellWidget, self).focusInEvent(event)
+
+    def focusOutEvent(self, event):
+        """Reimplement Qt method to send focus change notification"""
+        self.focus_changed.emit()
+        return super(ShellWidget, self).focusOutEvent(event)
diff --git a/spyderlib/widgets/mixins.py b/spyder/widgets/mixins.py
similarity index 94%
rename from spyderlib/widgets/mixins.py
rename to spyder/widgets/mixins.py
index dc1dea8..02974eb 100644
--- a/spyderlib/widgets/mixins.py
+++ b/spyder/widgets/mixins.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2012 Pierre Raybaut
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """Mix-in classes
 
@@ -24,13 +24,13 @@ from qtpy.QtGui import QCursor, QTextCursor, QTextDocument
 from qtpy.QtWidgets import QApplication, QToolTip
 
 # Local imports
-from spyderlib.config.base import _
-from spyderlib.py3compat import is_text_string, to_text_string, u
-from spyderlib.utils import encoding, sourcecode
-from spyderlib.utils.dochelpers import (getargspecfromtext, getobj,
-                                        getsignaturefromtext)
-from spyderlib.utils.misc import get_error_match
-from spyderlib.widgets.arraybuilder import NumpyArrayDialog
+from spyder.config.base import _
+from spyder.py3compat import is_text_string, to_text_string, u
+from spyder.utils import encoding, sourcecode
+from spyder.utils.dochelpers import (getargspecfromtext, getobj,
+                                     getsignaturefromtext)
+from spyder.utils.misc import get_error_match
+from spyder.widgets.arraybuilder import NumpyArrayDialog
 
 
 HISTORY_FILENAMES = []
@@ -502,7 +502,7 @@ class BaseEditMixin(object):
         """Needs to be overloaded in the codeeditor where it will be True"""
         return False
 
-    # --- Numpy matrix/array helper / See 'spyderlib/widgets/arraybuilder.py'
+    # --- Numpy matrix/array helper / See 'spyder/widgets/arraybuilder.py'
     def enter_array_inline(self):
         """ """
         self._enter_array(True)
@@ -592,7 +592,6 @@ class GetHelpMixin(object):
     def set_help(self, help_plugin):
         """Set Help DockWidget reference"""
         self.help = help_plugin
-        self.help.set_shell(self)
 
     def set_help_enabled(self, state):
         self.help_enabled = state
@@ -612,7 +611,7 @@ class GetHelpMixin(object):
 
     def show_object_info(self, text, call=False, force=False):
         """Show signature calltip and/or docstring in the Help plugin"""
-        text = to_text_string(text) # Useful only for ExternalShellBase
+        text = to_text_string(text)
 
         # Show docstring
         help_enabled = self.help_enabled or force
@@ -622,7 +621,10 @@ class GetHelpMixin(object):
         if help_enabled and (self.help is not None) and \
            (self.help.dockwidget.isVisible()):
             # Help widget exists and is visible
-            self.help.set_shell(self)
+            if hasattr(self, 'get_doc'):
+                self.help.set_shell(self)
+            else:
+                self.help.set_shell(self.parent())
             self.help.set_object_text(text, ignore_unknown=False)
             self.setFocus() # if help was not at top level, raising it to
                             # top will automatically give it focus because of
diff --git a/spyderlib/widgets/onecolumntree.py b/spyder/widgets/onecolumntree.py
similarity index 93%
rename from spyderlib/widgets/onecolumntree.py
rename to spyder/widgets/onecolumntree.py
index 7f59a1b..08fcff7 100644
--- a/spyderlib/widgets/onecolumntree.py
+++ b/spyder/widgets/onecolumntree.py
@@ -1,18 +1,18 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 # Third party imports
 from qtpy.QtCore import Slot
 from qtpy.QtWidgets import QTreeWidget, QMenu
 
 # Local imports
-from spyderlib.config.base import _
-from spyderlib.utils import icon_manager as ima
-from spyderlib.utils.qthelpers import (add_actions, create_action,
-                                       get_item_user_text)
+from spyder.config.base import _
+from spyder.utils import icon_manager as ima
+from spyder.utils.qthelpers import (add_actions, create_action,
+                                    get_item_user_text)
 
 
 class OneColumnTree(QTreeWidget):
diff --git a/spyderlib/widgets/pathmanager.py b/spyder/widgets/pathmanager.py
similarity index 93%
rename from spyderlib/widgets/pathmanager.py
rename to spyder/widgets/pathmanager.py
index 6ca78bd..145bf30 100644
--- a/spyderlib/widgets/pathmanager.py
+++ b/spyder/widgets/pathmanager.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """Spyder path manager"""
 
@@ -20,10 +20,10 @@ from qtpy.QtWidgets import (QDialog, QDialogButtonBox, QHBoxLayout,
                             QVBoxLayout)
 
 # Local imports
-from spyderlib.config.base import _
-from spyderlib.py3compat import getcwd
-from spyderlib.utils import icon_manager as ima
-from spyderlib.utils.qthelpers import create_toolbutton
+from spyder.config.base import _
+from spyder.py3compat import getcwd
+from spyder.utils import icon_manager as ima
+from spyder.utils.qthelpers import create_toolbutton
 
 
 class PathManager(QDialog):
@@ -156,8 +156,8 @@ class PathManager(QDialog):
             remove = True
         else:
             remove = False
-        from spyderlib.utils.environ import (get_user_env, set_user_env,
-                                             listdict2envdict)
+        from spyder.utils.environ import (get_user_env, set_user_env,
+                                          listdict2envdict)
         env = get_user_env()
         if remove:
             ppath = self.pathlist+self.ro_pathlist
@@ -243,7 +243,7 @@ class PathManager(QDialog):
 
 def test():
     """Run path manager test"""
-    from spyderlib.utils.qthelpers import qapplication
+    from spyder.utils.qthelpers import qapplication
     _app = qapplication()  # analysis:ignore
     test = PathManager(None, pathlist=sys.path[:-10],
                        ro_pathlist=sys.path[-10:])
diff --git a/spyder/widgets/projects/__init__.py b/spyder/widgets/projects/__init__.py
new file mode 100644
index 0000000..2f2cdb1
--- /dev/null
+++ b/spyder/widgets/projects/__init__.py
@@ -0,0 +1,96 @@
+# -*- coding: utf-8 -*-
+# -----------------------------------------------------------------------------
+# Copyright © Spyder Project Contributors
+#
+# Licensed under the terms of the MIT License
+# (see spyder/__init__.py for details)
+# -----------------------------------------------------------------------------
+"""Projects"""
+
+# Local imports
+from spyder.widgets.projects.type import EmptyProject
+from spyder.widgets.projects.type.python import PythonProject
+
+
+def get_available_project_types():
+    """ """
+#    return [EmptyProject, PythonProject, PythonPackageProject, DjangoProject,
+#            SpyderPluginProject] + get_available_project_types_plugins()
+    return ([EmptyProject] +
+            get_available_project_types_plugins())
+
+
+def get_available_project_types_plugins():
+    """ """
+    return []
+
+
+#def components(path):
+#    '''
+#    Returns the individual components of the given file path
+#    string (for the local operating system).
+#
+#    The returned components, when joined with os.path.join(), point to
+#    the same location as the original path.
+#    '''
+#    components = []
+#    # The loop guarantees that the returned components can be
+#    # os.path.joined with the path separator and point to the same
+#    # location:
+#    while True:
+#        (new_path, tail) = osp.split(path)  # Works on any platform
+#        components.append(tail)
+#        if new_path == path:  # Root (including drive, on Windows) reached
+#            break
+#        path = new_path
+#    components.append(new_path)
+#
+#    components.reverse()  # First component first
+#    return components
+#
+#
+#def longest_prefix(iter0, iter1):
+#    '''
+#    Returns the longest common prefix of the given two iterables.
+#    '''
+#    longest_prefix = []
+#    for (elmt0, elmt1) in itertools.izip(iter0, iter1):
+#        if elmt0 != elmt1:
+#            break
+#        longest_prefix.append(elmt0)
+#    return longest_prefix
+#
+#
+#def common_prefix_path(path0, path1):
+#    return os.path.join(*longest_prefix(components(path0), components(path1)))
+#
+
+#
+#def has_children_files(path, include, exclude, show_all):
+#    """Return True if path has children files"""
+#    try:
+#        return len(listdir(path, include, exclude, show_all)) > 0
+#    except (IOError, OSError):
+#        return False
+#
+#
+#def is_drive_path(path):
+#    """Return True if path is a drive (Windows)"""
+#    path = osp.abspath(path)
+#    return osp.normpath(osp.join(path, osp.pardir)) == path
+#
+#
+#def get_dir_icon(dirname, project):
+#    """Return appropriate directory icon"""
+#    if is_drive_path(dirname):
+#        return get_std_icon('DriveHDIcon')
+#    prefix = 'pp_' if dirname in project.get_pythonpath() else ''
+#    if dirname == project.root_path:
+#        if project.is_opened():
+#            return get_icon(prefix+'project.png')
+#        else:
+#            return get_icon('project_closed.png')
+#    elif osp.isfile(osp.join(dirname, '__init__.py')):
+#        return get_icon(prefix+'package.png')
+#    else:
+#        return get_icon(prefix+'folder.png')
diff --git a/spyder/widgets/projects/config.py b/spyder/widgets/projects/config.py
new file mode 100644
index 0000000..8c05a39
--- /dev/null
+++ b/spyder/widgets/projects/config.py
@@ -0,0 +1,98 @@
+# -*- coding: utf-8 -*-
+# -----------------------------------------------------------------------------
+# Copyright © Spyder Project Contributors
+#
+# Licensed under the terms of the MIT License
+# (see spyder/__init__.py for details)
+# -----------------------------------------------------------------------------
+"""Configuration options for projects"""
+
+# Standard library imports
+import os
+
+# Local imports
+from spyder.config.user import UserConfig
+
+PROJECT_FILENAME = '.spyproj'
+PROJECT_FOLDER = '.spyproject'
+
+
+# Project configuration defaults
+WORKSPACE = 'workspace'
+WORKSPACE_DEFAULTS = [
+    (WORKSPACE,
+     {'restore_data_on_startup': True,
+      'save_data_on_exit': True,
+      'save_history': True,
+      'save_non_project_files': False,
+      }
+     )]
+WORKSPACE_VERSION = '0.1.0'
+
+
+CODESTYLE = 'codestyle'
+CODESTYLE_DEFAULTS = [
+    (CODESTYLE,
+     {'indentation': True,
+      }
+     )]
+CODESTYLE_VERSION = '0.1.0'
+
+
+ENCODING = 'encoding'
+ENCODING_DEFAULTS = [
+    (ENCODING,
+     {'text_encoding': 'utf-8',
+      }
+     )]
+ENCODING_VERSION = '0.1.0'
+
+
+VCS = 'vcs'
+VCS_DEFAULTS = [
+    (VCS,
+     {'use_version_control': False,
+      'version_control_system': '',
+      }
+     )]
+VCS_VERSION = '0.1.0'
+
+
+class ProjectConfig(UserConfig):
+    """ProjectConfig class, based on UserConfig.
+
+    Parameters
+    ----------
+    name: str
+        name of the config
+    defaults: tuple
+        dictionnary containing options *or* list of tuples
+        (section_name, options)
+    version: str
+        version of the configuration file (X.Y.Z format)
+    filename: str
+        configuration file will be saved in %home%/subfolder/%name%.ini
+    """
+    DEFAULT_SECTION_NAME = 'main'
+
+    def __init__(self, name, root_path, filename, defaults=None, load=True,
+                 version=None):
+        self.project_root_path = root_path
+
+        # Config rootpath
+        self._root_path = os.path.join(root_path, PROJECT_FOLDER)
+        self._filename = filename
+
+        # Create folder if non existent
+        if not os.path.isdir(self._root_path):
+            os.makedirs(self._root_path)
+
+        # Add file
+        # NOTE: We have to think better about the uses of this file
+        # with open(os.path.join(root_path, PROJECT_FILENAME), 'w') as f:
+        #    f.write('spyder-ide project\n')
+
+        UserConfig.__init__(self, name, defaults=defaults, load=load,
+                            version=version, subfolder=None, backup=False,
+                            raw_mode=True, remove_obsolete=True)
+
diff --git a/spyder/widgets/projects/configdialog.py b/spyder/widgets/projects/configdialog.py
new file mode 100644
index 0000000..398f2c9
--- /dev/null
+++ b/spyder/widgets/projects/configdialog.py
@@ -0,0 +1,190 @@
+# -*- coding: utf-8 -*-
+# -----------------------------------------------------------------------------
+# Copyright © Spyder Project Contributors
+#
+# Licensed under the terms of the MIT License
+# (see spyder/__init__.py for details)
+# -----------------------------------------------------------------------------
+"""Configuration dialog for projects"""
+
+from qtpy.QtWidgets import QGroupBox, QVBoxLayout
+
+from spyder.config.base import _
+from spyder.plugins.configdialog import ConfigDialog, GeneralConfigPage
+from spyder.utils.qthelpers import get_icon
+from spyder.config.user import NoDefault
+from spyder.widgets.projects import EmptyProject
+from spyder.widgets.projects.config import (WORKSPACE, VCS, ENCODING,
+                                            CODESTYLE)
+
+
+class ProjectPreferences(ConfigDialog):
+    """ """
+    def __init__(self, parent, project):
+        super(ProjectPreferences, self).__init__()
+
+        self._main = parent
+        self._project = project
+        self._project_preferences = [WorkspaceConfigPage] #, VersionConfigPage]
+
+        self.setWindowTitle(_("Project preferences"))
+        self.setWindowIcon(get_icon("configure.png"))
+
+        self.setup_dialog()
+
+    def setup_dialog(self):
+        """ """
+        # Move to spyder.py
+#        dlg = ConfigDialog(self)
+#        dlg.size_change.connect(self.set_prefs_size)
+#        if self.prefs_dialog_size is not None:
+#            dlg.resize(self.prefs_dialog_size)
+        for PrefPageClass in self._project_preferences:
+            widget = PrefPageClass(self, self._main, self._project)
+            widget.initialize()
+            self.add_page(widget)
+
+
+class ProjectConfigPage(GeneralConfigPage):
+    """General config page that redefines the configuration accessors."""
+    CONF_SECTION = None
+    NAME = None
+    ICON = None
+
+    def __init__(self, parent, main, project):
+        self._project = project
+        self._conf_files = project.get_conf_files()
+        self._conf = self._conf_files[self.CONF_SECTION]
+
+        GeneralConfigPage.__init__(self, parent, main)
+
+    def set_option(self, option, value):
+        """ """
+        CONF = self._conf
+        CONF.set(self.CONF_SECTION, option, value)
+
+    def get_option(self, option, default=NoDefault):
+        """" """
+        CONF = self._conf
+        return CONF.get(self.CONF_SECTION, option, default)
+
+
+class WorkspaceConfigPage(ProjectConfigPage):
+    CONF_SECTION = WORKSPACE
+    NAME = _("General")
+    ICON = "genprefs.png"
+
+    def setup_page(self):
+        newcb = self.create_checkbox
+
+        # --- Workspace
+        interface_group = QGroupBox(_("Interface"))
+        restore_data_box = newcb(_("Restore data on startup"),
+                                 'restore_data_on_startup')
+        save_data_box = newcb(_("Save data on exit"),
+                              'save_data_on_exit')
+        save_history_box = newcb(_("Save history"),
+                                 'save_history')
+        save_non_project_box = newcb(_("Save non project files opened"),
+                                     'save_non_project_files')
+
+        interface_layout = QVBoxLayout()
+        interface_layout.addWidget(restore_data_box)
+        interface_layout.addWidget(save_data_box)
+        interface_layout.addWidget(save_history_box)
+        interface_layout.addWidget(save_non_project_box)
+        interface_group.setLayout(interface_layout)
+
+        vlayout = QVBoxLayout()
+        vlayout.addWidget(interface_group)
+        vlayout.addStretch(1)
+        self.setLayout(vlayout)
+
+    def apply_settings(self, options):
+        """ """
+        pass  # TODO:
+        #self.main.apply_settings()
+
+
+class CodeConfigPage(ProjectConfigPage):
+    CONF_SECTION = CODESTYLE
+    NAME = _("Code")
+    ICON = "genprefs.png"
+
+    def setup_page(self):
+        newcb = self.create_checkbox
+
+        # --- Workspace
+        interface_group = QGroupBox(_("Workspace"))
+        restore_data_box = newcb(_("Restore data on startup"),
+                                 'restore_data_on_startup')
+        save_data_box = newcb(_("Save data on exit"),
+                              'save_data_on_exit')
+        save_history_box = newcb(_("Save history"),
+                                 'save_history')
+        save_non_project_box = newcb(_("Save non project files opened"),
+                                     'save_non_project_files')
+
+        interface_layout = QVBoxLayout()
+        interface_layout.addWidget(restore_data_box)
+        interface_layout.addWidget(save_data_box)
+        interface_layout.addWidget(save_history_box)
+        interface_layout.addWidget(save_non_project_box)
+        interface_group.setLayout(interface_layout)
+
+        vlayout = QVBoxLayout()
+        vlayout.addWidget(interface_group)
+        vlayout.addStretch(1)
+        self.setLayout(vlayout)
+
+    def apply_settings(self, options):
+        """ """
+        print('applied')
+        #self.main.apply_settings()
+
+
+class VersionConfigPage(ProjectConfigPage):
+    CONF_SECTION = VCS
+    NAME = _("Version control")
+    ICON = "genprefs.png"
+
+    def setup_page(self):
+        newcb = self.create_checkbox
+
+        # --- Workspace
+        vcs_group = QGroupBox(_("Version control"))
+        use_version_control = newcb(_("Use version control"),
+                                    'use_version_control')
+
+        styles = ['git', 'hg']
+        choices = list(zip(styles, [style.lower() for style in styles]))
+        vcs_combo = self.create_combobox(_('Version control system'), choices,
+                                         'version_control_system',
+                                         default='git')
+
+        vcs_layout = QVBoxLayout()
+        vcs_layout.addWidget(use_version_control)
+        vcs_layout.addWidget(vcs_combo)
+        vcs_group.setLayout(vcs_layout)
+
+        vlayout = QVBoxLayout()
+        vlayout.addWidget(vcs_group)
+        vlayout.addStretch(1)
+        self.setLayout(vlayout)
+
+    def apply_settings(self, options):
+        """ """
+        print('applied')
+        #self.main.apply_settings()
+
+
+if __name__ == "__main__":
+    import os.path as osp
+    import tempfile
+    from spyder.utils.qthelpers import qapplication
+    app = qapplication()
+    proj_dir = tempfile.mkdtemp() + osp.sep + '.spyproject'
+    proj = EmptyProject(proj_dir)
+    dlg = ProjectPreferences(None, proj)
+    dlg.show()
+    app.exec_()
diff --git a/spyder/widgets/projects/explorer.py b/spyder/widgets/projects/explorer.py
new file mode 100644
index 0000000..7e9c33a
--- /dev/null
+++ b/spyder/widgets/projects/explorer.py
@@ -0,0 +1,262 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright © Spyder Project Contributors
+# Licensed under the terms of the MIT License
+# (see spyder/__init__.py for details)
+
+"""Project Explorer"""
+
+# pylint: disable=C0103
+
+# Standard library imports
+from __future__ import print_function
+
+import os.path as osp
+import shutil
+
+# Third party imports
+from qtpy import PYQT5
+from qtpy.QtCore import Qt, Signal, Slot
+from qtpy.QtWidgets import (QAbstractItemView, QHBoxLayout, QHeaderView,
+                            QLabel, QMessageBox, QVBoxLayout, QWidget)
+
+# Local imports
+from spyder.config.base import _
+from spyder.py3compat import to_text_string
+from spyder.utils import misc
+from spyder.utils.qthelpers import create_action
+from spyder.widgets.explorer import FilteredDirView
+
+
+class ExplorerTreeWidget(FilteredDirView):
+    """Explorer tree widget"""
+
+    def __init__(self, parent, show_hscrollbar=True):
+        FilteredDirView.__init__(self, parent)
+        self.last_folder = None
+        self.setSelectionMode(FilteredDirView.ExtendedSelection)
+        self.show_hscrollbar = show_hscrollbar
+
+        # Enable drag & drop events
+        self.setDragEnabled(True)
+        self.setDragDropMode(FilteredDirView.DragDrop)
+
+    #------DirView API---------------------------------------------------------
+    def setup_common_actions(self):
+        """Setup context menu common actions"""
+        actions = FilteredDirView.setup_common_actions(self)
+
+        # Toggle horizontal scrollbar
+        hscrollbar_action = create_action(self, _("Show horizontal scrollbar"),
+                                          toggled=self.toggle_hscrollbar)
+        hscrollbar_action.setChecked(self.show_hscrollbar)
+        self.toggle_hscrollbar(self.show_hscrollbar)
+
+        return actions + [hscrollbar_action]
+
+    #------Public API----------------------------------------------------------
+    @Slot(bool)
+    def toggle_hscrollbar(self, checked):
+        """Toggle horizontal scrollbar"""
+        self.parent_widget.sig_option_changed.emit('show_hscrollbar', checked)
+        self.show_hscrollbar = checked
+        self.header().setStretchLastSection(not checked)
+        self.header().setHorizontalScrollMode(QAbstractItemView.ScrollPerPixel)
+        if PYQT5:
+            self.header().setSectionResizeMode(QHeaderView.ResizeToContents)
+        else:
+            self.header().setResizeMode(QHeaderView.ResizeToContents)
+
+    #---- Internal drag & drop
+    def dragMoveEvent(self, event):
+        """Reimplement Qt method"""
+        index = self.indexAt(event.pos())
+        if index:
+            dst = self.get_filename(index)
+            if osp.isdir(dst):
+                event.acceptProposedAction()
+            else:
+                event.ignore()
+        else:
+            event.ignore()
+
+    def dropEvent(self, event):
+        """Reimplement Qt method"""
+        event.ignore()
+        action = event.dropAction()
+        if action not in (Qt.MoveAction, Qt.CopyAction):
+            return
+
+        # QTreeView must not remove the source items even in MoveAction mode:
+        # event.setDropAction(Qt.CopyAction)
+
+        dst = self.get_filename(self.indexAt(event.pos()))
+        yes_to_all, no_to_all = None, None
+        src_list = [to_text_string(url.toString())
+                    for url in event.mimeData().urls()]
+        if len(src_list) > 1:
+            buttons = QMessageBox.Yes|QMessageBox.YesAll| \
+                      QMessageBox.No|QMessageBox.NoAll|QMessageBox.Cancel
+        else:
+            buttons = QMessageBox.Yes|QMessageBox.No
+        for src in src_list:
+            if src == dst:
+                continue
+            dst_fname = osp.join(dst, osp.basename(src))
+            if osp.exists(dst_fname):
+                if yes_to_all is not None or no_to_all is not None:
+                    if no_to_all:
+                        continue
+                elif osp.isfile(dst_fname):
+                    answer = QMessageBox.warning(self, _('Project explorer'),
+                              _('File <b>%s</b> already exists.<br>'
+                                'Do you want to overwrite it?') % dst_fname,
+                              buttons)
+                    if answer == QMessageBox.No:
+                        continue
+                    elif answer == QMessageBox.Cancel:
+                        break
+                    elif answer == QMessageBox.YesAll:
+                        yes_to_all = True
+                    elif answer == QMessageBox.NoAll:
+                        no_to_all = True
+                        continue
+                else:
+                    QMessageBox.critical(self, _('Project explorer'),
+                                         _('Folder <b>%s</b> already exists.'
+                                           ) % dst_fname, QMessageBox.Ok)
+                    event.setDropAction(Qt.CopyAction)
+                    return
+            try:
+                if action == Qt.CopyAction:
+                    if osp.isfile(src):
+                        shutil.copy(src, dst)
+                    else:
+                        shutil.copytree(src, dst)
+                else:
+                    if osp.isfile(src):
+                        misc.move_file(src, dst)
+                    else:
+                        shutil.move(src, dst)
+                    self.parent_widget.removed.emit(src)
+            except EnvironmentError as error:
+                if action == Qt.CopyAction:
+                    action_str = _('copy')
+                else:
+                    action_str = _('move')
+                QMessageBox.critical(self, _("Project Explorer"),
+                                     _("<b>Unable to %s <i>%s</i></b>"
+                                       "<br><br>Error message:<br>%s"
+                                       ) % (action_str, src,
+                                            to_text_string(error)))
+
+
+class ProjectExplorerWidget(QWidget):
+    """Project Explorer"""
+    sig_option_changed = Signal(str, object)
+    sig_open_file = Signal(str)
+
+    def __init__(self, parent, name_filters=[],
+                 show_all=True, show_hscrollbar=True):
+        QWidget.__init__(self, parent)
+        self.treewidget = None
+        self.emptywidget = None
+        self.name_filters = name_filters
+        self.show_all = show_all
+        self.show_hscrollbar = show_hscrollbar
+        self.setup_layout()
+
+    def setup_layout(self):
+        """Setup project explorer widget layout"""
+
+        self.emptywidget = ExplorerTreeWidget(self)
+
+        layout = QVBoxLayout()
+        layout.setContentsMargins(0, 0, 0, 0)
+        layout.addWidget(self.emptywidget)
+        self.setLayout(layout)
+
+    def closing_widget(self):
+        """Perform actions before widget is closed"""
+        pass
+
+    def set_project_dir(self, directory):
+        """Set the project directory"""
+        if directory is not None:
+            project = directory.split(osp.sep)[-1]
+            self.treewidget.set_root_path(osp.dirname(directory))
+            self.treewidget.set_folder_names([project])
+        self.treewidget.setup_project_view()
+        try:
+            self.treewidget.setExpanded(self.treewidget.get_index(directory),
+                                        True)
+        except TypeError:
+            pass
+
+    def clear(self):
+        """Show an empty view"""
+        self.treewidget.hide()
+        self.emptywidget.show()
+
+    def setup_project(self, directory):
+        """Setup project"""
+        if self.treewidget is not None:
+            self.treewidget.hide()
+
+        # Setup a new tree widget
+        self.treewidget = ExplorerTreeWidget(self, self.show_hscrollbar)
+        self.treewidget.setup(name_filters=self.name_filters,
+                              show_all=self.show_all)
+        self.treewidget.setup_view()
+        self.emptywidget.hide()
+        self.treewidget.show()
+        self.layout().addWidget(self.treewidget)
+
+        # Setup the directory shown by the tree
+        self.set_project_dir(directory)
+
+
+#==============================================================================
+# Tests
+#==============================================================================
+class Test(QWidget):
+    def __init__(self):
+        QWidget.__init__(self)
+        vlayout = QVBoxLayout()
+        self.setLayout(vlayout)
+
+        self.explorer = ProjectExplorerWidget(None, show_all=True)
+        self.explorer.setup_project(osp.dirname(osp.abspath(__file__)))
+        vlayout.addWidget(self.explorer)
+
+        hlayout1 = QHBoxLayout()
+        vlayout.addLayout(hlayout1)
+        label = QLabel("<b>Open file:</b>")
+        label.setAlignment(Qt.AlignRight)
+        hlayout1.addWidget(label)
+        self.label1 = QLabel()
+        hlayout1.addWidget(self.label1)
+        self.explorer.sig_open_file.connect(self.label1.setText)
+
+        hlayout3 = QHBoxLayout()
+        vlayout.addLayout(hlayout3)
+        label = QLabel("<b>Option changed:</b>")
+        label.setAlignment(Qt.AlignRight)
+        hlayout3.addWidget(label)
+        self.label3 = QLabel()
+        hlayout3.addWidget(self.label3)
+        self.explorer.sig_option_changed.connect(
+           lambda x, y: self.label3.setText('option_changed: %r, %r' % (x, y)))
+
+
+def test():
+    from spyder.utils.qthelpers import qapplication
+    app = qapplication()
+    test = Test()
+    test.resize(250, 480)
+    test.show()
+    app.exec_()
+
+
+if __name__ == "__main__":
+    test()
diff --git a/spyder/widgets/projects/projectdialog.py b/spyder/widgets/projects/projectdialog.py
new file mode 100644
index 0000000..e4e27cb
--- /dev/null
+++ b/spyder/widgets/projects/projectdialog.py
@@ -0,0 +1,199 @@
+# -*- coding: utf-8 -*-
+# -----------------------------------------------------------------------------
+# Copyright © Spyder Project Contributors
+#
+# Licensed under the terms of the MIT License
+# (see spyder/__init__.py for details)
+# -----------------------------------------------------------------------------
+"""Project creation dialog."""
+
+from __future__ import print_function
+
+# Standard library imports
+import errno
+import os
+import os.path as osp
+import sys
+import tempfile
+
+# Third party imports
+from qtpy.compat import getexistingdirectory
+from qtpy.QtCore import Qt, Signal
+from qtpy.QtWidgets import (QVBoxLayout, QLabel, QLineEdit, QPushButton,
+                            QDialog, QComboBox, QGridLayout, QToolButton,
+                            QDialogButtonBox, QGroupBox, QRadioButton,
+                            QHBoxLayout)
+
+
+# Local imports
+from spyder.config.base import _, get_home_dir
+from spyder.utils.qthelpers import get_std_icon
+from spyder.py3compat import to_text_string
+from spyder.widgets.projects import get_available_project_types
+
+
+def is_writable(path):
+    """Check if path has write access"""
+    try:
+        testfile = tempfile.TemporaryFile(dir=path)
+        testfile.close()
+    except OSError as e:
+        if e.errno == errno.EACCES:  # 13
+            return False
+    return True
+
+
+class ProjectDialog(QDialog):
+    """Project creation dialog."""
+
+    # path, type, packages
+    sig_project_creation_requested = Signal(object, object, object)
+
+    def __init__(self, parent):
+        """Project creation dialog."""
+        super(ProjectDialog, self).__init__(parent=parent)
+
+        # Variables
+        current_python_version = '.'.join([to_text_string(sys.version_info[0]),
+                                           to_text_string(sys.version_info[1])])
+        python_versions = ['2.7', '3.4', '3.5']
+        if current_python_version not in python_versions:
+            python_versions.append(current_python_version)
+            python_versions = sorted(python_versions)
+
+        self.project_name = None
+        self.location = get_home_dir()
+
+        # Widgets
+        self.groupbox = QGroupBox()
+        self.radio_new_dir = QRadioButton(_("New directory"))
+        self.radio_from_dir = QRadioButton(_("Existing directory"))
+
+        self.label_project_name = QLabel(_('Project name'))
+        self.label_location = QLabel(_('Location'))
+        self.label_project_type = QLabel(_('Project type'))
+        self.label_python_version = QLabel(_('Python version'))
+
+        self.text_project_name = QLineEdit()
+        self.text_location = QLineEdit(get_home_dir())
+        self.combo_project_type = QComboBox()
+        self.combo_python_version = QComboBox()
+
+        self.button_select_location = QToolButton()
+        self.button_cancel = QPushButton(_('Cancel'))
+        self.button_create = QPushButton(_('Create'))
+
+        self.bbox = QDialogButtonBox(Qt.Horizontal)
+        self.bbox.addButton(self.button_cancel, QDialogButtonBox.ActionRole)
+        self.bbox.addButton(self.button_create, QDialogButtonBox.ActionRole)
+
+        # Widget setup
+        self.combo_python_version.addItems(python_versions)
+        self.radio_new_dir.setChecked(True)
+        self.text_location.setEnabled(True)
+        self.text_location.setReadOnly(True)
+        self.button_select_location.setIcon(get_std_icon('DirOpenIcon'))
+        self.button_cancel.setDefault(True)
+        self.button_cancel.setAutoDefault(True)
+        self.button_create.setEnabled(False)
+        self.combo_project_type.addItems(self._get_project_types())
+        self.combo_python_version.setCurrentIndex(
+            python_versions.index(current_python_version))
+        self.setWindowTitle(_('Create new project'))
+        self.setFixedWidth(500)
+        self.label_python_version.setVisible(False)
+        self.combo_python_version.setVisible(False)
+
+        # Layouts        
+        layout_top = QHBoxLayout()
+        layout_top.addWidget(self.radio_new_dir)
+        layout_top.addWidget(self.radio_from_dir)
+        layout_top.addStretch(1)
+        self.groupbox.setLayout(layout_top)
+
+        layout_grid = QGridLayout()
+        layout_grid.addWidget(self.label_project_name, 0, 0)
+        layout_grid.addWidget(self.text_project_name, 0, 1, 1, 2)
+        layout_grid.addWidget(self.label_location, 1, 0)
+        layout_grid.addWidget(self.text_location, 1, 1)
+        layout_grid.addWidget(self.button_select_location, 1, 2)
+        layout_grid.addWidget(self.label_project_type, 2, 0)
+        layout_grid.addWidget(self.combo_project_type, 2, 1, 1, 2)
+        layout_grid.addWidget(self.label_python_version, 3, 0)
+        layout_grid.addWidget(self.combo_python_version, 3, 1, 1, 2)
+
+        layout = QVBoxLayout()
+        layout.addWidget(self.groupbox)
+        layout.addSpacing(10)
+        layout.addLayout(layout_grid)
+        layout.addStretch()
+        layout.addSpacing(20)
+        layout.addWidget(self.bbox)
+
+        self.setLayout(layout)
+
+        # Signals and slots
+        self.button_select_location.clicked.connect(self.select_location)
+        self.button_create.clicked.connect(self.create_project)
+        self.button_cancel.clicked.connect(self.close)
+        self.radio_from_dir.clicked.connect(self.update_location)
+        self.radio_new_dir.clicked.connect(self.update_location)
+        self.text_project_name.textChanged.connect(self.update_location)
+
+    def _get_project_types(self):
+        """Get all available project types."""
+        project_types = get_available_project_types()
+        projects = []
+
+        for project in project_types:
+            projects.append(project.PROJECT_TYPE_NAME)
+
+        return projects
+
+    def select_location(self):
+        """Select directory."""
+        location = getexistingdirectory(self, _("Select directory"),
+                                        self.location)
+        if location:
+            if is_writable(location):
+                self.location = location
+                self.update_location()
+
+    def update_location(self, text=''):
+        """Update text of location."""
+        self.text_project_name.setEnabled(self.radio_new_dir.isChecked())
+        name = self.text_project_name.text().strip()
+
+        if name and self.radio_new_dir.isChecked():
+            path = osp.join(self.location, name)
+            self.button_create.setDisabled(os.path.isdir(path))
+        elif self.radio_from_dir.isChecked():
+            self.button_create.setEnabled(True)
+            path = self.location
+        else:
+            self.button_create.setEnabled(False)
+            path = self.location
+        
+        self.text_location.setText(path)
+        
+    def create_project(self):
+        """Create project."""
+        packages = ['python={0}'.format(self.combo_python_version.currentText())]
+        self.sig_project_creation_requested.emit(
+            self.text_location.text(),
+            self.combo_project_type.currentText(),
+            packages)
+        self.accept()
+        
+
+def test():        
+    """Local test."""
+    from spyder.utils.qthelpers import qapplication
+    app = qapplication()
+    dlg = ProjectDialog(None)
+    dlg.show()
+    sys.exit(app.exec_())
+
+
+if __name__ == "__main__":
+    test()
diff --git a/spyder/widgets/projects/type/__init__.py b/spyder/widgets/projects/type/__init__.py
new file mode 100644
index 0000000..2fda66a
--- /dev/null
+++ b/spyder/widgets/projects/type/__init__.py
@@ -0,0 +1,215 @@
+# -*- coding: utf-8 -*-
+# -----------------------------------------------------------------------------
+# Copyright © Spyder Project Contributors
+#
+# Licensed under the terms of the MIT License
+# (see spyder/__init__.py for details)
+# -----------------------------------------------------------------------------
+"""Project types"""
+
+import os
+import os.path as osp
+
+from spyder.config.base import _
+from spyder.py3compat import to_text_string
+from spyder.widgets.projects.config import (ProjectConfig, CODESTYLE,
+                                            CODESTYLE_DEFAULTS,
+                                            CODESTYLE_VERSION, WORKSPACE,
+                                            WORKSPACE_DEFAULTS,
+                                            WORKSPACE_VERSION,
+                                            ENCODING, ENCODING_DEFAULTS,
+                                            ENCODING_VERSION,
+                                            VCS, VCS_DEFAULTS, VCS_VERSION)
+
+
+class BaseProject(object):
+    """Spyder base project.
+
+    This base class must not be used directly, but inherited from. It does not
+    assume that python is specific to this project.
+    """
+    PROJECT_FOLDER = '.spyderproject'
+    PROJECT_TYPE_NAME = None
+    IGNORE_FILE = ""
+    CONFIG_SETUP = {WORKSPACE: {'filename': '{0}.ini'.format(WORKSPACE),
+                                'defaults': WORKSPACE_DEFAULTS,
+                                'version': WORKSPACE_VERSION},
+                    CODESTYLE: {'filename': '{0}.ini'.format(CODESTYLE),
+                                'defaults': CODESTYLE_DEFAULTS,
+                                'version': CODESTYLE_VERSION},
+                    ENCODING: {'filename': '{0}.ini'.format(ENCODING),
+                               'defaults': ENCODING_DEFAULTS,
+                               'version': ENCODING_VERSION},
+                    VCS: {'filename': '{0}.ini'.format(VCS),
+                          'defaults': VCS_DEFAULTS,
+                          'version': VCS_VERSION}
+                    }
+
+    def __init__(self, root_path):
+        self.name = None
+        self.root_path = root_path
+        self.open_project_files = []
+        self.open_non_project_files = []
+        self.config_files = []
+        self.CONF = {}
+
+        # Configuration files
+
+        self.related_projects = []  # storing project path, not project objects
+#        self.pythonpath = []
+        self.opened = True
+
+        self.ioerror_flag = False
+        self.create_project_config_files()
+
+    # --- Helpers
+    # -------------------------------------------------------------------------
+    def set_recent_files(self, recent_files):
+        """Set a list of files opened by the project."""
+        for recent_file in recent_files[:]:
+            if not os.path.isfile(recent_file):
+                recent_files.remove(recent_file)
+        self.CONF[WORKSPACE].set('main', 'recent_files',
+                                 list(set(recent_files)))
+
+    def get_recent_files(self):
+        """Return a list of files opened by the project."""
+        recent_files = self.CONF[WORKSPACE].get('main', 'recent_files',
+                                                default=[])
+        for recent_file in recent_files[:]:
+            if not os.path.isfile(recent_file):
+                recent_files.remove(recent_file)
+        return list(set(recent_files))
+
+    def create_project_config_files(self):
+        """ """
+        dic = self.CONFIG_SETUP
+        for key in dic:
+            name = key
+            filename = dic[key]['filename']
+            defaults = dic[key]['defaults']
+            version = dic[key]['version']
+            self.CONF[key] = ProjectConfig(name, self.root_path, filename,
+                                           defaults=defaults, load=True,
+                                           version=version)
+
+    def get_conf_files(self):
+        """ """
+        return self.CONF
+
+    def add_ignore_lines(self, lines):
+        """ """
+        text = self.IGNORE_FILE
+        for line in lines:
+            text += line
+        self.IGNORE_FILE = text
+
+    def set_root_path(self, root_path):
+        """Set project root path."""
+        if self.name is None:
+            self.name = osp.basename(root_path)
+        self.root_path = to_text_string(root_path)
+        config_path = self.__get_project_config_path()
+        if osp.exists(config_path):
+            self.load()
+        else:
+            if not osp.isdir(self.root_path):
+                os.mkdir(self.root_path)
+            self.save()
+
+    def rename(self, new_name):
+        """Rename project and rename its root path accordingly."""
+        old_name = self.name
+        self.name = new_name
+        pypath = self.relative_pythonpath  # ??
+        self.root_path = self.root_path[:-len(old_name)]+new_name
+        self.relative_pythonpath = pypath  # ??
+        self.save()
+
+    def __get_project_config_folder(self):
+        """Return project configuration folder."""
+        return osp.join(self.root_path, self.PROJECT_FOLDER)
+
+    def __get_project_config_path(self):
+        """Return project configuration path"""
+        return osp.join(self.root_path, self.CONFIG_NAME)
+
+    def load(self):
+        """Load project data"""
+#        fname = self.__get_project_config_path()
+#        try:
+#            # Old format (Spyder 2.0-2.1 for Python 2)
+#            with open(fname, 'U') as fdesc:
+#                data = pickle.loads(fdesc.read())
+#        except (pickle.PickleError, TypeError, UnicodeDecodeError,
+#                AttributeError):
+#            try:
+#                # New format (Spyder >=2.2 for Python 2 and Python 3)
+#                with open(fname, 'rb') as fdesc:
+#                    data = pickle.loads(fdesc.read())
+#            except (IOError, OSError, pickle.PickleError):
+#                self.ioerror_flag = True
+#                return
+        # Compatibilty with old project explorer file format:
+#        if 'relative_pythonpath' not in data:
+#            print("Warning: converting old configuration file "
+#                  "for project '%s'" % data['name'], file=STDERR)
+#            self.pythonpath = data['pythonpath']
+#            data['relative_pythonpath'] = self.relative_pythonpath
+#        for attr in self.CONFIG_ATTR:
+#            setattr(self, attr, data[attr])
+#        self.save()
+
+    def save(self):
+        """Save project data"""
+#        data = {}
+#        for attr in self.PROJECT_ATTR:
+#            data[attr] = getattr(self, attr)
+#        try:
+#            with open(self.__get_project_config_path(), 'wb') as fdesc:
+#                pickle.dump(data, fdesc, 2)
+#        except (IOError, OSError):
+#            self.ioerror_flag = True
+
+#    def delete(self):
+#        """Delete project"""
+#        os.remove(self.__get_project_config_path())
+#
+#    # --- Misc.
+#    def get_related_projects(self):
+#        """Return related projects path list"""
+#        return self.related_projects
+#
+#    def set_related_projects(self, related_projects):
+#        """Set related projects"""
+#        self.related_projects = related_projects
+#        self.save()
+#
+#    def open(self):
+#        """Open project"""
+#        self.opened = True
+#        self.save()
+#
+#    def close(self):
+#        """Close project"""
+#        self.opened = False
+#        self.save()
+#
+#    def is_opened(self):
+#        """Return True if project is opened"""
+#        return self.opened
+#
+#    def is_file_in_project(self, fname):
+#        """Return True if file *fname* is in one of the project subfolders"""
+#        fixed_root = fixpath(self.root_path)
+#        return fixpath(fname) == fixed_root or\
+#            fixpath(osp.dirname(fname)).startswith(fixed_root)
+#
+#    def is_root_path(self, dirname):
+#        """Return True if dirname is project's root path"""
+#        return fixpath(dirname) == fixpath(self.root_path)
+
+
+class EmptyProject(BaseProject):
+    """Empty Project"""
+    PROJECT_TYPE_NAME = _('Empty project')
diff --git a/spyder/widgets/projects/type/python.py b/spyder/widgets/projects/type/python.py
new file mode 100644
index 0000000..1875d3d
--- /dev/null
+++ b/spyder/widgets/projects/type/python.py
@@ -0,0 +1,88 @@
+# -*- coding: utf-8 -*-
+# -----------------------------------------------------------------------------
+# Copyright © Spyder Project Contributors
+#
+# Licensed under the terms of the MIT License
+# (see spyder/__init__.py for details)
+# -----------------------------------------------------------------------------
+"""Python project type"""
+
+import os
+import os.path as osp
+
+from spyder.config.base import _
+from spyder.widgets.projects.type import EmptyProject
+
+
+class PythonProject(EmptyProject):
+    """Python project."""
+
+    PROJECT_TYPE_NAME = _('Python project')
+    IGNORE_FILE = """"""
+
+    def _get_relative_pythonpath(self):
+        """Return PYTHONPATH list as relative paths"""
+        # Workaround to replace os.path.relpath (new in Python v2.6):
+        offset = len(self.root_path)+len(os.pathsep)
+        return [path[offset:] for path in self.pythonpath]
+
+    def _set_relative_pythonpath(self, value):
+        """Set PYTHONPATH list relative paths"""
+        self.pythonpath = [osp.abspath(osp.join(self.root_path, path))
+                           for path in value]
+
+    relative_pythonpath = property(_get_relative_pythonpath,
+                                   _set_relative_pythonpath)
+
+    # --- Python Path
+    def is_in_pythonpath(self, dirname):
+        """Return True if dirname is in project's PYTHONPATH"""
+        return fixpath(dirname) in [fixpath(_p) for _p in self.pythonpath]
+
+    def get_pythonpath(self):
+        """Return a copy of pythonpath attribute"""
+        return self.pythonpath[:]
+
+    def set_pythonpath(self, pythonpath):
+        """Set project's PYTHONPATH"""
+        self.pythonpath = pythonpath
+        self.save()
+
+    def remove_from_pythonpath(self, path):
+        """Remove path from project's PYTHONPATH
+        Return True if path was removed, False if it was not found"""
+        pathlist = self.get_pythonpath()
+        if path in pathlist:
+            pathlist.pop(pathlist.index(path))
+            self.set_pythonpath(pathlist)
+            return True
+        else:
+            return False
+
+    def add_to_pythonpath(self, path):
+        """Add path to project's PYTHONPATH
+        Return True if path was added, False if it was already there"""
+        pathlist = self.get_pythonpath()
+        if path in pathlist:
+            return False
+        else:
+            pathlist.insert(0, path)
+            self.set_pythonpath(pathlist)
+            return True
+
+
+class PythonPackageProject(PythonProject):
+    """ """
+    PROJECT_TYPE_NAME = _('Python package')
+    IGNORE_FILE = """
+    """
+    STRUCTURE_TEMPATE = {
+        'relative_path/test.py':
+        """
+test
+        """,
+        'other/test.py':
+        """
+test
+        """,
+        }
diff --git a/spyderlib/widgets/pydocgui.py b/spyder/widgets/pydocgui.py
similarity index 88%
rename from spyderlib/widgets/pydocgui.py
rename to spyder/widgets/pydocgui.py
index 7740247..3890618 100644
--- a/spyderlib/widgets/pydocgui.py
+++ b/spyder/widgets/pydocgui.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """pydoc widget"""
 
@@ -16,10 +16,10 @@ from qtpy.QtGui import QCursor
 from qtpy.QtWidgets import QApplication
 
 # Local imports
-from spyderlib.config.base import _
-from spyderlib.py3compat import PY3, to_text_string
-from spyderlib.utils.misc import select_port
-from spyderlib.widgets.browser import WebBrowser
+from spyder.config.base import _
+from spyder.py3compat import PY3, to_text_string
+from spyder.utils.misc import select_port
+from spyder.widgets.browser import WebBrowser
 
 
 class PydocServer(QThread):
@@ -127,7 +127,7 @@ class PydocBrowser(WebBrowser):
 
 def test():
     """Run web browser"""
-    from spyderlib.utils.qthelpers import qapplication
+    from spyder.utils.qthelpers import qapplication
     app = qapplication(test_time=8)
     widget = PydocBrowser(None)
     widget.show()
diff --git a/spyderlib/widgets/shell.py b/spyder/widgets/shell.py
similarity index 95%
rename from spyderlib/widgets/shell.py
rename to spyder/widgets/shell.py
index 4bb454a..48ec1b2 100644
--- a/spyderlib/widgets/shell.py
+++ b/spyder/widgets/shell.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009-2010 Pierre Raybaut
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """Shell widgets: base, python and terminal"""
 
@@ -27,19 +27,19 @@ from qtpy.QtGui import QKeySequence, QTextCharFormat, QTextCursor
 from qtpy.QtWidgets import QApplication, QMenu, QMessageBox, QToolTip
 
 # Local import
-from spyderlib.config.base import _, DEBUG, get_conf_path, STDERR
-from spyderlib.config.gui import config_shortcut, get_shortcut, fixed_shortcut
-from spyderlib.config.main import CONF
-from spyderlib.py3compat import (builtins, is_string, is_text_string,
-                                 PY3, to_text_string)
-from spyderlib.utils import encoding
-from spyderlib.utils import icon_manager as ima
-from spyderlib.utils.qthelpers import (add_actions, create_action, keybinding,
-                                       restore_keyevent)
-from spyderlib.widgets.arraybuilder import SHORTCUT_INLINE, SHORTCUT_TABLE
-from spyderlib.widgets.mixins import (GetHelpMixin, SaveHistoryMixin,
-                                      TracebackLinksMixin)
-from spyderlib.widgets.sourcecode.base import ConsoleBaseWidget
+from spyder.config.base import _, DEBUG, get_conf_path, STDERR
+from spyder.config.gui import config_shortcut, get_shortcut, fixed_shortcut
+from spyder.config.main import CONF
+from spyder.py3compat import (builtins, is_string, is_text_string,
+                              PY3, to_text_string)
+from spyder.utils import encoding
+from spyder.utils import icon_manager as ima
+from spyder.utils.qthelpers import (add_actions, create_action, keybinding,
+                                    restore_keyevent)
+from spyder.widgets.arraybuilder import SHORTCUT_INLINE, SHORTCUT_TABLE
+from spyder.widgets.mixins import (GetHelpMixin, SaveHistoryMixin,
+                                   TracebackLinksMixin)
+from spyder.widgets.sourcecode.base import ConsoleBaseWidget
 
 
 class ShellBaseWidget(ConsoleBaseWidget, SaveHistoryMixin):
@@ -667,7 +667,7 @@ class ShellBaseWidget(ConsoleBaseWidget, SaveHistoryMixin):
 
 # Example how to debug complex interclass call chains:
 #
-# from spyderlib.utils.debug import log_methods_calls
+# from spyder.utils.debug import log_methods_calls
 # log_methods_calls('log.log', ShellBaseWidget)
 
 class PythonShellWidget(TracebackLinksMixin, ShellBaseWidget,
diff --git a/spyderlib/widgets/sourcecode/__init__.py b/spyder/widgets/sourcecode/__init__.py
similarity index 50%
rename from spyderlib/widgets/sourcecode/__init__.py
rename to spyder/widgets/sourcecode/__init__.py
index 23c9476..ab76145 100644
--- a/spyderlib/widgets/sourcecode/__init__.py
+++ b/spyder/widgets/sourcecode/__init__.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009-2011 Pierre Raybaut
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """
-spyderlib.widgets.sourcecode
-============================
+spyder.widgets.sourcecode
+=========================
 
 Source code related widgets (code editor, console) based exclusively on Qt
 """
diff --git a/spyderlib/widgets/sourcecode/base.py b/spyder/widgets/sourcecode/base.py
similarity index 96%
rename from spyderlib/widgets/sourcecode/base.py
rename to spyder/widgets/sourcecode/base.py
index 0be8e88..e69bf04 100644
--- a/spyderlib/widgets/sourcecode/base.py
+++ b/spyder/widgets/sourcecode/base.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009-2010 Pierre Raybaut
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """QPlainTextEdit base class"""
 
@@ -26,13 +26,13 @@ from qtpy.QtWidgets import (QAbstractItemView, QApplication, QListWidget,
                             QTextEdit, QToolTip)
 
 # Local imports
-from spyderlib.config.gui import get_font
-from spyderlib.config.main import CONF
-from spyderlib.py3compat import PY3, str_lower, to_text_string
-from spyderlib.utils import icon_manager as ima
-from spyderlib.widgets.calltip import CallTipWidget
-from spyderlib.widgets.mixins import BaseEditMixin
-from spyderlib.widgets.sourcecode.terminal import ANSIEscapeCodeHandler
+from spyder.config.gui import get_font
+from spyder.config.main import CONF
+from spyder.py3compat import PY3, str_lower, to_text_string
+from spyder.utils import icon_manager as ima
+from spyder.widgets.calltip import CallTipWidget
+from spyder.widgets.mixins import BaseEditMixin
+from spyder.widgets.sourcecode.terminal import ANSIEscapeCodeHandler
 
 
 def insert_text_to(cursor, text, fmt):
diff --git a/spyderlib/widgets/sourcecode/codeeditor.py b/spyder/widgets/sourcecode/codeeditor.py
similarity index 96%
rename from spyderlib/widgets/sourcecode/codeeditor.py
rename to spyder/widgets/sourcecode/codeeditor.py
index 59e1229..5594c3f 100644
--- a/spyderlib/widgets/sourcecode/codeeditor.py
+++ b/spyder/widgets/sourcecode/codeeditor.py
@@ -1,14 +1,14 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """
 Editor widget based on QtGui.QPlainTextEdit
 """
 
-# TODO: Try to separate this module from spyderlib to create a self
+# TODO: Try to separate this module from spyder to create a self
 #       consistent editor module (Qt source code and shell widgets library)
 
 # %% This line is for cell execution testing
@@ -43,22 +43,22 @@ from qtpy.QtWidgets import (QApplication, QDialog, QDialogButtonBox,
 # %% This line is for cell execution testing
 
 # Local imports
-from spyderlib.config.base import get_conf_path, _, DEBUG
-from spyderlib.config.gui import (config_shortcut, fixed_shortcut, get_shortcut,
-                                  RUN_CELL_SHORTCUT,
-                                  RUN_CELL_AND_ADVANCE_SHORTCUT)
-from spyderlib.config.main import CONF
-from spyderlib.py3compat import to_text_string
-from spyderlib.utils import icon_manager as ima
-from spyderlib.utils import syntaxhighlighters as sh
-from spyderlib.utils import encoding, sourcecode
-from spyderlib.utils.dochelpers import getobj
-from spyderlib.utils.qthelpers import add_actions, create_action, mimedata2url
-from spyderlib.utils.sourcecode import ALL_LANGUAGES, CELL_LANGUAGES
-from spyderlib.widgets.arraybuilder import SHORTCUT_INLINE, SHORTCUT_TABLE
-from spyderlib.widgets.editortools import PythonCFM
-from spyderlib.widgets.sourcecode.base import TextEditBaseWidget
-from spyderlib.widgets.sourcecode.kill_ring import QtKillRing
+from spyder.config.base import get_conf_path, _, DEBUG
+from spyder.config.gui import (config_shortcut, fixed_shortcut, get_shortcut,
+                               RUN_CELL_SHORTCUT,
+                               RUN_CELL_AND_ADVANCE_SHORTCUT)
+from spyder.config.main import CONF
+from spyder.py3compat import to_text_string
+from spyder.utils import icon_manager as ima
+from spyder.utils import syntaxhighlighters as sh
+from spyder.utils import encoding, sourcecode
+from spyder.utils.dochelpers import getobj
+from spyder.utils.qthelpers import add_actions, create_action, mimedata2url
+from spyder.utils.sourcecode import ALL_LANGUAGES, CELL_LANGUAGES
+from spyder.widgets.arraybuilder import SHORTCUT_INLINE, SHORTCUT_TABLE
+from spyder.widgets.editortools import PythonCFM
+from spyder.widgets.sourcecode.base import TextEditBaseWidget
+from spyder.widgets.sourcecode.kill_ring import QtKillRing
 
 try:
     import nbformat as nbformat
@@ -375,6 +375,8 @@ class CodeEditor(TextEditBaseWidget):
                 self.setObjectName('help')
             elif 'historylog' in plugin_name.lower():
                 self.setObjectName('historylog')
+            elif 'configdialog' in plugin_name.lower():
+                self.setObjectName('configdialog')
 
         # Caret (text cursor)
         self.setCursorWidth( CONF.get('main', 'cursor/width') )
@@ -1521,6 +1523,10 @@ class CodeEditor(TextEditBaseWidget):
             else:
                 self.highlighter.rehighlight()
 
+    def get_outlineexplorer_data(self):
+        """Get data provided by the Outline Explorer"""
+        return self.highlighter.get_outlineexplorer_data()
+
     def set_font(self, font, color_scheme=None):
         """Set font"""
         # Note: why using this method to set color scheme instead of
@@ -2940,7 +2946,7 @@ class TestWidget(QSplitter):
                                  font=QFont("Courier New", 10),
                                  show_blanks=True, color_scheme='Zenburn')
         self.addWidget(self.editor)
-        from spyderlib.widgets.editortools import OutlineExplorerWidget
+        from spyder.widgets.editortools import OutlineExplorerWidget
         self.classtree = OutlineExplorerWidget(self)
         self.addWidget(self.classtree)
         self.classtree.edit_goto.connect(
@@ -2958,15 +2964,15 @@ class TestWidget(QSplitter):
 
 
 def test(fname):
-    from spyderlib.utils.qthelpers import qapplication
+    from spyder.utils.qthelpers import qapplication
     app = qapplication(test_time=5)
     win = TestWidget(None)
     win.show()
     win.load(fname)
     win.resize(900, 700)
 
-    from spyderlib.utils.codeanalysis import (check_with_pyflakes,
-                                              check_with_pep8)
+    from spyder.utils.codeanalysis import (check_with_pyflakes,
+                                           check_with_pep8)
     source_code = to_text_string(win.editor.toPlainText())
     results = check_with_pyflakes(source_code, fname) + \
               check_with_pep8(source_code, fname)
diff --git a/spyderlib/widgets/sourcecode/kill_ring.py b/spyder/widgets/sourcecode/kill_ring.py
similarity index 100%
rename from spyderlib/widgets/sourcecode/kill_ring.py
rename to spyder/widgets/sourcecode/kill_ring.py
diff --git a/spyderlib/widgets/sourcecode/terminal.py b/spyder/widgets/sourcecode/terminal.py
similarity index 95%
rename from spyderlib/widgets/sourcecode/terminal.py
rename to spyder/widgets/sourcecode/terminal.py
index c722e77..69c7750 100644
--- a/spyderlib/widgets/sourcecode/terminal.py
+++ b/spyder/widgets/sourcecode/terminal.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009-2010 Pierre Raybaut
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """Terminal emulation tools"""
 
diff --git a/spyderlib/widgets/status.py b/spyder/widgets/status.py
similarity index 92%
rename from spyderlib/widgets/status.py
rename to spyder/widgets/status.py
index ece0b3a..7a3901d 100644
--- a/spyderlib/widgets/status.py
+++ b/spyder/widgets/status.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """Status bar widgets"""
 
@@ -14,10 +14,10 @@ from qtpy.QtCore import QTimer
 from qtpy.QtWidgets import QHBoxLayout, QLabel, QWidget
 
 # Local imports
-from spyderlib import dependencies
-from spyderlib.config.base import _
-from spyderlib.config.gui import get_font
-from spyderlib.py3compat import to_text_string
+from spyder import dependencies
+from spyder.config.base import _
+from spyder.config.gui import get_font
+from spyder.py3compat import to_text_string
 
 
 if not os.name == 'nt':
@@ -96,11 +96,11 @@ class MemoryStatus(BaseTimerStatus):
             "requires the `psutil` (>=v0.3) library on non-Windows platforms")
     def import_test(self):
         """Raise ImportError if feature is not supported"""
-        from spyderlib.utils.system import memory_usage  # analysis:ignore
+        from spyder.utils.system import memory_usage  # analysis:ignore
 
     def get_value(self):
         """Return memory usage"""
-        from spyderlib.utils.system import memory_usage
+        from spyder.utils.system import memory_usage
         return memory_usage()
 
 class CPUStatus(BaseTimerStatus):
@@ -108,7 +108,7 @@ class CPUStatus(BaseTimerStatus):
     TIP = _("CPU usage status: requires the `psutil` (>=v0.3) library")
     def import_test(self):
         """Raise ImportError if feature is not supported"""
-        from spyderlib.utils import programs
+        from spyder.utils import programs
         if not programs.is_module_installed('psutil', '>=0.2.0'):
             # The `interval` argument in `psutil.cpu_percent` function
             # was introduced in v0.2.0
@@ -185,7 +185,7 @@ class CursorPositionStatus(StatusBarWidget):
 
 def test():
     from qtpy.QtWidgets import QMainWindow
-    from spyderlib.utils.qthelpers import qapplication
+    from spyder.utils.qthelpers import qapplication
 
     app = qapplication(test_time=5)
     win = QMainWindow()
diff --git a/spyderlib/widgets/tabs.py b/spyder/widgets/tabs.py
similarity index 94%
rename from spyderlib/widgets/tabs.py
rename to spyder/widgets/tabs.py
index e664ffd..f582887 100644
--- a/spyderlib/widgets/tabs.py
+++ b/spyder/widgets/tabs.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009-2010 Pierre Raybaut
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """Tabs widget"""
 
@@ -22,13 +22,13 @@ from qtpy.QtWidgets import (QApplication, QHBoxLayout, QMenu, QTabBar,
                             QTabWidget, QWidget)
 
 # Local imports
-from spyderlib.config.base import _
-from spyderlib.config.gui import fixed_shortcut
-from spyderlib.py3compat import PY2, to_text_string
-from spyderlib.utils import icon_manager as ima
-from spyderlib.utils.misc import get_common_path
-from spyderlib.utils.qthelpers import (add_actions, create_action,
-                                       create_toolbutton)
+from spyder.config.base import _
+from spyder.config.gui import fixed_shortcut
+from spyder.py3compat import PY2, to_text_string
+from spyder.utils import icon_manager as ima
+from spyder.utils.misc import get_common_path
+from spyder.utils.qthelpers import (add_actions, create_action,
+                                    create_toolbutton)
 
 
 class TabBar(QTabBar):
@@ -151,7 +151,7 @@ class BaseTabs(QTabWidget):
         corner_widgets[Qt.TopLeftCorner] += [self.browse_button]
 
         self.set_corner_widgets(corner_widgets)
-        
+
     def update_browse_tabs_menu(self):
         """Update browse tabs menu"""
         self.browse_tabs_menu.clear()
@@ -178,7 +178,7 @@ class BaseTabs(QTabWidget):
                 if offset <= 3:
                     # Common path is not a path but a drive letter...
                     offset = None
-                
+
         for index, text in enumerate(names):
             tab_action = create_action(self, text[offset:],
                                        icon=self.tabIcon(index),
@@ -187,7 +187,7 @@ class BaseTabs(QTabWidget):
                                        tip=self.tabToolTip(index))
             tab_action.setChecked(index == self.currentIndex())
             self.browse_tabs_menu.addAction(tab_action)
-        
+
     def set_corner_widgets(self, corner_widgets):
         """
         Set tabs corner widgets
diff --git a/spyderlib/widgets/tests/__init__.py b/spyder/widgets/tests/__init__.py
similarity index 100%
rename from spyderlib/widgets/tests/__init__.py
rename to spyder/widgets/tests/__init__.py
diff --git a/spyderlib/widgets/tests/test_array_builder.py b/spyder/widgets/tests/test_array_builder.py
similarity index 98%
rename from spyderlib/widgets/tests/test_array_builder.py
rename to spyder/widgets/tests/test_array_builder.py
index e980e9a..f896867 100644
--- a/spyderlib/widgets/tests/test_array_builder.py
+++ b/spyder/widgets/tests/test_array_builder.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
 #
 
@@ -14,7 +14,7 @@ from pytestqt import qtbot
 import pytest
 
 # Local imports
-from spyderlib.widgets.arraybuilder import NumpyArrayDialog
+from spyder.widgets.arraybuilder import NumpyArrayDialog
 
 
 # --- Fixtures
diff --git a/spyderlib/widgets/tests/test_editor.py b/spyder/widgets/tests/test_editor.py
similarity index 96%
rename from spyderlib/widgets/tests/test_editor.py
rename to spyder/widgets/tests/test_editor.py
index bd2c021..53f2d20 100644
--- a/spyderlib/widgets/tests/test_editor.py
+++ b/spyder/widgets/tests/test_editor.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2016- The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
 #
 
@@ -18,7 +18,7 @@ except ImportError:
 import pytest
 
 # Local imports
-from spyderlib.widgets.editor import EditorStack
+from spyder.widgets.editor import EditorStack
 
 def setup_editor(qtbot):
     """
diff --git a/spyder/widgets/variableexplorer/__init__.py b/spyder/widgets/variableexplorer/__init__.py
new file mode 100644
index 0000000..8715103
--- /dev/null
+++ b/spyder/widgets/variableexplorer/__init__.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright © Spyder Project Contributors
+# Licensed under the terms of the MIT License
+# (see spyder/__init__.py for details)
+
+"""
+spyder.widgets.variableexplorer
+===============================
+
+Variable Explorer related widgets
+"""
diff --git a/spyderlib/widgets/variableexplorer/arrayeditor.py b/spyder/widgets/variableexplorer/arrayeditor.py
similarity index 95%
rename from spyderlib/widgets/variableexplorer/arrayeditor.py
rename to spyder/widgets/variableexplorer/arrayeditor.py
index 234431e..1e9da66 100644
--- a/spyderlib/widgets/variableexplorer/arrayeditor.py
+++ b/spyder/widgets/variableexplorer/arrayeditor.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """
 NumPy Array Editor Dialog based on Qt
@@ -30,14 +30,14 @@ from qtpy.QtWidgets import (QAbstractItemDelegate, QApplication, QCheckBox,
 import numpy as np
 
 # Local imports
-from spyderlib.config.base import _
-from spyderlib.config.fonts import DEFAULT_SMALL_DELTA
-from spyderlib.config.gui import get_font, fixed_shortcut
-from spyderlib.py3compat import (io, is_binary_string, is_string,
-                                 is_text_string, PY3, to_binary_string,
-                                 to_text_string)
-from spyderlib.utils import icon_manager as ima
-from spyderlib.utils.qthelpers import add_actions, create_action, keybinding
+from spyder.config.base import _
+from spyder.config.fonts import DEFAULT_SMALL_DELTA
+from spyder.config.gui import get_font, fixed_shortcut
+from spyder.py3compat import (io, is_binary_string, is_string,
+                              is_text_string, PY3, to_binary_string,
+                              to_text_string)
+from spyder.utils import icon_manager as ima
+from spyder.utils.qthelpers import add_actions, create_action, keybinding
 
 
 # Note: string and unicode data types will be formatted with '%s' (see below)
@@ -602,6 +602,7 @@ class ArrayEditor(QDialog):
         return False if data is not supported, True otherwise
         """
         self.data = data
+        self.data.flags.writeable = True
         is_record_array = data.dtype.names is not None
         is_masked_array = isinstance(data, np.ma.MaskedArray)
         if data.size == 0:
diff --git a/spyderlib/widgets/variableexplorer/collectionseditor.py b/spyder/widgets/variableexplorer/collectionseditor.py
similarity index 93%
rename from spyderlib/widgets/variableexplorer/collectionseditor.py
rename to spyder/widgets/variableexplorer/collectionseditor.py
index 533602f..0921257 100644
--- a/spyderlib/widgets/variableexplorer/collectionseditor.py
+++ b/spyder/widgets/variableexplorer/collectionseditor.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """
 Collections (i.e. dictionary, list and tuple) editor widget and dialog
@@ -33,28 +33,28 @@ from qtpy.QtWidgets import (QAbstractItemDelegate, QApplication, QDateEdit,
                             QMessageBox, QTableView, QVBoxLayout, QWidget)
 
 # Local import
-from spyderlib.config.base import _
-from spyderlib.config.fonts import DEFAULT_SMALL_DELTA
-from spyderlib.config.gui import get_font
-from spyderlib.py3compat import (io, is_binary_string, is_text_string,
-                                 getcwd, PY3, to_text_string)
-from spyderlib.utils import icon_manager as ima
-from spyderlib.utils.misc import fix_reference_name
-from spyderlib.utils.qthelpers import (add_actions, create_action,
-                                       mimedata2url)
-from spyderlib.widgets.variableexplorer.importwizard import ImportWizard
-from spyderlib.widgets.variableexplorer.texteditor import TextEditor
-from spyderlib.widgets.variableexplorer.utils import (
+from spyder.config.base import _
+from spyder.config.fonts import DEFAULT_SMALL_DELTA
+from spyder.config.gui import get_font
+from spyder.py3compat import (io, is_binary_string, is_text_string,
+                              getcwd, PY3, to_text_string)
+from spyder.utils import icon_manager as ima
+from spyder.utils.misc import fix_reference_name
+from spyder.utils.qthelpers import (add_actions, create_action,
+                                    mimedata2url)
+from spyder.widgets.variableexplorer.importwizard import ImportWizard
+from spyder.widgets.variableexplorer.texteditor import TextEditor
+from spyder.widgets.variableexplorer.utils import (
     array, DataFrame, display_to_value, FakeObject, get_color_name,
     get_human_readable_type, get_size, Image, is_editable_type, is_known_type,
     MaskedArray, ndarray, np_savetxt, Series, sort_against, try_to_eval,
     unsorted_unique, value_to_display,)
 
 if ndarray is not FakeObject:
-    from spyderlib.widgets.variableexplorer.arrayeditor import ArrayEditor
+    from spyder.widgets.variableexplorer.arrayeditor import ArrayEditor
 
 if DataFrame is not FakeObject:
-    from spyderlib.widgets.variableexplorer.dataframeeditor import DataFrameEditor
+    from spyder.widgets.variableexplorer.dataframeeditor import DataFrameEditor
 
 
 LARGE_NROWS = 100
@@ -416,9 +416,11 @@ class CollectionsDelegate(QItemDelegate):
         try:
             value = self.get_value(index)
         except Exception as msg:
-            QMessageBox.critical(self.parent(), _("Edit item"),
-                                 _("<b>Unable to retrieve data.</b>"
-                                   "<br><br>Error message:<br>%s"
+            QMessageBox.critical(self.parent(), _("Error"),
+                                 _("Spyder was unable to retrieve the value of "
+                                   "this variable from the console.<br><br>"
+                                   "The error mesage was:<br>"
+                                   "<i>%s</i>"
                                    ) % to_text_string(msg))
             return
         key = index.model().get_key(index)
@@ -489,7 +491,11 @@ class CollectionsDelegate(QItemDelegate):
             editor = QLineEdit(parent)
             editor.setFont(get_font(font_size_delta=DEFAULT_SMALL_DELTA))
             editor.setAlignment(Qt.AlignLeft)
-            editor.returnPressed.connect(self.commitAndCloseEditor)
+            # This is making Spyder crash because the QLineEdit that it's
+            # been modified is removed and a new one is created after
+            # evaluation. So the object on which this method is trying to
+            # act doesn't exist anymore.
+            # editor.returnPressed.connect(self.commitAndCloseEditor)
             return editor
         #---editor = CollectionsEditor for an arbitrary object
         else:
@@ -895,7 +901,7 @@ class BaseTableView(QTableView):
         for index in indexes:
             if not index.isValid():
                 return
-        one = _("Do you want to remove selected item?")
+        one = _("Do you want to remove the selected item?")
         more = _("Do you want to remove all selected items?")
         answer = QMessageBox.question(self, _( "Remove"),
                                       one if len(indexes) == 1 else more,
@@ -914,7 +920,13 @@ class BaseTableView(QTableView):
         if len(idx_rows) > 1 or not indexes[0].isValid():
             return
         orig_key = self.model.keys[idx_rows[0]]
-        new_key, valid = QInputDialog.getText(self, _( 'Rename'), _( 'Key:'),
+        if erase_original:
+            title = _('Rename')
+            field_text = _('New variable name:')
+        else:
+            title = _('Duplicate')
+            field_text = _('Variable name:')
+        new_key, valid = QInputDialog.getText(self, title, field_text,
                                               QLineEdit.Normal, orig_key)
         if valid and to_text_string(new_key):
             new_key = try_to_eval(to_text_string(new_key))
@@ -1171,13 +1183,13 @@ class CollectionsEditorTableView(BaseTableView):
     def oedit(self, key):
         """Edit item"""
         data = self.model.get_data()
-        from spyderlib.widgets.variableexplorer.objecteditor import oedit
+        from spyder.widgets.variableexplorer.objecteditor import oedit
         oedit(data[key])
 
     def plot(self, key, funcname):
         """Plot item"""
         data = self.model.get_data()
-        import spyderlib.pyplot as plt
+        import spyder.pyplot as plt
         plt.figure()
         getattr(plt, funcname)(data[key])
         plt.show()
@@ -1185,7 +1197,7 @@ class CollectionsEditorTableView(BaseTableView):
     def imshow(self, key):
         """Show item's image"""
         data = self.model.get_data()
-        import spyderlib.pyplot as plt
+        import spyder.pyplot as plt
         plt.figure()
         plt.imshow(data[key])
         plt.show()
@@ -1416,7 +1428,7 @@ class RemoteCollectionsEditorTableView(BaseTableView):
 def get_test_data():
     """Create test data"""
     import numpy as np
-    from spyderlib.pil_patch import Image
+    from spyder.pil_patch import Image
     image = Image.fromarray(np.random.random_integers(255, size=(100, 100)),
                             mode='P')
     testdict = {'d': 1, 'a': np.random.rand(10, 10), 'b': [1, 2]}
@@ -1458,7 +1470,7 @@ def get_test_data():
 
 def editor_test():
     """Collections editor test"""
-    from spyderlib.utils.qthelpers import qapplication
+    from spyder.utils.qthelpers import qapplication
 
     app = qapplication()             #analysis:ignore
     dialog = CollectionsEditor()
@@ -1472,11 +1484,11 @@ def remote_editor_test():
     """Remote collections editor test"""
     from pprint import pprint
 
-    from spyderlib.utils.qthelpers import qapplication
+    from spyder.utils.qthelpers import qapplication
     app = qapplication()
 
-    from spyderlib.plugins.variableexplorer import VariableExplorer
-    from spyderlib.widgets.externalshell.monitor import make_remote_view
+    from spyder.plugins.variableexplorer import VariableExplorer
+    from spyder.widgets.variableexplorer.utils import make_remote_view
 
     remote = make_remote_view(get_test_data(), VariableExplorer.get_settings())
     pprint(remote)
diff --git a/spyderlib/widgets/variableexplorer/dataframeeditor.py b/spyder/widgets/variableexplorer/dataframeeditor.py
similarity index 95%
rename from spyderlib/widgets/variableexplorer/dataframeeditor.py
rename to spyder/widgets/variableexplorer/dataframeeditor.py
index 72dd291..e1cca66 100644
--- a/spyderlib/widgets/variableexplorer/dataframeeditor.py
+++ b/spyder/widgets/variableexplorer/dataframeeditor.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- Spyder development team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the New BSD License
 #
 # DataFrameModel is based on the class ArrayModel from array editor
@@ -25,15 +25,15 @@ from qtpy.QtWidgets import (QApplication, QCheckBox, QDialogButtonBox, QDialog,
 import numpy as np
 
 # Local imports
-from spyderlib.config.base import _
-from spyderlib.config.fonts import DEFAULT_SMALL_DELTA
-from spyderlib.config.gui import get_font, fixed_shortcut
-from spyderlib.py3compat import io, is_text_string, PY2, to_text_string
-from spyderlib.utils import encoding
-from spyderlib.utils import icon_manager as ima
-from spyderlib.utils.qthelpers import (add_actions, create_action,
-                                       keybinding, qapplication)
-from spyderlib.widgets.variableexplorer.arrayeditor import get_idx_rect
+from spyder.config.base import _
+from spyder.config.fonts import DEFAULT_SMALL_DELTA
+from spyder.config.gui import get_font, fixed_shortcut
+from spyder.py3compat import io, is_text_string, PY2, to_text_string
+from spyder.utils import encoding
+from spyder.utils import icon_manager as ima
+from spyder.utils.qthelpers import (add_actions, create_action,
+                                    keybinding, qapplication)
+from spyder.widgets.variableexplorer.arrayeditor import get_idx_rect
 
 # Supported Numbers and complex numbers
 REAL_NUMBER_TYPES = (float, int, np.int64, np.int32)
diff --git a/spyderlib/widgets/variableexplorer/importwizard.py b/spyder/widgets/variableexplorer/importwizard.py
similarity index 95%
rename from spyderlib/widgets/variableexplorer/importwizard.py
rename to spyder/widgets/variableexplorer/importwizard.py
index 5c1a583..9c82179 100644
--- a/spyderlib/widgets/variableexplorer/importwizard.py
+++ b/spyder/widgets/variableexplorer/importwizard.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """
 Text data Importing Wizard based on Qt
@@ -28,12 +28,12 @@ except ImportError:
     pd = None
 
 # Local import
-from spyderlib.config.base import _
-from spyderlib.py3compat import (INT_TYPES, io, TEXT_TYPES, to_text_string,
-                                 zip_longest)
-from spyderlib.utils import programs
-from spyderlib.utils import icon_manager as ima
-from spyderlib.utils.qthelpers import add_actions, create_action
+from spyder.config.base import _
+from spyder.py3compat import (INT_TYPES, io, TEXT_TYPES, to_text_string,
+                              zip_longest)
+from spyder.utils import programs
+from spyder.utils import icon_manager as ima
+from spyder.utils.qthelpers import add_actions, create_action
 
 
 def try_to_parse(value):
@@ -527,6 +527,8 @@ class ImportWizard(QDialog):
         btns_layout.addWidget(self.back_btn)
         self.back_btn.clicked.connect(ft_partial(self._set_step, step=-1))
         self.fwd_btn = QPushButton(_("Next"))
+        if not text:
+            self.fwd_btn.setEnabled(False)
         btns_layout.addWidget(self.fwd_btn)
         self.fwd_btn.clicked.connect(ft_partial(self._set_step, step=1))
         self.done_btn = QPushButton(_("Done"))
@@ -629,7 +631,7 @@ class ImportWizard(QDialog):
 
 def test(text):
     """Test"""
-    from spyderlib.utils.qthelpers import qapplication
+    from spyder.utils.qthelpers import qapplication
     _app = qapplication()  # analysis:ignore
     dialog = ImportWizard(None, text)
     if dialog.exec_():
diff --git a/spyderlib/widgets/variableexplorer/namespacebrowser.py b/spyder/widgets/variableexplorer/namespacebrowser.py
similarity index 59%
rename from spyderlib/widgets/variableexplorer/namespacebrowser.py
rename to spyder/widgets/variableexplorer/namespacebrowser.py
index 0d4b853..3f86fb6 100644
--- a/spyderlib/widgets/variableexplorer/namespacebrowser.py
+++ b/spyder/widgets/variableexplorer/namespacebrowser.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """
 Namespace browser widget
@@ -14,35 +14,51 @@ This is the main widget used in the Variable Explorer plugin
 import os.path as osp
 import socket
 
-# Third library imports
+# Third library imports (qtpy)
 from qtpy.compat import getsavefilename, getopenfilenames
 from qtpy.QtCore import Qt, Signal, Slot
 from qtpy.QtGui import QCursor
 from qtpy.QtWidgets import (QApplication, QHBoxLayout, QInputDialog, QMenu,
                             QMessageBox, QToolButton, QVBoxLayout, QWidget)
 
+# Third party imports (others)
+try:
+    import ipykernel.pickleutil
+    from ipykernel.serialize import serialize_object
+except ImportError:
+    serialize_object = None
+
 # Local imports
-from spyderlib.config.base import _, get_supported_types
-from spyderlib.py3compat import is_text_string, getcwd, to_text_string
-from spyderlib.utils import encoding
-from spyderlib.utils import icon_manager as ima
-from spyderlib.utils.iofuncs import iofunctions
-from spyderlib.utils.misc import fix_reference_name
-from spyderlib.utils.programs import is_module_installed
-from spyderlib.utils.qthelpers import (add_actions, create_action,
-                                       create_toolbutton)
-from spyderlib.widgets.externalshell.monitor import (
+from spyder.config.base import _, get_supported_types
+from spyder.py3compat import is_text_string, getcwd, to_text_string
+from spyder.utils import encoding
+from spyder.utils import icon_manager as ima
+from spyder.utils.iofuncs import iofunctions
+from spyder.utils.misc import fix_reference_name
+from spyder.utils.programs import is_module_installed
+from spyder.utils.qthelpers import (add_actions, create_action,
+                                    create_toolbutton)
+from spyder.widgets.externalshell.monitor import (
     communicate, monitor_copy_global, monitor_del_global, monitor_get_global,
-    monitor_load_globals, monitor_save_globals, monitor_set_global,
-    REMOTE_SETTINGS)
-from spyderlib.widgets.variableexplorer.collectionseditor import (
-    CollectionsEditorTableView, RemoteCollectionsEditorTableView)
-from spyderlib.widgets.variableexplorer.importwizard import ImportWizard
-from spyderlib.widgets.variableexplorer.utils import globalsfilter
+    monitor_load_globals, monitor_save_globals, monitor_set_global)
+from spyder.widgets.variableexplorer.collectionseditor import (
+    RemoteCollectionsEditorTableView)
+from spyder.widgets.variableexplorer.importwizard import ImportWizard
+from spyder.widgets.variableexplorer.utils import REMOTE_SETTINGS
 
 
 SUPPORTED_TYPES = get_supported_types()
 
+# XXX --- Disable canning for Numpy arrays for now ---
+# This allows getting values between a Python 3 frontend
+# and a Python 2 kernel, and viceversa, for several types of
+# arrays.
+# See this link for interesting ideas on how to solve this
+# in the future:
+# http://stackoverflow.com/q/30698004/438386
+if serialize_object is not None:
+    ipykernel.pickleutil.can_map.pop('numpy.ndarray')
+
 
 class NamespaceBrowser(QWidget):
     """Namespace browser (global variables explorer widget)"""
@@ -53,9 +69,6 @@ class NamespaceBrowser(QWidget):
         QWidget.__init__(self, parent)
         
         self.shellwidget = None
-        self.is_internal_shell = None
-        self.ipyclient = None
-        self.is_ipykernel = None
         self.is_visible = True
         self.setup_in_progress = None
 
@@ -76,9 +89,13 @@ class NamespaceBrowser(QWidget):
         self.exclude_uppercase_action = None
         self.exclude_capitalized_action = None
         self.exclude_unsupported_action = None
-        
+
         self.filename = None
-            
+
+        # For IPython clients
+        self.is_ipyclient = False
+        self.var_properties = {}
+
     def setup(self, check_all=None, exclude_private=None,
               exclude_uppercase=None, exclude_capitalized=None,
               exclude_unsupported=None, excluded_names=None,
@@ -104,39 +121,31 @@ class NamespaceBrowser(QWidget):
             self.exclude_uppercase_action.setChecked(exclude_uppercase)
             self.exclude_capitalized_action.setChecked(exclude_capitalized)
             self.exclude_unsupported_action.setChecked(exclude_unsupported)
-            # Don't turn autorefresh on for IPython kernels
-            # See Issue 1450
-            if not self.is_ipykernel:
+            if self.auto_refresh_button is not None:
                 self.auto_refresh_button.setChecked(autorefresh)
             self.refresh_table()
             return
 
-        # Dict editor:
-        if self.is_internal_shell:
-            self.editor = CollectionsEditorTableView(self, None,
-                                                     truncate=truncate,
-                                                     minmax=minmax)
-        else:
-            self.editor = RemoteCollectionsEditorTableView(self, None,
-                            truncate=truncate, minmax=minmax,
-                            remote_editing=remote_editing,
-                            get_value_func=self.get_value,
-                            set_value_func=self.set_value,
-                            new_value_func=self.set_value,
-                            remove_values_func=self.remove_values,
-                            copy_value_func=self.copy_value,
-                            is_list_func=self.is_list,
-                            get_len_func=self.get_len,
-                            is_array_func=self.is_array,
-                            is_image_func=self.is_image,
-                            is_dict_func=self.is_dict,
-                            is_data_frame_func=self.is_data_frame,
-                            is_series_func=self.is_series,                       
-                            get_array_shape_func=self.get_array_shape,
-                            get_array_ndim_func=self.get_array_ndim,
-                            oedit_func=self.oedit,
-                            plot_func=self.plot, imshow_func=self.imshow,
-                            show_image_func=self.show_image)
+        self.editor = RemoteCollectionsEditorTableView(self, None,
+                        truncate=truncate, minmax=minmax,
+                        remote_editing=remote_editing,
+                        get_value_func=self.get_value,
+                        set_value_func=self.set_value,
+                        new_value_func=self.set_value,
+                        remove_values_func=self.remove_values,
+                        copy_value_func=self.copy_value,
+                        is_list_func=self.is_list,
+                        get_len_func=self.get_len,
+                        is_array_func=self.is_array,
+                        is_image_func=self.is_image,
+                        is_dict_func=self.is_dict,
+                        is_data_frame_func=self.is_data_frame,
+                        is_series_func=self.is_series,
+                        get_array_shape_func=self.get_array_shape,
+                        get_array_ndim_func=self.get_array_ndim,
+                        oedit_func=self.oedit,
+                        plot_func=self.plot, imshow_func=self.imshow,
+                        show_image_func=self.show_image)
         self.editor.sig_option_changed.connect(self.sig_option_changed.emit)
         self.editor.sig_files_dropped.connect(self.import_data)
 
@@ -176,17 +185,8 @@ class NamespaceBrowser(QWidget):
     def set_shellwidget(self, shellwidget):
         """Bind shellwidget instance to namespace browser"""
         self.shellwidget = shellwidget
-        from spyderlib.widgets import internalshell
-        self.is_internal_shell = isinstance(self.shellwidget,
-                                            internalshell.InternalShell)
-        self.is_ipykernel = self.shellwidget.is_ipykernel
-        if not self.is_internal_shell:
-            shellwidget.set_namespacebrowser(self)
-    
-    def set_ipyclient(self, ipyclient):
-        """Bind ipyclient instance to namespace browser"""
-        self.ipyclient = ipyclient
-        
+        shellwidget.set_namespacebrowser(self)
+
     def setup_toolbar(self, exclude_private, exclude_uppercase,
                       exclude_capitalized, exclude_unsupported, autorefresh):
         """Setup toolbar"""
@@ -194,14 +194,19 @@ class NamespaceBrowser(QWidget):
                           
         toolbar = []
 
-        refresh_button = create_toolbutton(self, text=_('Refresh'),
-                                           icon=ima.icon('reload'),
-                                           triggered=self.refresh_table)
-        self.auto_refresh_button = create_toolbutton(self,
-                                           text=_('Refresh periodically'),
-                                           icon=ima.icon('auto_reload'),
-                                           toggled=self.toggle_auto_refresh)
-        self.auto_refresh_button.setChecked(autorefresh)
+        # There is no need of refreshes for ipyclients
+        if not self.is_ipyclient:
+            refresh_button = create_toolbutton(self, text=_('Refresh'),
+                                               icon=ima.icon('reload'),
+                                               triggered=self.refresh_table)
+            self.auto_refresh_button = create_toolbutton(self,
+                                              text=_('Refresh periodically'),
+                                              icon=ima.icon('auto_reload'),
+                                              toggled=self.toggle_auto_refresh)
+            self.auto_refresh_button.setChecked(autorefresh)
+        else:
+            refresh_button = self.auto_refresh_button = None
+
         load_button = create_toolbutton(self, text=_('Import data'),
                                         icon=ima.icon('fileimport'),
                                         triggered=lambda: self.import_data())
@@ -213,8 +218,12 @@ class NamespaceBrowser(QWidget):
                                            text=_("Save data as..."),
                                            icon=ima.icon('filesaveas'),
                                            triggered=self.save_data)
-        toolbar += [refresh_button, self.auto_refresh_button, load_button,
-                    self.save_button, save_as_button]
+
+        if self.is_ipyclient:
+            toolbar += [load_button, self.save_button, save_as_button]
+        else:
+            toolbar += [refresh_button, self.auto_refresh_button, load_button,
+                        self.save_button, save_as_button]
         
         self.exclude_private_action = create_action(self,
                 _("Exclude private references"),
@@ -254,7 +263,10 @@ class NamespaceBrowser(QWidget):
     def option_changed(self, option, value):
         """Option has changed"""
         setattr(self, to_text_string(option), value)
-        if not self.is_internal_shell:
+        if self.is_ipyclient:
+            self.shellwidget.set_namespace_view_settings()
+            self.refresh_table()
+        else:
             settings = self.get_view_settings()
             communicate(self._get_sock(),
                         'set_remote_view_settings()', settings=[settings])
@@ -279,35 +291,13 @@ class NamespaceBrowser(QWidget):
     def toggle_auto_refresh(self, state):
         """Toggle auto refresh state"""
         self.autorefresh = state
-        if not self.setup_in_progress and not self.is_internal_shell:
+        if not self.setup_in_progress and not self.is_ipyclient:
             communicate(self._get_sock(),
                         "set_monitor_auto_refresh(%r)" % state)
-            
+
     def _get_sock(self):
         """Return socket connection"""
         return self.shellwidget.introspection_socket
-    
-    def get_internal_shell_filter(self, mode, check_all=None):
-        """
-        Return internal shell data types filter:
-            * check_all: check all elements data types for sequences
-              (dict, list, tuple)
-            * mode (string): 'editable' or 'picklable'
-        """
-        assert mode in list(SUPPORTED_TYPES.keys())
-        if check_all is None:
-            check_all = self.check_all
-        def wsfilter(input_dict, check_all=check_all,
-                     filters=tuple(SUPPORTED_TYPES[mode])):
-            """Keep only objects that can be pickled"""
-            return globalsfilter(
-                         input_dict, check_all=check_all, filters=filters,
-                         exclude_private=self.exclude_private,
-                         exclude_uppercase=self.exclude_uppercase,
-                         exclude_capitalized=self.exclude_capitalized,
-                         exclude_unsupported=self.exclude_unsupported,
-                         excluded_names=self.excluded_names)
-        return wsfilter
 
     def get_view_settings(self):
         """Return dict editor view settings"""
@@ -320,124 +310,165 @@ class NamespaceBrowser(QWidget):
     def refresh_table(self):
         """Refresh variable table"""
         if self.is_visible and self.isVisible():
-            if self.is_internal_shell:
-                # Internal shell
-                wsfilter = self.get_internal_shell_filter('editable')
-                self.editor.set_filter(wsfilter)
-                interpreter = self.shellwidget.interpreter
-                if interpreter is not None:
-                    self.editor.set_data(interpreter.namespace)
-                    self.editor.adjust_columns()
-            elif self.shellwidget.is_running():
-    #            import time; print >>STDOUT, time.ctime(time.time()), "Refreshing namespace browser"
-                sock = self._get_sock()
-                if sock is None:
-                    return
-                try:
-                    communicate(sock, "refresh()")
-                except socket.error:
-                    # Process was terminated before calling this method
-                    pass                
-                
+            if self.is_ipyclient:
+                self.shellwidget.refresh_namespacebrowser()
+            else:
+                if self.shellwidget.is_running():
+                    sock = self._get_sock()
+                    if sock is None:
+                        return
+                    try:
+                        communicate(sock, "refresh()")
+                    except socket.error:
+                        # Process was terminated before calling this method
+                        pass
+
     def process_remote_view(self, remote_view):
         """Process remote view"""
         if remote_view is not None:
             self.set_data(remote_view)
-        
-    #------ Remote Python process commands ------------------------------------
+
+    def set_var_properties(self, properties):
+        """Set properties of variables"""
+        self.var_properties = properties
+
+    #------ Remote commands ------------------------------------
     def get_value(self, name):
-        value = monitor_get_global(self._get_sock(), name)
-        if value is None:
-            if communicate(self._get_sock(), '%s is not None' % name):
-                import pickle
-                msg = to_text_string(_("Object <b>%s</b> is not picklable")
-                                     % name)
-                raise pickle.PicklingError(msg)
+        if self.is_ipyclient:
+            value = self.shellwidget.get_value(name)
+
+            # Reset temporal variable where value is saved to
+            # save memory
+            self.shellwidget._kernel_value = None
+        else:
+            value = monitor_get_global(self._get_sock(), name)
+            if value is None:
+                if communicate(self._get_sock(), '%s is not None' % name):
+                    import pickle
+                    msg = to_text_string(_("Object <b>%s</b> is not picklable")
+                                         % name)
+                    raise pickle.PicklingError(msg)
         return value
         
     def set_value(self, name, value):
-        monitor_set_global(self._get_sock(), name, value)
+        if self.is_ipyclient:
+            value = serialize_object(value)
+            self.shellwidget.set_value(name, value)
+        else:
+            monitor_set_global(self._get_sock(), name, value)
         self.refresh_table()
         
     def remove_values(self, names):
         for name in names:
-            monitor_del_global(self._get_sock(), name)
+            if self.is_ipyclient:
+                self.shellwidget.remove_value(name)
+            else:
+                monitor_del_global(self._get_sock(), name)
         self.refresh_table()
         
     def copy_value(self, orig_name, new_name):
-        monitor_copy_global(self._get_sock(), orig_name, new_name)
+        if self.is_ipyclient:
+            self.shellwidget.copy_value(orig_name, new_name)
+        else:
+            monitor_copy_global(self._get_sock(), orig_name, new_name)
         self.refresh_table()
         
     def is_list(self, name):
         """Return True if variable is a list or a tuple"""
-        return communicate(self._get_sock(),
-                           'isinstance(%s, (tuple, list))' % name)
+        if self.is_ipyclient:
+            return self.var_properties[name]['is_list']
+        else:
+            return communicate(self._get_sock(),
+                               'isinstance(%s, (tuple, list))' % name)
         
     def is_dict(self, name):
         """Return True if variable is a dictionary"""
-        return communicate(self._get_sock(), 'isinstance(%s, dict)' % name)
+        if self.is_ipyclient:
+            return self.var_properties[name]['is_dict']
+        else:
+            return communicate(self._get_sock(), 'isinstance(%s, dict)' % name)
         
     def get_len(self, name):
         """Return sequence length"""
-        return communicate(self._get_sock(), "len(%s)" % name)
+        if self.is_ipyclient:
+            return self.var_properties[name]['len']
+        else:
+            return communicate(self._get_sock(), "len(%s)" % name)
         
     def is_array(self, name):
         """Return True if variable is a NumPy array"""
-        return communicate(self._get_sock(), 'is_array("%s")' % name)
+        if self.is_ipyclient:
+            return self.var_properties[name]['is_array']
+        else:
+            return communicate(self._get_sock(), 'is_array("%s")' % name)
         
     def is_image(self, name):
         """Return True if variable is a PIL.Image image"""
-        return communicate(self._get_sock(), 'is_image("%s")' % name)
+        if self.is_ipyclient:
+            return self.var_properties[name]['is_image']
+        else:
+            return communicate(self._get_sock(), 'is_image("%s")' % name)
 
     def is_data_frame(self, name):
         """Return True if variable is a DataFrame"""
-        return communicate(self._get_sock(),
-             "isinstance(globals()['%s'], DataFrame)" % name)
+        if self.is_ipyclient:
+            return self.var_properties[name]['is_data_frame']
+        else:
+            return communicate(self._get_sock(),
+                               "isinstance(globals()['%s'], DataFrame)" % name)
 
     def is_series(self, name):
         """Return True if variable is a Series"""
-        return communicate(self._get_sock(),
-             "isinstance(globals()['%s'], Series)" % name)
+        if self.is_ipyclient:
+            return self.var_properties[name]['is_series']
+        else:
+            return communicate(self._get_sock(),
+                               "isinstance(globals()['%s'], Series)" % name)
 
     def get_array_shape(self, name):
         """Return array's shape"""
-        return communicate(self._get_sock(), "%s.shape" % name)
+        if self.is_ipyclient:
+            return self.var_properties[name]['array_shape']
+        else:
+            return communicate(self._get_sock(), "%s.shape" % name)
         
     def get_array_ndim(self, name):
         """Return array's ndim"""
-        return communicate(self._get_sock(), "%s.ndim" % name)
+        if self.is_ipyclient:
+            return self.var_properties[name]['array_ndim']
+        else:
+            return communicate(self._get_sock(), "%s.ndim" % name)
         
     def plot(self, name, funcname):
-        command = "import spyderlib.pyplot; "\
-                  "__fig__ = spyderlib.pyplot.figure(); "\
-                  "__items__ = getattr(spyderlib.pyplot, '%s')(%s); "\
-                  "spyderlib.pyplot.show(); "\
-                  "del __fig__, __items__;" % (funcname, name)
-        if self.is_ipykernel:
-            self.ipyclient.shellwidget.execute("%%varexp --%s %s" % (funcname,
-                                                                   name))
+        if self.is_ipyclient:
+            self.shellwidget.execute("%%varexp --%s %s" % (funcname, name))
         else:
+            command = "import spyder.pyplot; "\
+                  "__fig__ = spyder.pyplot.figure(); "\
+                  "__items__ = getattr(spyder.pyplot, '%s')(%s); "\
+                  "spyder.pyplot.show(); "\
+                  "del __fig__, __items__;" % (funcname, name)
             self.shellwidget.send_to_process(command)
         
     def imshow(self, name):
-        command = "import spyderlib.pyplot; " \
-                  "__fig__ = spyderlib.pyplot.figure(); " \
-                  "__items__ = spyderlib.pyplot.imshow(%s); " \
-                  "spyderlib.pyplot.show(); del __fig__, __items__;" % name
-        if self.is_ipykernel:
-            self.ipyclient.shellwidget.execute("%%varexp --imshow %s" % name)
+        if self.is_ipyclient:
+            self.shellwidget.execute("%%varexp --imshow %s" % name)
         else:
+            command = "import spyder.pyplot; " \
+                  "__fig__ = spyder.pyplot.figure(); " \
+                  "__items__ = spyder.pyplot.imshow(%s); " \
+                  "spyder.pyplot.show(); del __fig__, __items__;" % name
             self.shellwidget.send_to_process(command)
         
     def show_image(self, name):
         command = "%s.show()" % name
-        if self.is_ipykernel:
-            self.ipyclient.shellwidget.execute(command)
+        if self.is_ipyclient:
+            self.shellwidget.execute(command)
         else:
             self.shellwidget.send_to_process(command)
 
     def oedit(self, name):
-        command = "from spyderlib.widgets.variableexplorer.objecteditor import oedit; " \
+        command = "from spyder.widgets.variableexplorer.objecteditor import oedit; " \
                   "oedit('%s', modal=False, namespace=locals());" % name
         self.shellwidget.send_to_process(command)
 
@@ -499,31 +530,21 @@ class NamespaceBrowser(QWidget):
                 error_message = None
                 try:
                     text, _encoding = encoding.read(self.filename)
-                    if self.is_internal_shell:
-                        self.editor.import_from_string(text)
-                    else:
-                        base_name = osp.basename(self.filename)
-                        editor = ImportWizard(self, text, title=base_name,
-                                      varname=fix_reference_name(base_name))
-                        if editor.exec_():
-                            var_name, clip_data = editor.get_data()
-                            monitor_set_global(self._get_sock(),
-                                               var_name, clip_data)
+                    base_name = osp.basename(self.filename)
+                    editor = ImportWizard(self, text, title=base_name,
+                                  varname=fix_reference_name(base_name))
+                    if editor.exec_():
+                        var_name, clip_data = editor.get_data()
+                        self.set_value(var_name, clip_data)
                 except Exception as error:
                     error_message = str(error)
             else:
                 QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
                 QApplication.processEvents()
-                if self.is_internal_shell:
-                    namespace, error_message = load_func(self.filename)
-                    interpreter = self.shellwidget.interpreter
-                    for key in list(namespace.keys()):
-                        new_key = fix_reference_name(key,
-                                     blacklist=list(interpreter.namespace.keys()))
-                        if new_key != key:
-                            namespace[new_key] = namespace.pop(key)
-                    if error_message is None:
-                        interpreter.namespace.update(namespace)
+                if self.is_ipyclient:
+                    error_message = self.shellwidget.load_data(self.filename,
+                                                               ext)
+                    self.shellwidget._kernel_reply = None
                 else:
                     error_message = monitor_load_globals(self._get_sock(),
                                                          self.filename, ext)
@@ -553,15 +574,13 @@ class NamespaceBrowser(QWidget):
                 return False
         QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
         QApplication.processEvents()
-        if self.is_internal_shell:
-            wsfilter = self.get_internal_shell_filter('picklable',
-                                                      check_all=True)
-            namespace = wsfilter(self.shellwidget.interpreter.namespace).copy()
-            error_message = iofunctions.save(namespace, filename)
+        if self.is_ipyclient:
+            error_message = self.shellwidget.save_namespace(self.filename)
+            self.shellwidget._kernel_reply = None
         else:
             settings = self.get_view_settings()
-            error_message = monitor_save_globals(self._get_sock(),
-                                                 settings, filename)
+            error_message = monitor_save_globals(self._get_sock(), settings,
+                                             filename)
         QApplication.restoreOverrideCursor()
         QApplication.processEvents()
         if error_message is not None:
diff --git a/spyderlib/widgets/variableexplorer/objecteditor.py b/spyder/widgets/variableexplorer/objecteditor.py
similarity index 85%
rename from spyderlib/widgets/variableexplorer/objecteditor.py
rename to spyder/widgets/variableexplorer/objecteditor.py
index e9c190f..d7f74de 100644
--- a/spyderlib/widgets/variableexplorer/objecteditor.py
+++ b/spyder/widgets/variableexplorer/objecteditor.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """
 Generic object editor dialog
@@ -15,7 +15,7 @@ from __future__ import print_function
 from qtpy.QtCore import QObject
 
 # Local imports
-from spyderlib.py3compat import is_text_string
+from spyder.py3compat import is_text_string
 
 
 class DialogKeeper(QObject):
@@ -58,14 +58,14 @@ def create_dialog(obj, obj_name):
     oedit to show eMZed related data)
     """
     # Local import
-    from spyderlib.widgets.variableexplorer.texteditor import TextEditor
-    from spyderlib.widgets.variableexplorer.utils import (ndarray, FakeObject,
+    from spyder.widgets.variableexplorer.texteditor import TextEditor
+    from spyder.widgets.variableexplorer.utils import (ndarray, FakeObject,
                                                Image, is_known_type, DataFrame,
                                                Series)
-    from spyderlib.widgets.variableexplorer.collectionseditor import CollectionsEditor
-    from spyderlib.widgets.variableexplorer.arrayeditor import ArrayEditor
+    from spyder.widgets.variableexplorer.collectionseditor import CollectionsEditor
+    from spyder.widgets.variableexplorer.arrayeditor import ArrayEditor
     if DataFrame is not FakeObject:
-        from spyderlib.widgets.variableexplorer.dataframeeditor import DataFrameEditor
+        from spyder.widgets.variableexplorer.dataframeeditor import DataFrameEditor
 
     conv_func = lambda data: data
     readonly = not is_known_type(obj)
@@ -82,7 +82,7 @@ def create_dialog(obj, obj_name):
         if not dialog.setup_and_check(data, title=obj_name,
                                       readonly=readonly):
             return
-        from spyderlib.pil_patch import Image
+        from spyder.pil_patch import Image
         conv_func = lambda data: Image.fromarray(data, mode=obj.mode)
     elif isinstance(obj, (DataFrame, Series)) and DataFrame is not FakeObject:
         dialog = DataFrameEditor()
@@ -113,7 +113,7 @@ def oedit(obj, modal=True, namespace=None):
     so it can be called directly from the interpreter)
     """
     # Local import
-    from spyderlib.utils.qthelpers import qapplication
+    from spyder.utils.qthelpers import qapplication
     app = qapplication()
     
     if modal:
@@ -149,7 +149,7 @@ def oedit(obj, modal=True, namespace=None):
 def test():
     """Run object editor test"""
     import datetime, numpy as np
-    from spyderlib.pil_patch import Image
+    from spyder.pil_patch import Image
     data = np.random.random_integers(255, size=(100, 100)).astype('uint8')
     image = Image.fromarray(data)
     example = {'str': 'kjkj kj k j j kj k jkj',
diff --git a/spyderlib/widgets/variableexplorer/texteditor.py b/spyder/widgets/variableexplorer/texteditor.py
similarity index 86%
rename from spyderlib/widgets/variableexplorer/texteditor.py
rename to spyder/widgets/variableexplorer/texteditor.py
index 6dc7ca9..d9d2503 100644
--- a/spyderlib/widgets/variableexplorer/texteditor.py
+++ b/spyder/widgets/variableexplorer/texteditor.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """
 Text editor dialog
@@ -16,11 +16,11 @@ from qtpy.QtCore import Qt
 from qtpy.QtWidgets import QDialog, QDialogButtonBox, QTextEdit, QVBoxLayout
 
 # Local import
-from spyderlib.config.base import _
-from spyderlib.config.gui import get_font
-from spyderlib.py3compat import (is_binary_string, to_binary_string,
-                                 to_text_string)
-from spyderlib.utils import icon_manager as ima
+from spyder.config.base import _
+from spyder.config.gui import get_font
+from spyder.py3compat import (is_binary_string, to_binary_string,
+                              to_text_string)
+from spyder.utils import icon_manager as ima
 
 
 class TextEditor(QDialog):
@@ -95,7 +95,7 @@ class TextEditor(QDialog):
 #==============================================================================
 def test():
     """Text editor demo"""
-    from spyderlib.utils.qthelpers import qapplication
+    from spyder.utils.qthelpers import qapplication
     _app = qapplication()  # analysis:ignore
 
     text = """01234567890123456789012345678901234567890123456789012345678901234567890123456789
diff --git a/spyderlib/widgets/variableexplorer/utils.py b/spyder/widgets/variableexplorer/utils.py
similarity index 82%
rename from spyderlib/widgets/variableexplorer/utils.py
rename to spyder/widgets/variableexplorer/utils.py
index 9f450d9..88682e7 100644
--- a/spyderlib/widgets/variableexplorer/utils.py
+++ b/spyder/widgets/variableexplorer/utils.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """
 Utilities for the Collections editor widget and dialog
@@ -13,12 +13,13 @@ from __future__ import print_function
 import re
 
 # Local imports
-from spyderlib.py3compat import (NUMERIC_TYPES, TEXT_TYPES, to_text_string,
-                                 is_text_string, is_binary_string, reprlib,
-                                 PY2, to_binary_string)
-from spyderlib.utils import programs
-from spyderlib import dependencies
-from spyderlib.config.base import _
+from spyder.config.base import get_supported_types
+from spyder.py3compat import (NUMERIC_TYPES, TEXT_TYPES, to_text_string,
+                              is_text_string, is_binary_string, reprlib,
+                              PY2, to_binary_string)
+from spyder.utils import programs
+from spyder import dependencies
+from spyder.config.base import _
 
 
 #==============================================================================
@@ -86,7 +87,7 @@ else:
 # PIL Images support
 #==============================================================================
 try:
-    from spyderlib import pil_patch
+    from spyder import pil_patch
     Image = pil_patch.Image.Image
 except ImportError:
     Image = FakeObject  # analysis:ignore
@@ -431,3 +432,53 @@ def globalsfilter(input_dict, check_all=False, filters=None,
         if not excluded:
             output_dict[key] = value
     return output_dict
+
+
+#==============================================================================
+# Create view to be displayed by NamespaceBrowser
+#==============================================================================
+REMOTE_SETTINGS = ('check_all', 'exclude_private', 'exclude_uppercase',
+                   'exclude_capitalized', 'exclude_unsupported',
+                   'excluded_names', 'truncate', 'minmax',
+                   'remote_editing', 'autorefresh')
+
+
+def get_remote_data(data, settings, mode, more_excluded_names=None):
+    """
+    Return globals according to filter described in *settings*:
+        * data: data to be filtered (dictionary)
+        * settings: variable explorer settings (dictionary)
+        * mode (string): 'editable' or 'picklable'
+        * more_excluded_names: additional excluded names (list)
+    """
+    supported_types = get_supported_types()
+    assert mode in list(supported_types.keys())
+    excluded_names = settings['excluded_names']
+    if more_excluded_names is not None:
+        excluded_names += more_excluded_names
+    return globalsfilter(data, check_all=settings['check_all'],
+                         filters=tuple(supported_types[mode]),
+                         exclude_private=settings['exclude_private'],
+                         exclude_uppercase=settings['exclude_uppercase'],
+                         exclude_capitalized=settings['exclude_capitalized'],
+                         exclude_unsupported=settings['exclude_unsupported'],
+                         excluded_names=excluded_names)
+
+
+def make_remote_view(data, settings, more_excluded_names=None):
+    """
+    Make a remote view of dictionary *data*
+    -> globals explorer
+    """
+    assert all([name in REMOTE_SETTINGS for name in settings])
+    data = get_remote_data(data, settings, mode='editable',
+                           more_excluded_names=more_excluded_names)
+    remote = {}
+    for key, value in list(data.items()):
+        view = value_to_display(value, truncate=settings['truncate'],
+                                minmax=settings['minmax'])
+        remote[key] = {'type':  get_human_readable_type(value),
+                       'size':  get_size(value),
+                       'color': get_color_name(value),
+                       'view':  view}
+    return remote
diff --git a/spyderlib/workers/__init__.py b/spyder/workers/__init__.py
similarity index 100%
rename from spyderlib/workers/__init__.py
rename to spyder/workers/__init__.py
diff --git a/spyderlib/workers/updates.py b/spyder/workers/updates.py
similarity index 90%
rename from spyderlib/workers/updates.py
rename to spyder/workers/updates.py
index 6228d55..fb1337c 100644
--- a/spyderlib/workers/updates.py
+++ b/spyder/workers/updates.py
@@ -1,9 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009-2013 Pierre Raybaut
-# Copyright © 2013-2015 The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 # Standard library imports
 import json
@@ -13,10 +12,10 @@ import ssl
 from qtpy.QtCore import QObject, Signal
 
 # Local imports
-from spyderlib import __version__
-from spyderlib.config.base import _
-from spyderlib.py3compat import PY3
-from spyderlib.utils.programs import check_version, is_stable_version
+from spyder import __version__
+from spyder.config.base import _
+from spyder.py3compat import PY3
+from spyder.utils.programs import check_version, is_stable_version
 
 
 if PY3:
diff --git a/spyder_breakpoints/breakpoints.py b/spyder_breakpoints/breakpoints.py
index 6ceab0c..8203bec 100644
--- a/spyder_breakpoints/breakpoints.py
+++ b/spyder_breakpoints/breakpoints.py
@@ -1,9 +1,9 @@
 # -*- coding:utf-8 -*-
 #
-# Copyright © 2012 Jed Ludlow
+# Copyright © Spyder Project Contributors
 # Based loosely on p_pylint.py by Pierre Raybaut
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """Breakpoint Plugin"""
 
@@ -16,11 +16,11 @@
 import os.path as osp
 
 # Local imports
-from spyderlib.config.base import get_translation
-from spyderlib.utils import icon_manager as ima
-from spyderlib.utils.qthelpers import create_action
-from spyderlib.plugins import SpyderPluginMixin
-from spyderlib.py3compat import to_text_string, is_text_string
+from spyder.config.base import get_translation
+from spyder.utils import icon_manager as ima
+from spyder.utils.qthelpers import create_action
+from spyder.plugins import SpyderPluginMixin
+from spyder.py3compat import to_text_string, is_text_string
 from .widgets.breakpointsgui import BreakpointWidget
 
 _ = get_translation("breakpoints", "spyder_breakpoints")
diff --git a/spyder_breakpoints/locale/breakpoints.pot b/spyder_breakpoints/locale/breakpoints.pot
index fb71f21..e32dc7f 100644
--- a/spyder_breakpoints/locale/breakpoints.pot
+++ b/spyder_breakpoints/locale/breakpoints.pot
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-08-29 22:49+COT\n"
+"POT-Creation-Date: 2016-09-24 04:45+COT\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"
@@ -15,35 +15,35 @@ msgstr ""
 "Generated-By: pygettext.py 1.5\n"
 
 
-#: spyder_breakpoints/breakpoints.py:41
+#: spyder_breakpoints/breakpoints.py:45
 msgid "Breakpoints"
 msgstr ""
 
-#: spyder_breakpoints/breakpoints.py:75
+#: spyder_breakpoints/breakpoints.py:80
 msgid "List breakpoints"
 msgstr ""
 
-#: spyder_breakpoints/widgets/breakpointsgui.py:87
+#: spyder_breakpoints/widgets/breakpointsgui.py:97
 msgid "Condition"
 msgstr ""
 
-#: spyder_breakpoints/widgets/breakpointsgui.py:87
+#: spyder_breakpoints/widgets/breakpointsgui.py:97
 msgid "File"
 msgstr ""
 
-#: spyder_breakpoints/widgets/breakpointsgui.py:87
+#: spyder_breakpoints/widgets/breakpointsgui.py:97
 msgid "Line"
 msgstr ""
 
-#: spyder_breakpoints/widgets/breakpointsgui.py:170
+#: spyder_breakpoints/widgets/breakpointsgui.py:180
 msgid "Clear breakpoints in all files"
 msgstr ""
 
-#: spyder_breakpoints/widgets/breakpointsgui.py:177
+#: spyder_breakpoints/widgets/breakpointsgui.py:201
 msgid "Clear this breakpoint"
 msgstr ""
 
-#: spyder_breakpoints/widgets/breakpointsgui.py:183
+#: spyder_breakpoints/widgets/breakpointsgui.py:206
 msgid "Edit this breakpoint"
 msgstr ""
 
diff --git a/spyder_breakpoints/locale/es/LC_MESSAGES/breakpoints.mo b/spyder_breakpoints/locale/es/LC_MESSAGES/breakpoints.mo
index c4c9a53..6925b8b 100644
Binary files a/spyder_breakpoints/locale/es/LC_MESSAGES/breakpoints.mo and b/spyder_breakpoints/locale/es/LC_MESSAGES/breakpoints.mo differ
diff --git a/spyder_breakpoints/locale/es/LC_MESSAGES/breakpoints.po b/spyder_breakpoints/locale/es/LC_MESSAGES/breakpoints.po
index 30d5234..4de5cf2 100644
--- a/spyder_breakpoints/locale/es/LC_MESSAGES/breakpoints.po
+++ b/spyder_breakpoints/locale/es/LC_MESSAGES/breakpoints.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.2\n"
-"POT-Creation-Date: 2015-08-29 22:49+COT\n"
+"POT-Creation-Date: 2016-09-24 04:45+COT\n"
 "PO-Revision-Date: 2013-05-07 17:37-0500\n"
 "Last-Translator: Carlos Cordoba <ccordoba12 at gmail.com>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,35 +16,35 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: pygettext.py 1.5\n"
 
-#: spyder_breakpoints/breakpoints.py:41
+#: spyder_breakpoints/breakpoints.py:45
 msgid "Breakpoints"
 msgstr "Puntos de interrupción"
 
-#: spyder_breakpoints/breakpoints.py:75
+#: spyder_breakpoints/breakpoints.py:80
 msgid "List breakpoints"
 msgstr "Listar puntos de interrupción"
 
-#: spyder_breakpoints/widgets/breakpointsgui.py:87
+#: spyder_breakpoints/widgets/breakpointsgui.py:97
 msgid "Condition"
 msgstr "Condición"
 
-#: spyder_breakpoints/widgets/breakpointsgui.py:87
+#: spyder_breakpoints/widgets/breakpointsgui.py:97
 msgid "File"
 msgstr "Archivo"
 
-#: spyder_breakpoints/widgets/breakpointsgui.py:87
+#: spyder_breakpoints/widgets/breakpointsgui.py:97
 msgid "Line"
 msgstr "Línea"
 
-#: spyder_breakpoints/widgets/breakpointsgui.py:170
+#: spyder_breakpoints/widgets/breakpointsgui.py:180
 msgid "Clear breakpoints in all files"
 msgstr "Borrar los puntos de todos los archivos"
 
-#: spyder_breakpoints/widgets/breakpointsgui.py:177
+#: spyder_breakpoints/widgets/breakpointsgui.py:201
 msgid "Clear this breakpoint"
 msgstr "Eliminar este punto"
 
-#: spyder_breakpoints/widgets/breakpointsgui.py:183
+#: spyder_breakpoints/widgets/breakpointsgui.py:206
 #, fuzzy
 msgid "Edit this breakpoint"
 msgstr "Eliminar este punto"
diff --git a/spyder_breakpoints/locale/fr/LC_MESSAGES/breakpoints.mo b/spyder_breakpoints/locale/fr/LC_MESSAGES/breakpoints.mo
index 8c28814..a3288a7 100644
Binary files a/spyder_breakpoints/locale/fr/LC_MESSAGES/breakpoints.mo and b/spyder_breakpoints/locale/fr/LC_MESSAGES/breakpoints.mo differ
diff --git a/spyder_breakpoints/locale/fr/LC_MESSAGES/breakpoints.po b/spyder_breakpoints/locale/fr/LC_MESSAGES/breakpoints.po
index cd79af6..e473bf7 100644
--- a/spyder_breakpoints/locale/fr/LC_MESSAGES/breakpoints.po
+++ b/spyder_breakpoints/locale/fr/LC_MESSAGES/breakpoints.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-08-29 22:49+COT\n"
+"POT-Creation-Date: 2016-09-24 04:45+COT\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"
@@ -16,34 +16,34 @@ msgstr ""
 "Content-Transfer-Encoding: utf-8\n"
 "Generated-By: pygettext.py 1.5\n"
 
-#: spyder_breakpoints/breakpoints.py:41
+#: spyder_breakpoints/breakpoints.py:45
 msgid "Breakpoints"
 msgstr "Points d'arrêt"
 
-#: spyder_breakpoints/breakpoints.py:75
+#: spyder_breakpoints/breakpoints.py:80
 msgid "List breakpoints"
 msgstr "Liste des points d'arrêt"
 
-#: spyder_breakpoints/widgets/breakpointsgui.py:87
+#: spyder_breakpoints/widgets/breakpointsgui.py:97
 msgid "Condition"
 msgstr "Condition"
 
-#: spyder_breakpoints/widgets/breakpointsgui.py:87
+#: spyder_breakpoints/widgets/breakpointsgui.py:97
 msgid "File"
 msgstr "Fichier"
 
-#: spyder_breakpoints/widgets/breakpointsgui.py:87
+#: spyder_breakpoints/widgets/breakpointsgui.py:97
 msgid "Line"
 msgstr "Ligne"
 
-#: spyder_breakpoints/widgets/breakpointsgui.py:170
+#: spyder_breakpoints/widgets/breakpointsgui.py:180
 msgid "Clear breakpoints in all files"
 msgstr "Supprimer tous les points d'arrêts"
 
-#: spyder_breakpoints/widgets/breakpointsgui.py:177
+#: spyder_breakpoints/widgets/breakpointsgui.py:201
 msgid "Clear this breakpoint"
 msgstr "Supprimer ce point d'arrêt"
 
-#: spyder_breakpoints/widgets/breakpointsgui.py:183
+#: spyder_breakpoints/widgets/breakpointsgui.py:206
 msgid "Edit this breakpoint"
 msgstr "Supprimer ce point d'arrêt"
diff --git a/spyder_breakpoints/locale/pt_BR/LC_MESSAGES/breakpoints.mo b/spyder_breakpoints/locale/pt_BR/LC_MESSAGES/breakpoints.mo
index 2ad5a3c..68806c4 100644
Binary files a/spyder_breakpoints/locale/pt_BR/LC_MESSAGES/breakpoints.mo and b/spyder_breakpoints/locale/pt_BR/LC_MESSAGES/breakpoints.mo differ
diff --git a/spyder_breakpoints/locale/pt_BR/LC_MESSAGES/breakpoints.po b/spyder_breakpoints/locale/pt_BR/LC_MESSAGES/breakpoints.po
index 4226cb4..4e08f7a 100644
--- a/spyder_breakpoints/locale/pt_BR/LC_MESSAGES/breakpoints.po
+++ b/spyder_breakpoints/locale/pt_BR/LC_MESSAGES/breakpoints.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2015-08-29 22:49+COT\n"
+"POT-Creation-Date: 2016-09-24 04:45+COT\n"
 "PO-Revision-Date: 2015-02-25 22:08-0400\n"
 "Last-Translator: Valter Nazianzeno <manipuladordedados at gmail.com>\n"
 "Language-Team: \n"
@@ -16,34 +16,34 @@ msgstr ""
 "Generated-By: pygettext.py 1.5\n"
 "X-Generator: Poedit 1.7.4\n"
 
-#: spyder_breakpoints/breakpoints.py:41
+#: spyder_breakpoints/breakpoints.py:45
 msgid "Breakpoints"
 msgstr "Pontos de interrupção"
 
-#: spyder_breakpoints/breakpoints.py:75
+#: spyder_breakpoints/breakpoints.py:80
 msgid "List breakpoints"
 msgstr "Listar pontos de interrupção"
 
-#: spyder_breakpoints/widgets/breakpointsgui.py:87
+#: spyder_breakpoints/widgets/breakpointsgui.py:97
 msgid "Condition"
 msgstr "Condição"
 
-#: spyder_breakpoints/widgets/breakpointsgui.py:87
+#: spyder_breakpoints/widgets/breakpointsgui.py:97
 msgid "File"
 msgstr "Arquivo"
 
-#: spyder_breakpoints/widgets/breakpointsgui.py:87
+#: spyder_breakpoints/widgets/breakpointsgui.py:97
 msgid "Line"
 msgstr "Linha"
 
-#: spyder_breakpoints/widgets/breakpointsgui.py:170
+#: spyder_breakpoints/widgets/breakpointsgui.py:180
 msgid "Clear breakpoints in all files"
 msgstr "Limpar pontos de interrupção em todos os arquivos"
 
-#: spyder_breakpoints/widgets/breakpointsgui.py:177
+#: spyder_breakpoints/widgets/breakpointsgui.py:201
 msgid "Clear this breakpoint"
 msgstr "Limpar este ponto"
 
-#: spyder_breakpoints/widgets/breakpointsgui.py:183
+#: spyder_breakpoints/widgets/breakpointsgui.py:206
 msgid "Edit this breakpoint"
 msgstr "Editar este ponto"
diff --git a/spyder_breakpoints/locale/ru/LC_MESSAGES/breakpoints.mo b/spyder_breakpoints/locale/ru/LC_MESSAGES/breakpoints.mo
index 1db4002..db5881e 100644
Binary files a/spyder_breakpoints/locale/ru/LC_MESSAGES/breakpoints.mo and b/spyder_breakpoints/locale/ru/LC_MESSAGES/breakpoints.mo differ
diff --git a/spyder_breakpoints/locale/ru/LC_MESSAGES/breakpoints.po b/spyder_breakpoints/locale/ru/LC_MESSAGES/breakpoints.po
index 1cbdaa7..b78c78d 100644
--- a/spyder_breakpoints/locale/ru/LC_MESSAGES/breakpoints.po
+++ b/spyder_breakpoints/locale/ru/LC_MESSAGES/breakpoints.po
@@ -5,47 +5,47 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2016-03-21 06:04+0300\n"
+"POT-Creation-Date: 2016-09-24 04:45+COT\n"
 "PO-Revision-Date: 2016-04-18 19:58+0300\n"
+"Last-Translator: Roman Kulagin <Roman.Qlogin at gmail.com>\n"
 "Language-Team: \n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: pygettext.py 1.5\n"
 "X-Generator: Poedit 1.5.4\n"
-"Last-Translator: Roman Kulagin <Roman.Qlogin at gmail.com>\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"Language: ru\n"
 
-#: spyder_breakpoints/breakpoints.py:41
+#: spyder_breakpoints/breakpoints.py:45
 msgid "Breakpoints"
 msgstr "Точки останова"
 
-#: spyder_breakpoints/breakpoints.py:75
+#: spyder_breakpoints/breakpoints.py:80
 msgid "List breakpoints"
 msgstr "Список точек останова"
 
-#: spyder_breakpoints/widgets/breakpointsgui.py:87
+#: spyder_breakpoints/widgets/breakpointsgui.py:97
 msgid "Condition"
 msgstr "Условие"
 
-#: spyder_breakpoints/widgets/breakpointsgui.py:87
+#: spyder_breakpoints/widgets/breakpointsgui.py:97
 msgid "File"
 msgstr "Файл"
 
-#: spyder_breakpoints/widgets/breakpointsgui.py:87
+#: spyder_breakpoints/widgets/breakpointsgui.py:97
 msgid "Line"
 msgstr "Строка"
 
-#: spyder_breakpoints/widgets/breakpointsgui.py:170
+#: spyder_breakpoints/widgets/breakpointsgui.py:180
 msgid "Clear breakpoints in all files"
 msgstr "Очистить все точки останова"
 
-#: spyder_breakpoints/widgets/breakpointsgui.py:177
+#: spyder_breakpoints/widgets/breakpointsgui.py:201
 msgid "Clear this breakpoint"
 msgstr "Убрать эту точку останова"
 
-#: spyder_breakpoints/widgets/breakpointsgui.py:183
+#: spyder_breakpoints/widgets/breakpointsgui.py:206
 msgid "Edit this breakpoint"
 msgstr "Редактировать эту точку останова"
diff --git a/spyder_breakpoints/widgets/breakpointsgui.py b/spyder_breakpoints/widgets/breakpointsgui.py
index 6465d46..418f073 100644
--- a/spyder_breakpoints/widgets/breakpointsgui.py
+++ b/spyder_breakpoints/widgets/breakpointsgui.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # based loosley on pylintgui.py by Pierre Raybaut
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """Breakpoint widget"""
 
@@ -25,9 +25,9 @@ from qtpy.QtWidgets import (QItemDelegate, QMenu, QTableView, QVBoxLayout,
                             QWidget)
 
 # Local imports
-from spyderlib.config.base import get_translation
-from spyderlib.config.main import CONF
-from spyderlib.utils.qthelpers import add_actions, create_action
+from spyder.config.base import get_translation
+from spyder.config.main import CONF
+from spyder.utils.qthelpers import add_actions, create_action
 
 # This is needed for testing this module as a stand alone script
 try:
@@ -261,7 +261,7 @@ class BreakpointWidget(QWidget):
 #==============================================================================
 def test():
     """Run breakpoint widget test"""
-    from spyderlib.utils.qthelpers import qapplication
+    from spyder.utils.qthelpers import qapplication
     app = qapplication()
     widget = BreakpointWidget(None)
     widget.show()
diff --git a/spyder_io_hdf5/hdf5.py b/spyder_io_hdf5/hdf5.py
index 6b02599..7ebef4b 100644
--- a/spyder_io_hdf5/hdf5.py
+++ b/spyder_io_hdf5/hdf5.py
@@ -1,8 +1,8 @@
 # -*- coding:utf-8 -*-
 #
-# Copyright © 2011 David Anthony Powell
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """I/O plugin for loading/saving HDF5 files
 
diff --git a/spyder_profiler/locale/es/LC_MESSAGES/profiler.mo b/spyder_profiler/locale/es/LC_MESSAGES/profiler.mo
index 155f930..dc3856c 100644
Binary files a/spyder_profiler/locale/es/LC_MESSAGES/profiler.mo and b/spyder_profiler/locale/es/LC_MESSAGES/profiler.mo differ
diff --git a/spyder_profiler/locale/es/LC_MESSAGES/profiler.po b/spyder_profiler/locale/es/LC_MESSAGES/profiler.po
index 08a1b8d..a65e05a 100644
--- a/spyder_profiler/locale/es/LC_MESSAGES/profiler.po
+++ b/spyder_profiler/locale/es/LC_MESSAGES/profiler.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.1\n"
-"POT-Creation-Date: 2015-08-29 22:49+COT\n"
+"POT-Creation-Date: 2016-09-24 04:45+COT\n"
 "PO-Revision-Date: 2012-06-25 21:59-0500\n"
 "Last-Translator: Carlos Cordoba <ccordoba12 at gmail.com>\n"
 "Language-Team: Python\n"
@@ -18,11 +18,11 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Poedit-Basepath: ../../../../\n"
 
-#: spyder_profiler/profiler.py:27
+#: spyder_profiler/profiler.py:33
 msgid "Results"
 msgstr "Resultados"
 
-#: spyder_profiler/profiler.py:28
+#: spyder_profiler/profiler.py:34
 msgid ""
 "Profiler plugin results (the output of python's profile/cProfile)\n"
 "are stored here:"
@@ -30,156 +30,159 @@ msgstr ""
 "Los resultados del perfilador (es decir la salida de profile o cProfile)\n"
 "son guardados aquí:"
 
-#: spyder_profiler/profiler.py:68
+#: spyder_profiler/profiler.py:75
 msgid "Profiler"
 msgstr "Perfilador (Profiler)"
 
-#: spyder_profiler/profiler.py:96
-#: spyder_profiler/widgets/profilergui.py:76
+#: spyder_profiler/profiler.py:104 spyder_profiler/widgets/profilergui.py:81
 msgid "Profile"
 msgstr "Perfilar (Profile)"
 
-#: spyder_profiler/widgets/profilergui.py:77
+#: spyder_profiler/widgets/profilergui.py:82
 msgid "Run profiler"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:82
+#: spyder_profiler/widgets/profilergui.py:87
 msgid "Stop"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:83
+#: spyder_profiler/widgets/profilergui.py:88
 msgid "Stop current profiling"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:91
-#: spyder_profiler/widgets/profilergui.py:214
+#: spyder_profiler/widgets/profilergui.py:96
+#: spyder_profiler/widgets/profilergui.py:219
 msgid "Select Python script"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:97
+#: spyder_profiler/widgets/profilergui.py:102
 msgid "Output"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:99
+#: spyder_profiler/widgets/profilergui.py:104
 msgid "Show program's output"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:108
+#: spyder_profiler/widgets/profilergui.py:113
 msgid "Collapse one level up"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:113
+#: spyder_profiler/widgets/profilergui.py:118
 msgid "Expand one level down"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:116
+#: spyder_profiler/widgets/profilergui.py:121
 msgid "Save data"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:119
+#: spyder_profiler/widgets/profilergui.py:124
 msgid "Save profiling data"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:121
+#: spyder_profiler/widgets/profilergui.py:126
 msgid "Load data"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:124
+#: spyder_profiler/widgets/profilergui.py:129
 msgid "Load profiling data for comparison"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:126
+#: spyder_profiler/widgets/profilergui.py:131
 msgid "Clear comparison"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:166
+#: spyder_profiler/widgets/profilergui.py:171
 msgid "Please install"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:167
+#: spyder_profiler/widgets/profilergui.py:172
 msgid "the Python profiler modules"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:174
+#: spyder_profiler/widgets/profilergui.py:179
 msgid "Save profiler result"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:177
-#: spyder_profiler/widgets/profilergui.py:183
+#: spyder_profiler/widgets/profilergui.py:182
+#: spyder_profiler/widgets/profilergui.py:188
 #, fuzzy
 msgid "Profiler result"
 msgstr "Perfilador (Profiler)"
 
-#: spyder_profiler/widgets/profilergui.py:182
+#: spyder_profiler/widgets/profilergui.py:187
 msgid "Select script to compare"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:215
+#: spyder_profiler/widgets/profilergui.py:220
 msgid "Python scripts"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:222
 #: spyder_profiler/widgets/profilergui.py:227
+#: spyder_profiler/widgets/profilergui.py:232
 msgid "Profiler output"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:246
+#: spyder_profiler/widgets/profilergui.py:251
 msgid "Profiling, please wait..."
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:290
+#: spyder_profiler/widgets/profilergui.py:295
 msgid "Error"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:291
+#: spyder_profiler/widgets/profilergui.py:296
 msgid "Process failed to start"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:338
+#: spyder_profiler/widgets/profilergui.py:343
 msgid "Sorting data, please wait..."
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:384
+#: spyder_profiler/widgets/profilergui.py:389
 msgid "Function/Module"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:384
+#: spyder_profiler/widgets/profilergui.py:389
 msgid "Total Time"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:384
-#: spyder_profiler/widgets/profilergui.py:385
+#: spyder_profiler/widgets/profilergui.py:389
+#: spyder_profiler/widgets/profilergui.py:390
 msgid "Diff"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:385
+#: spyder_profiler/widgets/profilergui.py:390
 msgid "Calls"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:385
+#: spyder_profiler/widgets/profilergui.py:390
 msgid "Local Time"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:386
+#: spyder_profiler/widgets/profilergui.py:391
 msgid "File:line"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:536
+#: spyder_profiler/widgets/profilergui.py:537
+msgid "Function or module name"
+msgstr ""
+
+#: spyder_profiler/widgets/profilergui.py:541
 msgid "Time in function (including sub-functions)"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:545
+#: spyder_profiler/widgets/profilergui.py:550
 msgid "Local time in function (not in sub-functions)"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:555
+#: spyder_profiler/widgets/profilergui.py:560
 msgid "Total number of calls (including recursion)"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:565
+#: spyder_profiler/widgets/profilergui.py:570
 msgid "File:line where function is defined"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:570
+#: spyder_profiler/widgets/profilergui.py:575
 msgid "recursion"
 msgstr ""
diff --git a/spyder_profiler/locale/fr/LC_MESSAGES/profiler.mo b/spyder_profiler/locale/fr/LC_MESSAGES/profiler.mo
index f36f05d..b5c1965 100644
Binary files a/spyder_profiler/locale/fr/LC_MESSAGES/profiler.mo and b/spyder_profiler/locale/fr/LC_MESSAGES/profiler.mo differ
diff --git a/spyder_profiler/locale/fr/LC_MESSAGES/profiler.po b/spyder_profiler/locale/fr/LC_MESSAGES/profiler.po
index 77d298c..095a865 100644
--- a/spyder_profiler/locale/fr/LC_MESSAGES/profiler.po
+++ b/spyder_profiler/locale/fr/LC_MESSAGES/profiler.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.1\n"
-"POT-Creation-Date: 2015-08-29 22:49+COT\n"
+"POT-Creation-Date: 2016-09-24 04:45+COT\n"
 "PO-Revision-Date: 2011-04-11 21:41+2\n"
 "Last-Translator: Pierre Raybaut\n"
 "Language-Team: Python\n"
@@ -15,166 +15,170 @@ msgstr ""
 "Content-Transfer-Encoding: utf-8\n"
 "Generated-By: pygettext.py 1.5\n"
 
-#: spyder_profiler/profiler.py:27
+#: spyder_profiler/profiler.py:33
 msgid "Results"
 msgstr "Résultats"
 
-#: spyder_profiler/profiler.py:28
+#: spyder_profiler/profiler.py:34
 msgid ""
 "Profiler plugin results (the output of python's profile/cProfile)\n"
 "are stored here:"
 msgstr "Les résultats du profileur Python sont stockés ici :"
 
-#: spyder_profiler/profiler.py:68
+#: spyder_profiler/profiler.py:75
 msgid "Profiler"
 msgstr "Profileur"
 
-#: spyder_profiler/profiler.py:96
-#: spyder_profiler/widgets/profilergui.py:76
+#: spyder_profiler/profiler.py:104 spyder_profiler/widgets/profilergui.py:81
 msgid "Profile"
 msgstr "Profiler"
 
-#: spyder_profiler/widgets/profilergui.py:77
+#: spyder_profiler/widgets/profilergui.py:82
 msgid "Run profiler"
 msgstr "Exécuter le profileur"
 
-#: spyder_profiler/widgets/profilergui.py:82
+#: spyder_profiler/widgets/profilergui.py:87
 msgid "Stop"
 msgstr "Arrêter"
 
-#: spyder_profiler/widgets/profilergui.py:83
+#: spyder_profiler/widgets/profilergui.py:88
 msgid "Stop current profiling"
 msgstr "Arrêter le processus en cours"
 
-#: spyder_profiler/widgets/profilergui.py:91
-#: spyder_profiler/widgets/profilergui.py:214
+#: spyder_profiler/widgets/profilergui.py:96
+#: spyder_profiler/widgets/profilergui.py:219
 msgid "Select Python script"
 msgstr "Sélectionner un script Python"
 
-#: spyder_profiler/widgets/profilergui.py:97
+#: spyder_profiler/widgets/profilergui.py:102
 msgid "Output"
 msgstr "Sortie"
 
-#: spyder_profiler/widgets/profilergui.py:99
+#: spyder_profiler/widgets/profilergui.py:104
 msgid "Show program's output"
 msgstr "Afficher la sortie du programme"
 
-#: spyder_profiler/widgets/profilergui.py:108
+#: spyder_profiler/widgets/profilergui.py:113
 msgid "Collapse one level up"
 msgstr "Replier l'arbre d'un niveau"
 
-#: spyder_profiler/widgets/profilergui.py:113
+#: spyder_profiler/widgets/profilergui.py:118
 msgid "Expand one level down"
 msgstr "Déplier l'arbre d'un niveau"
 
-#: spyder_profiler/widgets/profilergui.py:116
+#: spyder_profiler/widgets/profilergui.py:121
 msgid "Save data"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:119
+#: spyder_profiler/widgets/profilergui.py:124
 msgid "Save profiling data"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:121
+#: spyder_profiler/widgets/profilergui.py:126
 msgid "Load data"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:124
+#: spyder_profiler/widgets/profilergui.py:129
 msgid "Load profiling data for comparison"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:126
+#: spyder_profiler/widgets/profilergui.py:131
 msgid "Clear comparison"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:166
+#: spyder_profiler/widgets/profilergui.py:171
 msgid "Please install"
 msgstr "Veuillez installer"
 
-#: spyder_profiler/widgets/profilergui.py:167
+#: spyder_profiler/widgets/profilergui.py:172
 msgid "the Python profiler modules"
 msgstr "les profileurs Python"
 
-#: spyder_profiler/widgets/profilergui.py:174
+#: spyder_profiler/widgets/profilergui.py:179
 msgid "Save profiler result"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:177
-#: spyder_profiler/widgets/profilergui.py:183
+#: spyder_profiler/widgets/profilergui.py:182
+#: spyder_profiler/widgets/profilergui.py:188
 #, fuzzy
 msgid "Profiler result"
 msgstr "Sortie du profileur"
 
-#: spyder_profiler/widgets/profilergui.py:182
+#: spyder_profiler/widgets/profilergui.py:187
 msgid "Select script to compare"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:215
+#: spyder_profiler/widgets/profilergui.py:220
 msgid "Python scripts"
 msgstr "Scripts Python"
 
-#: spyder_profiler/widgets/profilergui.py:222
 #: spyder_profiler/widgets/profilergui.py:227
+#: spyder_profiler/widgets/profilergui.py:232
 msgid "Profiler output"
 msgstr "Sortie du profileur"
 
-#: spyder_profiler/widgets/profilergui.py:246
+#: spyder_profiler/widgets/profilergui.py:251
 msgid "Profiling, please wait..."
 msgstr "Profilage en cours..."
 
-#: spyder_profiler/widgets/profilergui.py:290
+#: spyder_profiler/widgets/profilergui.py:295
 msgid "Error"
 msgstr "Erreur"
 
-#: spyder_profiler/widgets/profilergui.py:291
+#: spyder_profiler/widgets/profilergui.py:296
 msgid "Process failed to start"
 msgstr "Le processus n'a pas pu démarrer"
 
-#: spyder_profiler/widgets/profilergui.py:338
+#: spyder_profiler/widgets/profilergui.py:343
 msgid "Sorting data, please wait..."
 msgstr "Classement des résultats en cours..."
 
-#: spyder_profiler/widgets/profilergui.py:384
+#: spyder_profiler/widgets/profilergui.py:389
 msgid "Function/Module"
 msgstr "Fonction/Module"
 
-#: spyder_profiler/widgets/profilergui.py:384
+#: spyder_profiler/widgets/profilergui.py:389
 msgid "Total Time"
 msgstr "Durée totale"
 
-#: spyder_profiler/widgets/profilergui.py:384
-#: spyder_profiler/widgets/profilergui.py:385
+#: spyder_profiler/widgets/profilergui.py:389
+#: spyder_profiler/widgets/profilergui.py:390
 msgid "Diff"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:385
+#: spyder_profiler/widgets/profilergui.py:390
 msgid "Calls"
 msgstr "Appels"
 
-#: spyder_profiler/widgets/profilergui.py:385
+#: spyder_profiler/widgets/profilergui.py:390
 msgid "Local Time"
 msgstr "Durée locale"
 
-#: spyder_profiler/widgets/profilergui.py:386
+#: spyder_profiler/widgets/profilergui.py:391
 msgid "File:line"
 msgstr "Fichier:ligne"
 
-#: spyder_profiler/widgets/profilergui.py:536
+#: spyder_profiler/widgets/profilergui.py:537
+#, fuzzy
+msgid "Function or module name"
+msgstr "Fonction/Module"
+
+#: spyder_profiler/widgets/profilergui.py:541
 msgid "Time in function (including sub-functions)"
 msgstr "Temps écoulé dans la fonction (sous-fonctions comprises)"
 
-#: spyder_profiler/widgets/profilergui.py:545
+#: spyder_profiler/widgets/profilergui.py:550
 msgid "Local time in function (not in sub-functions)"
 msgstr "Temps écoulé dans la fonction (hors sous-fonctions)"
 
-#: spyder_profiler/widgets/profilergui.py:555
+#: spyder_profiler/widgets/profilergui.py:560
 msgid "Total number of calls (including recursion)"
 msgstr "Nombre total d'appels (récursion comprise)"
 
-#: spyder_profiler/widgets/profilergui.py:565
+#: spyder_profiler/widgets/profilergui.py:570
 msgid "File:line where function is defined"
 msgstr "Fichier:ligne de définition de la fonction"
 
-#: spyder_profiler/widgets/profilergui.py:570
+#: spyder_profiler/widgets/profilergui.py:575
 msgid "recursion"
 msgstr "récursion"
diff --git a/spyder_profiler/locale/profiler.pot b/spyder_profiler/locale/profiler.pot
index 7d5c866..5b79f0e 100644
--- a/spyder_profiler/locale/profiler.pot
+++ b/spyder_profiler/locale/profiler.pot
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-08-29 22:49+COT\n"
+"POT-Creation-Date: 2016-09-24 04:45+COT\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"
@@ -15,166 +15,169 @@ msgstr ""
 "Generated-By: pygettext.py 1.5\n"
 
 
-#: spyder_profiler/profiler.py:27
+#: spyder_profiler/profiler.py:33
 msgid "Results"
 msgstr ""
 
-#: spyder_profiler/profiler.py:28
+#: spyder_profiler/profiler.py:34
 msgid ""
 "Profiler plugin results (the output of python's profile/cProfile)\n"
 "are stored here:"
 msgstr ""
 
-#: spyder_profiler/profiler.py:68
+#: spyder_profiler/profiler.py:75
 msgid "Profiler"
 msgstr ""
 
-#: spyder_profiler/profiler.py:96
-#: spyder_profiler/widgets/profilergui.py:76
+#: spyder_profiler/profiler.py:104 spyder_profiler/widgets/profilergui.py:81
 msgid "Profile"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:77
+#: spyder_profiler/widgets/profilergui.py:82
 msgid "Run profiler"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:82
+#: spyder_profiler/widgets/profilergui.py:87
 msgid "Stop"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:83
+#: spyder_profiler/widgets/profilergui.py:88
 msgid "Stop current profiling"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:91
-#: spyder_profiler/widgets/profilergui.py:214
+#: spyder_profiler/widgets/profilergui.py:96
+#: spyder_profiler/widgets/profilergui.py:219
 msgid "Select Python script"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:97
+#: spyder_profiler/widgets/profilergui.py:102
 msgid "Output"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:99
+#: spyder_profiler/widgets/profilergui.py:104
 msgid "Show program's output"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:108
+#: spyder_profiler/widgets/profilergui.py:113
 msgid "Collapse one level up"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:113
+#: spyder_profiler/widgets/profilergui.py:118
 msgid "Expand one level down"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:116
+#: spyder_profiler/widgets/profilergui.py:121
 msgid "Save data"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:119
+#: spyder_profiler/widgets/profilergui.py:124
 msgid "Save profiling data"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:121
+#: spyder_profiler/widgets/profilergui.py:126
 msgid "Load data"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:124
+#: spyder_profiler/widgets/profilergui.py:129
 msgid "Load profiling data for comparison"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:126
+#: spyder_profiler/widgets/profilergui.py:131
 msgid "Clear comparison"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:166
+#: spyder_profiler/widgets/profilergui.py:171
 msgid "Please install"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:167
+#: spyder_profiler/widgets/profilergui.py:172
 msgid "the Python profiler modules"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:174
+#: spyder_profiler/widgets/profilergui.py:179
 msgid "Save profiler result"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:177
-#: spyder_profiler/widgets/profilergui.py:183
+#: spyder_profiler/widgets/profilergui.py:182
+#: spyder_profiler/widgets/profilergui.py:188
 msgid "Profiler result"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:182
+#: spyder_profiler/widgets/profilergui.py:187
 msgid "Select script to compare"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:215
+#: spyder_profiler/widgets/profilergui.py:220
 msgid "Python scripts"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:222
 #: spyder_profiler/widgets/profilergui.py:227
+#: spyder_profiler/widgets/profilergui.py:232
 msgid "Profiler output"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:246
+#: spyder_profiler/widgets/profilergui.py:251
 msgid "Profiling, please wait..."
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:290
+#: spyder_profiler/widgets/profilergui.py:295
 msgid "Error"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:291
+#: spyder_profiler/widgets/profilergui.py:296
 msgid "Process failed to start"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:338
+#: spyder_profiler/widgets/profilergui.py:343
 msgid "Sorting data, please wait..."
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:384
+#: spyder_profiler/widgets/profilergui.py:389
 msgid "Function/Module"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:384
+#: spyder_profiler/widgets/profilergui.py:389
 msgid "Total Time"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:384
-#: spyder_profiler/widgets/profilergui.py:385
+#: spyder_profiler/widgets/profilergui.py:389
+#: spyder_profiler/widgets/profilergui.py:390
 msgid "Diff"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:385
+#: spyder_profiler/widgets/profilergui.py:390
 msgid "Calls"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:385
+#: spyder_profiler/widgets/profilergui.py:390
 msgid "Local Time"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:386
+#: spyder_profiler/widgets/profilergui.py:391
 msgid "File:line"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:536
+#: spyder_profiler/widgets/profilergui.py:537
+msgid "Function or module name"
+msgstr ""
+
+#: spyder_profiler/widgets/profilergui.py:541
 msgid "Time in function (including sub-functions)"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:545
+#: spyder_profiler/widgets/profilergui.py:550
 msgid "Local time in function (not in sub-functions)"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:555
+#: spyder_profiler/widgets/profilergui.py:560
 msgid "Total number of calls (including recursion)"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:565
+#: spyder_profiler/widgets/profilergui.py:570
 msgid "File:line where function is defined"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:570
+#: spyder_profiler/widgets/profilergui.py:575
 msgid "recursion"
 msgstr ""
 
diff --git a/spyder_profiler/locale/pt_BR/LC_MESSAGES/profiler.mo b/spyder_profiler/locale/pt_BR/LC_MESSAGES/profiler.mo
index d32074a..a856e7c 100644
Binary files a/spyder_profiler/locale/pt_BR/LC_MESSAGES/profiler.mo and b/spyder_profiler/locale/pt_BR/LC_MESSAGES/profiler.mo differ
diff --git a/spyder_profiler/locale/pt_BR/LC_MESSAGES/profiler.po b/spyder_profiler/locale/pt_BR/LC_MESSAGES/profiler.po
index b362279..c3ada9b 100644
--- a/spyder_profiler/locale/pt_BR/LC_MESSAGES/profiler.po
+++ b/spyder_profiler/locale/pt_BR/LC_MESSAGES/profiler.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2015-08-29 22:49+COT\n"
+"POT-Creation-Date: 2016-09-24 04:45+COT\n"
 "PO-Revision-Date: 2015-02-25 22:08-0400\n"
 "Last-Translator: Valter Nazianzeno <manipuladordedados at gmail.com>\n"
 "Language-Team: \n"
@@ -16,166 +16,170 @@ msgstr ""
 "Generated-By: pygettext.py 1.5\n"
 "X-Generator: Poedit 1.7.4\n"
 
-#: spyder_profiler/profiler.py:27
+#: spyder_profiler/profiler.py:33
 msgid "Results"
 msgstr "Resultados"
 
-#: spyder_profiler/profiler.py:28
+#: spyder_profiler/profiler.py:34
 msgid ""
 "Profiler plugin results (the output of python's profile/cProfile)\n"
 "are stored here:"
 msgstr "Os resultados do plugin Profiler são armazenados aqui: "
 
-#: spyder_profiler/profiler.py:68
+#: spyder_profiler/profiler.py:75
 msgid "Profiler"
 msgstr "Profiler"
 
-#: spyder_profiler/profiler.py:96
-#: spyder_profiler/widgets/profilergui.py:76
+#: spyder_profiler/profiler.py:104 spyder_profiler/widgets/profilergui.py:81
 msgid "Profile"
 msgstr "Profiler"
 
-#: spyder_profiler/widgets/profilergui.py:77
+#: spyder_profiler/widgets/profilergui.py:82
 msgid "Run profiler"
 msgstr "Executar Profiler"
 
-#: spyder_profiler/widgets/profilergui.py:82
+#: spyder_profiler/widgets/profilergui.py:87
 msgid "Stop"
 msgstr "Parar"
 
-#: spyder_profiler/widgets/profilergui.py:83
+#: spyder_profiler/widgets/profilergui.py:88
 msgid "Stop current profiling"
 msgstr "Parar processo atual"
 
-#: spyder_profiler/widgets/profilergui.py:91
-#: spyder_profiler/widgets/profilergui.py:214
+#: spyder_profiler/widgets/profilergui.py:96
+#: spyder_profiler/widgets/profilergui.py:219
 msgid "Select Python script"
 msgstr "Selecionar script Python"
 
-#: spyder_profiler/widgets/profilergui.py:97
+#: spyder_profiler/widgets/profilergui.py:102
 msgid "Output"
 msgstr "Saída"
 
-#: spyder_profiler/widgets/profilergui.py:99
+#: spyder_profiler/widgets/profilergui.py:104
 msgid "Show program's output"
 msgstr "Mostrar saída do programa"
 
-#: spyder_profiler/widgets/profilergui.py:108
+#: spyder_profiler/widgets/profilergui.py:113
 msgid "Collapse one level up"
 msgstr "Subir um nível"
 
-#: spyder_profiler/widgets/profilergui.py:113
+#: spyder_profiler/widgets/profilergui.py:118
 msgid "Expand one level down"
 msgstr "Descer um nível"
 
-#: spyder_profiler/widgets/profilergui.py:116
+#: spyder_profiler/widgets/profilergui.py:121
 msgid "Save data"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:119
+#: spyder_profiler/widgets/profilergui.py:124
 msgid "Save profiling data"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:121
+#: spyder_profiler/widgets/profilergui.py:126
 msgid "Load data"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:124
+#: spyder_profiler/widgets/profilergui.py:129
 msgid "Load profiling data for comparison"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:126
+#: spyder_profiler/widgets/profilergui.py:131
 msgid "Clear comparison"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:166
+#: spyder_profiler/widgets/profilergui.py:171
 msgid "Please install"
 msgstr "Por favor instale"
 
-#: spyder_profiler/widgets/profilergui.py:167
+#: spyder_profiler/widgets/profilergui.py:172
 msgid "the Python profiler modules"
 msgstr "Módulos do Python Profiler"
 
-#: spyder_profiler/widgets/profilergui.py:174
+#: spyder_profiler/widgets/profilergui.py:179
 msgid "Save profiler result"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:177
-#: spyder_profiler/widgets/profilergui.py:183
+#: spyder_profiler/widgets/profilergui.py:182
+#: spyder_profiler/widgets/profilergui.py:188
 #, fuzzy
 msgid "Profiler result"
 msgstr "Saída do Profiler"
 
-#: spyder_profiler/widgets/profilergui.py:182
+#: spyder_profiler/widgets/profilergui.py:187
 msgid "Select script to compare"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:215
+#: spyder_profiler/widgets/profilergui.py:220
 msgid "Python scripts"
 msgstr "Scripts Python"
 
-#: spyder_profiler/widgets/profilergui.py:222
 #: spyder_profiler/widgets/profilergui.py:227
+#: spyder_profiler/widgets/profilergui.py:232
 msgid "Profiler output"
 msgstr "Saída do Profiler"
 
-#: spyder_profiler/widgets/profilergui.py:246
+#: spyder_profiler/widgets/profilergui.py:251
 msgid "Profiling, please wait..."
 msgstr "Processando..."
 
-#: spyder_profiler/widgets/profilergui.py:290
+#: spyder_profiler/widgets/profilergui.py:295
 msgid "Error"
 msgstr "Erro"
 
-#: spyder_profiler/widgets/profilergui.py:291
+#: spyder_profiler/widgets/profilergui.py:296
 msgid "Process failed to start"
 msgstr "O processo falhou ao iniciar"
 
-#: spyder_profiler/widgets/profilergui.py:338
+#: spyder_profiler/widgets/profilergui.py:343
 msgid "Sorting data, please wait..."
 msgstr "Ordenando dados..."
 
-#: spyder_profiler/widgets/profilergui.py:384
+#: spyder_profiler/widgets/profilergui.py:389
 msgid "Function/Module"
 msgstr "Função/Módulo"
 
-#: spyder_profiler/widgets/profilergui.py:384
+#: spyder_profiler/widgets/profilergui.py:389
 msgid "Total Time"
 msgstr "Tempo Total"
 
-#: spyder_profiler/widgets/profilergui.py:384
-#: spyder_profiler/widgets/profilergui.py:385
+#: spyder_profiler/widgets/profilergui.py:389
+#: spyder_profiler/widgets/profilergui.py:390
 msgid "Diff"
 msgstr ""
 
-#: spyder_profiler/widgets/profilergui.py:385
+#: spyder_profiler/widgets/profilergui.py:390
 msgid "Calls"
 msgstr "Chamadas"
 
-#: spyder_profiler/widgets/profilergui.py:385
+#: spyder_profiler/widgets/profilergui.py:390
 msgid "Local Time"
 msgstr "Hora Local"
 
-#: spyder_profiler/widgets/profilergui.py:386
+#: spyder_profiler/widgets/profilergui.py:391
 msgid "File:line"
 msgstr "Arquivo/Linha"
 
-#: spyder_profiler/widgets/profilergui.py:536
+#: spyder_profiler/widgets/profilergui.py:537
+#, fuzzy
+msgid "Function or module name"
+msgstr "Função/Módulo"
+
+#: spyder_profiler/widgets/profilergui.py:541
 msgid "Time in function (including sub-functions)"
 msgstr "Tempo decorrido na função (sub-funções incluídas)"
 
-#: spyder_profiler/widgets/profilergui.py:545
+#: spyder_profiler/widgets/profilergui.py:550
 msgid "Local time in function (not in sub-functions)"
 msgstr "Tempo decorrido na função (excluindo sub-funções)"
 
-#: spyder_profiler/widgets/profilergui.py:555
+#: spyder_profiler/widgets/profilergui.py:560
 msgid "Total number of calls (including recursion)"
 msgstr "Número total de chamadas (incluindo recursão)"
 
-#: spyder_profiler/widgets/profilergui.py:565
+#: spyder_profiler/widgets/profilergui.py:570
 msgid "File:line where function is defined"
 msgstr "Arquivo/Linha onde a função está definida"
 
-#: spyder_profiler/widgets/profilergui.py:570
+#: spyder_profiler/widgets/profilergui.py:575
 msgid "recursion"
 msgstr "recursão"
diff --git a/spyder_profiler/locale/ru/LC_MESSAGES/profiler.mo b/spyder_profiler/locale/ru/LC_MESSAGES/profiler.mo
index 169063e..27377d3 100644
Binary files a/spyder_profiler/locale/ru/LC_MESSAGES/profiler.mo and b/spyder_profiler/locale/ru/LC_MESSAGES/profiler.mo differ
diff --git a/spyder_profiler/locale/ru/LC_MESSAGES/profiler.po b/spyder_profiler/locale/ru/LC_MESSAGES/profiler.po
index 7735971..6da2b24 100644
--- a/spyder_profiler/locale/ru/LC_MESSAGES/profiler.po
+++ b/spyder_profiler/locale/ru/LC_MESSAGES/profiler.po
@@ -5,24 +5,24 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2016-03-21 22:00+0300\n"
-"PO-Revision-Date: 2016-04-18 20:14+0300\n"
+"POT-Creation-Date: 2016-09-24 04:45+COT\n"
+"PO-Revision-Date: 2016-09-21 14:46+0300\n"
+"Last-Translator: Roman Kulagin <Roman.Qlogin at gmail.com>\n"
 "Language-Team: \n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: pygettext.py 1.5\n"
 "X-Generator: Poedit 1.5.4\n"
-"Last-Translator: Roman Kulagin <Roman.Qlogin at gmail.com>\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"Language: ru\n"
 
-#: spyder_profiler/profiler.py:27
+#: spyder_profiler/profiler.py:33
 msgid "Results"
 msgstr "Результаты"
 
-#: spyder_profiler/profiler.py:28
+#: spyder_profiler/profiler.py:34
 msgid ""
 "Profiler plugin results (the output of python's profile/cProfile)\n"
 "are stored here:"
@@ -30,155 +30,158 @@ msgstr ""
 "Результаты Профайлера (вывод profile/cProfile python'а)\n"
 "хранятся здесь:"
 
-#: spyder_profiler/profiler.py:68
+#: spyder_profiler/profiler.py:75
 msgid "Profiler"
 msgstr "Профайлер"
 
-#: spyder_profiler/profiler.py:96
-#: spyder_profiler/widgets/profilergui.py:76
+#: spyder_profiler/profiler.py:104 spyder_profiler/widgets/profilergui.py:81
 msgid "Profile"
 msgstr "Профилировать"
 
-#: spyder_profiler/widgets/profilergui.py:77
+#: spyder_profiler/widgets/profilergui.py:82
 msgid "Run profiler"
 msgstr "Запустить профайлер"
 
-#: spyder_profiler/widgets/profilergui.py:82
+#: spyder_profiler/widgets/profilergui.py:87
 msgid "Stop"
 msgstr "Стоп"
 
-#: spyder_profiler/widgets/profilergui.py:83
+#: spyder_profiler/widgets/profilergui.py:88
 msgid "Stop current profiling"
 msgstr "Остановить текущее профилирование"
 
-#: spyder_profiler/widgets/profilergui.py:91
-#: spyder_profiler/widgets/profilergui.py:214
+#: spyder_profiler/widgets/profilergui.py:96
+#: spyder_profiler/widgets/profilergui.py:219
 msgid "Select Python script"
 msgstr "Выбрать скрипт Python"
 
-#: spyder_profiler/widgets/profilergui.py:97
+#: spyder_profiler/widgets/profilergui.py:102
 msgid "Output"
 msgstr "Вывод"
 
-#: spyder_profiler/widgets/profilergui.py:99
+#: spyder_profiler/widgets/profilergui.py:104
 msgid "Show program's output"
 msgstr "Показать вывод программы"
 
-#: spyder_profiler/widgets/profilergui.py:108
+#: spyder_profiler/widgets/profilergui.py:113
 msgid "Collapse one level up"
 msgstr "Свернуть на один уровень вверх"
 
-#: spyder_profiler/widgets/profilergui.py:113
+#: spyder_profiler/widgets/profilergui.py:118
 msgid "Expand one level down"
 msgstr "Раскрыть на один уровень вниз"
 
-#: spyder_profiler/widgets/profilergui.py:116
+#: spyder_profiler/widgets/profilergui.py:121
 msgid "Save data"
 msgstr "Сохранить данные"
 
-#: spyder_profiler/widgets/profilergui.py:119
+#: spyder_profiler/widgets/profilergui.py:124
 msgid "Save profiling data"
 msgstr "Сохранить данные профилирования"
 
-#: spyder_profiler/widgets/profilergui.py:121
+#: spyder_profiler/widgets/profilergui.py:126
 msgid "Load data"
 msgstr "Загрузить данные"
 
-#: spyder_profiler/widgets/profilergui.py:124
+#: spyder_profiler/widgets/profilergui.py:129
 msgid "Load profiling data for comparison"
 msgstr "Загрузить данные профилирования для сравнения"
 
-#: spyder_profiler/widgets/profilergui.py:126
+#: spyder_profiler/widgets/profilergui.py:131
 msgid "Clear comparison"
 msgstr "Очистить сравнение"
 
-#: spyder_profiler/widgets/profilergui.py:166
+#: spyder_profiler/widgets/profilergui.py:171
 msgid "Please install"
 msgstr "Пожалуйста, установите"
 
-#: spyder_profiler/widgets/profilergui.py:167
+#: spyder_profiler/widgets/profilergui.py:172
 msgid "the Python profiler modules"
 msgstr "модули профайлера Python"
 
-#: spyder_profiler/widgets/profilergui.py:174
+#: spyder_profiler/widgets/profilergui.py:179
 msgid "Save profiler result"
 msgstr "Сохранить результаты профилирования"
 
-#: spyder_profiler/widgets/profilergui.py:177
-#: spyder_profiler/widgets/profilergui.py:183
+#: spyder_profiler/widgets/profilergui.py:182
+#: spyder_profiler/widgets/profilergui.py:188
 msgid "Profiler result"
 msgstr "Результаты профилирования"
 
-#: spyder_profiler/widgets/profilergui.py:182
+#: spyder_profiler/widgets/profilergui.py:187
 msgid "Select script to compare"
 msgstr "Выберите скрипт для сравнения"
 
-#: spyder_profiler/widgets/profilergui.py:215
+#: spyder_profiler/widgets/profilergui.py:220
 msgid "Python scripts"
 msgstr "Скрипты Python"
 
-#: spyder_profiler/widgets/profilergui.py:222
 #: spyder_profiler/widgets/profilergui.py:227
+#: spyder_profiler/widgets/profilergui.py:232
 msgid "Profiler output"
 msgstr "Вывод профайлера"
 
-#: spyder_profiler/widgets/profilergui.py:246
+#: spyder_profiler/widgets/profilergui.py:251
 msgid "Profiling, please wait..."
 msgstr "Профилирование, пожалуйста, подождите..."
 
-#: spyder_profiler/widgets/profilergui.py:290
+#: spyder_profiler/widgets/profilergui.py:295
 msgid "Error"
 msgstr "Ошибка"
 
-#: spyder_profiler/widgets/profilergui.py:291
+#: spyder_profiler/widgets/profilergui.py:296
 msgid "Process failed to start"
 msgstr "Процесс не удалось запустить"
 
-#: spyder_profiler/widgets/profilergui.py:338
+#: spyder_profiler/widgets/profilergui.py:343
 msgid "Sorting data, please wait..."
 msgstr "Сортировка данных, пожалуйста, подождите..."
 
-#: spyder_profiler/widgets/profilergui.py:384
+#: spyder_profiler/widgets/profilergui.py:389
 msgid "Function/Module"
 msgstr "Функция/Модуль"
 
-#: spyder_profiler/widgets/profilergui.py:384
+#: spyder_profiler/widgets/profilergui.py:389
 msgid "Total Time"
 msgstr "Общее время"
 
-#: spyder_profiler/widgets/profilergui.py:384
-#: spyder_profiler/widgets/profilergui.py:385
+#: spyder_profiler/widgets/profilergui.py:389
+#: spyder_profiler/widgets/profilergui.py:390
 msgid "Diff"
 msgstr "Различие"
 
-#: spyder_profiler/widgets/profilergui.py:385
+#: spyder_profiler/widgets/profilergui.py:390
 msgid "Calls"
 msgstr "Вызовы"
 
-#: spyder_profiler/widgets/profilergui.py:385
+#: spyder_profiler/widgets/profilergui.py:390
 msgid "Local Time"
 msgstr "Локальное время"
 
-#: spyder_profiler/widgets/profilergui.py:386
+#: spyder_profiler/widgets/profilergui.py:391
 msgid "File:line"
 msgstr "Файл:строка"
 
-#: spyder_profiler/widgets/profilergui.py:536
+#: spyder_profiler/widgets/profilergui.py:537
+msgid "Function or module name"
+msgstr "Функция/Модуль"
+
+#: spyder_profiler/widgets/profilergui.py:541
 msgid "Time in function (including sub-functions)"
 msgstr "Время в функции (включая подфункции)"
 
-#: spyder_profiler/widgets/profilergui.py:545
+#: spyder_profiler/widgets/profilergui.py:550
 msgid "Local time in function (not in sub-functions)"
 msgstr "Локальное время в функции (исключая подфункции)"
 
-#: spyder_profiler/widgets/profilergui.py:555
+#: spyder_profiler/widgets/profilergui.py:560
 msgid "Total number of calls (including recursion)"
 msgstr "Общее число вызовов (включая рекурсию)"
 
-#: spyder_profiler/widgets/profilergui.py:565
+#: spyder_profiler/widgets/profilergui.py:570
 msgid "File:line where function is defined"
 msgstr "Файл:строка, где функция определена"
 
-#: spyder_profiler/widgets/profilergui.py:570
+#: spyder_profiler/widgets/profilergui.py:575
 msgid "recursion"
 msgstr "рекурсия"
diff --git a/spyder_profiler/profiler.py b/spyder_profiler/profiler.py
index fcddbdf..19c01bd 100644
--- a/spyder_profiler/profiler.py
+++ b/spyder_profiler/profiler.py
@@ -1,10 +1,10 @@
 # -*- coding:utf-8 -*-
 #
-# Copyright © 2009- The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # based on p_pylint.py by Pierre Raybaut
 #
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """Profiler Plugin."""
 
@@ -16,10 +16,12 @@ from qtpy.QtCore import Qt, Signal
 from qtpy.QtWidgets import QGroupBox, QLabel, QVBoxLayout
 
 # Local imports
-from spyderlib.config.base import get_translation
-from spyderlib.plugins import SpyderPluginMixin, PluginConfigPage, runconfig
-from spyderlib.utils import icon_manager as ima
-from spyderlib.utils.qthelpers import create_action
+from spyder.config.base import get_translation
+from spyder.plugins import SpyderPluginMixin
+from spyder.plugins.configdialog import PluginConfigPage
+from spyder.plugins.runconfig import get_run_configuration
+from spyder.utils import icon_manager as ima
+from spyder.utils.qthelpers import create_action
 from .widgets.profilergui import (ProfilerWidget, is_profiler_installed)
 
 
@@ -136,7 +138,7 @@ class Profiler(ProfilerWidget, SpyderPluginMixin):
             self.dockwidget.setFocus()
             self.dockwidget.raise_()
         pythonpath = self.main.get_spyder_pythonpath()
-        runconf = runconfig.get_run_configuration(filename)
+        runconf = get_run_configuration(filename)
         wdir, args = None, []
         if runconf is not None:
             if runconf.wdir_enabled:
diff --git a/spyder_profiler/widgets/profilergui.py b/spyder_profiler/widgets/profilergui.py
index dd19464..8d26f13 100644
--- a/spyder_profiler/widgets/profilergui.py
+++ b/spyder_profiler/widgets/profilergui.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # based on pylintgui.py by Pierre Raybaut
 #
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """
 Profiler widget
@@ -29,15 +29,15 @@ from qtpy.QtWidgets import (QApplication, QHBoxLayout, QLabel, QMessageBox,
                             QTreeWidget, QTreeWidgetItem, QVBoxLayout, QWidget)
 
 # Local imports
-from spyderlib.config.base import get_conf_path, get_translation
-from spyderlib.py3compat import getcwd, to_text_string
-from spyderlib.utils import icon_manager as ima
-from spyderlib.utils.qthelpers import (create_toolbutton, get_item_user_text,
-                                       set_item_user_text)
-from spyderlib.utils.programs import shell_split
-from spyderlib.widgets.comboboxes import PythonModulesComboBox
-from spyderlib.widgets.externalshell import baseshell
-from spyderlib.widgets.variableexplorer.texteditor import TextEditor
+from spyder.config.base import get_conf_path, get_translation
+from spyder.py3compat import getcwd, to_text_string
+from spyder.utils import icon_manager as ima
+from spyder.utils.qthelpers import (create_toolbutton, get_item_user_text,
+                                    set_item_user_text)
+from spyder.utils.programs import shell_split
+from spyder.widgets.comboboxes import PythonModulesComboBox
+from spyder.utils.misc import add_pathlist_to_PYTHONPATH
+from spyder.widgets.variableexplorer.texteditor import TextEditor
 
 # This is needed for testing this module as a stand alone script
 try:
@@ -51,7 +51,7 @@ locale_codec = QTextCodec.codecForLocale()
 
 
 def is_profiler_installed():
-    from spyderlib.utils.programs import is_module_installed
+    from spyder.utils.programs import is_module_installed
     return is_module_installed('cProfile') and is_module_installed('pstats')
 
 
@@ -263,7 +263,7 @@ class ProfilerWidget(QWidget):
         if pythonpath is not None:
             env = [to_text_string(_pth)
                    for _pth in self.process.systemEnvironment()]
-            baseshell.add_pathlist_to_PYTHONPATH(env, pythonpath)
+            add_pathlist_to_PYTHONPATH(env, pythonpath)
             processEnvironment = QProcessEnvironment()
             for envItem in env:
                 envName, separator, envValue = envItem.partition('=')
@@ -534,7 +534,7 @@ class ProfilerDataTree(QTreeWidget):
             self.set_item_data(child_item, filename, line_number)
 
             # FIXME: indexes to data should be defined by a dictionary on init
-            child_item.setToolTip(0, 'Function or module name')
+            child_item.setToolTip(0, _('Function or module name'))
             child_item.setData(0, Qt.DisplayRole, function_name)
             child_item.setIcon(0, self.icon_list[node_type])
 
@@ -670,7 +670,7 @@ def test():
     """Run widget test"""
     import inspect
     import tempfile
-    from spyderlib.utils.qthelpers import qapplication
+    from spyder.utils.qthelpers import qapplication
 
     primes_sc = inspect.getsource(primes)
     fd, script = tempfile.mkstemp(suffix='.py')
diff --git a/spyder_pylint/locale/es/LC_MESSAGES/pylint.mo b/spyder_pylint/locale/es/LC_MESSAGES/pylint.mo
index 483dfd5..bd33c42 100644
Binary files a/spyder_pylint/locale/es/LC_MESSAGES/pylint.mo and b/spyder_pylint/locale/es/LC_MESSAGES/pylint.mo differ
diff --git a/spyder_pylint/locale/es/LC_MESSAGES/pylint.po b/spyder_pylint/locale/es/LC_MESSAGES/pylint.po
index b381c93..63011ab 100644
--- a/spyder_pylint/locale/es/LC_MESSAGES/pylint.po
+++ b/spyder_pylint/locale/es/LC_MESSAGES/pylint.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.1\n"
-"POT-Creation-Date: 2015-08-29 22:49+COT\n"
+"POT-Creation-Date: 2016-09-24 04:45+COT\n"
 "PO-Revision-Date: 2014-05-18 16:44-0500\n"
 "Last-Translator: Carlos Cordoba <ccordoba12 at gmail.com>\n"
 "Language-Team: Python\n"
@@ -18,143 +18,142 @@ msgstr ""
 "X-Poedit-Basepath: ../../../../\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#: spyder_pylint/pylint.py:29
+#: spyder_pylint/pylint.py:35
 msgid "Settings"
 msgstr "Ajustes"
 
-#: spyder_pylint/pylint.py:30
+#: spyder_pylint/pylint.py:36
 msgid "Save file before analyzing it"
 msgstr "Guardar archivo antes de analizarlo"
 
-#: spyder_pylint/pylint.py:33 spyder_pylint/pylint.py:152
+#: spyder_pylint/pylint.py:39 spyder_pylint/pylint.py:160
 msgid "History"
 msgstr "Historial"
 
-#: spyder_pylint/pylint.py:34
+#: spyder_pylint/pylint.py:40
 msgid "The following option will be applied at next startup."
 msgstr "La siguiente opción será aplicada la próxima vez que se inicie Spyder"
 
-#: spyder_pylint/pylint.py:37
+#: spyder_pylint/pylint.py:43
 msgid "History: "
 msgstr "Guardar"
 
-#: spyder_pylint/pylint.py:38
+#: spyder_pylint/pylint.py:44
 msgid " results"
 msgstr " resultados"
 
-#: spyder_pylint/pylint.py:41
+#: spyder_pylint/pylint.py:47
 msgid "Results"
 msgstr "Resultados"
 
-#: spyder_pylint/pylint.py:42
+#: spyder_pylint/pylint.py:48
 msgid "Results are stored here:"
 msgstr "Los resultados se guardan en:"
 
-#: spyder_pylint/pylint.py:92
-#: spyder_pylint/widgets/pylintgui.py:73
+#: spyder_pylint/pylint.py:98 spyder_pylint/widgets/pylintgui.py:83
 msgid "Static code analysis"
 msgstr "Análisis estático del código"
 
-#: spyder_pylint/pylint.py:108
+#: spyder_pylint/pylint.py:115
 msgid "History..."
 msgstr ""
 
-#: spyder_pylint/pylint.py:110
+#: spyder_pylint/pylint.py:117
 msgid "Set history maximum entries"
 msgstr ""
 
-#: spyder_pylint/pylint.py:126
+#: spyder_pylint/pylint.py:133
 msgid "Run static code analysis"
 msgstr "Realizar análisis estático del código"
 
-#: spyder_pylint/pylint.py:153
+#: spyder_pylint/pylint.py:161
 msgid "Maximum entries"
 msgstr ""
 
-#: spyder_pylint/widgets/pylintgui.py:107
+#: spyder_pylint/widgets/pylintgui.py:117
 msgid "Results for "
 msgstr ""
 
-#: spyder_pylint/widgets/pylintgui.py:112
+#: spyder_pylint/widgets/pylintgui.py:122
 msgid "Convention"
 msgstr ""
 
-#: spyder_pylint/widgets/pylintgui.py:114
+#: spyder_pylint/widgets/pylintgui.py:124
 msgid "Refactor"
 msgstr ""
 
-#: spyder_pylint/widgets/pylintgui.py:116
+#: spyder_pylint/widgets/pylintgui.py:126
 msgid "Warning"
 msgstr ""
 
-#: spyder_pylint/widgets/pylintgui.py:118
-#: spyder_pylint/widgets/pylintgui.py:350
-#: spyder_pylint/widgets/pylintgui.py:378
+#: spyder_pylint/widgets/pylintgui.py:128
+#: spyder_pylint/widgets/pylintgui.py:363
+#: spyder_pylint/widgets/pylintgui.py:391
 msgid "Error"
 msgstr ""
 
-#: spyder_pylint/widgets/pylintgui.py:196
+#: spyder_pylint/widgets/pylintgui.py:206
 msgid "Analyze"
 msgstr ""
 
-#: spyder_pylint/widgets/pylintgui.py:197
+#: spyder_pylint/widgets/pylintgui.py:207
 msgid "Run analysis"
 msgstr ""
 
-#: spyder_pylint/widgets/pylintgui.py:201
+#: spyder_pylint/widgets/pylintgui.py:211
 msgid "Stop"
 msgstr ""
 
-#: spyder_pylint/widgets/pylintgui.py:202
+#: spyder_pylint/widgets/pylintgui.py:212
 msgid "Stop current analysis"
 msgstr ""
 
-#: spyder_pylint/widgets/pylintgui.py:208
-#: spyder_pylint/widgets/pylintgui.py:277
+#: spyder_pylint/widgets/pylintgui.py:218
+#: spyder_pylint/widgets/pylintgui.py:288
 msgid "Select Python file"
 msgstr ""
 
-#: spyder_pylint/widgets/pylintgui.py:214
+#: spyder_pylint/widgets/pylintgui.py:224
 msgid "Output"
 msgstr ""
 
-#: spyder_pylint/widgets/pylintgui.py:216
+#: spyder_pylint/widgets/pylintgui.py:226
 msgid "Complete output"
 msgstr ""
 
-#: spyder_pylint/widgets/pylintgui.py:250
+#: spyder_pylint/widgets/pylintgui.py:260
 msgid "Pylint script was not found. Please add \"%s\" to PATH."
 msgstr ""
 
-#: spyder_pylint/widgets/pylintgui.py:253
+#: spyder_pylint/widgets/pylintgui.py:263
 msgid "Please install <b>pylint</b>:"
 msgstr ""
 
-#: spyder_pylint/widgets/pylintgui.py:278
+#: spyder_pylint/widgets/pylintgui.py:289
 msgid "Python files"
 msgstr ""
 
-#: spyder_pylint/widgets/pylintgui.py:314
+#: spyder_pylint/widgets/pylintgui.py:326
 msgid "Pylint output"
 msgstr ""
 
-#: spyder_pylint/widgets/pylintgui.py:351
+#: spyder_pylint/widgets/pylintgui.py:364
 msgid "Process failed to start"
 msgstr ""
 
-#: spyder_pylint/widgets/pylintgui.py:452
+#: spyder_pylint/widgets/pylintgui.py:465
 msgid "Source code has not been rated yet."
 msgstr ""
 
-#: spyder_pylint/widgets/pylintgui.py:458
+#: spyder_pylint/widgets/pylintgui.py:471
 msgid "Analysis did not succeed (see output for more details)."
 msgstr ""
 
-#: spyder_pylint/widgets/pylintgui.py:471
+#: spyder_pylint/widgets/pylintgui.py:484
 msgid "Global evaluation:"
 msgstr ""
 
-#: spyder_pylint/widgets/pylintgui.py:475
+#: spyder_pylint/widgets/pylintgui.py:488
 msgid "previous run:"
 msgstr ""
 
diff --git a/spyder_pylint/locale/fr/LC_MESSAGES/pylint.mo b/spyder_pylint/locale/fr/LC_MESSAGES/pylint.mo
index 8572426..2efae21 100644
Binary files a/spyder_pylint/locale/fr/LC_MESSAGES/pylint.mo and b/spyder_pylint/locale/fr/LC_MESSAGES/pylint.mo differ
diff --git a/spyder_pylint/locale/fr/LC_MESSAGES/pylint.po b/spyder_pylint/locale/fr/LC_MESSAGES/pylint.po
index 8e6c9d9..98318b7 100644
--- a/spyder_pylint/locale/fr/LC_MESSAGES/pylint.po
+++ b/spyder_pylint/locale/fr/LC_MESSAGES/pylint.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.1\n"
-"POT-Creation-Date: 2015-08-29 22:49+COT\n"
+"POT-Creation-Date: 2016-09-24 04:45+COT\n"
 "PO-Revision-Date: 2011-04-11 21:41+2\n"
 "Last-Translator: Pierre Raybaut\n"
 "Language-Team: Python\n"
@@ -15,143 +15,142 @@ msgstr ""
 "Content-Transfer-Encoding: utf-8\n"
 "Generated-By: pygettext.py 1.5\n"
 
-#: spyder_pylint/pylint.py:29
+#: spyder_pylint/pylint.py:35
 msgid "Settings"
 msgstr "Options"
 
-#: spyder_pylint/pylint.py:30
+#: spyder_pylint/pylint.py:36
 msgid "Save file before analyzing it"
 msgstr "Enregistrer le fichier avant de l'analyser"
 
-#: spyder_pylint/pylint.py:33 spyder_pylint/pylint.py:152
+#: spyder_pylint/pylint.py:39 spyder_pylint/pylint.py:160
 msgid "History"
 msgstr "Historique"
 
-#: spyder_pylint/pylint.py:34
+#: spyder_pylint/pylint.py:40
 msgid "The following option will be applied at next startup."
 msgstr "L'option suivante ne sera appliquée qu'au prochain démarrage."
 
-#: spyder_pylint/pylint.py:37
+#: spyder_pylint/pylint.py:43
 msgid "History: "
 msgstr "Historique : "
 
-#: spyder_pylint/pylint.py:38
+#: spyder_pylint/pylint.py:44
 msgid " results"
 msgstr " résultats"
 
-#: spyder_pylint/pylint.py:41
+#: spyder_pylint/pylint.py:47
 msgid "Results"
 msgstr "Résultats"
 
-#: spyder_pylint/pylint.py:42
+#: spyder_pylint/pylint.py:48
 msgid "Results are stored here:"
 msgstr "Les résultats sont stockés ici :"
 
-#: spyder_pylint/pylint.py:92
-#: spyder_pylint/widgets/pylintgui.py:73
+#: spyder_pylint/pylint.py:98 spyder_pylint/widgets/pylintgui.py:83
 msgid "Static code analysis"
 msgstr "Analyse de code statique"
 
-#: spyder_pylint/pylint.py:108
+#: spyder_pylint/pylint.py:115
 msgid "History..."
 msgstr "Historique..."
 
-#: spyder_pylint/pylint.py:110
+#: spyder_pylint/pylint.py:117
 msgid "Set history maximum entries"
 msgstr "Modifier le nombre d'entrées maximum de l'historique"
 
-#: spyder_pylint/pylint.py:126
+#: spyder_pylint/pylint.py:133
 msgid "Run static code analysis"
 msgstr "Démarrer l'analyse de code statique"
 
-#: spyder_pylint/pylint.py:153
+#: spyder_pylint/pylint.py:161
 msgid "Maximum entries"
 msgstr "Nombre maximum d'entrées"
 
-#: spyder_pylint/widgets/pylintgui.py:107
+#: spyder_pylint/widgets/pylintgui.py:117
 msgid "Results for "
 msgstr "Résultats pour "
 
-#: spyder_pylint/widgets/pylintgui.py:112
+#: spyder_pylint/widgets/pylintgui.py:122
 msgid "Convention"
 msgstr "Convention"
 
-#: spyder_pylint/widgets/pylintgui.py:114
+#: spyder_pylint/widgets/pylintgui.py:124
 msgid "Refactor"
 msgstr "Factorisation"
 
-#: spyder_pylint/widgets/pylintgui.py:116
+#: spyder_pylint/widgets/pylintgui.py:126
 msgid "Warning"
 msgstr "Avertissement"
 
-#: spyder_pylint/widgets/pylintgui.py:118
-#: spyder_pylint/widgets/pylintgui.py:350
-#: spyder_pylint/widgets/pylintgui.py:378
+#: spyder_pylint/widgets/pylintgui.py:128
+#: spyder_pylint/widgets/pylintgui.py:363
+#: spyder_pylint/widgets/pylintgui.py:391
 msgid "Error"
 msgstr "Erreur"
 
-#: spyder_pylint/widgets/pylintgui.py:196
+#: spyder_pylint/widgets/pylintgui.py:206
 msgid "Analyze"
 msgstr "Analyser"
 
-#: spyder_pylint/widgets/pylintgui.py:197
+#: spyder_pylint/widgets/pylintgui.py:207
 msgid "Run analysis"
 msgstr "Analyser le code source"
 
-#: spyder_pylint/widgets/pylintgui.py:201
+#: spyder_pylint/widgets/pylintgui.py:211
 msgid "Stop"
 msgstr "Arrêter"
 
-#: spyder_pylint/widgets/pylintgui.py:202
+#: spyder_pylint/widgets/pylintgui.py:212
 msgid "Stop current analysis"
 msgstr "Arrêter l'analyse en cours"
 
-#: spyder_pylint/widgets/pylintgui.py:208
-#: spyder_pylint/widgets/pylintgui.py:277
+#: spyder_pylint/widgets/pylintgui.py:218
+#: spyder_pylint/widgets/pylintgui.py:288
 msgid "Select Python file"
 msgstr "Sélectionner un fichier Python"
 
-#: spyder_pylint/widgets/pylintgui.py:214
+#: spyder_pylint/widgets/pylintgui.py:224
 msgid "Output"
 msgstr "Sortie"
 
-#: spyder_pylint/widgets/pylintgui.py:216
+#: spyder_pylint/widgets/pylintgui.py:226
 msgid "Complete output"
 msgstr "Sortie complète"
 
-#: spyder_pylint/widgets/pylintgui.py:250
+#: spyder_pylint/widgets/pylintgui.py:260
 msgid "Pylint script was not found. Please add \"%s\" to PATH."
 msgstr "Le script pylint est introuvable. Merci d'ajouter \"%s\" au PATH."
 
-#: spyder_pylint/widgets/pylintgui.py:253
+#: spyder_pylint/widgets/pylintgui.py:263
 msgid "Please install <b>pylint</b>:"
 msgstr "Merci d'installer au préalable <b>pylint</b> :"
 
-#: spyder_pylint/widgets/pylintgui.py:278
+#: spyder_pylint/widgets/pylintgui.py:289
 msgid "Python files"
 msgstr "Fichiers Python"
 
-#: spyder_pylint/widgets/pylintgui.py:314
+#: spyder_pylint/widgets/pylintgui.py:326
 msgid "Pylint output"
 msgstr "Analyse Pylint"
 
-#: spyder_pylint/widgets/pylintgui.py:351
+#: spyder_pylint/widgets/pylintgui.py:364
 msgid "Process failed to start"
 msgstr "Le processus n'a pas pu démarrer"
 
-#: spyder_pylint/widgets/pylintgui.py:452
+#: spyder_pylint/widgets/pylintgui.py:465
 msgid "Source code has not been rated yet."
 msgstr "Le code source n'a pas encore été analysé."
 
-#: spyder_pylint/widgets/pylintgui.py:458
+#: spyder_pylint/widgets/pylintgui.py:471
 msgid "Analysis did not succeed (see output for more details)."
 msgstr "L'analyse n'a pas réussi (voir la sortie pour plus de détails)."
 
-#: spyder_pylint/widgets/pylintgui.py:471
+#: spyder_pylint/widgets/pylintgui.py:484
 msgid "Global evaluation:"
 msgstr "Évaluation globale :"
 
-#: spyder_pylint/widgets/pylintgui.py:475
+#: spyder_pylint/widgets/pylintgui.py:488
 msgid "previous run:"
 msgstr "analyse précédente :"
 
diff --git a/spyder_pylint/locale/pt_BR/LC_MESSAGES/pylint.mo b/spyder_pylint/locale/pt_BR/LC_MESSAGES/pylint.mo
index 14f6f1f..9af6cf2 100644
Binary files a/spyder_pylint/locale/pt_BR/LC_MESSAGES/pylint.mo and b/spyder_pylint/locale/pt_BR/LC_MESSAGES/pylint.mo differ
diff --git a/spyder_pylint/locale/pt_BR/LC_MESSAGES/pylint.po b/spyder_pylint/locale/pt_BR/LC_MESSAGES/pylint.po
index ff5d711..e8c2092 100644
--- a/spyder_pylint/locale/pt_BR/LC_MESSAGES/pylint.po
+++ b/spyder_pylint/locale/pt_BR/LC_MESSAGES/pylint.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2015-08-29 22:49+COT\n"
+"POT-Creation-Date: 2016-09-24 04:45+COT\n"
 "PO-Revision-Date: 2015-02-25 22:08-0400\n"
 "Last-Translator: Valter Nazianzeno <manipuladordedados at gmail.com>\n"
 "Language-Team: \n"
@@ -16,144 +16,143 @@ msgstr ""
 "Generated-By: pygettext.py 1.5\n"
 "X-Generator: Poedit 1.7.4\n"
 
-#: spyder_pylint/pylint.py:29
+#: spyder_pylint/pylint.py:35
 msgid "Settings"
 msgstr "Configurações"
 
-#: spyder_pylint/pylint.py:30
+#: spyder_pylint/pylint.py:36
 msgid "Save file before analyzing it"
 msgstr "Salvar arquivo antes de analisá-lo"
 
-#: spyder_pylint/pylint.py:33 spyder_pylint/pylint.py:152
+#: spyder_pylint/pylint.py:39 spyder_pylint/pylint.py:160
 msgid "History"
 msgstr "Histórico"
 
-#: spyder_pylint/pylint.py:34
+#: spyder_pylint/pylint.py:40
 msgid "The following option will be applied at next startup."
 msgstr ""
 "A seguinte opção será aplicada na próxima vez que o Spyder for iniciado."
 
-#: spyder_pylint/pylint.py:37
+#: spyder_pylint/pylint.py:43
 msgid "History: "
 msgstr "Histórico:"
 
-#: spyder_pylint/pylint.py:38
+#: spyder_pylint/pylint.py:44
 msgid " results"
 msgstr " resultados"
 
-#: spyder_pylint/pylint.py:41
+#: spyder_pylint/pylint.py:47
 msgid "Results"
 msgstr "Resultados"
 
-#: spyder_pylint/pylint.py:42
+#: spyder_pylint/pylint.py:48
 msgid "Results are stored here:"
 msgstr "Os resultados são armazenados aqui:"
 
-#: spyder_pylint/pylint.py:92
-#: spyder_pylint/widgets/pylintgui.py:73
+#: spyder_pylint/pylint.py:98 spyder_pylint/widgets/pylintgui.py:83
 msgid "Static code analysis"
 msgstr "Análise de código"
 
-#: spyder_pylint/pylint.py:108
+#: spyder_pylint/pylint.py:115
 msgid "History..."
 msgstr "Histórico..."
 
-#: spyder_pylint/pylint.py:110
+#: spyder_pylint/pylint.py:117
 msgid "Set history maximum entries"
 msgstr "Definir número máximo de entradas para o histórico"
 
-#: spyder_pylint/pylint.py:126
+#: spyder_pylint/pylint.py:133
 msgid "Run static code analysis"
 msgstr "Executar análise de código"
 
-#: spyder_pylint/pylint.py:153
+#: spyder_pylint/pylint.py:161
 msgid "Maximum entries"
 msgstr "Número máximo de entradas"
 
-#: spyder_pylint/widgets/pylintgui.py:107
+#: spyder_pylint/widgets/pylintgui.py:117
 msgid "Results for "
 msgstr "Resultados para "
 
-#: spyder_pylint/widgets/pylintgui.py:112
+#: spyder_pylint/widgets/pylintgui.py:122
 msgid "Convention"
 msgstr "Convention"
 
-#: spyder_pylint/widgets/pylintgui.py:114
+#: spyder_pylint/widgets/pylintgui.py:124
 msgid "Refactor"
 msgstr "Refatoração"
 
-#: spyder_pylint/widgets/pylintgui.py:116
+#: spyder_pylint/widgets/pylintgui.py:126
 msgid "Warning"
 msgstr "Aviso"
 
-#: spyder_pylint/widgets/pylintgui.py:118
-#: spyder_pylint/widgets/pylintgui.py:350
-#: spyder_pylint/widgets/pylintgui.py:378
+#: spyder_pylint/widgets/pylintgui.py:128
+#: spyder_pylint/widgets/pylintgui.py:363
+#: spyder_pylint/widgets/pylintgui.py:391
 msgid "Error"
 msgstr "Erro"
 
-#: spyder_pylint/widgets/pylintgui.py:196
+#: spyder_pylint/widgets/pylintgui.py:206
 msgid "Analyze"
 msgstr "Analisar"
 
-#: spyder_pylint/widgets/pylintgui.py:197
+#: spyder_pylint/widgets/pylintgui.py:207
 msgid "Run analysis"
 msgstr "Executar análise"
 
-#: spyder_pylint/widgets/pylintgui.py:201
+#: spyder_pylint/widgets/pylintgui.py:211
 msgid "Stop"
 msgstr "Parar"
 
-#: spyder_pylint/widgets/pylintgui.py:202
+#: spyder_pylint/widgets/pylintgui.py:212
 msgid "Stop current analysis"
 msgstr "Parar análise atual"
 
-#: spyder_pylint/widgets/pylintgui.py:208
-#: spyder_pylint/widgets/pylintgui.py:277
+#: spyder_pylint/widgets/pylintgui.py:218
+#: spyder_pylint/widgets/pylintgui.py:288
 msgid "Select Python file"
 msgstr "Selecionar arquivo Python"
 
-#: spyder_pylint/widgets/pylintgui.py:214
+#: spyder_pylint/widgets/pylintgui.py:224
 msgid "Output"
 msgstr "Saída"
 
-#: spyder_pylint/widgets/pylintgui.py:216
+#: spyder_pylint/widgets/pylintgui.py:226
 msgid "Complete output"
 msgstr "Saída completa"
 
-#: spyder_pylint/widgets/pylintgui.py:250
+#: spyder_pylint/widgets/pylintgui.py:260
 msgid "Pylint script was not found. Please add \"%s\" to PATH."
 msgstr ""
 "O script do Pylint não foi encontrada. Por favor adicione \"%s\" ao PATH."
 
-#: spyder_pylint/widgets/pylintgui.py:253
+#: spyder_pylint/widgets/pylintgui.py:263
 msgid "Please install <b>pylint</b>:"
 msgstr "Por favor instale o <b>pylint</b>:"
 
-#: spyder_pylint/widgets/pylintgui.py:278
+#: spyder_pylint/widgets/pylintgui.py:289
 msgid "Python files"
 msgstr "Arquivos Python"
 
-#: spyder_pylint/widgets/pylintgui.py:314
+#: spyder_pylint/widgets/pylintgui.py:326
 msgid "Pylint output"
 msgstr "Saída do Pylint"
 
-#: spyder_pylint/widgets/pylintgui.py:351
+#: spyder_pylint/widgets/pylintgui.py:364
 msgid "Process failed to start"
 msgstr "O processo falhou ao iniciar"
 
-#: spyder_pylint/widgets/pylintgui.py:452
+#: spyder_pylint/widgets/pylintgui.py:465
 msgid "Source code has not been rated yet."
 msgstr "O código fonte não foi avaliado ainda."
 
-#: spyder_pylint/widgets/pylintgui.py:458
+#: spyder_pylint/widgets/pylintgui.py:471
 msgid "Analysis did not succeed (see output for more details)."
 msgstr "A análise não foi bem sucedida (veja a saída para mais detalhes)."
 
-#: spyder_pylint/widgets/pylintgui.py:471
+#: spyder_pylint/widgets/pylintgui.py:484
 msgid "Global evaluation:"
 msgstr "Avaliação global:"
 
-#: spyder_pylint/widgets/pylintgui.py:475
+#: spyder_pylint/widgets/pylintgui.py:488
 msgid "previous run:"
 msgstr "análise anterior:"
diff --git a/spyder_pylint/locale/pylint.pot b/spyder_pylint/locale/pylint.pot
index 6cd640d..71ba763 100644
--- a/spyder_pylint/locale/pylint.pot
+++ b/spyder_pylint/locale/pylint.pot
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-08-29 22:49+COT\n"
+"POT-Creation-Date: 2016-09-24 04:45+COT\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"
@@ -15,143 +15,142 @@ msgstr ""
 "Generated-By: pygettext.py 1.5\n"
 
 
-#: spyder_pylint/pylint.py:29
+#: spyder_pylint/pylint.py:35
 msgid "Settings"
 msgstr ""
 
-#: spyder_pylint/pylint.py:30
+#: spyder_pylint/pylint.py:36
 msgid "Save file before analyzing it"
 msgstr ""
 
-#: spyder_pylint/pylint.py:33 spyder_pylint/pylint.py:152
+#: spyder_pylint/pylint.py:39 spyder_pylint/pylint.py:160
 msgid "History"
 msgstr ""
 
-#: spyder_pylint/pylint.py:34
+#: spyder_pylint/pylint.py:40
 msgid "The following option will be applied at next startup."
 msgstr ""
 
-#: spyder_pylint/pylint.py:37
+#: spyder_pylint/pylint.py:43
 msgid "History: "
 msgstr ""
 
-#: spyder_pylint/pylint.py:38
+#: spyder_pylint/pylint.py:44
 msgid " results"
 msgstr ""
 
-#: spyder_pylint/pylint.py:41
+#: spyder_pylint/pylint.py:47
 msgid "Results"
 msgstr ""
 
-#: spyder_pylint/pylint.py:42
+#: spyder_pylint/pylint.py:48
 msgid "Results are stored here:"
 msgstr ""
 
-#: spyder_pylint/pylint.py:92
-#: spyder_pylint/widgets/pylintgui.py:73
+#: spyder_pylint/pylint.py:98 spyder_pylint/widgets/pylintgui.py:83
 msgid "Static code analysis"
 msgstr ""
 
-#: spyder_pylint/pylint.py:108
+#: spyder_pylint/pylint.py:115
 msgid "History..."
 msgstr ""
 
-#: spyder_pylint/pylint.py:110
+#: spyder_pylint/pylint.py:117
 msgid "Set history maximum entries"
 msgstr ""
 
-#: spyder_pylint/pylint.py:126
+#: spyder_pylint/pylint.py:133
 msgid "Run static code analysis"
 msgstr ""
 
-#: spyder_pylint/pylint.py:153
+#: spyder_pylint/pylint.py:161
 msgid "Maximum entries"
 msgstr ""
 
-#: spyder_pylint/widgets/pylintgui.py:107
+#: spyder_pylint/widgets/pylintgui.py:117
 msgid "Results for "
 msgstr ""
 
-#: spyder_pylint/widgets/pylintgui.py:112
+#: spyder_pylint/widgets/pylintgui.py:122
 msgid "Convention"
 msgstr ""
 
-#: spyder_pylint/widgets/pylintgui.py:114
+#: spyder_pylint/widgets/pylintgui.py:124
 msgid "Refactor"
 msgstr ""
 
-#: spyder_pylint/widgets/pylintgui.py:116
+#: spyder_pylint/widgets/pylintgui.py:126
 msgid "Warning"
 msgstr ""
 
-#: spyder_pylint/widgets/pylintgui.py:118
-#: spyder_pylint/widgets/pylintgui.py:350
-#: spyder_pylint/widgets/pylintgui.py:378
+#: spyder_pylint/widgets/pylintgui.py:128
+#: spyder_pylint/widgets/pylintgui.py:363
+#: spyder_pylint/widgets/pylintgui.py:391
 msgid "Error"
 msgstr ""
 
-#: spyder_pylint/widgets/pylintgui.py:196
+#: spyder_pylint/widgets/pylintgui.py:206
 msgid "Analyze"
 msgstr ""
 
-#: spyder_pylint/widgets/pylintgui.py:197
+#: spyder_pylint/widgets/pylintgui.py:207
 msgid "Run analysis"
 msgstr ""
 
-#: spyder_pylint/widgets/pylintgui.py:201
+#: spyder_pylint/widgets/pylintgui.py:211
 msgid "Stop"
 msgstr ""
 
-#: spyder_pylint/widgets/pylintgui.py:202
+#: spyder_pylint/widgets/pylintgui.py:212
 msgid "Stop current analysis"
 msgstr ""
 
-#: spyder_pylint/widgets/pylintgui.py:208
-#: spyder_pylint/widgets/pylintgui.py:277
+#: spyder_pylint/widgets/pylintgui.py:218
+#: spyder_pylint/widgets/pylintgui.py:288
 msgid "Select Python file"
 msgstr ""
 
-#: spyder_pylint/widgets/pylintgui.py:214
+#: spyder_pylint/widgets/pylintgui.py:224
 msgid "Output"
 msgstr ""
 
-#: spyder_pylint/widgets/pylintgui.py:216
+#: spyder_pylint/widgets/pylintgui.py:226
 msgid "Complete output"
 msgstr ""
 
-#: spyder_pylint/widgets/pylintgui.py:250
+#: spyder_pylint/widgets/pylintgui.py:260
 msgid "Pylint script was not found. Please add \"%s\" to PATH."
 msgstr ""
 
-#: spyder_pylint/widgets/pylintgui.py:253
+#: spyder_pylint/widgets/pylintgui.py:263
 msgid "Please install <b>pylint</b>:"
 msgstr ""
 
-#: spyder_pylint/widgets/pylintgui.py:278
+#: spyder_pylint/widgets/pylintgui.py:289
 msgid "Python files"
 msgstr ""
 
-#: spyder_pylint/widgets/pylintgui.py:314
+#: spyder_pylint/widgets/pylintgui.py:326
 msgid "Pylint output"
 msgstr ""
 
-#: spyder_pylint/widgets/pylintgui.py:351
+#: spyder_pylint/widgets/pylintgui.py:364
 msgid "Process failed to start"
 msgstr ""
 
-#: spyder_pylint/widgets/pylintgui.py:452
+#: spyder_pylint/widgets/pylintgui.py:465
 msgid "Source code has not been rated yet."
 msgstr ""
 
-#: spyder_pylint/widgets/pylintgui.py:458
+#: spyder_pylint/widgets/pylintgui.py:471
 msgid "Analysis did not succeed (see output for more details)."
 msgstr ""
 
-#: spyder_pylint/widgets/pylintgui.py:471
+#: spyder_pylint/widgets/pylintgui.py:484
 msgid "Global evaluation:"
 msgstr ""
 
-#: spyder_pylint/widgets/pylintgui.py:475
+#: spyder_pylint/widgets/pylintgui.py:488
 msgid "previous run:"
 msgstr ""
 
diff --git a/spyder_pylint/locale/ru/LC_MESSAGES/pylint.mo b/spyder_pylint/locale/ru/LC_MESSAGES/pylint.mo
index 4a662e4..0d87fff 100644
Binary files a/spyder_pylint/locale/ru/LC_MESSAGES/pylint.mo and b/spyder_pylint/locale/ru/LC_MESSAGES/pylint.mo differ
diff --git a/spyder_pylint/locale/ru/LC_MESSAGES/pylint.po b/spyder_pylint/locale/ru/LC_MESSAGES/pylint.po
index cad90c1..83f13a4 100644
--- a/spyder_pylint/locale/ru/LC_MESSAGES/pylint.po
+++ b/spyder_pylint/locale/ru/LC_MESSAGES/pylint.po
@@ -5,156 +5,155 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2016-03-21 22:22+0300\n"
+"POT-Creation-Date: 2016-09-24 04:45+COT\n"
 "PO-Revision-Date: 2016-04-18 20:29+0300\n"
+"Last-Translator: Roman Kulagin <Roman.Qlogin at gmail.com>\n"
 "Language-Team: \n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: pygettext.py 1.5\n"
 "X-Generator: Poedit 1.5.4\n"
-"Last-Translator: Roman Kulagin <Roman.Qlogin at gmail.com>\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"Language: ru\n"
 
-#: spyder_pylint/pylint.py:29
+#: spyder_pylint/pylint.py:35
 msgid "Settings"
 msgstr "Настройки"
 
-#: spyder_pylint/pylint.py:30
+#: spyder_pylint/pylint.py:36
 msgid "Save file before analyzing it"
 msgstr "Сохранить файл перед его анализом"
 
-#: spyder_pylint/pylint.py:33 spyder_pylint/pylint.py:152
+#: spyder_pylint/pylint.py:39 spyder_pylint/pylint.py:160
 msgid "History"
 msgstr "История"
 
-#: spyder_pylint/pylint.py:34
+#: spyder_pylint/pylint.py:40
 msgid "The following option will be applied at next startup."
 msgstr "Следующая опция будет применена при следующем запуске."
 
-#: spyder_pylint/pylint.py:37
+#: spyder_pylint/pylint.py:43
 msgid "History: "
 msgstr "История:"
 
-#: spyder_pylint/pylint.py:38
+#: spyder_pylint/pylint.py:44
 msgid " results"
 msgstr " результаты"
 
-#: spyder_pylint/pylint.py:41
+#: spyder_pylint/pylint.py:47
 msgid "Results"
 msgstr "Результаты"
 
-#: spyder_pylint/pylint.py:42
+#: spyder_pylint/pylint.py:48
 msgid "Results are stored here:"
 msgstr "Результаты хранятся здесь:"
 
-#: spyder_pylint/pylint.py:92
-#: spyder_pylint/widgets/pylintgui.py:73
+#: spyder_pylint/pylint.py:98 spyder_pylint/widgets/pylintgui.py:83
 msgid "Static code analysis"
 msgstr "Статический анализ кода"
 
-#: spyder_pylint/pylint.py:108
+#: spyder_pylint/pylint.py:115
 msgid "History..."
 msgstr "История..."
 
-#: spyder_pylint/pylint.py:110
+#: spyder_pylint/pylint.py:117
 msgid "Set history maximum entries"
 msgstr "Установить максимальное число записей истории"
 
-#: spyder_pylint/pylint.py:126
+#: spyder_pylint/pylint.py:133
 msgid "Run static code analysis"
 msgstr "Запустить статический анализ кода"
 
-#: spyder_pylint/pylint.py:153
+#: spyder_pylint/pylint.py:161
 msgid "Maximum entries"
 msgstr "Максимум записей"
 
-#: spyder_pylint/widgets/pylintgui.py:107
+#: spyder_pylint/widgets/pylintgui.py:117
 msgid "Results for "
 msgstr "Результаты для"
 
 # Соглашения, Конвенции
-#: spyder_pylint/widgets/pylintgui.py:112
+#: spyder_pylint/widgets/pylintgui.py:122
 msgid "Convention"
 msgstr "Договорённости"
 
-#: spyder_pylint/widgets/pylintgui.py:114
+#: spyder_pylint/widgets/pylintgui.py:124
 msgid "Refactor"
 msgstr "Рефакторинг"
 
-#: spyder_pylint/widgets/pylintgui.py:116
+#: spyder_pylint/widgets/pylintgui.py:126
 msgid "Warning"
 msgstr "Предупреждения"
 
-#: spyder_pylint/widgets/pylintgui.py:118
-#: spyder_pylint/widgets/pylintgui.py:350
-#: spyder_pylint/widgets/pylintgui.py:378
+#: spyder_pylint/widgets/pylintgui.py:128
+#: spyder_pylint/widgets/pylintgui.py:363
+#: spyder_pylint/widgets/pylintgui.py:391
 msgid "Error"
 msgstr "Ошибки"
 
-#: spyder_pylint/widgets/pylintgui.py:196
+#: spyder_pylint/widgets/pylintgui.py:206
 msgid "Analyze"
 msgstr "Анализ"
 
-#: spyder_pylint/widgets/pylintgui.py:197
+#: spyder_pylint/widgets/pylintgui.py:207
 msgid "Run analysis"
 msgstr "Запустить анализ"
 
-#: spyder_pylint/widgets/pylintgui.py:201
+#: spyder_pylint/widgets/pylintgui.py:211
 msgid "Stop"
 msgstr "Остановить"
 
-#: spyder_pylint/widgets/pylintgui.py:202
+#: spyder_pylint/widgets/pylintgui.py:212
 msgid "Stop current analysis"
 msgstr "Остановить текущий анализ"
 
-#: spyder_pylint/widgets/pylintgui.py:208
-#: spyder_pylint/widgets/pylintgui.py:277
+#: spyder_pylint/widgets/pylintgui.py:218
+#: spyder_pylint/widgets/pylintgui.py:288
 msgid "Select Python file"
 msgstr "Выбрать файл Python"
 
-#: spyder_pylint/widgets/pylintgui.py:214
+#: spyder_pylint/widgets/pylintgui.py:224
 msgid "Output"
 msgstr "Вывод"
 
-#: spyder_pylint/widgets/pylintgui.py:216
+#: spyder_pylint/widgets/pylintgui.py:226
 msgid "Complete output"
 msgstr "Детальный вывод:"
 
-#: spyder_pylint/widgets/pylintgui.py:250
+#: spyder_pylint/widgets/pylintgui.py:260
 msgid "Pylint script was not found. Please add \"%s\" to PATH."
 msgstr "Скрипт pylint не найден. Пожалуйста добавьте \"%s\" в PATH."
 
-#: spyder_pylint/widgets/pylintgui.py:253
+#: spyder_pylint/widgets/pylintgui.py:263
 msgid "Please install <b>pylint</b>:"
 msgstr "Пожалуйста, установите <b>pylint</b>:"
 
-#: spyder_pylint/widgets/pylintgui.py:278
+#: spyder_pylint/widgets/pylintgui.py:289
 msgid "Python files"
 msgstr "Файлы Python"
 
-#: spyder_pylint/widgets/pylintgui.py:314
+#: spyder_pylint/widgets/pylintgui.py:326
 msgid "Pylint output"
 msgstr "Вывод pylint"
 
-#: spyder_pylint/widgets/pylintgui.py:351
+#: spyder_pylint/widgets/pylintgui.py:364
 msgid "Process failed to start"
 msgstr "Процесс не удалось запустить"
 
-#: spyder_pylint/widgets/pylintgui.py:452
+#: spyder_pylint/widgets/pylintgui.py:465
 msgid "Source code has not been rated yet."
 msgstr "Исходный код еще не был оценен."
 
-#: spyder_pylint/widgets/pylintgui.py:458
+#: spyder_pylint/widgets/pylintgui.py:471
 msgid "Analysis did not succeed (see output for more details)."
 msgstr "Анализ не удался (смотрите подробности в выводе)."
 
-#: spyder_pylint/widgets/pylintgui.py:471
+#: spyder_pylint/widgets/pylintgui.py:484
 msgid "Global evaluation:"
 msgstr "Общая оценка:"
 
-#: spyder_pylint/widgets/pylintgui.py:475
+#: spyder_pylint/widgets/pylintgui.py:488
 msgid "previous run:"
 msgstr "предыдущий запуск:"
diff --git a/spyder_pylint/pylint.py b/spyder_pylint/pylint.py
index 723854e..79571e3 100644
--- a/spyder_pylint/pylint.py
+++ b/spyder_pylint/pylint.py
@@ -1,8 +1,8 @@
 # -*- coding:utf-8 -*-
 #
-# Copyright © 2009-2011 Pierre Raybaut
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """Pylint Code Analysis Plugin."""
 
@@ -19,10 +19,11 @@ from qtpy.QtCore import Qt, Signal, Slot
 from qtpy.QtWidgets import QGroupBox, QInputDialog, QLabel, QVBoxLayout
 
 # Local imports
-from spyderlib.config.base import get_translation
-from spyderlib.plugins import PluginConfigPage, SpyderPluginMixin
-from spyderlib.utils import icon_manager as ima
-from spyderlib.utils.qthelpers import create_action
+from spyder.config.base import get_translation
+from spyder.plugins import SpyderPluginMixin
+from spyder.plugins.configdialog import PluginConfigPage
+from spyder.utils import icon_manager as ima
+from spyder.utils.qthelpers import create_action
 from .widgets.pylintgui import (PYLINT_PATH, PylintWidget)
 
 
diff --git a/spyder_pylint/widgets/pylintgui.py b/spyder_pylint/widgets/pylintgui.py
index 408fafc..6700383 100644
--- a/spyder_pylint/widgets/pylintgui.py
+++ b/spyder_pylint/widgets/pylintgui.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2009- The Spyder Development Team
+# Copyright © Spyder Project Contributors
 # Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
+# (see spyder/__init__.py for details)
 
 """Pylint widget"""
 
@@ -26,17 +26,17 @@ from qtpy.QtWidgets import (QHBoxLayout, QLabel, QMessageBox, QTreeWidgetItem,
                             QVBoxLayout, QWidget)
 
 # Local imports
-from spyderlib import dependencies
-from spyderlib.config.base import get_conf_path, get_translation
-from spyderlib.py3compat import getcwd, pickle, PY3, to_text_string
-from spyderlib.utils import icon_manager as ima
-from spyderlib.utils import programs
-from spyderlib.utils.encoding import to_unicode_from_fs
-from spyderlib.utils.qthelpers import create_toolbutton
-from spyderlib.widgets.comboboxes import (is_module_or_package,
-                                          PythonModulesComboBox)
-from spyderlib.widgets.onecolumntree import OneColumnTree
-from spyderlib.widgets.variableexplorer.texteditor import TextEditor
+from spyder import dependencies
+from spyder.config.base import get_conf_path, get_translation
+from spyder.py3compat import getcwd, pickle, PY3, to_text_string
+from spyder.utils import icon_manager as ima
+from spyder.utils import programs
+from spyder.utils.encoding import to_unicode_from_fs
+from spyder.utils.qthelpers import create_toolbutton
+from spyder.widgets.comboboxes import (is_module_or_package,
+                                       PythonModulesComboBox)
+from spyder.widgets.onecolumntree import OneColumnTree
+from spyder.widgets.variableexplorer.texteditor import TextEditor
 
 
 # This is needed for testing this module as a stand alone script
@@ -502,7 +502,7 @@ class PylintWidget(QWidget):
 #==============================================================================
 def test():
     """Run pylint widget test"""
-    from spyderlib.utils.qthelpers import qapplication
+    from spyder.utils.qthelpers import qapplication
     app = qapplication(test_time=20)
     widget = PylintWidget(None)
     widget.resize(640, 480)
diff --git a/spyderlib/locale/es/LC_MESSAGES/spyderlib.mo b/spyderlib/locale/es/LC_MESSAGES/spyderlib.mo
deleted file mode 100644
index 753e6e4..0000000
Binary files a/spyderlib/locale/es/LC_MESSAGES/spyderlib.mo and /dev/null differ
diff --git a/spyderlib/locale/fr/LC_MESSAGES/spyderlib.mo b/spyderlib/locale/fr/LC_MESSAGES/spyderlib.mo
deleted file mode 100644
index 9f51156..0000000
Binary files a/spyderlib/locale/fr/LC_MESSAGES/spyderlib.mo and /dev/null differ
diff --git a/spyderlib/locale/ja/LC_MESSAGES/spyderlib.mo b/spyderlib/locale/ja/LC_MESSAGES/spyderlib.mo
deleted file mode 100644
index b59b83e..0000000
Binary files a/spyderlib/locale/ja/LC_MESSAGES/spyderlib.mo and /dev/null differ
diff --git a/spyderlib/locale/pt_BR/LC_MESSAGES/spyderlib.mo b/spyderlib/locale/pt_BR/LC_MESSAGES/spyderlib.mo
deleted file mode 100644
index c7c130a..0000000
Binary files a/spyderlib/locale/pt_BR/LC_MESSAGES/spyderlib.mo and /dev/null differ
diff --git a/spyderlib/locale/ru/LC_MESSAGES/spyderlib.mo b/spyderlib/locale/ru/LC_MESSAGES/spyderlib.mo
deleted file mode 100644
index bf037bb..0000000
Binary files a/spyderlib/locale/ru/LC_MESSAGES/spyderlib.mo and /dev/null differ
diff --git a/spyderlib/locale/spyderlib.pot b/spyderlib/locale/spyderlib.pot
deleted file mode 100644
index e41eda8..0000000
--- a/spyderlib/locale/spyderlib.pot
+++ /dev/null
@@ -1,5117 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-19 17:55+0300\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"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: spyderlib/app/restart.py:129
-msgid ""
-"It was not possible to close the previous Spyder instance.\n"
-"Restart aborted."
-msgstr ""
-
-#: spyderlib/app/restart.py:131
-msgid ""
-"Spyder could not reset to factory defaults.\n"
-"Restart aborted."
-msgstr ""
-
-#: spyderlib/app/restart.py:133
-msgid ""
-"It was not possible to restart Spyder.\n"
-"Operation aborted."
-msgstr ""
-
-#: spyderlib/app/restart.py:135
-msgid "Spyder exit error"
-msgstr ""
-
-#: spyderlib/app/restart.py:136
-msgid "Spyder reset error"
-msgstr ""
-
-#: spyderlib/app/restart.py:137
-msgid "Spyder restart error"
-msgstr ""
-
-#: spyderlib/app/restart.py:141
-#, python-brace-format
-msgid ""
-"\n"
-"\n"
-"{0}"
-msgstr ""
-
-#: spyderlib/app/restart.py:161
-msgid "Closing Spyder"
-msgstr ""
-
-#: spyderlib/app/restart.py:235
-msgid "Resetting Spyder to defaults"
-msgstr ""
-
-#: spyderlib/app/restart.py:267
-msgid "Restarting"
-msgstr ""
-
-#: spyderlib/app/spyder.py:112
-msgid "Initializing..."
-msgstr ""
-
-#: spyderlib/app/spyder.py:237
-msgid "Numpy and Scipy documentation"
-msgstr ""
-
-#: spyderlib/app/spyder.py:239 spyderlib/app/spyder.py:1073
-msgid "Matplotlib documentation"
-msgstr ""
-
-#: spyderlib/app/spyder.py:242
-msgid "PyQt4 Reference Guide"
-msgstr ""
-
-#: spyderlib/app/spyder.py:245
-msgid "PyQt4 API Reference"
-msgstr ""
-
-#: spyderlib/app/spyder.py:247
-msgid "Python(x,y)"
-msgstr ""
-
-#: spyderlib/app/spyder.py:249
-msgid "WinPython"
-msgstr ""
-
-#: spyderlib/app/spyder.py:311
-msgid "Reload last session"
-msgstr ""
-
-#: spyderlib/app/spyder.py:315
-msgid "Load session..."
-msgstr ""
-
-#: spyderlib/app/spyder.py:318
-msgid "Load Spyder session"
-msgstr ""
-
-#: spyderlib/app/spyder.py:320
-msgid "Save session and quit..."
-msgstr ""
-
-#: spyderlib/app/spyder.py:323
-msgid "Save current session and quit application"
-msgstr ""
-
-#: spyderlib/app/spyder.py:533
-msgid "Close current pane"
-msgstr ""
-
-#: spyderlib/app/spyder.py:538
-msgid "Lock panes"
-msgstr ""
-
-#: spyderlib/app/spyder.py:545
-msgid "Use next layout"
-msgstr ""
-
-#: spyderlib/app/spyder.py:549
-msgid "Use previous layout"
-msgstr ""
-
-#: spyderlib/app/spyder.py:558
-msgid "&Find text"
-msgstr ""
-
-#: spyderlib/app/spyder.py:563
-msgid "Find &next"
-msgstr ""
-
-#: spyderlib/app/spyder.py:570
-msgid "Find &previous"
-msgstr ""
-
-#: spyderlib/app/spyder.py:576
-msgid "&Replace text"
-msgstr ""
-
-#: spyderlib/app/spyder.py:596 spyderlib/widgets/sourcecode/codeeditor.py:2418
-msgid "Undo"
-msgstr ""
-
-#: spyderlib/app/spyder.py:598 spyderlib/widgets/sourcecode/codeeditor.py:2421
-msgid "Redo"
-msgstr ""
-
-#: spyderlib/app/spyder.py:600
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:638
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:452
-#: spyderlib/widgets/variableexplorer/dataframeeditor.py:425
-#: spyderlib/widgets/shell.py:120
-#: spyderlib/widgets/sourcecode/codeeditor.py:2427
-msgid "Copy"
-msgstr ""
-
-#: spyderlib/app/spyder.py:602 spyderlib/widgets/shell.py:116
-#: spyderlib/widgets/sourcecode/codeeditor.py:2424
-msgid "Cut"
-msgstr ""
-
-#: spyderlib/app/spyder.py:604
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:635
-#: spyderlib/widgets/shell.py:124
-#: spyderlib/widgets/sourcecode/codeeditor.py:2430
-msgid "Paste"
-msgstr ""
-
-#: spyderlib/app/spyder.py:607 spyderlib/widgets/shell.py:137
-#: spyderlib/widgets/sourcecode/codeeditor.py:2433
-msgid "Select All"
-msgstr ""
-
-#: spyderlib/app/spyder.py:624 spyderlib/plugins/editor.py:1257
-msgid "&File"
-msgstr ""
-
-#: spyderlib/app/spyder.py:626 spyderlib/plugins/editor.py:1249
-msgid "File toolbar"
-msgstr ""
-
-#: spyderlib/app/spyder.py:630 spyderlib/plugins/editor.py:1258
-msgid "&Edit"
-msgstr ""
-
-#: spyderlib/app/spyder.py:631 spyderlib/plugins/editor.py:1254
-msgid "Edit toolbar"
-msgstr ""
-
-#: spyderlib/app/spyder.py:635 spyderlib/plugins/editor.py:1259
-msgid "&Search"
-msgstr ""
-
-#: spyderlib/app/spyder.py:636 spyderlib/plugins/editor.py:1250
-msgid "Search toolbar"
-msgstr ""
-
-#: spyderlib/app/spyder.py:640 spyderlib/plugins/editor.py:1260
-msgid "Sour&ce"
-msgstr ""
-
-#: spyderlib/app/spyder.py:641 spyderlib/plugins/editor.py:1251
-msgid "Source toolbar"
-msgstr ""
-
-#: spyderlib/app/spyder.py:645 spyderlib/plugins/editor.py:775
-#: spyderlib/plugins/editor.py:1261
-msgid "&Run"
-msgstr ""
-
-#: spyderlib/app/spyder.py:646 spyderlib/plugins/editor.py:1252
-msgid "Run toolbar"
-msgstr ""
-
-#: spyderlib/app/spyder.py:650 spyderlib/plugins/editor.py:723
-msgid "&Debug"
-msgstr ""
-
-#: spyderlib/app/spyder.py:651 spyderlib/plugins/editor.py:1253
-msgid "Debug toolbar"
-msgstr ""
-
-#: spyderlib/app/spyder.py:655
-msgid "C&onsoles"
-msgstr ""
-
-#: spyderlib/app/spyder.py:658 spyderlib/plugins/editor.py:1262
-msgid "&Tools"
-msgstr ""
-
-#: spyderlib/app/spyder.py:661
-msgid "&View"
-msgstr ""
-
-#: spyderlib/app/spyder.py:664
-msgid "&Help"
-msgstr ""
-
-#: spyderlib/app/spyder.py:669
-msgid "Welcome to Spyder!"
-msgstr ""
-
-#: spyderlib/app/spyder.py:674
-msgid "Pre&ferences"
-msgstr ""
-
-#: spyderlib/app/spyder.py:681 spyderlib/widgets/pathmanager.py:48
-#: spyderlib/widgets/projectexplorer.py:598
-msgid "PYTHONPATH manager"
-msgstr ""
-
-#: spyderlib/app/spyder.py:684
-msgid "Python Path Manager"
-msgstr ""
-
-#: spyderlib/app/spyder.py:687
-msgid "Update module names list"
-msgstr ""
-
-#: spyderlib/app/spyder.py:690
-msgid "Refresh list of module names available in PYTHONPATH"
-msgstr ""
-
-#: spyderlib/app/spyder.py:693
-msgid "Reset Spyder to factory defaults"
-msgstr ""
-
-#: spyderlib/app/spyder.py:698
-msgid "Current user environment variables..."
-msgstr ""
-
-#: spyderlib/app/spyder.py:700
-msgid ""
-"Show and edit current user environment variables in Windows registry (i.e. "
-"for all sessions)"
-msgstr ""
-
-#: spyderlib/app/spyder.py:709 spyderlib/app/spyder.py:1167
-msgid "External Tools"
-msgstr ""
-
-#: spyderlib/app/spyder.py:713
-msgid "Python(x,y) launcher"
-msgstr ""
-
-#: spyderlib/app/spyder.py:720
-msgid "WinPython control panel"
-msgstr ""
-
-#: spyderlib/app/spyder.py:729
-msgid "Qt Designer"
-msgstr ""
-
-#: spyderlib/app/spyder.py:734
-msgid "Qt Linguist"
-msgstr ""
-
-#: spyderlib/app/spyder.py:740
-msgid "Qt examples"
-msgstr ""
-
-#: spyderlib/app/spyder.py:761
-msgid "guidata examples"
-msgstr ""
-
-#: spyderlib/app/spyder.py:772
-msgid "guiqwt examples"
-msgstr ""
-
-#: spyderlib/app/spyder.py:777
-msgid "Sift"
-msgstr ""
-
-#: spyderlib/app/spyder.py:787
-msgid "ViTables"
-msgstr ""
-
-#: spyderlib/app/spyder.py:801
-msgid "Fullscreen mode"
-msgstr ""
-
-#: spyderlib/app/spyder.py:813
-msgid "Main toolbar"
-msgstr ""
-
-#: spyderlib/app/spyder.py:822
-msgid ""
-"Spyder Internal Console\n"
-"\n"
-"This console is used to report application\n"
-"internal errors and to inspect Spyder\n"
-"internals with the following commands:\n"
-"  spy.app, spy.window, dir(spy)\n"
-"\n"
-"Please don't use it to run your code\n"
-"\n"
-msgstr ""
-
-#: spyderlib/app/spyder.py:839
-msgid "Loading help..."
-msgstr ""
-
-#: spyderlib/app/spyder.py:846
-msgid "Loading outline explorer..."
-msgstr ""
-
-#: spyderlib/app/spyder.py:854
-msgid "Loading editor..."
-msgstr ""
-
-#: spyderlib/app/spyder.py:860 spyderlib/widgets/ipython.py:610
-#: spyderlib/plugins/console.py:133
-msgid "&Quit"
-msgstr ""
-
-#: spyderlib/app/spyder.py:862 spyderlib/plugins/console.py:135
-msgid "Quit"
-msgstr ""
-
-#: spyderlib/app/spyder.py:865
-msgid "&Restart"
-msgstr ""
-
-#: spyderlib/app/spyder.py:867
-msgid "Restart"
-msgstr ""
-
-#: spyderlib/app/spyder.py:886
-msgid "Loading file explorer..."
-msgstr ""
-
-#: spyderlib/app/spyder.py:893
-msgid "Loading history plugin..."
-msgstr ""
-
-#: spyderlib/app/spyder.py:904
-msgid "Loading online help..."
-msgstr ""
-
-#: spyderlib/app/spyder.py:910
-msgid "Loading project explorer..."
-msgstr ""
-
-#: spyderlib/app/spyder.py:916
-msgid "Loading external console..."
-msgstr ""
-
-#: spyderlib/app/spyder.py:922
-msgid "Loading namespace browser..."
-msgstr ""
-
-#: spyderlib/app/spyder.py:929
-msgid "Loading IPython console..."
-msgstr ""
-
-#: spyderlib/app/spyder.py:938
-msgid "Setting up main window..."
-msgstr ""
-
-#: spyderlib/app/spyder.py:941
-msgid "Dependencies..."
-msgstr ""
-
-#: spyderlib/app/spyder.py:945
-msgid "Report issue..."
-msgstr ""
-
-#: spyderlib/app/spyder.py:949
-msgid "Spyder support..."
-msgstr ""
-
-#: spyderlib/app/spyder.py:952
-msgid "Check for updates..."
-msgstr ""
-
-#: spyderlib/app/spyder.py:975
-msgid "Spyder documentation"
-msgstr ""
-
-#: spyderlib/app/spyder.py:980
-msgid "Spyder tutorial"
-msgstr ""
-
-#: spyderlib/app/spyder.py:987
-msgid "Interactive tours"
-msgstr ""
-
-#: spyderlib/app/spyder.py:1015
-msgid "Python documentation"
-msgstr ""
-
-#: spyderlib/app/spyder.py:1021 spyderlib/app/spyder.py:1065
-msgid "IPython documentation"
-msgstr ""
-
-#: spyderlib/app/spyder.py:1022
-msgid "Intro to IPython"
-msgstr ""
-
-#: spyderlib/app/spyder.py:1024
-msgid "Quick reference"
-msgstr ""
-
-#: spyderlib/app/spyder.py:1026
-msgid "Console help"
-msgstr ""
-
-#: spyderlib/app/spyder.py:1063
-msgid "Python(x,y) documentation folder"
-msgstr ""
-
-#: spyderlib/app/spyder.py:1067
-msgid "guidata documentation"
-msgstr ""
-
-#: spyderlib/app/spyder.py:1070
-msgid "guiqwt documentation"
-msgstr ""
-
-#: spyderlib/app/spyder.py:1076
-msgid "NumPy documentation"
-msgstr ""
-
-#: spyderlib/app/spyder.py:1078
-msgid "NumPy reference guide"
-msgstr ""
-
-#: spyderlib/app/spyder.py:1080
-msgid "NumPy user guide"
-msgstr ""
-
-#: spyderlib/app/spyder.py:1082
-msgid "SciPy documentation"
-msgstr ""
-
-#: spyderlib/app/spyder.py:1089
-msgid "Installed Python modules"
-msgstr ""
-
-#: spyderlib/app/spyder.py:1093
-msgid "Online documentation"
-msgstr ""
-
-#: spyderlib/app/spyder.py:1105
-msgid "Qt documentation"
-msgstr ""
-
-#: spyderlib/app/spyder.py:1111
-#, python-format
-msgid "About %s..."
-msgstr ""
-
-#: spyderlib/app/spyder.py:1135
-msgid "Panes"
-msgstr ""
-
-#: spyderlib/app/spyder.py:1136
-msgid "Toolbars"
-msgstr ""
-
-#: spyderlib/app/spyder.py:1137
-msgid "Window layouts"
-msgstr ""
-
-#: spyderlib/app/spyder.py:1146 spyderlib/app/spyder.py:1919
-#: spyderlib/app/spyder.py:1920
-msgid "Show toolbars"
-msgstr ""
-
-#: spyderlib/app/spyder.py:1160
-msgid "Attached console window (debugging)"
-msgstr ""
-
-#: spyderlib/app/spyder.py:1324
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:572
-#: spyderlib/widgets/variableexplorer/dataframeeditor.py:573
-#: spyderlib/widgets/externalshell/pythonshell.py:553
-#: spyderlib/widgets/externalshell/systemshell.py:104
-#: spyderlib/widgets/explorer.py:597 spyderlib/widgets/explorer.py:699
-msgid "Error"
-msgstr ""
-
-#: spyderlib/app/spyder.py:1325
-#, python-format
-msgid ""
-"<b>You have missing dependencies!</b><br><br><tt>%s</tt><br><br><b>"
-"Please install them to avoid this message.</b><br><br><i>Note</i>: "
-"Spyder could work without some of these dependencies, however to "
-"have a smooth experience when using Spyder we <i>strongly</i> recommend"
-" you to install all the listed missing dependencies.<br><br>Failing to "
-"install these dependencies might result in bugs. Please be sure that any "
-"found bugs are not the direct result of missing dependencies, prior to reporting a new issue."
-msgstr ""
-
-#: spyderlib/app/spyder.py:1766
-msgid "Spyder Default Layout"
-msgstr ""
-
-#: spyderlib/app/spyder.py:1784
-msgid "Save current layout"
-msgstr ""
-
-#: spyderlib/app/spyder.py:1788
-msgid "Layout preferences"
-msgstr ""
-
-#: spyderlib/app/spyder.py:1792
-msgid "Reset to spyder default"
-msgstr ""
-
-#: spyderlib/app/spyder.py:1812 spyderlib/app/spyder.py:1834
-#: spyderlib/app/spyder.py:1897 spyderlib/app/spyder.py:2775
-#: spyderlib/utils/environ.py:97 spyderlib/utils/environ.py:110
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:407
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:1048
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:495
-#: spyderlib/plugins/configdialog.py:1229
-#: spyderlib/plugins/ipythonconsole.py:114
-#: spyderlib/plugins/ipythonconsole.py:834
-#: spyderlib/plugins/externalconsole.py:368
-#: spyderlib/plugins/externalconsole.py:611
-msgid "Warning"
-msgstr ""
-
-#: spyderlib/app/spyder.py:1813
-msgid ""
-"Window layout will be reset to default settings: this affects window "
-"position, size and dockwidgets.\n"
-"Do you want to continue?"
-msgstr ""
-
-#: spyderlib/app/spyder.py:1835
-#, python-format
-msgid ""
-"Layout <b>%s</b> will be                                                "
-"overwritten. Do you want to                                                "
-"continue?"
-msgstr ""
-
-#: spyderlib/app/spyder.py:1898
-#, python-format
-msgid "Quick switch layout #%s has not yet been defined."
-msgstr ""
-
-#: spyderlib/app/spyder.py:1916 spyderlib/app/spyder.py:1917
-msgid "Hide toolbars"
-msgstr ""
-
-#: spyderlib/app/spyder.py:2231 spyderlib/app/spyder.py:2232
-msgid "Maximize current pane"
-msgstr ""
-
-#: spyderlib/app/spyder.py:2235
-msgid "Restore current pane"
-msgstr ""
-
-#: spyderlib/app/spyder.py:2236
-msgid "Restore pane to its original size"
-msgstr ""
-
-#: spyderlib/app/spyder.py:2320
-#, python-format
-msgid "About %s"
-msgstr ""
-
-#: spyderlib/app/spyder.py:2496 spyderlib/utils/programs.py:281
-#: spyderlib/widgets/externalshell/baseshell.py:139
-#: spyderlib/widgets/explorer.py:239 spyderlib/plugins/editor.py:156
-#: spyderlib/plugins/runconfig.py:321 spyderlib/plugins/runconfig.py:443
-#: spyderlib/plugins/runconfig.py:448
-msgid "Run"
-msgstr ""
-
-#: spyderlib/app/spyder.py:2497
-#, python-format
-msgid "Running an external system terminal is not supported on platform %s."
-msgstr ""
-
-#: spyderlib/app/spyder.py:2722
-msgid "Open session"
-msgstr ""
-
-#: spyderlib/app/spyder.py:2723 spyderlib/app/spyder.py:2735
-msgid "Spyder sessions"
-msgstr ""
-
-#: spyderlib/app/spyder.py:2734
-msgid "Save session"
-msgstr ""
-
-#: spyderlib/app/spyder.py:2776
-msgid ""
-"Spyder will restart and reset to default settings: <br><br>Do you want to "
-"continue?"
-msgstr ""
-
-#: spyderlib/app/spyder.py:2873 spyderlib/widgets/helperwidgets.py:243
-msgid "Spyder updates"
-msgstr ""
-
-#: spyderlib/app/spyder.py:2874 spyderlib/plugins/configdialog.py:799
-msgid "Check for updates on startup"
-msgstr ""
-
-#: spyderlib/app/spyder.py:2892
-#, python-format
-msgid ""
-"<b>Spyder %s is available!</b> <br><br>Please use your package manager to "
-"update Spyder or go to our <a href=\"%s\">Releases</a> page to download this "
-"new version. <br><br>If you are not sure how to proceed to update Spyder "
-"please refer to our  <a href=\"%s\">Installation</a> instructions."
-msgstr ""
-
-#: spyderlib/app/spyder.py:2904
-msgid "Spyder is up to date."
-msgstr ""
-
-#: spyderlib/app/tour.py:121
-msgid "Welcome to the Introduction tour"
-msgstr ""
-
-#: spyderlib/app/tour.py:122
-msgid ""
-"<b>Spyder</b> is a powerful Interactive Development Environment (or IDE) for "
-"the Python programming language.<br><br>Here we are going to guide you "
-"through its most important features.<br><br>Please use the arrow keys or "
-"click on the buttons below to move along the tour."
-msgstr ""
-
-#: spyderlib/app/tour.py:131
-msgid "The Editor"
-msgstr ""
-
-#: spyderlib/app/tour.py:132
-msgid ""
-"This is the pane where you write Python code before evaluating it. You can "
-"get automatic suggestions and completions while writing, by pressing the "
-"<b>Tab</b> key next to a given text.<br><br>The Editor comes with a line "
-"number area (highlighted here in red), where Spyder shows warnings and "
-"syntax errors. They can help you to detect potential problems before running "
-"the code.<br><br>You can also set debug breakpoints in the line number area, "
-"by doing a double click next to a non-empty line."
-msgstr ""
-
-#: spyderlib/app/tour.py:147
-msgid "The IPython console"
-msgstr ""
-
-#: spyderlib/app/tour.py:148
-#, python-brace-format
-msgid ""
-"This is one of panes where you can run or execute the code you wrote on the "
-"Editor. To do it you need to press the <b>F5</b> key.<br><br>This console "
-"comes with several useful features that greatly improve your programming "
-"workflow (like syntax highlighting and inline plots). If you want to know "
-"more about them, please follow this <a href=\"{0}\">link</a>.<br><br>Please "
-"click on the button below to run some simple code in this console. This will "
-"be useful to show you other important features."
-msgstr ""
-
-#: spyderlib/app/tour.py:164
-msgid "The Variable Explorer"
-msgstr ""
-
-#: spyderlib/app/tour.py:165
-msgid ""
-"In this pane you can view and edit the variables generated during the "
-"execution of a program, or those entered directly in one of Spyder consoles."
-"<br><br>As you can see, the Variable Explorer is showing the variables "
-"generated during the last step of this tour. By doing a double-click on any "
-"of them, a new window will be opened, where you can inspect and modify their "
-"contents."
-msgstr ""
-
-#: spyderlib/app/tour.py:177
-msgid "The Python console"
-msgstr ""
-
-#: spyderlib/app/tour.py:178
-msgid ""
-"You can also run your code on a Python console. These consoles are useful "
-"because they let you run a file in a console dedicated only to it.To select "
-"this behavior, please press the <b>F6</b> key.<br><br>By pressing the button "
-"below and then focusing the Variable Explorer, you will notice that Python "
-"consoles are also connected to that pane, and that the Variable Explorer "
-"only shows the variables of the currently focused console."
-msgstr ""
-
-#: spyderlib/app/tour.py:192 spyderlib/widgets/internalshell.py:266
-#: spyderlib/plugins/help.py:490 spyderlib/plugins/help.py:940
-msgid "Help"
-msgstr ""
-
-#: spyderlib/app/tour.py:193
-msgid ""
-"This pane displays documentation of the functions, classes, methods or "
-"modules you are currently using in the Editor or the Consoles.<br><br>To use "
-"it, you need to press <b>Ctrl+I</b> in front of an object. If that object "
-"has some documentation associated with it, it will be displayed here."
-msgstr ""
-
-#: spyderlib/app/tour.py:203
-msgid "The File Explorer"
-msgstr ""
-
-#: spyderlib/app/tour.py:204
-msgid ""
-"This pane lets you navigate through the directories and files present in "
-"your computer.<br><br>You can also open any of these files with its "
-"corresponding application, by doing a double click on it.<br><br>There is "
-"one exception to this rule: plain-text files will always be opened in the "
-"Spyder Editor."
-msgstr ""
-
-#: spyderlib/app/tour.py:214
-msgid "The History Log"
-msgstr ""
-
-#: spyderlib/app/tour.py:215
-msgid ""
-"This pane records all commands introduced in the Python and IPython consoles."
-msgstr ""
-
-#: spyderlib/app/tour.py:263
-msgid "<b>Spyder</b> is an interactive development environment based on bla"
-msgstr ""
-
-#: spyderlib/app/tour.py:267
-msgid "Welcome to Spyder introduction tour"
-msgstr ""
-
-#: spyderlib/app/tour.py:268
-msgid "Spyder is an interactive development environment based on bla"
-msgstr ""
-
-#: spyderlib/app/tour.py:273
-msgid "Introduction tour"
-msgstr ""
-
-#: spyderlib/app/tour.py:274
-msgid "New features in version 3.0"
-msgstr ""
-
-#: spyderlib/app/tour.py:552 spyderlib/plugins/ipythonconsole.py:324
-msgid "Run code"
-msgstr ""
-
-#: spyderlib/app/tour.py:821
-msgid "Go to step: "
-msgstr ""
-
-#: spyderlib/config/ipython.py:23
-msgid "Jupyter Qtconsole integration"
-msgstr ""
-
-#: spyderlib/config/ipython.py:25
-msgid "Manipulate Jupyter notebooks on the Editor"
-msgstr ""
-
-#: spyderlib/config/base.py:241
-msgid ""
-"Update LANGUAGE_CODES (inside config/base.py) if a new translation has been "
-"added to Spyder"
-msgstr ""
-
-#: spyderlib/config/utils.py:24
-msgid "Python files"
-msgstr ""
-
-#: spyderlib/config/utils.py:25
-msgid "Cython/Pyrex files"
-msgstr ""
-
-#: spyderlib/config/utils.py:26
-msgid "C files"
-msgstr ""
-
-#: spyderlib/config/utils.py:27
-msgid "C++ files"
-msgstr ""
-
-#: spyderlib/config/utils.py:28
-msgid "OpenCL files"
-msgstr ""
-
-#: spyderlib/config/utils.py:29
-msgid "Fortran files"
-msgstr ""
-
-#: spyderlib/config/utils.py:30
-msgid "IDL files"
-msgstr ""
-
-#: spyderlib/config/utils.py:31
-msgid "MATLAB files"
-msgstr ""
-
-#: spyderlib/config/utils.py:32
-msgid "Julia files"
-msgstr ""
-
-#: spyderlib/config/utils.py:33
-msgid "Yaml files"
-msgstr ""
-
-#: spyderlib/config/utils.py:34
-msgid "Patch and diff files"
-msgstr ""
-
-#: spyderlib/config/utils.py:35
-msgid "Batch files"
-msgstr ""
-
-#: spyderlib/config/utils.py:36 spyderlib/utils/iofuncs.py:515
-msgid "Text files"
-msgstr ""
-
-#: spyderlib/config/utils.py:37
-msgid "reStructuredText files"
-msgstr ""
-
-#: spyderlib/config/utils.py:38
-msgid "gettext files"
-msgstr ""
-
-#: spyderlib/config/utils.py:39
-msgid "NSIS files"
-msgstr ""
-
-#: spyderlib/config/utils.py:40
-msgid "Web page files"
-msgstr ""
-
-#: spyderlib/config/utils.py:41
-msgid "XML files"
-msgstr ""
-
-#: spyderlib/config/utils.py:42
-msgid "Javascript files"
-msgstr ""
-
-#: spyderlib/config/utils.py:43
-msgid "Json files"
-msgstr ""
-
-#: spyderlib/config/utils.py:44
-msgid "IPython notebooks"
-msgstr ""
-
-#: spyderlib/config/utils.py:45
-msgid "Enaml files"
-msgstr ""
-
-#: spyderlib/config/utils.py:46
-msgid "Configuration files"
-msgstr ""
-
-#: spyderlib/config/utils.py:51 spyderlib/widgets/explorer.py:670
-msgid "All files"
-msgstr ""
-
-#: spyderlib/config/utils.py:113
-msgid "Supported text files"
-msgstr ""
-
-#: spyderlib/utils/environ.py:98
-msgid ""
-"Module <b>pywin32 was not found</b>.<br>Please restart this Windows "
-"<i>session</i> (not the computer) for changes to take effect."
-msgstr ""
-
-#: spyderlib/utils/environ.py:111
-msgid ""
-"If you accept changes, this will modify the current user environment "
-"variables directly <b>in Windows registry</b>. Use it with precautions, at "
-"your own risks.<br><br>Note that for changes to take effect, you will need "
-"to restart the parent process of this application (simply restart Spyder if "
-"you have executed it from a Windows shortcut, otherwise restart any "
-"application from which you may have executed it, like <i>Python(x,y) Home</"
-"i> for example)"
-msgstr ""
-
-#: spyderlib/utils/codeanalysis.py:91
-msgid "Real-time code analysis on the Editor"
-msgstr ""
-
-#: spyderlib/utils/codeanalysis.py:95
-msgid "Real-time code style analysis on the Editor"
-msgstr ""
-
-#: spyderlib/utils/iofuncs.py:497
-msgid "Supported files"
-msgstr ""
-
-#: spyderlib/utils/iofuncs.py:499
-msgid "All files (*.*)"
-msgstr ""
-
-#: spyderlib/utils/iofuncs.py:509
-msgid "Spyder data files"
-msgstr ""
-
-#: spyderlib/utils/iofuncs.py:511
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:1014
-msgid "NumPy arrays"
-msgstr ""
-
-#: spyderlib/utils/iofuncs.py:512
-msgid "NumPy zip arrays"
-msgstr ""
-
-#: spyderlib/utils/iofuncs.py:513
-msgid "Matlab files"
-msgstr ""
-
-#: spyderlib/utils/iofuncs.py:514
-msgid "CSV text files"
-msgstr ""
-
-#: spyderlib/utils/iofuncs.py:516
-msgid "JPEG images"
-msgstr ""
-
-#: spyderlib/utils/iofuncs.py:517
-msgid "PNG images"
-msgstr ""
-
-#: spyderlib/utils/iofuncs.py:518
-msgid "GIF images"
-msgstr ""
-
-#: spyderlib/utils/iofuncs.py:519
-msgid "TIFF images"
-msgstr ""
-
-#: spyderlib/utils/iofuncs.py:520 spyderlib/utils/iofuncs.py:521
-msgid "Pickle files"
-msgstr ""
-
-#: spyderlib/utils/iofuncs.py:522
-msgid "JSON files"
-msgstr ""
-
-#: spyderlib/utils/iofuncs.py:541 spyderlib/utils/iofuncs.py:548
-#, python-format
-msgid "<b>Unsupported file type '%s'</b>"
-msgstr ""
-
-#: spyderlib/utils/programs.py:282
-msgid "It was not possible to run this file in an external terminal"
-msgstr ""
-
-#: spyderlib/utils/help/sphinxify.py:212 spyderlib/utils/help/sphinxify.py:222
-msgid ""
-"It was not possible to generate rich text help for this object.</br>Please "
-"see it in plain text."
-msgstr ""
-
-#: spyderlib/utils/introspection/manager.py:31
-#: spyderlib/utils/introspection/manager.py:36
-msgid "Editor's code completion, go-to-definition and help"
-msgstr ""
-
-#: spyderlib/utils/syntaxhighlighters.py:32
-msgid "Syntax highlighting for Matlab, Julia and other file types"
-msgstr ""
-
-#: spyderlib/utils/syntaxhighlighters.py:41
-msgid "Background:"
-msgstr ""
-
-#: spyderlib/utils/syntaxhighlighters.py:42
-#: spyderlib/widgets/sourcecode/codeeditor.py:103
-msgid "Current line:"
-msgstr ""
-
-#: spyderlib/utils/syntaxhighlighters.py:43
-msgid "Current cell:"
-msgstr ""
-
-#: spyderlib/utils/syntaxhighlighters.py:44
-msgid "Occurrence:"
-msgstr ""
-
-#: spyderlib/utils/syntaxhighlighters.py:45
-msgid "Link:"
-msgstr ""
-
-#: spyderlib/utils/syntaxhighlighters.py:46
-msgid "Side areas:"
-msgstr ""
-
-#: spyderlib/utils/syntaxhighlighters.py:47
-msgid "Matched <br>parens:"
-msgstr ""
-
-#: spyderlib/utils/syntaxhighlighters.py:48
-msgid "Unmatched <br>parens:"
-msgstr ""
-
-#: spyderlib/utils/syntaxhighlighters.py:49
-msgid "Normal text:"
-msgstr ""
-
-#: spyderlib/utils/syntaxhighlighters.py:50
-msgid "Keyword:"
-msgstr ""
-
-#: spyderlib/utils/syntaxhighlighters.py:51
-msgid "Builtin:"
-msgstr ""
-
-#: spyderlib/utils/syntaxhighlighters.py:52
-msgid "Definition:"
-msgstr ""
-
-#: spyderlib/utils/syntaxhighlighters.py:53
-msgid "Comment:"
-msgstr ""
-
-#: spyderlib/utils/syntaxhighlighters.py:54
-msgid "String:"
-msgstr ""
-
-#: spyderlib/utils/syntaxhighlighters.py:55
-msgid "Number:"
-msgstr ""
-
-#: spyderlib/utils/syntaxhighlighters.py:56
-msgid "Instance:"
-msgstr ""
-
-#: spyderlib/workers/updates.py:86 spyderlib/workers/updates.py:88
-msgid "Unable to retrieve information."
-msgstr ""
-
-#: spyderlib/workers/updates.py:90
-msgid ""
-"Unable to connect to the internet. <br><br>Make sure the connection is "
-"working properly."
-msgstr ""
-
-#: spyderlib/workers/updates.py:93
-msgid "Unable to check for updates."
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:113
-msgid "Index"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:115
-#: spyderlib/plugins/shortcuts.py:517
-msgid "Name"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:118
-msgid "Tuple"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:121
-msgid "List"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:124
-msgid "Dictionary"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:126
-msgid "Key"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:130
-#: spyderlib/plugins/help.py:399
-msgid "Object"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:132
-msgid "Attribute"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:134
-msgid "elements"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:310
-msgid "Type"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:310
-msgid "Size"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:310
-msgid "Value"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:408
-msgid ""
-"Opening this variable can be slow\n"
-"\n"
-"Do you want to continue anyway?"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:416
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:570
-msgid "Edit item"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:417
-#, python-format
-msgid "<b>Unable to retrieve data.</b><br><br>Error message:<br>%s"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:571
-#, python-format
-msgid "<b>Unable to assign data to item.</b><br><br>Error message:<br>%s"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:633
-msgid "Resize rows to contents"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:641
-#: spyderlib/widgets/explorer.py:241
-msgid "Edit"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:644
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:983
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:1000
-msgid "Plot"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:648
-msgid "Histogram"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:652
-msgid "Show image"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:656
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:1008
-msgid "Save array"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:660
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:947
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:955
-msgid "Insert"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:663
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:897
-msgid "Remove"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:666
-#: spyderlib/plugins/variableexplorer.py:42
-msgid "Truncate values"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:670
-#: spyderlib/plugins/variableexplorer.py:44
-msgid "Show arrays min/max"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:674
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:914
-#: spyderlib/widgets/explorer.py:542 spyderlib/widgets/explorer.py:550
-#: spyderlib/widgets/explorer.py:561
-msgid "Rename"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:677
-msgid "Duplicate"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:895
-msgid "Do you want to remove selected item?"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:896
-msgid "Do you want to remove all selected items?"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:914
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:947
-msgid "Key:"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:955
-msgid "Value:"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:971
-msgid "Import error"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:972
-msgid "Please install <b>matplotlib</b> or <b>guiqwt</b>."
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:984
-#, python-format
-msgid "<b>Unable to plot data.</b><br><br>Error message:<br>%s"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:1001
-#, python-format
-msgid "<b>Unable to show image.</b><br><br>Error message:<br>%s"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:1024
-#, python-format
-msgid "<b>Unable to save array</b><br><br>Error message:<br>%s"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:1049
-msgid "It was not possible to copy this array"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:1074
-msgid "Clipboard contents"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:1089
-msgid "Import from clipboard"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:1091
-msgid "Empty clipboard"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/collectionseditor.py:1092
-msgid "Nothing to be imported from clipboard."
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:496
-msgid "It was not possible to copy values for this array"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:531
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:564
-#: spyderlib/widgets/variableexplorer/dataframeeditor.py:524
-#: spyderlib/widgets/variableexplorer/dataframeeditor.py:564
-msgid "Format"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:536
-#: spyderlib/widgets/variableexplorer/dataframeeditor.py:528
-msgid "Resize"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:539
-#: spyderlib/widgets/variableexplorer/dataframeeditor.py:532
-#: spyderlib/plugins/ipythonconsole.py:191
-#: spyderlib/plugins/externalconsole.py:111
-msgid "Background color"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:565
-#: spyderlib/widgets/variableexplorer/dataframeeditor.py:565
-msgid "Float formatting"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:573
-#: spyderlib/widgets/variableexplorer/dataframeeditor.py:574
-#, python-format
-msgid "Format (%s) is incorrect"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:607
-msgid "Array is empty"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:610
-msgid "Arrays with more than 3 dimensions are not supported"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:613
-msgid "The 'xlabels' argument length do no match array column number"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:617
-msgid "The 'ylabels' argument length do no match array row number"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:624
-#, python-format
-msgid "%s arrays"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:625
-#, python-format
-msgid "%s are currently not supported"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:632
-msgid "NumPy array"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:634
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:788
-msgid "Array editor"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:636
-msgid "read only"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:666
-msgid "Record array fields:"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:678
-msgid "Masked data"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:678
-msgid "Data"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:678
-msgid "Mask"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:689
-msgid "Axis:"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:694
-msgid "Index:"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:707
-msgid "<u>Warning</u>: changes are applied separately"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/arrayeditor.py:708
-msgid ""
-"For performance reasons, changes applied to masked array won't be reflected "
-"in array's data (and vice-versa)."
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/dataframeeditor.py:430
-msgid "To bool"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/dataframeeditor.py:430
-msgid "To complex"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/dataframeeditor.py:431
-msgid "To int"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/dataframeeditor.py:431
-msgid "To float"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/dataframeeditor.py:432
-msgid "To str"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/dataframeeditor.py:506
-#, python-format
-msgid "%s editor"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/dataframeeditor.py:538
-msgid "Column min/max"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/utils.py:28
-msgid "View and edit DataFrames and Series in the Variable Explorer"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/utils.py:33
-msgid "View and edit two and three dimensional arrays in the Variable Explorer"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:151
-#: spyderlib/widgets/editor.py:468 spyderlib/widgets/ipython.py:580
-#: spyderlib/widgets/externalshell/baseshell.py:152
-#: spyderlib/widgets/explorer.py:1040 spyderlib/plugins/help.py:443
-#: spyderlib/plugins/history.py:103
-msgid "Options"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:195
-msgid "Refresh"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:199
-msgid "Refresh periodically"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:203
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:456
-msgid "Import data"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:206
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:544
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:565
-msgid "Save data"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:211
-msgid "Save data as..."
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:218
-#: spyderlib/plugins/variableexplorer.py:33
-msgid "Exclude private references"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:219
-msgid "Exclude references which name starts with an underscore"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:226
-#: spyderlib/plugins/variableexplorer.py:35
-msgid "Exclude all-uppercase references"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:227
-msgid "Exclude references which name is uppercase"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:233
-#: spyderlib/plugins/variableexplorer.py:34
-msgid "Exclude capitalized references"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:234
-msgid "Exclude references which name starts with an uppercase character"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:241
-#: spyderlib/plugins/variableexplorer.py:36
-msgid "Exclude unsupported data types"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:242
-msgid ""
-"Exclude references to unsupported data types (i.e. which won't be handled/"
-"saved correctly)"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:351
-#, python-format
-msgid "Object <b>%s</b> is not picklable"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:476
-#, python-format
-msgid ""
-"<b>Unsupported file extension '%s'</b><br><br>Would you like to import it "
-"anyway (by selecting a known file format)?"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:484
-msgid "Open file as:"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:532
-#, python-format
-msgid "<b>Unable to load '%s'</b><br><br>Error message:<br>%s"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/namespacebrowser.py:566
-#, python-format
-msgid "<b>Unable to save current workspace</b><br><br>Error message:<br>%s"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/importwizard.py:116
-#: spyderlib/widgets/variableexplorer/importwizard.py:431
-msgid "Import as"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/importwizard.py:118
-msgid "data"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/importwizard.py:122
-msgid "code"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/importwizard.py:125
-#: spyderlib/widgets/variableexplorer/importwizard.py:504
-msgid "text"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/importwizard.py:138
-msgid "Column separator:"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/importwizard.py:142
-msgid "Tab"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/importwizard.py:145
-#: spyderlib/widgets/variableexplorer/importwizard.py:163
-msgid "other"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/importwizard.py:156
-msgid "Row separator:"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/importwizard.py:160
-msgid "EOL"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/importwizard.py:175
-msgid "Additional options"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/importwizard.py:179
-msgid "Skip rows:"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/importwizard.py:190
-msgid "Comments:"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/importwizard.py:196
-msgid "Transpose"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/importwizard.py:434
-msgid "array"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/importwizard.py:439
-msgid "list"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/importwizard.py:444
-msgid "DataFrame"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/importwizard.py:487
-#: spyderlib/widgets/variableexplorer/importwizard.py:569
-msgid "Import wizard"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/importwizard.py:492
-msgid "Raw text"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/importwizard.py:495
-msgid "variable_name"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/importwizard.py:506
-msgid "table"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/importwizard.py:507
-msgid "Preview"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/importwizard.py:511
-msgid "Variable Name"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/importwizard.py:519
-msgid "Cancel"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/importwizard.py:525
-#: spyderlib/widgets/explorer.py:1031
-msgid "Previous"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/importwizard.py:529
-#: spyderlib/widgets/explorer.py:1034
-#: spyderlib/plugins/workingdirectory.py:179
-msgid "Next"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/importwizard.py:532
-msgid "Done"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/importwizard.py:570
-#, python-format
-msgid ""
-"<b>Unable to proceed to next step</b><br><br>Please check your entries."
-"<br><br>Error message:<br>%s"
-msgstr ""
-
-#: spyderlib/widgets/variableexplorer/texteditor.py:72
-msgid "Text editor"
-msgstr ""
-
-#: spyderlib/widgets/comboboxes.py:165
-msgid "Press enter to validate this entry"
-msgstr ""
-
-#: spyderlib/widgets/comboboxes.py:166
-msgid "This entry is incorrect"
-msgstr ""
-
-#: spyderlib/widgets/comboboxes.py:209
-msgid "Press enter to validate this path"
-msgstr ""
-
-#: spyderlib/widgets/onecolumntree.py:50
-msgid "Collapse all"
-msgstr ""
-
-#: spyderlib/widgets/onecolumntree.py:54
-msgid "Expand all"
-msgstr ""
-
-#: spyderlib/widgets/onecolumntree.py:58
-msgid "Restore"
-msgstr ""
-
-#: spyderlib/widgets/onecolumntree.py:59
-msgid "Restore original tree layout"
-msgstr ""
-
-#: spyderlib/widgets/onecolumntree.py:63
-msgid "Collapse selection"
-msgstr ""
-
-#: spyderlib/widgets/onecolumntree.py:67
-msgid "Expand selection"
-msgstr ""
-
-#: spyderlib/widgets/editor.py:341 spyderlib/plugins/editor.py:645
-msgid "File switcher..."
-msgstr ""
-
-#: spyderlib/widgets/editor.py:344
-msgid "Copy path to clipboard"
-msgstr ""
-
-#: spyderlib/widgets/editor.py:348
-msgid "Close all to the right"
-msgstr ""
-
-#: spyderlib/widgets/editor.py:350
-msgid "Close all but this"
-msgstr ""
-
-#: spyderlib/widgets/editor.py:365
-#: spyderlib/widgets/sourcecode/codeeditor.py:94
-#: spyderlib/widgets/sourcecode/codeeditor.py:2901
-#: spyderlib/plugins/editor.py:96 spyderlib/plugins/editor.py:556
-#: spyderlib/plugins/editor.py:1636 spyderlib/plugins/help.py:123
-#: spyderlib/plugins/help.py:391 spyderlib/plugins/__init__.py:523
-msgid "Editor"
-msgstr ""
-
-#: spyderlib/widgets/editor.py:914
-msgid "Temporary file"
-msgstr ""
-
-#: spyderlib/widgets/editor.py:1011
-msgid "New window"
-msgstr ""
-
-#: spyderlib/widgets/editor.py:1012
-msgid "Create a new editor window"
-msgstr ""
-
-#: spyderlib/widgets/editor.py:1015
-msgid "Split vertically"
-msgstr ""
-
-#: spyderlib/widgets/editor.py:1017
-msgid "Split vertically this editor window"
-msgstr ""
-
-#: spyderlib/widgets/editor.py:1019
-msgid "Split horizontally"
-msgstr ""
-
-#: spyderlib/widgets/editor.py:1021
-msgid "Split horizontally this editor window"
-msgstr ""
-
-#: spyderlib/widgets/editor.py:1023
-msgid "Close this panel"
-msgstr ""
-
-#: spyderlib/widgets/editor.py:1180
-#, python-format
-msgid "<b>%s</b> has been modified.<br>Do you want to save changes?"
-msgstr ""
-
-#: spyderlib/widgets/editor.py:1242
-msgid "Save"
-msgstr ""
-
-#: spyderlib/widgets/editor.py:1243
-#, python-format
-msgid "<b>Unable to save script '%s'</b><br><br>Error message:<br>%s"
-msgstr ""
-
-#: spyderlib/widgets/editor.py:1263 spyderlib/plugins/editor.py:657
-msgid "Save file"
-msgstr ""
-
-#: spyderlib/widgets/editor.py:1477
-#, python-format
-msgid ""
-"<b>%s</b> is unavailable (this file may have been removed, moved or renamed "
-"outside Spyder).<br>Do you want to close it?"
-msgstr ""
-
-#: spyderlib/widgets/editor.py:1497
-#, python-format
-msgid ""
-"<b>%s</b> has been modified outside Spyder.<br>Do you want to reload it and "
-"lose all your changes?"
-msgstr ""
-
-#: spyderlib/widgets/editor.py:1593
-#, python-format
-msgid ""
-"All changes to <b>%s</b> will be lost.<br>Do you want to revert file from "
-"disk?"
-msgstr ""
-
-#: spyderlib/widgets/editor.py:1733
-#, python-format
-msgid "Loading %s..."
-msgstr ""
-
-#: spyderlib/widgets/editor.py:1743
-#, python-format
-msgid ""
-"<b>%s</b> contains mixed end-of-line characters.<br>Spyder will fix this "
-"automatically."
-msgstr ""
-
-#: spyderlib/widgets/editor.py:2108
-msgid "Close window"
-msgstr ""
-
-#: spyderlib/widgets/editor.py:2110
-msgid "Close this window"
-msgstr ""
-
-#: spyderlib/widgets/shell.py:128
-msgid "Save history log..."
-msgstr ""
-
-#: spyderlib/widgets/shell.py:130
-msgid "Save current history log (i.e. all inputs and outputs) in a text file"
-msgstr ""
-
-#: spyderlib/widgets/shell.py:133 spyderlib/widgets/projectexplorer.py:1015
-#: spyderlib/widgets/explorer.py:480 spyderlib/plugins/configdialog.py:1000
-msgid "Delete"
-msgstr ""
-
-#: spyderlib/widgets/shell.py:256
-msgid "Save history log"
-msgstr ""
-
-#: spyderlib/widgets/shell.py:259
-msgid "History logs"
-msgstr ""
-
-#: spyderlib/widgets/shell.py:270
-#, python-format
-msgid "<b>Unable to save file '%s'</b><br><br>Error message:<br>%s"
-msgstr ""
-
-#: spyderlib/widgets/shell.py:712
-msgid "Copy without prompts"
-msgstr ""
-
-#: spyderlib/widgets/shell.py:715 spyderlib/widgets/shell.py:719
-msgid "Clear line"
-msgstr ""
-
-#: spyderlib/widgets/shell.py:721
-msgid "Clear shell"
-msgstr ""
-
-#: spyderlib/widgets/shell.py:725
-msgid "Clear shell contents ('cls' command)"
-msgstr ""
-
-#: spyderlib/widgets/ipython.py:246
-msgid "Reset IPython namespace"
-msgstr ""
-
-#: spyderlib/widgets/ipython.py:247
-msgid ""
-"All user-defined variables will be removed.<br>Are you sure you want to "
-"reset the namespace?"
-msgstr ""
-
-#: spyderlib/widgets/ipython.py:363 spyderlib/widgets/ipython.py:380
-#: spyderlib/widgets/externalshell/baseshell.py:250
-#: spyderlib/widgets/mixins.py:656
-msgid "Arguments"
-msgstr ""
-
-#: spyderlib/widgets/ipython.py:518
-msgid "An error ocurred while starting the kernel"
-msgstr ""
-
-#: spyderlib/widgets/ipython.py:533
-#: spyderlib/widgets/externalshell/baseshell.py:106
-#: spyderlib/plugins/help.py:391 spyderlib/plugins/runconfig.py:185
-#: spyderlib/plugins/runconfig.py:455 spyderlib/plugins/externalconsole.py:56
-#: spyderlib/plugins/externalconsole.py:999
-msgid "Console"
-msgstr ""
-
-#: spyderlib/widgets/ipython.py:547
-msgid "Restart kernel"
-msgstr ""
-
-#: spyderlib/widgets/ipython.py:567 spyderlib/widgets/findinfiles.py:333
-msgid "Stop"
-msgstr ""
-
-#: spyderlib/widgets/ipython.py:569
-msgid "Stop the current command"
-msgstr ""
-
-#: spyderlib/widgets/ipython.py:593
-msgid "Inspect current object"
-msgstr ""
-
-#: spyderlib/widgets/ipython.py:598
-msgid "Clear line or block"
-msgstr ""
-
-#: spyderlib/widgets/ipython.py:602
-msgid "Reset namespace"
-msgstr ""
-
-#: spyderlib/widgets/ipython.py:605
-msgid "Clear console"
-msgstr ""
-
-#: spyderlib/widgets/ipython.py:661
-msgid ""
-"It seems the kernel died unexpectedly. Use 'Restart kernel' to continue "
-"using this console."
-msgstr ""
-
-#: spyderlib/widgets/ipython.py:681
-msgid "Changing backend to Qt for Mayavi"
-msgstr ""
-
-#: spyderlib/widgets/ipython.py:690
-msgid "Kernel process is either remote or unspecified. Cannot interrupt"
-msgstr ""
-
-#: spyderlib/widgets/ipython.py:699
-msgid "Kernel process is either remote or unspecified. Cannot restart."
-msgstr ""
-
-#: spyderlib/widgets/ipython.py:778
-msgid "Connecting to kernel..."
-msgstr ""
-
-#: spyderlib/widgets/pathmanager.py:86
-msgid "Move to top"
-msgstr ""
-
-#: spyderlib/widgets/pathmanager.py:92
-msgid "Move up"
-msgstr ""
-
-#: spyderlib/widgets/pathmanager.py:98
-msgid "Move down"
-msgstr ""
-
-#: spyderlib/widgets/pathmanager.py:104
-msgid "Move to bottom"
-msgstr ""
-
-#: spyderlib/widgets/pathmanager.py:115 spyderlib/widgets/pathmanager.py:230
-msgid "Add path"
-msgstr ""
-
-#: spyderlib/widgets/pathmanager.py:120 spyderlib/widgets/pathmanager.py:213
-msgid "Remove path"
-msgstr ""
-
-#: spyderlib/widgets/pathmanager.py:130
-msgid "Synchronize..."
-msgstr ""
-
-#: spyderlib/widgets/pathmanager.py:132
-msgid "Synchronize Spyder's path list with PYTHONPATH environment variable"
-msgstr ""
-
-#: spyderlib/widgets/pathmanager.py:144
-msgid "Synchronize"
-msgstr ""
-
-#: spyderlib/widgets/pathmanager.py:145
-msgid ""
-"This will synchronize Spyder's path list with <b>PYTHONPATH</b> environment "
-"variable for current user, allowing you to run your Python modules outside "
-"Spyder without having to configure sys.path. <br>Do you want to clear "
-"contents of PYTHONPATH before adding Spyder's path list?"
-msgstr ""
-
-#: spyderlib/widgets/pathmanager.py:214
-msgid "Do you really want to remove selected path?"
-msgstr ""
-
-#: spyderlib/widgets/pathmanager.py:223 spyderlib/widgets/findinfiles.py:504
-#: spyderlib/widgets/projectexplorer.py:899
-#: spyderlib/widgets/externalshell/pythonshell.py:638
-#: spyderlib/widgets/explorer.py:584 spyderlib/plugins/configdialog.py:490
-#: spyderlib/plugins/configdialog.py:505
-#: spyderlib/plugins/workingdirectory.py:290
-#: spyderlib/plugins/runconfig.py:176 spyderlib/plugins/runconfig.py:240
-msgid "Select directory"
-msgstr ""
-
-#: spyderlib/widgets/pathmanager.py:231
-msgid ""
-"This directory is already included in Spyder path list.<br>Do you want to "
-"move it to the top of the list?"
-msgstr ""
-
-#: spyderlib/widgets/findinfiles.py:158
-msgid "Unexpected error: see internal console"
-msgstr ""
-
-#: spyderlib/widgets/findinfiles.py:209 spyderlib/widgets/findinfiles.py:233
-#: spyderlib/widgets/findinfiles.py:280
-msgid "invalid regular expression"
-msgstr ""
-
-#: spyderlib/widgets/findinfiles.py:278
-msgid "permission denied errors were encountered"
-msgstr ""
-
-#: spyderlib/widgets/findinfiles.py:315
-msgid "Search pattern"
-msgstr ""
-
-#: spyderlib/widgets/findinfiles.py:318 spyderlib/widgets/findinfiles.py:352
-#: spyderlib/widgets/findinfiles.py:364 spyderlib/widgets/findreplace.py:77
-msgid "Regular expression"
-msgstr ""
-
-#: spyderlib/widgets/findinfiles.py:327
-msgid "Search"
-msgstr ""
-
-#: spyderlib/widgets/findinfiles.py:330
-msgid "Start search"
-msgstr ""
-
-#: spyderlib/widgets/findinfiles.py:336
-msgid "Stop search"
-msgstr ""
-
-#: spyderlib/widgets/findinfiles.py:346
-msgid "Included filenames pattern"
-msgstr ""
-
-#: spyderlib/widgets/findinfiles.py:355
-msgid "Include:"
-msgstr ""
-
-#: spyderlib/widgets/findinfiles.py:358
-msgid "Excluded filenames pattern"
-msgstr ""
-
-#: spyderlib/widgets/findinfiles.py:367
-msgid "Exclude:"
-msgstr ""
-
-#: spyderlib/widgets/findinfiles.py:377
-msgid "PYTHONPATH"
-msgstr ""
-
-#: spyderlib/widgets/findinfiles.py:380
-msgid ""
-"Search in all directories listed in sys.path which are outside the Python "
-"installation directory"
-msgstr ""
-
-#: spyderlib/widgets/findinfiles.py:382
-msgid "Hg repository"
-msgstr ""
-
-#: spyderlib/widgets/findinfiles.py:385
-msgid "Search in current directory hg repository"
-msgstr ""
-
-#: spyderlib/widgets/findinfiles.py:386
-msgid "Here:"
-msgstr ""
-
-#: spyderlib/widgets/findinfiles.py:390
-msgid "Search recursively in this directory"
-msgstr ""
-
-#: spyderlib/widgets/findinfiles.py:395
-msgid "Browse a search directory"
-msgstr ""
-
-#: spyderlib/widgets/findinfiles.py:425
-msgid "Hide advanced options"
-msgstr ""
-
-#: spyderlib/widgets/findinfiles.py:428
-msgid "Show advanced options"
-msgstr ""
-
-#: spyderlib/widgets/findinfiles.py:569
-msgid "Search canceled"
-msgstr ""
-
-#: spyderlib/widgets/findinfiles.py:573
-msgid "String not found"
-msgstr ""
-
-#: spyderlib/widgets/findinfiles.py:575
-msgid "matches in"
-msgstr ""
-
-#: spyderlib/widgets/findinfiles.py:576
-msgid "file"
-msgstr ""
-
-#: spyderlib/widgets/findinfiles.py:584
-msgid "interrupted"
-msgstr ""
-
-#: spyderlib/widgets/findinfiles.py:689 spyderlib/plugins/findinfiles.py:114
-msgid "Find in files"
-msgstr ""
-
-#: spyderlib/widgets/tabs.py:142
-msgid "Browse tabs"
-msgstr ""
-
-#: spyderlib/widgets/tabs.py:271
-msgid "Close current tab"
-msgstr ""
-
-#: spyderlib/widgets/pydocgui.py:107
-msgid "Module or package:"
-msgstr ""
-
-#: spyderlib/widgets/editortools.py:94 spyderlib/widgets/editortools.py:130
-#, python-format
-msgid "Line %s"
-msgstr ""
-
-#: spyderlib/widgets/editortools.py:99
-#, python-format
-msgid "Class defined at line %s"
-msgstr ""
-
-#: spyderlib/widgets/editortools.py:107
-#, python-format
-msgid "Method defined at line %s"
-msgstr ""
-
-#: spyderlib/widgets/editortools.py:117
-#, python-format
-msgid "Function defined at line %s"
-msgstr ""
-
-#: spyderlib/widgets/editortools.py:149
-#, python-format
-msgid "Cell starts at line %s"
-msgstr ""
-
-#: spyderlib/widgets/editortools.py:195
-#: spyderlib/plugins/outlineexplorer.py:48
-msgid "Outline"
-msgstr ""
-
-#: spyderlib/widgets/editortools.py:202 spyderlib/widgets/editortools.py:539
-msgid "Go to cursor position"
-msgstr ""
-
-#: spyderlib/widgets/editortools.py:205
-msgid "Show absolute path"
-msgstr ""
-
-#: spyderlib/widgets/editortools.py:208 spyderlib/widgets/explorer.py:178
-msgid "Show all files"
-msgstr ""
-
-#: spyderlib/widgets/editortools.py:211
-msgid "Show special comments"
-msgstr ""
-
-#: spyderlib/widgets/editortools.py:510 spyderlib/plugins/editor.py:615
-msgid "Show/hide outline explorer"
-msgstr ""
-
-#: spyderlib/widgets/fileswitcher.py:108
-msgid "unsaved file"
-msgstr ""
-
-#: spyderlib/widgets/fileswitcher.py:228
-msgid ""
-"Press <b>Enter</b> to switch files or <b>Esc</b> to cancel.<br><br>Type to "
-"filter filenames.<br><br>Use <b>:number</b> to go to a line, e.g. "
-"<b><code>main:42</code></b><br>Use <b>@symbol_text</b> to go to a symbol, e."
-"g. <b><code>@init</code></b><br><br> Press <b>Ctrl+W</b> to close current "
-"tab.<br>"
-msgstr ""
-
-#: spyderlib/widgets/fileswitcher.py:485
-msgid "lines"
-msgstr ""
-
-#: spyderlib/widgets/sourcecode/codeeditor.py:97
-msgid "Go to line:"
-msgstr ""
-
-#: spyderlib/widgets/sourcecode/codeeditor.py:105
-msgid "Line count:"
-msgstr ""
-
-#: spyderlib/widgets/sourcecode/codeeditor.py:1269
-msgid "Breakpoint"
-msgstr ""
-
-#: spyderlib/widgets/sourcecode/codeeditor.py:1270
-msgid "Condition:"
-msgstr ""
-
-#: spyderlib/widgets/sourcecode/codeeditor.py:1672
-msgid "Code analysis"
-msgstr ""
-
-#: spyderlib/widgets/sourcecode/codeeditor.py:1726
-msgid "To do"
-msgstr ""
-
-#: spyderlib/widgets/sourcecode/codeeditor.py:1967
-msgid "Removal error"
-msgstr ""
-
-#: spyderlib/widgets/sourcecode/codeeditor.py:1968
-msgid ""
-"It was not possible to remove outputs from this notebook. The error is:\n"
-"\n"
-msgstr ""
-
-#: spyderlib/widgets/sourcecode/codeeditor.py:1980
-#: spyderlib/widgets/explorer.py:524
-msgid "Conversion error"
-msgstr ""
-
-#: spyderlib/widgets/sourcecode/codeeditor.py:1981
-#: spyderlib/widgets/explorer.py:525
-msgid ""
-"It was not possible to convert this notebook. The error is:\n"
-"\n"
-msgstr ""
-
-#: spyderlib/widgets/sourcecode/codeeditor.py:2438
-#: spyderlib/plugins/editor.py:879
-msgid "Comment"
-msgstr ""
-
-#: spyderlib/widgets/sourcecode/codeeditor.py:2438
-#: spyderlib/plugins/editor.py:879
-msgid "Uncomment"
-msgstr ""
-
-#: spyderlib/widgets/sourcecode/codeeditor.py:2442
-msgid "Clear all ouput"
-msgstr ""
-
-#: spyderlib/widgets/sourcecode/codeeditor.py:2445
-#: spyderlib/widgets/explorer.py:253
-msgid "Convert to Python script"
-msgstr ""
-
-#: spyderlib/widgets/sourcecode/codeeditor.py:2448
-msgid "Go to definition"
-msgstr ""
-
-#: spyderlib/widgets/sourcecode/codeeditor.py:2451
-#: spyderlib/plugins/editor.py:816
-msgid "Run cell"
-msgstr ""
-
-#: spyderlib/widgets/sourcecode/codeeditor.py:2455
-#: spyderlib/plugins/editor.py:824
-msgid "Run cell and advance"
-msgstr ""
-
-#: spyderlib/widgets/sourcecode/codeeditor.py:2459
-#: spyderlib/plugins/editor.py:800
-msgid "Run &selection or current line"
-msgstr ""
-
-#: spyderlib/widgets/sourcecode/codeeditor.py:2462
-#: spyderlib/widgets/browser.py:34
-msgid "Zoom in"
-msgstr ""
-
-#: spyderlib/widgets/sourcecode/codeeditor.py:2465
-#: spyderlib/widgets/browser.py:31
-msgid "Zoom out"
-msgstr ""
-
-#: spyderlib/widgets/sourcecode/codeeditor.py:2468
-msgid "Zoom reset"
-msgstr ""
-
-#: spyderlib/widgets/internalshell.py:258
-msgid "Help..."
-msgstr ""
-
-#: spyderlib/widgets/internalshell.py:275
-msgid "Shell special commands:"
-msgstr ""
-
-#: spyderlib/widgets/internalshell.py:276
-msgid "Internal editor:"
-msgstr ""
-
-#: spyderlib/widgets/internalshell.py:277
-msgid "External editor:"
-msgstr ""
-
-#: spyderlib/widgets/internalshell.py:278
-msgid "Run script:"
-msgstr ""
-
-#: spyderlib/widgets/internalshell.py:279
-msgid "Remove references:"
-msgstr ""
-
-#: spyderlib/widgets/internalshell.py:280
-msgid "System commands:"
-msgstr ""
-
-#: spyderlib/widgets/internalshell.py:281
-msgid "Python help:"
-msgstr ""
-
-#: spyderlib/widgets/internalshell.py:282
-msgid "GUI-based editor:"
-msgstr ""
-
-#: spyderlib/widgets/projectexplorer.py:335
-msgid "its own configuration file"
-msgstr ""
-
-#: spyderlib/widgets/projectexplorer.py:337
-msgid " and "
-msgstr ""
-
-#: spyderlib/widgets/projectexplorer.py:341
-#, python-format
-msgid "the following projects:<br>%s"
-msgstr ""
-
-#: spyderlib/widgets/projectexplorer.py:545
-msgid "Project..."
-msgstr ""
-
-#: spyderlib/widgets/projectexplorer.py:549
-#: spyderlib/plugins/projectexplorer.py:64
-msgid "New project..."
-msgstr ""
-
-#: spyderlib/widgets/projectexplorer.py:558
-msgid "Existing directory"
-msgstr ""
-
-#: spyderlib/widgets/projectexplorer.py:562
-msgid "Existing Spyder project"
-msgstr ""
-
-#: spyderlib/widgets/projectexplorer.py:566
-msgid "Existing Pydev project"
-msgstr ""
-
-#: spyderlib/widgets/projectexplorer.py:583
-msgid "Open project"
-msgstr ""
-
-#: spyderlib/widgets/projectexplorer.py:588
-msgid "Close project"
-msgstr ""
-
-#: spyderlib/widgets/projectexplorer.py:593
-msgid "Close unrelated projects"
-msgstr ""
-
-#: spyderlib/widgets/projectexplorer.py:602
-msgid "Edit related projects"
-msgstr ""
-
-#: spyderlib/widgets/projectexplorer.py:610
-msgid "Add to PYTHONPATH"
-msgstr ""
-
-#: spyderlib/widgets/projectexplorer.py:615
-msgid "Remove from PYTHONPATH"
-msgstr ""
-
-#: spyderlib/widgets/projectexplorer.py:620
-msgid "Properties"
-msgstr ""
-
-#: spyderlib/widgets/projectexplorer.py:655
-msgid "Show horizontal scrollbar"
-msgstr ""
-
-#: spyderlib/widgets/projectexplorer.py:692
-msgid "Workspace"
-msgstr ""
-
-#: spyderlib/widgets/projectexplorer.py:693
-#, python-format
-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."
-msgstr ""
-
-#: spyderlib/widgets/projectexplorer.py:752
-msgid "Import directory"
-msgstr ""
-
-#: spyderlib/widgets/projectexplorer.py:754
-#, python-format
-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)?"
-msgstr ""
-
-#: spyderlib/widgets/projectexplorer.py:770
-#: spyderlib/widgets/projectexplorer.py:1187 spyderlib/widgets/explorer.py:501
-#, python-format
-msgid "<b>Unable to %s <i>%s</i></b><br><br>Error message:<br>%s"
-msgstr ""
-
-#: spyderlib/widgets/projectexplorer.py:772
-#: spyderlib/widgets/projectexplorer.py:1183
-msgid "copy"
-msgstr ""
-
-#: spyderlib/widgets/projectexplorer.py:823
-#: spyderlib/widgets/projectexplorer.py:830
-#: spyderlib/widgets/projectexplorer.py:1101
-#: spyderlib/widgets/projectexplorer.py:1186 spyderlib/widgets/explorer.py:500
-msgid "Project Explorer"
-msgstr ""
-
-#: spyderlib/widgets/projectexplorer.py:824
-#, python-format
-msgid "The project <b>%s</b> is already opened!"
-msgstr ""
-
-#: spyderlib/widgets/projectexplorer.py:831
-#, python-format
-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>"
-msgstr ""
-
-#: spyderlib/widgets/projectexplorer.py:842
-msgid "Project name:"
-msgstr ""
-
-#: spyderlib/widgets/projectexplorer.py:851
-#, python-format
-msgid "A project named <b>%s</b> already exists"
-msgstr ""
-
-#: spyderlib/widgets/projectexplorer.py:856
-#, python-format
-msgid ""
-"Invalid project name.<br><br>Name must match the following regular "
-"expression:<br><b>%s</b>"
-msgstr ""
-
-#: spyderlib/widgets/projectexplorer.py:863
-#, python-format
-msgid ""
-"The following directory is not empty:<br><b>%s</b><br><br>Do you want to "
-"continue?"
-msgstr ""
-
-#: spyderlib/widgets/projectexplorer.py:876
-msgid "New project"
-msgstr ""
-
-#: spyderlib/widgets/projectexplorer.py:884
-msgid ""
-"The current workspace has not been configured yet.\n"
-"Do you want to do this now?"
-msgstr ""
-
-#: spyderlib/widgets/projectexplorer.py:922
-msgid "Import existing project"
-msgstr ""
-
-#: spyderlib/widgets/projectexplorer.py:935
-msgid "Select projects to import"
-msgstr ""
-
-#: spyderlib/widgets/projectexplorer.py:947
-#, python-format
-msgid "The folder <i>%s</i> does not contain a valid %s project"
-msgstr ""
-
-#: spyderlib/widgets/projectexplorer.py:977
-msgid "Import existing Pydev project"
-msgstr ""
-
-#: spyderlib/widgets/projectexplorer.py:978
-#, python-format
-msgid ""
-"<b>Unable to read Pydev project <i>%s</i></b><br><br>Error message:<br>%s"
-msgstr ""
-
-#: spyderlib/widgets/projectexplorer.py:1016
-#, python-format
-msgid ""
-"Do you really want to delete project <b>%s</b>?<br><br>Note: project files "
-"won't be deleted from disk."
-msgstr ""
-
-#: spyderlib/widgets/projectexplorer.py:1069
-msgid "Related projects"
-msgstr ""
-
-#: spyderlib/widgets/projectexplorer.py:1077
-#, python-format
-msgid "Select projects which are related to <b>%s</b>"
-msgstr ""
-
-#: spyderlib/widgets/projectexplorer.py:1102
-#, python-format
-msgid ""
-"Statistics on source files only:<br>(Python, Cython, IPython, Enaml,C/C++, "
-"Fortran)<br><br><b>%s</b> files.<br><b>%s</b> lines of code."
-msgstr ""
-
-#: spyderlib/widgets/projectexplorer.py:1150
-#: spyderlib/widgets/projectexplorer.py:1164
-#: spyderlib/plugins/projectexplorer.py:53
-msgid "Project explorer"
-msgstr ""
-
-#: spyderlib/widgets/projectexplorer.py:1151
-#, python-format
-msgid "File <b>%s</b> already exists.<br>Do you want to overwrite it?"
-msgstr ""
-
-#: spyderlib/widgets/projectexplorer.py:1165
-#, python-format
-msgid "Folder <b>%s</b> already exists."
-msgstr ""
-
-#: spyderlib/widgets/projectexplorer.py:1185
-msgid "move"
-msgstr ""
-
-#: spyderlib/widgets/projectexplorer.py:1195
-msgid "Select an existing workspace directory, or create a new one"
-msgstr ""
-
-#: spyderlib/widgets/projectexplorer.py:1196
-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>."
-"spyderworkspace</b> configuration file.<br><br>A <b>Spyder project</b> is a "
-"directory with source code (and other related files) and a configuration "
-"file (named <b>.spyderproject</b>) with project settings (PYTHONPATH, linked "
-"projects, ...).<br>"
-msgstr ""
-
-#: spyderlib/widgets/projectexplorer.py:1225
-msgid "This is the current workspace directory"
-msgstr ""
-
-#: spyderlib/widgets/projectexplorer.py:1255
-#, python-format
-msgid ""
-"The following directory is not a Spyder workspace:<br>%s<br><br>Do you want "
-"to create a new workspace in this directory?"
-msgstr ""
-
-#: spyderlib/widgets/externalshell/pythonshell.py:284
-msgid "Variables"
-msgstr ""
-
-#: spyderlib/widgets/externalshell/pythonshell.py:285
-msgid "Show/hide global variables explorer"
-msgstr ""
-
-#: spyderlib/widgets/externalshell/pythonshell.py:289
-msgid "Terminate"
-msgstr ""
-
-#: spyderlib/widgets/externalshell/pythonshell.py:290
-msgid ""
-"Attempts to stop the process. The process\n"
-"may not exit as a result of clicking this\n"
-"button (it is given the chance to prompt\n"
-"the user for any unsaved files, etc)."
-msgstr ""
-
-#: spyderlib/widgets/externalshell/pythonshell.py:303
-msgid "Interact"
-msgstr ""
-
-#: spyderlib/widgets/externalshell/pythonshell.py:305
-msgid "Debug"
-msgstr ""
-
-#: spyderlib/widgets/externalshell/pythonshell.py:307
-#: spyderlib/widgets/externalshell/pythonshell.py:373
-msgid "Arguments..."
-msgstr ""
-
-#: spyderlib/widgets/externalshell/pythonshell.py:309
-msgid "Post Mortem Debug"
-msgstr ""
-
-#: spyderlib/widgets/externalshell/pythonshell.py:311
-#: spyderlib/plugins/editor.py:783
-msgid "Run settings"
-msgstr ""
-
-#: spyderlib/widgets/externalshell/pythonshell.py:315
-msgid "Working directory"
-msgstr ""
-
-#: spyderlib/widgets/externalshell/pythonshell.py:317
-msgid "Set current working directory"
-msgstr ""
-
-#: spyderlib/widgets/externalshell/pythonshell.py:319
-msgid "Environment variables"
-msgstr ""
-
-#: spyderlib/widgets/externalshell/pythonshell.py:323
-msgid "Show sys.path contents"
-msgstr ""
-
-#: spyderlib/widgets/externalshell/pythonshell.py:369
-#, python-format
-msgid "Arguments: %s"
-msgstr ""
-
-#: spyderlib/widgets/externalshell/pythonshell.py:371
-msgid "No argument"
-msgstr ""
-
-#: spyderlib/widgets/externalshell/pythonshell.py:550
-msgid ""
-"The kernel failed to start!! That's all we know... Please close this console "
-"and open a new one."
-msgstr ""
-
-#: spyderlib/widgets/externalshell/pythonshell.py:554
-msgid "A Python console failed to start!"
-msgstr ""
-
-#: spyderlib/widgets/externalshell/systemshell.py:105
-msgid "Process failed to start"
-msgstr ""
-
-#: spyderlib/widgets/externalshell/baseshell.py:141
-msgid "Run again this program"
-msgstr ""
-
-#: spyderlib/widgets/externalshell/baseshell.py:144
-msgid "Kill"
-msgstr ""
-
-#: spyderlib/widgets/externalshell/baseshell.py:146
-msgid "Kills the current process, causing it to exit immediately"
-msgstr ""
-
-#: spyderlib/widgets/externalshell/baseshell.py:172
-#: spyderlib/plugins/externalconsole.py:69
-msgid "Show elapsed time"
-msgstr ""
-
-#: spyderlib/widgets/externalshell/baseshell.py:219
-msgid "<span style='color: #44AA44'><b>Running...</b></span>"
-msgstr ""
-
-#: spyderlib/widgets/externalshell/baseshell.py:225
-msgid "Terminated."
-msgstr ""
-
-#: spyderlib/widgets/externalshell/baseshell.py:251
-msgid "Command line arguments:"
-msgstr ""
-
-#: spyderlib/widgets/arraybuilder.py:162
-msgid ""
-"\n"
-"           <b>Numpy Array/Matrix Helper</b><br>\n"
-"           Type an array in Matlab    : <code>[1 2;3 4]</code><br>\n"
-"           or Spyder simplified syntax : <code>1 2;3 4</code>\n"
-"           <br><br>\n"
-"           Hit 'Enter' for array or 'Ctrl+Enter' for matrix.\n"
-"           <br><br>\n"
-"           <b>Hint:</b><br>\n"
-"           Use two spaces or two tabs to generate a ';'.\n"
-"           "
-msgstr ""
-
-#: spyderlib/widgets/arraybuilder.py:173
-msgid ""
-"\n"
-"           <b>Numpy Array/Matrix Helper</b><br>\n"
-"           Enter an array in the table. <br>\n"
-"           Use Tab to move between cells.\n"
-"           <br><br>\n"
-"           Hit 'Enter' for array or 'Ctrl+Enter' for matrix.\n"
-"           <br><br>\n"
-"           <b>Hint:</b><br>\n"
-"           Use two tabs at the end of a row to move to the next row.\n"
-"           "
-msgstr ""
-
-#: spyderlib/widgets/arraybuilder.py:337
-msgid "Array dimensions not valid"
-msgstr ""
-
-#: spyderlib/widgets/dependencies.py:59
-msgid "Module"
-msgstr ""
-
-#: spyderlib/widgets/dependencies.py:59
-msgid " Required "
-msgstr ""
-
-#: spyderlib/widgets/dependencies.py:60
-msgid " Installed "
-msgstr ""
-
-#: spyderlib/widgets/dependencies.py:60
-msgid "Provided features"
-msgstr ""
-
-#: spyderlib/widgets/dependencies.py:130
-msgid "Dependencies"
-msgstr ""
-
-#: spyderlib/widgets/dependencies.py:137
-#, python-format
-msgid ""
-"Spyder depends on several Python modules to provide the right functionality "
-"for all its panes. The table below shows the required and installed versions "
-"(if any) of all of them.<br><br><b>Note</b>: You can safely use Spyder "
-"without the following modules installed: <b>%s</b> and <b>%s</b>"
-msgstr ""
-
-#: spyderlib/widgets/dependencies.py:150
-msgid "Copy to clipboard"
-msgstr ""
-
-#: spyderlib/widgets/explorer.py:174
-msgid "Edit filename filters..."
-msgstr ""
-
-#: spyderlib/widgets/explorer.py:188
-msgid "Edit filename filters"
-msgstr ""
-
-#: spyderlib/widgets/explorer.py:189
-msgid "Name filters:"
-msgstr ""
-
-#: spyderlib/widgets/explorer.py:208
-msgid "File..."
-msgstr ""
-
-#: spyderlib/widgets/explorer.py:212
-msgid "Module..."
-msgstr ""
-
-#: spyderlib/widgets/explorer.py:216
-msgid "Folder..."
-msgstr ""
-
-#: spyderlib/widgets/explorer.py:220
-msgid "Package..."
-msgstr ""
-
-#: spyderlib/widgets/explorer.py:243
-msgid "Move..."
-msgstr ""
-
-#: spyderlib/widgets/explorer.py:246
-msgid "Delete..."
-msgstr ""
-
-#: spyderlib/widgets/explorer.py:249
-msgid "Rename..."
-msgstr ""
-
-#: spyderlib/widgets/explorer.py:252
-msgid "Open"
-msgstr ""
-
-#: spyderlib/widgets/explorer.py:287
-msgid "Commit"
-msgstr ""
-
-#: spyderlib/widgets/explorer.py:290
-msgid "Browse repository"
-msgstr ""
-
-#: spyderlib/widgets/explorer.py:301
-msgid "Open command prompt here"
-msgstr ""
-
-#: spyderlib/widgets/explorer.py:303
-msgid "Open terminal here"
-msgstr ""
-
-#: spyderlib/widgets/explorer.py:308
-msgid "Open Python console here"
-msgstr ""
-
-#: spyderlib/widgets/explorer.py:322
-msgid "New"
-msgstr ""
-
-#: spyderlib/widgets/explorer.py:330
-msgid "Import"
-msgstr ""
-
-#: spyderlib/widgets/explorer.py:481
-#, python-format
-msgid "Do you really want to delete <b>%s</b>?"
-msgstr ""
-
-#: spyderlib/widgets/explorer.py:499
-msgid "delete"
-msgstr ""
-
-#: spyderlib/widgets/explorer.py:543
-msgid "New name:"
-msgstr ""
-
-#: spyderlib/widgets/explorer.py:551
-#, python-format
-msgid ""
-"Do you really want to rename <b>%s</b> and overwrite the existing file <b>"
-"%s</b>?"
-msgstr ""
-
-#: spyderlib/widgets/explorer.py:562
-#, python-format
-msgid "<b>Unable to rename file <i>%s</i></b><br><br>Error message:<br>%s"
-msgstr ""
-
-#: spyderlib/widgets/explorer.py:598
-#, python-format
-msgid "<b>Unable to move <i>%s</i></b><br><br>Error message:<br>%s"
-msgstr ""
-
-#: spyderlib/widgets/explorer.py:616
-#, python-format
-msgid "<b>Unable to create folder <i>%s</i></b><br><br>Error message:<br>%s"
-msgstr ""
-
-#: spyderlib/widgets/explorer.py:629 spyderlib/widgets/explorer.py:663
-#, python-format
-msgid "<b>Unable to create file <i>%s</i></b><br><br>Error message:<br>%s"
-msgstr ""
-
-#: spyderlib/widgets/explorer.py:637
-msgid "New folder"
-msgstr ""
-
-#: spyderlib/widgets/explorer.py:638
-msgid "Folder name:"
-msgstr ""
-
-#: spyderlib/widgets/explorer.py:643
-msgid "New package"
-msgstr ""
-
-#: spyderlib/widgets/explorer.py:644
-msgid "Package name:"
-msgstr ""
-
-#: spyderlib/widgets/explorer.py:662 spyderlib/widgets/explorer.py:669
-#: spyderlib/plugins/editor.py:630 spyderlib/plugins/workingdirectory.py:82
-msgid "New file"
-msgstr ""
-
-#: spyderlib/widgets/explorer.py:684
-msgid "New module"
-msgstr ""
-
-#: spyderlib/widgets/explorer.py:685 spyderlib/plugins/console.py:232
-#: spyderlib/plugins/externalconsole.py:223
-#: spyderlib/plugins/externalconsole.py:1211
-msgid "Python scripts"
-msgstr ""
-
-#: spyderlib/widgets/explorer.py:696
-#, python-format
-msgid ""
-"For %s support, please install one of the<br/> following tools:<br/><br/>  %s"
-msgstr ""
-
-#: spyderlib/widgets/explorer.py:700
-#, python-format
-msgid "<b>Unable to find external program.</b><br><br>%s"
-msgstr ""
-
-#: spyderlib/widgets/explorer.py:903
-msgid "Show current directory only"
-msgstr ""
-
-#: spyderlib/widgets/explorer.py:1001
-msgid "You don't have the right permissions to open this directory"
-msgstr ""
-
-#: spyderlib/widgets/explorer.py:1029 spyderlib/plugins/externalconsole.py:70
-msgid "Show icons and text"
-msgstr ""
-
-#: spyderlib/widgets/explorer.py:1037
-msgid "Parent"
-msgstr ""
-
-#: spyderlib/widgets/findreplace.py:59
-msgid "Search string"
-msgstr ""
-
-#: spyderlib/widgets/findreplace.py:83
-msgid "Case Sensitive"
-msgstr ""
-
-#: spyderlib/widgets/findreplace.py:89
-msgid "Whole words"
-msgstr ""
-
-#: spyderlib/widgets/findreplace.py:95
-msgid "Highlight matches"
-msgstr ""
-
-#: spyderlib/widgets/findreplace.py:109
-msgid "Replace with:"
-msgstr ""
-
-#: spyderlib/widgets/findreplace.py:111
-msgid "Replace string"
-msgstr ""
-
-#: spyderlib/widgets/findreplace.py:114
-msgid "Replace/find"
-msgstr ""
-
-#: spyderlib/widgets/findreplace.py:121
-msgid "Replace all"
-msgstr ""
-
-#: spyderlib/widgets/formlayout.py:209 spyderlib/plugins/configdialog.py:612
-msgid "Italic"
-msgstr ""
-
-#: spyderlib/widgets/formlayout.py:214 spyderlib/plugins/configdialog.py:609
-msgid "Bold"
-msgstr ""
-
-#: spyderlib/widgets/status.py:23
-msgid "CPU and memory usage info in the status bar"
-msgstr ""
-
-#: spyderlib/widgets/status.py:92
-msgid "Memory:"
-msgstr ""
-
-#: spyderlib/widgets/status.py:93
-msgid ""
-"Memory usage status: requires the `psutil` (>=v0.3) library on non-Windows "
-"platforms"
-msgstr ""
-
-#: spyderlib/widgets/status.py:105
-msgid "CPU:"
-msgstr ""
-
-#: spyderlib/widgets/status.py:106
-msgid "CPU usage status: requires the `psutil` (>=v0.3) library"
-msgstr ""
-
-#: spyderlib/widgets/status.py:128
-msgid "Permissions:"
-msgstr ""
-
-#: spyderlib/widgets/status.py:142
-msgid "End-of-lines:"
-msgstr ""
-
-#: spyderlib/widgets/status.py:156
-msgid "Encoding:"
-msgstr ""
-
-#: spyderlib/widgets/status.py:169
-msgid "Line:"
-msgstr ""
-
-#: spyderlib/widgets/status.py:173
-msgid "Column:"
-msgstr ""
-
-#: spyderlib/widgets/browser.py:131
-msgid "Home"
-msgstr ""
-
-#: spyderlib/widgets/browser.py:166
-msgid "Find text"
-msgstr ""
-
-#: spyderlib/widgets/browser.py:184
-msgid "Address:"
-msgstr ""
-
-#: spyderlib/widgets/browser.py:220
-msgid "Unable to load page"
-msgstr ""
-
-#: spyderlib/plugins/configdialog.py:139
-msgid "Reset to defaults"
-msgstr ""
-
-#: spyderlib/plugins/configdialog.py:151
-msgid "Preferences"
-msgstr ""
-
-#: spyderlib/plugins/configdialog.py:487
-msgid "Invalid directory path"
-msgstr ""
-
-#: spyderlib/plugins/configdialog.py:517
-msgid "Invalid file path"
-msgstr ""
-
-#: spyderlib/plugins/configdialog.py:520 spyderlib/plugins/configdialog.py:537
-msgid "Select file"
-msgstr ""
-
-#: spyderlib/plugins/configdialog.py:536
-msgid "All files (*)"
-msgstr ""
-
-#: spyderlib/plugins/configdialog.py:666
-msgid "Font: "
-msgstr ""
-
-#: spyderlib/plugins/configdialog.py:672
-msgid "Size: "
-msgstr ""
-
-#: spyderlib/plugins/configdialog.py:691
-msgid "Font style"
-msgstr ""
-
-#: spyderlib/plugins/configdialog.py:751
-msgid "Spyder needs to restart to change the following setting:"
-msgstr ""
-
-#: spyderlib/plugins/configdialog.py:754
-msgid "Spyder needs to restart to change the following settings:"
-msgstr ""
-
-#: spyderlib/plugins/configdialog.py:756
-msgid "Do you wish to restart now?"
-msgstr ""
-
-#: spyderlib/plugins/configdialog.py:762
-msgid "Information"
-msgstr ""
-
-#: spyderlib/plugins/configdialog.py:777 spyderlib/plugins/configdialog.py:784
-msgid "General"
-msgstr ""
-
-#: spyderlib/plugins/configdialog.py:787
-msgid "Language"
-msgstr ""
-
-#: spyderlib/plugins/configdialog.py:790
-msgid "Use a single instance"
-msgstr ""
-
-#: spyderlib/plugins/configdialog.py:792
-msgid ""
-"Set this to open external<br> Python files in an already running instance "
-"(Requires a restart)"
-msgstr ""
-
-#: spyderlib/plugins/configdialog.py:795
-msgid "Prompt when exiting"
-msgstr ""
-
-#: spyderlib/plugins/configdialog.py:796
-msgid "Pop up internal console when internal errors appear"
-msgstr ""
-
-#: spyderlib/plugins/configdialog.py:816 spyderlib/plugins/editor.py:105
-#: spyderlib/plugins/ipythonconsole.py:158
-#: spyderlib/plugins/externalconsole.py:66
-msgid "Interface"
-msgstr ""
-
-#: spyderlib/plugins/configdialog.py:824
-msgid "Qt windows style"
-msgstr ""
-
-#: spyderlib/plugins/configdialog.py:830
-msgid "Icon theme"
-msgstr ""
-
-#: spyderlib/plugins/configdialog.py:834
-msgid "Vertical title bars in panes"
-msgstr ""
-
-#: spyderlib/plugins/configdialog.py:836
-msgid "Vertical tabs in panes"
-msgstr ""
-
-#: spyderlib/plugins/configdialog.py:838
-msgid "Animated toolbars and panes"
-msgstr ""
-
-#: spyderlib/plugins/configdialog.py:840
-msgid "Tear off menus"
-msgstr ""
-
-#: spyderlib/plugins/configdialog.py:841
-msgid "Set this to detach any<br> menu from the main window"
-msgstr ""
-
-#: spyderlib/plugins/configdialog.py:843
-msgid "Custom margin for panes:"
-msgstr ""
-
-#: spyderlib/plugins/configdialog.py:873
-msgid "Status bar"
-msgstr ""
-
-#: spyderlib/plugins/configdialog.py:874
-msgid "Show status bar"
-msgstr ""
-
-#: spyderlib/plugins/configdialog.py:876
-msgid "Show memory usage every"
-msgstr ""
-
-#: spyderlib/plugins/configdialog.py:885
-msgid "Show CPU usage every"
-msgstr ""
-
-#: spyderlib/plugins/configdialog.py:920
-msgid "Plain text font"
-msgstr ""
-
-#: spyderlib/plugins/configdialog.py:926
-msgid "Rich text font"
-msgstr ""
-
-#: spyderlib/plugins/configdialog.py:929
-msgid "Fonts"
-msgstr ""
-
-#: spyderlib/plugins/configdialog.py:943
-msgid "Appearance"
-msgstr ""
-
-#: spyderlib/plugins/configdialog.py:945
-#: spyderlib/plugins/ipythonconsole.py:465
-msgid "Advanced Settings"
-msgstr ""
-
-#: spyderlib/plugins/configdialog.py:981
-msgid "Syntax coloring"
-msgstr ""
-
-#: spyderlib/plugins/configdialog.py:993
-msgid ""
-"Here you can select the color scheme used in the Editor and all other Spyder "
-"plugins.<br><br>You can also edit the color schemes provided by Spyder or "
-"create your own ones by using the options provided below.<br>"
-msgstr ""
-
-#: spyderlib/plugins/configdialog.py:998
-msgid "Edit selected"
-msgstr ""
-
-#: spyderlib/plugins/configdialog.py:999
-msgid "Create new scheme"
-msgstr ""
-
-#: spyderlib/plugins/configdialog.py:1003
-msgid "Reset"
-msgstr ""
-
-#: spyderlib/plugins/configdialog.py:1010
-msgid "Scheme:"
-msgstr ""
-
-#: spyderlib/plugins/configdialog.py:1041
-msgid "Manage color schemes"
-msgstr ""
-
-#: spyderlib/plugins/configdialog.py:1230
-msgid "Are you sure you want to delete this scheme?"
-msgstr ""
-
-#: spyderlib/plugins/configdialog.py:1347
-msgid "Text"
-msgstr ""
-
-#: spyderlib/plugins/configdialog.py:1349
-msgid "Highlight"
-msgstr ""
-
-#: spyderlib/plugins/configdialog.py:1351
-msgid "Background"
-msgstr ""
-
-#: spyderlib/plugins/configdialog.py:1355
-msgid "Scheme name:"
-msgstr ""
-
-#: spyderlib/plugins/configdialog.py:1362
-msgid "Color scheme editor"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:102
-msgid "Edit template for new modules"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:107
-msgid "Sort files according to full path"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:109
-msgid "Show tab bar"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:116 spyderlib/plugins/editor.py:187
-#: spyderlib/plugins/help.py:161 spyderlib/plugins/ipythonconsole.py:202
-#: spyderlib/plugins/history.py:41 spyderlib/plugins/externalconsole.py:80
-#: spyderlib/plugins/externalconsole.py:123
-msgid "Source code"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:117
-msgid "Show line numbers"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:118 spyderlib/plugins/editor.py:931
-msgid "Show blank spaces"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:119
-msgid "Show vertical line after"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:120
-msgid "characters"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:125
-msgid "Highlight current line"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:127
-msgid "Highlight current cell"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:129
-msgid "Highlight occurrences after"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:137 spyderlib/plugins/help.py:162
-#: spyderlib/plugins/help.py:364 spyderlib/plugins/console.py:162
-#: spyderlib/plugins/history.py:42 spyderlib/plugins/history.py:154
-#: spyderlib/plugins/externalconsole.py:85
-msgid "Wrap lines"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:157
-msgid "Save all files before running script"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:160
-msgid "Run selection"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:161
-msgid "Maintain focus in the Editor after running cells or selections"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:164 spyderlib/plugins/externalconsole.py:329
-msgid "Introspection"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:167 spyderlib/plugins/console.py:169
-#: spyderlib/plugins/externalconsole.py:124
-msgid "Automatic code completion"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:169 spyderlib/plugins/externalconsole.py:126
-msgid "Case sensitive code completion"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:171 spyderlib/plugins/console.py:173
-#: spyderlib/plugins/externalconsole.py:128
-msgid "Enter key selects completion"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:173 spyderlib/plugins/ipythonconsole.py:168
-#: spyderlib/plugins/console.py:165 spyderlib/plugins/externalconsole.py:130
-msgid "Display balloon tips"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:174
-msgid "Link to object definition"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:176
-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:180
-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:188
-msgid "Automatic insertion of parentheses, braces and brackets"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:191
-msgid "Automatic insertion of closing quotes"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:193
-msgid "Automatic insertion of colons after 'for', 'if', 'def', etc"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:196
-msgid "Automatic indentation after 'else', 'elif', etc."
-msgstr ""
-
-#: spyderlib/plugins/editor.py:198
-msgid "Indentation characters: "
-msgstr ""
-
-#: spyderlib/plugins/editor.py:199
-msgid "2 spaces"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:200
-msgid "3 spaces"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:201
-msgid "4 spaces"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:202
-msgid "5 spaces"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:203
-msgid "6 spaces"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:204
-msgid "7 spaces"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:205
-msgid "8 spaces"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:206
-msgid "Tabulations"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:207
-msgid "Tab stop width:"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:207
-msgid "pixels"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:209
-msgid "Tab always indent"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:211
-msgid ""
-"If enabled, pressing Tab will always indent,\n"
-"even when the cursor is not at the beginning\n"
-"of a line (when this option is enabled, code\n"
-"completion may be triggered using the alternate\n"
-"shortcut: Ctrl+Space)"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:216
-msgid "Intelligent backspace"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:218
-msgid "Automatically remove trailing spaces when saving files"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:222
-msgid "Analysis"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:224
-msgid "<i>(Refer to the {} page)</i>"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:228
-msgid "Real-time code analysis"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:230
-msgid ""
-"<p>If enabled, Python source code will be analyzed using pyflakes, lines "
-"containing errors or warnings will be highlighted.</p><p><u>Note</u>: add "
-"<b>analysis:ignore</b> in a comment to ignore code analysis warnings.</p>"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:238
-#, python-format
-msgid "Code analysis requires pyflakes %s+"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:240
-msgid "Real-time code style analysis"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:242
-msgid ""
-"<p>If enabled, Python source code will be analyzedusing pep8, lines that are "
-"not following PEP8 style guide will be highlighted.</p><p><u>Note</u>: add "
-"<b>analysis:ignore</b> in a comment to ignore style analysis warnings.</p>"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:249
-msgid "Code annotations (TODO, FIXME, XXX, HINT, TIP, @todo)"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:252
-msgid "Perform analysis when saving file and every"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:256
-msgid "Perform analysis only when saving file"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:315
-msgid "End-of-line characters"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:316
-msgid ""
-"When opening a text file containing mixed end-of-line characters (this may "
-"raise syntax errors in the consoles on Windows platforms), Spyder may fix "
-"the file automatically."
-msgstr ""
-
-#: spyderlib/plugins/editor.py:322
-msgid "Fix automatically and show warning message box"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:333 spyderlib/plugins/ipythonconsole.py:459
-#: spyderlib/plugins/variableexplorer.py:41
-#: spyderlib/plugins/externalconsole.py:327
-msgid "Display"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:335
-msgid "Code Introspection/Analysis"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:338 spyderlib/plugins/externalconsole.py:331
-msgid "Advanced settings"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:621
-msgid "Show/hide project explorer"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:629
-msgid "&New file..."
-msgstr ""
-
-#: spyderlib/plugins/editor.py:637
-msgid "&Open..."
-msgstr ""
-
-#: spyderlib/plugins/editor.py:638 spyderlib/plugins/editor.py:1683
-#: spyderlib/plugins/workingdirectory.py:69
-msgid "Open file"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:647
-msgid "Fast switch between files"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:652
-msgid "&Revert"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:653
-msgid "Revert file from disk"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:656
-msgid "&Save"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:664
-msgid "Sav&e all"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:665
-msgid "Save all files"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:673
-msgid "Save &as..."
-msgstr ""
-
-#: spyderlib/plugins/editor.py:674
-msgid "Save current file as..."
-msgstr ""
-
-#: spyderlib/plugins/editor.py:678 spyderlib/plugins/editor.py:679
-msgid "Print preview..."
-msgstr ""
-
-#: spyderlib/plugins/editor.py:680
-msgid "&Print..."
-msgstr ""
-
-#: spyderlib/plugins/editor.py:681
-msgid "Print current file..."
-msgstr ""
-
-#: spyderlib/plugins/editor.py:684
-msgid "&Close"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:685
-msgid "Close current file"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:688
-msgid "C&lose all"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:689
-msgid "Close all opened files"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:696
-msgid "Set/Clear breakpoint"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:703
-msgid "Set/Edit conditional breakpoint"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:710
-msgid "Clear breakpoints in all files"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:712
-msgid "Breakpoints"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:716
-msgid "Debug with winpdb"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:724
-msgid "Debug file"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:728
-msgid "Step"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:729
-msgid "Run current line"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:735
-msgid "Continue"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:736
-msgid "Continue execution until next breakpoint"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:743
-msgid "Step Into"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:744
-msgid "Step into function or method of current line"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:751
-msgid "Step Return"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:752
-msgid "Run until current function or method returns"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:759
-msgid "Exit"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:760
-msgid "Exit Debug"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:771
-msgid "Debugging control"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:776
-msgid "Run file"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:781
-msgid "&Configure..."
-msgstr ""
-
-#: spyderlib/plugins/editor.py:791
-msgid "Re-run &last script"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:793
-msgid "Run again last file"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:803
-msgid "Run selection or current line"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:819
-#, python-format
-msgid ""
-"Run current cell (Ctrl+Enter)\n"
-"[Use #%% to create cells]"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:827
-msgid "Run current cell and go to the next one (Shift+Enter)"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:833
-msgid "Show todo list"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:834
-msgid "Show TODO/FIXME/XXX/HINT/TIP/@todo comments list"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:841
-msgid "Show warning/error list"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:842
-msgid "Show code analysis warnings/errors"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:848
-msgid "Previous warning/error"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:849
-msgid "Go to previous code analysis warning/error"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:852
-msgid "Next warning/error"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:853
-msgid "Go to next code analysis warning/error"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:857
-msgid "Last edit location"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:858
-msgid "Go to last edit location"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:864
-msgid "Previous cursor position"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:865
-msgid "Go to previous cursor position"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:871
-msgid "Next cursor position"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:872
-msgid "Go to next cursor position"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:880
-msgid "Comment current line or selection"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:884
-msgid "Add &block comment"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:885
-msgid "Add block comment around current line or selection"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:891
-msgid "R&emove block comment"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:892
-msgid "Remove comment block around current line or selection"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:903
-msgid "Indent"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:904
-msgid "Indent current line or selection"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:907
-msgid "Unindent"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:908
-msgid "Unindent current line or selection"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:913
-msgid "Carriage return and line feed (Windows)"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:916
-msgid "Line feed (UNIX)"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:919
-msgid "Carriage return (Mac)"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:925
-msgid "Convert end-of-line characters"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:929
-msgid "Remove trailing spaces"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:933
-msgid "Fix indentation"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:934
-msgid "Replace tab characters by space characters"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:937
-msgid "Go to line..."
-msgstr ""
-
-#: spyderlib/plugins/editor.py:945
-msgid "Set console working directory"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:947
-msgid ""
-"Set current console (and file explorer) working directory to current script "
-"directory"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:952
-msgid "Maximum number of recent files..."
-msgstr ""
-
-#: spyderlib/plugins/editor.py:955
-msgid "Clear this list"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:955
-msgid "Clear recent files list"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:957
-msgid "Open &recent"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:1263
-msgid "?"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:1490
-msgid "Spyder Editor"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:1491
-msgid "This is a temporary script file."
-msgstr ""
-
-#: spyderlib/plugins/editor.py:1559
-msgid "untitled"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:1637
-msgid "Maximum number of recent files"
-msgstr ""
-
-#: spyderlib/plugins/editor.py:1768
-msgid "Printing..."
-msgstr ""
-
-#: spyderlib/plugins/help.py:42
-msgid "Show help for objects in the Editor and Consoles in a dedicated pane"
-msgstr ""
-
-#: spyderlib/plugins/help.py:115
-msgid "Automatic connections"
-msgstr ""
-
-#: spyderlib/plugins/help.py:116
-msgid ""
-"This pane can automatically show an object's help information after a left "
-"parenthesis is written next to it. Below you can decide to which plugin you "
-"want to connect it to turn on this feature."
-msgstr ""
-
-#: spyderlib/plugins/help.py:128
-msgid ""
-"This feature requires the Rope or Jedi libraries.\n"
-"It seems you don't have either installed."
-msgstr ""
-
-#: spyderlib/plugins/help.py:131
-msgid "Python Console"
-msgstr ""
-
-#: spyderlib/plugins/help.py:133
-msgid "IPython Console"
-msgstr ""
-
-#: spyderlib/plugins/help.py:145
-msgid "Additional features"
-msgstr ""
-
-#: spyderlib/plugins/help.py:146
-msgid "Render mathematical equations"
-msgstr ""
-
-#: spyderlib/plugins/help.py:152
-msgid "This feature requires Sphinx 1.1 or superior."
-msgstr ""
-
-#: spyderlib/plugins/help.py:153
-#, python-format
-msgid "Sphinx %s is currently installed."
-msgstr ""
-
-#: spyderlib/plugins/help.py:351
-msgid "No further documentation available"
-msgstr ""
-
-#: spyderlib/plugins/help.py:384
-msgid "Source"
-msgstr ""
-
-#: spyderlib/plugins/help.py:413
-msgid "Plain Text"
-msgstr ""
-
-#: spyderlib/plugins/help.py:417
-msgid "Show Source"
-msgstr ""
-
-#: spyderlib/plugins/help.py:421
-msgid "Rich Text"
-msgstr ""
-
-#: spyderlib/plugins/help.py:431
-msgid "Automatic import"
-msgstr ""
-
-#: spyderlib/plugins/help.py:700
-#, python-format
-msgid ""
-"Here you can get help of any object by pressing %s in front of it, either on "
-"the Editor or the Console.%sHelp can also be shown automatically after "
-"writing a left parenthesis next to an object. You can activate this behavior "
-"in %s."
-msgstr ""
-
-#: spyderlib/plugins/help.py:706
-msgid "Preferences > Help"
-msgstr ""
-
-#: spyderlib/plugins/help.py:713
-msgid "Usage"
-msgstr ""
-
-#: spyderlib/plugins/help.py:714
-msgid "New to Spyder? Read our"
-msgstr ""
-
-#: spyderlib/plugins/help.py:715
-msgid "tutorial"
-msgstr ""
-
-#: spyderlib/plugins/help.py:722
-msgid ""
-"Please consider installing Sphinx to get documentation rendered in rich text."
-msgstr ""
-
-#: spyderlib/plugins/help.py:895
-msgid "Unlock"
-msgstr ""
-
-#: spyderlib/plugins/help.py:895
-msgid "Lock"
-msgstr ""
-
-#: spyderlib/plugins/help.py:941
-#, python-format
-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/help.py:985
-msgid "No source code available."
-msgstr ""
-
-#: spyderlib/plugins/findinfiles.py:135
-msgid "&Find in files"
-msgstr ""
-
-#: spyderlib/plugins/findinfiles.py:138
-msgid "Search text in multiple files"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:62
-msgid "Symbolic mathematics in the IPython Console"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:111
-#, python-format
-msgid ""
-"The authenticity of host <b>%s</b> can't be established. Are you sure you "
-"want to continue connecting?"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:123
-msgid "The authenticity of the host can't be established"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:130
-#, python-format
-msgid "Tunnel '%s' failed to start"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:135
-msgid "Could not connect to remote host"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:151
-#: spyderlib/plugins/ipythonconsole.py:691
-msgid "IPython console"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:159
-msgid "Display initial banner"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:160
-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:162
-msgid "Use a pager to display additional text inside the console"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:164
-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:169
-msgid "Ask for confirmation before closing"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:179
-msgid "Completion Type"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:180
-msgid "Decide what type of completion to use"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:183
-msgid "Completion:"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:192
-msgid "Light background"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:194
-msgid "Dark background"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:204
-msgid "Buffer:  "
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:204
-#: spyderlib/plugins/externalconsole.py:82
-msgid " lines"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:206
-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:215
-msgid "Support for graphics (Matplotlib)"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:216
-msgid "Activate support"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:217
-msgid "Automatically load Pylab and NumPy modules"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:220
-msgid ""
-"This lets you load graphics support without importing \n"
-"the commands to do plots. Useful to work with other\n"
-"plotting libraries different to Matplotlib or to develop \n"
-"GUIs with Spyder."
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:238
-msgid ""
-"This feature requires the Matplotlib library.\n"
-"It seems you don't have it installed."
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:243
-msgid "Inline"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:244
-msgid "Automatic"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:245
-msgid "Graphics backend"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:246
-#, python-format
-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:266
-#: spyderlib/plugins/externalconsole.py:290
-msgid "Backend:"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:268
-#: spyderlib/plugins/externalconsole.py:292
-msgid "This option will be applied the next time a console is opened."
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:279
-msgid "Inline backend"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:280
-msgid "Decide how to render the figures created by this backend"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:284
-msgid "Format:"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:287
-msgid "Resolution:"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:287
-msgid "dpi"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:289
-msgid "Only used when the format is PNG. Default is 72"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:292
-msgid "Width:"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:292
-#: spyderlib/plugins/ipythonconsole.py:296
-msgid "inches"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:294
-msgid "Default is 6"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:296
-msgid "Height:"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:298
-msgid "Default is 4"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:325
-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:331
-msgid "Lines:"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:340
-msgid "Run a file"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:341
-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:345
-msgid "Use the following file:"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:359
-msgid "Greedy completion"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:360
-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:368
-msgid "Use the greedy completer"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:379
-msgid "Autocall"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:380
-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:387
-msgid "Smart"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:388
-msgid "Full"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:389
-msgid "Off"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:391
-msgid "Autocall:  "
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:392
-#, python-format
-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:404
-msgid "Symbolic Mathematics"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:405
-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:410
-msgid "Use symbolic math"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:411
-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:424
-msgid ""
-"This feature requires the Sympy library.\n"
-"It seems you don't have it installed."
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:429
-msgid "Prompts"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:430
-msgid "Modify how Input and Output prompts are shown in the console."
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:433
-msgid "Input prompt:"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:435
-#, python-format
-msgid ""
-"Default is<br>In [<span class=\"in-prompt-number\">%i</span>]:"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:439
-msgid "Output prompt:"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:441
-#, python-format
-msgid ""
-"Default is<br>Out[<span class=\"out-prompt-number\">%i</span>]:"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:461
-#: spyderlib/plugins/externalconsole.py:275
-msgid "Graphics"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:463
-#: spyderlib/plugins/workingdirectory.py:44
-msgid "Startup"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:477
-#: spyderlib/plugins/ipythonconsole.py:751
-msgid "Connect to an existing kernel"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:479
-msgid ""
-"Please enter the connection info of the kernel you want to connect to. For "
-"that you can either select its JSON connection file using the <tt>Browse</"
-"tt> button, or write directly its id, in case it's a local kernel (for "
-"example <tt>kernel-3764.json</tt> or just <tt>3764</tt>)."
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:490
-msgid "Connection info:"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:492
-msgid "Path to connection file or kernel id"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:494
-#: spyderlib/plugins/ipythonconsole.py:511
-msgid "Browse"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:503
-msgid "This is a remote kernel"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:507
-msgid "username at hostname:port"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:510
-msgid "Path to ssh key file"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:519
-msgid "Password or ssh key passphrase"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:523
-msgid "Host name"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:524
-msgid "Ssh key"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:525
-msgid "Password"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:554
-msgid "Open IPython connection file"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:560
-msgid "Select ssh key"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:739
-msgid "Open an &IPython console"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:742
-#, python-format
-msgid "Use %s+T when the console is selected to open a new one"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:745
-msgid "Open a new console"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:752
-msgid "Open a new IPython console connected to an existing kernel"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:835
-#, python-format
-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:970
-msgid ""
-"Do you want to close all other consoles connected to the same kernel as this "
-"one?"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:1052
-msgid "Connection error"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:1053
-msgid ""
-"Could not open ssh tunnel. The error was:\n"
-"\n"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:1090
-msgid "IPython"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:1091
-#, python-format
-msgid "Unable to connect to IPython <b>%s"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:1142
-msgid "Are you sure you want to restart the kernel?"
-msgstr ""
-
-#: spyderlib/plugins/ipythonconsole.py:1144
-msgid "Restart kernel?"
-msgstr ""
-
-#: spyderlib/plugins/variableexplorer.py:24
-msgid "Autorefresh"
-msgstr ""
-
-#: spyderlib/plugins/variableexplorer.py:25
-msgid "Enable autorefresh"
-msgstr ""
-
-#: spyderlib/plugins/variableexplorer.py:27
-msgid "Refresh interval: "
-msgstr ""
-
-#: spyderlib/plugins/variableexplorer.py:28
-msgid " ms"
-msgstr ""
-
-#: spyderlib/plugins/variableexplorer.py:31
-msgid "Filter"
-msgstr ""
-
-#: spyderlib/plugins/variableexplorer.py:46
-msgid "Edit data in the remote process"
-msgstr ""
-
-#: spyderlib/plugins/variableexplorer.py:47
-msgid ""
-"Editors are opened in the remote process for NumPy arrays, PIL images, "
-"lists, tuples and dictionaries.\n"
-"This avoids transfering large amount of data between the remote process and "
-"Spyder (through the socket)."
-msgstr ""
-
-#: spyderlib/plugins/variableexplorer.py:183
-msgid "Variable explorer"
-msgstr ""
-
-#: spyderlib/plugins/console.py:108
-msgid "Internal console"
-msgstr ""
-
-#: spyderlib/plugins/console.py:138 spyderlib/plugins/externalconsole.py:1033
-msgid "&Run..."
-msgstr ""
-
-#: spyderlib/plugins/console.py:140 spyderlib/plugins/externalconsole.py:1034
-msgid "Run a Python script"
-msgstr ""
-
-#: spyderlib/plugins/console.py:143
-msgid "Environment variables..."
-msgstr ""
-
-#: spyderlib/plugins/console.py:145
-msgid "Show and edit environment variables (for current session)"
-msgstr ""
-
-#: spyderlib/plugins/console.py:149
-msgid "Show sys.path contents..."
-msgstr ""
-
-#: spyderlib/plugins/console.py:151
-msgid "Show (read-only) sys.path"
-msgstr ""
-
-#: spyderlib/plugins/console.py:154
-msgid "Buffer..."
-msgstr ""
-
-#: spyderlib/plugins/console.py:155 spyderlib/plugins/history.py:39
-#: spyderlib/plugins/externalconsole.py:84
-msgid "Set maximum line count"
-msgstr ""
-
-#: spyderlib/plugins/console.py:158
-msgid "External editor path..."
-msgstr ""
-
-#: spyderlib/plugins/console.py:159
-msgid "Set external editor executable path"
-msgstr ""
-
-#: spyderlib/plugins/console.py:178
-msgid "Internal console settings"
-msgstr ""
-
-#: spyderlib/plugins/console.py:231 spyderlib/plugins/externalconsole.py:1210
-msgid "Run Python script"
-msgstr ""
-
-#: spyderlib/plugins/console.py:277
-msgid "Buffer"
-msgstr ""
-
-#: spyderlib/plugins/console.py:278
-msgid "Maximum line count"
-msgstr ""
-
-#: spyderlib/plugins/console.py:288
-msgid "External editor"
-msgstr ""
-
-#: spyderlib/plugins/console.py:289
-msgid "External editor executable path:"
-msgstr ""
-
-#: spyderlib/plugins/projectexplorer.py:68
-msgid "&Font..."
-msgstr ""
-
-#: spyderlib/plugins/projectexplorer.py:69
-msgid "Set font style"
-msgstr ""
-
-#: spyderlib/plugins/projectexplorer.py:126
-msgid "Select a new font"
-msgstr ""
-
-#: spyderlib/plugins/workingdirectory.py:37
-msgid ""
-"The <b>global working directory</b> is the working directory for newly "
-"opened <i>consoles</i> (Python/IPython consoles and terminals), for the "
-"<i>file explorer</i>, for the <i>find in files</i> plugin and for new files "
-"created in the <i>editor</i>."
-msgstr ""
-
-#: spyderlib/plugins/workingdirectory.py:46
-msgid "At startup, the global working directory is:"
-msgstr ""
-
-#: spyderlib/plugins/workingdirectory.py:50
-msgid "the same as in last session"
-msgstr ""
-
-#: spyderlib/plugins/workingdirectory.py:52
-msgid "At startup, Spyder will restore the global directory from last session"
-msgstr ""
-
-#: spyderlib/plugins/workingdirectory.py:56 spyderlib/plugins/runconfig.py:480
-msgid "the following directory:"
-msgstr ""
-
-#: spyderlib/plugins/workingdirectory.py:58
-msgid "At startup, the global working directory will be the specified path"
-msgstr ""
-
-#: spyderlib/plugins/workingdirectory.py:70
-msgid "Files are opened from:"
-msgstr ""
-
-#: spyderlib/plugins/workingdirectory.py:74
-#: spyderlib/plugins/workingdirectory.py:87
-msgid "the current file directory"
-msgstr ""
-
-#: spyderlib/plugins/workingdirectory.py:78
-#: spyderlib/plugins/workingdirectory.py:91
-msgid "the global working directory"
-msgstr ""
-
-#: spyderlib/plugins/workingdirectory.py:83
-msgid "Files are created in:"
-msgstr ""
-
-#: spyderlib/plugins/workingdirectory.py:97
-msgid "Change to file base directory"
-msgstr ""
-
-#: spyderlib/plugins/workingdirectory.py:99
-msgid "When opening a file"
-msgstr ""
-
-#: spyderlib/plugins/workingdirectory.py:101
-msgid "When saving a file"
-msgstr ""
-
-#: spyderlib/plugins/workingdirectory.py:171
-msgid "Back"
-msgstr ""
-
-#: spyderlib/plugins/workingdirectory.py:190
-msgid ""
-"This is the working directory for newly\n"
-"opened consoles (Python/IPython consoles and\n"
-"terminals), for the file explorer, for the\n"
-"find in files plugin and for new files\n"
-"created in the editor"
-msgstr ""
-
-#: spyderlib/plugins/workingdirectory.py:218
-msgid "Browse a working directory"
-msgstr ""
-
-#: spyderlib/plugins/workingdirectory.py:225
-msgid "Change to parent directory"
-msgstr ""
-
-#: spyderlib/plugins/workingdirectory.py:232
-msgid "Global working directory"
-msgstr ""
-
-#: spyderlib/plugins/explorer.py:50
-msgid "File explorer"
-msgstr ""
-
-#: spyderlib/plugins/shortcuts.py:134
-msgid ""
-"Press the new shortcut and select 'Ok': \n"
-"(Press 'Tab' once to switch focus between the shortcut entry \n"
-"and the buttons below it)"
-msgstr ""
-
-#: spyderlib/plugins/shortcuts.py:137
-msgid "Current shortcut:"
-msgstr ""
-
-#: spyderlib/plugins/shortcuts.py:139
-msgid "New shortcut:"
-msgstr ""
-
-#: spyderlib/plugins/shortcuts.py:152
-#, python-brace-format
-msgid "Shortcut: {0}"
-msgstr ""
-
-#: spyderlib/plugins/shortcuts.py:273
-msgid "Please introduce a different shortcut"
-msgstr ""
-
-#: spyderlib/plugins/shortcuts.py:310
-msgid "The new shorcut conflicts with:"
-msgstr ""
-
-#: spyderlib/plugins/shortcuts.py:321
-#, python-brace-format
-msgid ""
-"A compound sequence can have {break} a maximum of 4 subsequences.{break}"
-msgstr ""
-
-#: spyderlib/plugins/shortcuts.py:326
-msgid "Invalid key entered"
-msgstr ""
-
-#: spyderlib/plugins/shortcuts.py:515
-msgid "Context"
-msgstr ""
-
-#: spyderlib/plugins/shortcuts.py:519
-msgid "Shortcut"
-msgstr ""
-
-#: spyderlib/plugins/shortcuts.py:521
-msgid "Score"
-msgstr ""
-
-#: spyderlib/plugins/shortcuts.py:681
-msgid "Conflicts"
-msgstr ""
-
-#: spyderlib/plugins/shortcuts.py:682
-msgid "The following conflicts have been detected:"
-msgstr ""
-
-#: spyderlib/plugins/shortcuts.py:767
-msgid "Keyboard shortcuts"
-msgstr ""
-
-#: spyderlib/plugins/shortcuts.py:775
-msgid "Search: "
-msgstr ""
-
-#: spyderlib/plugins/shortcuts.py:776
-msgid "Reset to default values"
-msgstr ""
-
-#: spyderlib/plugins/runconfig.py:28
-msgid "Execute in current Python or IPython console"
-msgstr ""
-
-#: spyderlib/plugins/runconfig.py:29
-msgid "Execute in a new dedicated Python console"
-msgstr ""
-
-#: spyderlib/plugins/runconfig.py:30
-msgid "Execute in an external System terminal"
-msgstr ""
-
-#: spyderlib/plugins/runconfig.py:40
-#, python-format
-msgid "Always show %s on a first file run"
-msgstr ""
-
-#: spyderlib/plugins/runconfig.py:159
-msgid "General settings"
-msgstr ""
-
-#: spyderlib/plugins/runconfig.py:162 spyderlib/plugins/runconfig.py:208
-msgid "Command line options:"
-msgstr ""
-
-#: spyderlib/plugins/runconfig.py:168
-msgid "Working directory:"
-msgstr ""
-
-#: spyderlib/plugins/runconfig.py:180 spyderlib/plugins/runconfig.py:491
-msgid "Enter debugging mode when errors appear during execution"
-msgstr ""
-
-#: spyderlib/plugins/runconfig.py:196 spyderlib/plugins/runconfig.py:501
-msgid "Dedicated Python console"
-msgstr ""
-
-#: spyderlib/plugins/runconfig.py:200 spyderlib/plugins/runconfig.py:503
-msgid "Interact with the Python console after execution"
-msgstr ""
-
-#: spyderlib/plugins/runconfig.py:204
-msgid "Show warning when killing running process"
-msgstr ""
-
-#: spyderlib/plugins/runconfig.py:213
-msgid "<b>-u</b> is added to the other options you set here"
-msgstr ""
-
-#: spyderlib/plugins/runconfig.py:223
-msgid "this dialog"
-msgstr ""
-
-#: spyderlib/plugins/runconfig.py:282
-msgid "Run configuration"
-msgstr ""
-
-#: spyderlib/plugins/runconfig.py:283
-#, python-format
-msgid "The following working directory is not valid:<br><b>%s</b>"
-msgstr ""
-
-#: spyderlib/plugins/runconfig.py:361
-#, python-format
-msgid "Run settings for %s"
-msgstr ""
-
-#: spyderlib/plugins/runconfig.py:393
-msgid "Select a run configuration:"
-msgstr ""
-
-#: spyderlib/plugins/runconfig.py:422 spyderlib/plugins/runconfig.py:447
-msgid "Run Settings"
-msgstr ""
-
-#: spyderlib/plugins/runconfig.py:449
-#, python-format
-msgid ""
-"The following are the default <i>%s</i>. These options may be overriden "
-"using the <b>%s</b> dialog box (see the <b>%s</b> menu)"
-msgstr ""
-
-#: spyderlib/plugins/runconfig.py:475
-msgid "Default working directory is:"
-msgstr ""
-
-#: spyderlib/plugins/runconfig.py:477
-msgid "the script directory"
-msgstr ""
-
-#: spyderlib/plugins/runconfig.py:506
-msgid "Show warning when killing running processes"
-msgstr ""
-
-#: spyderlib/plugins/runconfig.py:515
-msgid "Run Settings dialog"
-msgstr ""
-
-#: spyderlib/plugins/history.py:35
-msgid "Settings"
-msgstr ""
-
-#: spyderlib/plugins/history.py:37
-msgid "History depth: "
-msgstr ""
-
-#: spyderlib/plugins/history.py:37
-msgid " entries"
-msgstr ""
-
-#: spyderlib/plugins/history.py:44
-msgid "Scroll automatically to last entry"
-msgstr ""
-
-#: spyderlib/plugins/history.py:123
-msgid "History log"
-msgstr ""
-
-#: spyderlib/plugins/history.py:150
-msgid "History..."
-msgstr ""
-
-#: spyderlib/plugins/history.py:152
-msgid "Set history maximum entries"
-msgstr ""
-
-#: spyderlib/plugins/history.py:263
-msgid "History"
-msgstr ""
-
-#: spyderlib/plugins/history.py:264
-msgid "Maximum entries"
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:48
-msgid "Interactive data plotting in the consoles"
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:68
-msgid "One tab per script"
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:82
-msgid "Buffer: "
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:87
-msgid "Merge process standard output/error channels"
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:89
-msgid ""
-"Merging the output channels of the process means that\n"
-"the standard error won't be written in red anymore,\n"
-"but this has the effect of speeding up display."
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:93
-msgid "Colorize standard error channel using ANSI escape codes"
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:95
-msgid ""
-"This method is the only way to have colorized standard\n"
-"error channel when the output channels have been merged."
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:112
-msgid ""
-"This option will be applied the next time a Python console or a terminal is "
-"opened."
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:115
-msgid "Light background (white color)"
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:140
-msgid "User Module Reloader (UMR)"
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:141
-msgid ""
-"UMR forces Python to reload modules which were imported when executing a \n"
-"script in the external console with the 'runfile' function."
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:144
-msgid "Enable UMR"
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:146
-msgid ""
-"This option will enable the User Module Reloader (UMR) in Python/IPython "
-"consoles. UMR forces Python to reload deeply modules during import when "
-"running a Python script using the Spyder's builtin function <b>runfile</b>."
-"<br><br><b>1.</b> UMR may require to restart the console in which it will be "
-"called (otherwise only newly imported modules will be reloaded when "
-"executing scripts).<br><br><b>2.</b> If errors occur when re-running a PyQt-"
-"based program, please check that the Qt objects are properly destroyed (e.g. "
-"you may have to use the attribute <b>Qt.WA_DeleteOnClose</b> on your main "
-"window, using the <b>setAttribute</b> method)"
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:161
-msgid "Show reloaded modules list"
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:163
-msgid "Please note that these changes will be applied only to new consoles"
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:166
-msgid "Set UMR excluded (not reloaded) modules"
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:177
-msgid "Python executable"
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:179
-msgid ""
-"Select the Python interpreter executable binary in which Spyder will run "
-"scripts:"
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:182
-msgid "Default (i.e. the same as Spyder's)"
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:186
-msgid "Use the following Python interpreter:"
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:190
-msgid "Executables"
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:208
-msgid "PYTHONSTARTUP replacement"
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:210
-msgid ""
-"This option will override the PYTHONSTARTUP environment variable which\n"
-"defines the script to be executed during the Python console startup."
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:215
-msgid "Default PYTHONSTARTUP script"
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:219
-msgid "Use the following startup script:"
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:236
-msgid "Monitor"
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:237
-msgid ""
-"The monitor provides introspection features to console: code completion, "
-"calltips and variable explorer. Because it relies on several modules, "
-"disabling the monitor may be useful to accelerate console startup."
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:244
-msgid "Enable monitor"
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:257
-msgid "Default library"
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:262
-msgid "Qt-Python Bindings"
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:264
-msgid "Library:"
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:266
-msgid ""
-"This option will act on<br> libraries such as Matplotlib, guidata or ETS"
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:276
-msgid ""
-"Decide which backend to use to display graphics. If unsure, please select "
-"the <b>Automatic</b> backend.<br><br><b>Note:</b> We support a very limited "
-"number of backends in our Python consoles. If you prefer to work with a "
-"different one, please use an IPython console."
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:303
-msgid "Enthought Tool Suite"
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:304
-msgid ""
-"Enthought Tool Suite (ETS) supports PyQt4 (qt4) and wxPython (wx) graphical "
-"user interfaces."
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:308
-msgid "ETS_TOOLKIT:"
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:333
-msgid "External modules"
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:369
-#, python-format
-msgid ""
-"You selected a <b>Python %d</b> interpreter for the console but Spyder is "
-"running on <b>Python %d</b>!.<br><br>Although this is possible, we recommend "
-"you to install and run Spyder directly with your selected interpreter, to "
-"avoid seeing false warnings and errors due to the incompatible syntax "
-"between these two Python versions."
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:532
-msgid "Trying to kill a kernel?"
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:533
-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 "
-"the second button from right to left."
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:612
-#, python-format
-msgid ""
-"No Python console is currently selected to run <b>%s</b>.<br><br>Please "
-"select or open a new Python console and try again."
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:692
-#, python-format
-msgid ""
-"%s is already running in a separate process.\n"
-"Do you want to kill the process before starting a new one?"
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:852
-msgid "Kernel"
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:862
-msgid ""
-"Either:<ol><li>Your IPython frontend and kernel versions are "
-"<b>incompatible</b> or</li><li>You <b>don't have</b> IPython installed in "
-"your external interpreter.</li></ol>In any case, we're sorry but we can't "
-"create a console for you."
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:886
-msgid "Command Window"
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:888
-msgid "Terminal"
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:941
-#, python-format
-msgid "Kernel %s"
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:1021
-msgid "Open a &Python console"
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:1025
-msgid "Open &command prompt"
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:1026
-msgid "Open a Windows command prompt"
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:1028
-msgid "Open a &terminal"
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:1029
-msgid "Open a terminal window"
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:1186
-msgid "Open an IPython console"
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:1187
-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:1219
-#: spyderlib/plugins/externalconsole.py:1232
-#: spyderlib/plugins/externalconsole.py:1236
-msgid "UMR"
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:1220
-msgid ""
-"UMR excluded modules:\n"
-"(example: guidata, guiqwt)"
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:1233
-#, python-format
-msgid ""
-"The following modules are not installed on your machine:\n"
-"%s"
-msgstr ""
-
-#: spyderlib/plugins/externalconsole.py:1237
-msgid ""
-"Please note that these changes will be applied only to new Python/IPython "
-"consoles"
-msgstr ""
-
-#: spyderlib/plugins/layoutdialog.py:174
-msgid "Move Up"
-msgstr ""
-
-#: spyderlib/plugins/layoutdialog.py:175
-msgid "Move Down"
-msgstr ""
-
-#: spyderlib/plugins/layoutdialog.py:176
-msgid "Delete Layout"
-msgstr ""
-
-#: spyderlib/plugins/layoutdialog.py:180
-msgid "Layout Display and Order"
-msgstr ""
-
-#: spyderlib/plugins/onlinehelp.py:68
-msgid "Online help"
-msgstr ""
diff --git a/spyderlib/plugins/projectexplorer.py b/spyderlib/plugins/projectexplorer.py
deleted file mode 100644
index 6b7c419..0000000
--- a/spyderlib/plugins/projectexplorer.py
+++ /dev/null
@@ -1,159 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright © 2010 Pierre Raybaut
-# Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
-
-"""Project Explorer Plugin"""
-
-# Third party imports
-from qtpy.QtCore import Signal, Slot
-from qtpy.QtWidgets import QFontDialog
-
-# Local imports
-from spyderlib.config.base import _
-from spyderlib.plugins import SpyderPluginMixin
-from spyderlib.py3compat import is_text_string
-from spyderlib.utils import icon_manager as ima
-from spyderlib.utils.qthelpers import create_action
-from spyderlib.widgets.projectexplorer import ProjectExplorerWidget
-
-
-class ProjectExplorer(ProjectExplorerWidget, SpyderPluginMixin):
-    """Project explorer plugin"""
-    CONF_SECTION = 'project_explorer'
-
-    open_terminal = Signal(str)
-    open_interpreter = Signal(str)
-    pythonpath_changed = Signal()
-    sig_projects_were_closed = Signal()
-    create_module = Signal(str)
-    edit = Signal(str)
-    removed = Signal(str)
-    removed_tree = Signal(str)
-    renamed = Signal(str, str)
-    redirect_stdio = Signal(bool)
-    
-    def __init__(self, parent=None):
-        ProjectExplorerWidget.__init__(self, parent=parent,
-                    name_filters=self.get_option('name_filters'),
-                    show_all=self.get_option('show_all', False),
-                    show_hscrollbar=self.get_option('show_hscrollbar'))
-        SpyderPluginMixin.__init__(self, parent)
-
-        # Initialize plugin
-        self.initialize_plugin()
-
-        self.treewidget.header().hide()
-        self.set_font(self.get_plugin_font())
-        self.load_config()
-        
-    #------ SpyderPluginWidget API ---------------------------------------------    
-    def get_plugin_title(self):
-        """Return widget title"""
-        return _("Project explorer")
-    
-    def get_focus_widget(self):
-        """
-        Return the widget to give focus to when
-        this plugin's dockwidget is raised on top-level
-        """
-        return self.treewidget
-    
-    def get_plugin_actions(self):
-        """Return a list of actions related to plugin"""
-        new_project_act = create_action(self, text=_('New project...'),
-                                        icon=ima.icon('project_expanded'),
-                                        triggered=self.create_new_project)
-
-        font_action = create_action(self, _("&Font..."),
-                                    None, ima.icon('font'), _("Set font style"),
-                                    triggered=self.change_font)
-        self.treewidget.common_actions += (None, font_action)
-        
-        self.main.file_menu_actions.insert(1, new_project_act)
-        
-        return []
-    
-    def register_plugin(self):
-        """Register plugin in Spyder's main window"""
-        self.main.pythonpath_changed()
-        self.main.restore_scrollbar_position.connect(
-                                               self.restore_scrollbar_position)
-        self.pythonpath_changed.connect(self.main.pythonpath_changed)
-        self.sig_projects_were_closed.connect(self.projects_were_closed)
-        self.create_module.connect(self.main.editor.new)
-        self.edit.connect(self.main.editor.load)
-        self.removed.connect(self.main.editor.removed)
-        self.removed_tree.connect(self.main.editor.removed_tree)
-        self.renamed.connect(self.main.editor.renamed)
-        self.main.editor.set_projectexplorer(self)
-        self.main.add_dockwidget(self)
-
-        self.sig_open_file.connect(self.main.open_file)
-        
-    def refresh_plugin(self):
-        """Refresh project explorer widget"""
-        pass
-        
-    def closing_plugin(self, cancelable=False):
-        """Perform actions before parent main window is closed"""
-        self.save_config()
-        self.closing_widget()
-        return True
-        
-    #------ Public API ---------------------------------------------------------
-    @Slot()
-    def create_new_project(self):
-        """Create new project"""
-        if self.dockwidget.isHidden():
-            self.dockwidget.show()
-        self.dockwidget.raise_()
-        if not self.treewidget.new_project():
-            # Notify dockwidget to schedule a repaint
-            self.dockwidget.update()
-
-    def projects_were_closed(self):
-        """Project were just closed: checking if related files are opened in 
-        the editor and closing them"""
-        for fname in self.main.editor.get_filenames():
-            if self.treewidget.workspace.is_file_in_closed_project(fname):
-                self.main.editor.close_file_from_name(fname)
-
-    @Slot()    
-    def change_font(self):
-        """Change font"""
-        font, valid = QFontDialog.getFont(self.get_plugin_font(), self,
-                                          _("Select a new font"))
-        if valid:
-            self.set_font(font)
-            self.set_plugin_font(font)
-            
-    def set_font(self, font):
-        """Set project explorer widget font"""
-        self.treewidget.setFont(font)
-        
-    def save_config(self):
-        """Save configuration: opened projects & tree widget state"""
-        self.set_option('workspace', self.get_workspace())
-        self.set_option('expanded_state', self.treewidget.get_expanded_state())
-        self.set_option('scrollbar_position',
-                        self.treewidget.get_scrollbar_position())
-        
-    def load_config(self):
-        """Load configuration: opened projects & tree widget state"""
-        self.set_workspace(self.get_option('workspace', None))
-        expanded_state = self.get_option('expanded_state', None)
-        # Sometimes the expanded state option may be truncated in .ini file
-        # (for an unknown reason), in this case it would be converted to a
-        # string by 'userconfig':
-        if is_text_string(expanded_state):
-            expanded_state = None
-        if expanded_state is not None:
-            self.treewidget.set_expanded_state(expanded_state)
-        
-    def restore_scrollbar_position(self):
-        """Restoring scrollbar position after main window is visible"""
-        scrollbar_pos = self.get_option('scrollbar_position', None)
-        if scrollbar_pos is not None:
-            self.treewidget.set_scrollbar_position(scrollbar_pos)
diff --git a/spyderlib/utils/__init__.py b/spyderlib/utils/__init__.py
deleted file mode 100644
index c80bd2e..0000000
--- a/spyderlib/utils/__init__.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright © 2009-2010 Pierre Raybaut
-# Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
-
-"""
-spyderlib.utils
-===============
-
-Spyder utilities
-"""
diff --git a/spyderlib/utils/help/templates/warning.html b/spyderlib/utils/help/templates/warning.html
deleted file mode 100644
index 38adc8d..0000000
--- a/spyderlib/utils/help/templates/warning.html
+++ /dev/null
@@ -1,12 +0,0 @@
-{#
-    warning.html
-    ~~~~~~~~~~~
-
-    A simple page to emit a warning when no docstring text was found for the
-    one a user was looking for
-
-    :copyright: Copyright 2012 by the Spyder team.
-    :license: MIT license
-#}
-
-<div id="doc-warning">{{text}}</div>
diff --git a/spyderlib/widgets/ipython.py b/spyderlib/widgets/ipython.py
deleted file mode 100644
index f5083a6..0000000
--- a/spyderlib/widgets/ipython.py
+++ /dev/null
@@ -1,792 +0,0 @@
-# -*- coding:utf-8 -*-
-#
-# Copyright © 2011-2012 Pierre Raybaut
-# Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
-
-"""
-IPython v0.13+ client's widget
-"""
-
-# Standard library imports
-from __future__ import absolute_import  # Fix for Issue 1356
-from string import Template
-import os
-import os.path as osp
-import re
-import sys
-import time
-
-# Third party imports
-from qtpy.QtCore import Qt, QUrl, Signal, Slot
-from qtpy.QtGui import QKeySequence
-from qtpy.QtWidgets import (QHBoxLayout, QMenu, QMessageBox, QTextEdit,
-                            QToolButton, QVBoxLayout, QWidget)
-
-# Third party imports (IPython/Jupyter)
-from IPython.core.application import get_ipython_dir
-from IPython.core.oinspect import call_tip
-from qtconsole.rich_jupyter_widget import RichJupyterWidget
-from qtconsole.ansi_code_processor import ANSI_OR_SPECIAL_PATTERN
-from traitlets.config.loader import Config, load_pyconfig_files
-
-# Local imports
-from spyderlib.config.base import (_, get_conf_path, get_image_path,
-                                   get_module_source_path)
-from spyderlib.config.gui import (config_shortcut, get_font, get_shortcut,
-                                  fixed_shortcut)
-from spyderlib.config.main import CONF
-from spyderlib.py3compat import PY3
-from spyderlib.utils import icon_manager as ima
-from spyderlib.utils import programs, sourcecode
-from spyderlib.utils.dochelpers import getargspecfromtext, getsignaturefromtext
-from spyderlib.utils.qthelpers import (add_actions, create_action,
-                                       create_toolbutton, restore_keyevent)
-from spyderlib.widgets.arraybuilder import SHORTCUT_INLINE, SHORTCUT_TABLE
-from spyderlib.widgets.browser import WebView
-from spyderlib.widgets.calltip import CallTipWidget
-from spyderlib.widgets.mixins import (BaseEditMixin, GetHelpMixin,
-                                      SaveHistoryMixin, TracebackLinksMixin)
-
-
-#-----------------------------------------------------------------------------
-# Templates
-#-----------------------------------------------------------------------------
-# Using the same css file from the Help plugin for now. Maybe
-# later it'll be a good idea to create a new one.
-UTILS_PATH = get_module_source_path('spyderlib', 'utils')
-CSS_PATH = osp.join(UTILS_PATH, 'help', 'static', 'css')
-TEMPLATES_PATH = osp.join(UTILS_PATH, 'ipython', 'templates')
-
-BLANK = open(osp.join(TEMPLATES_PATH, 'blank.html')).read()
-LOADING = open(osp.join(TEMPLATES_PATH, 'loading.html')).read()
-KERNEL_ERROR = open(osp.join(TEMPLATES_PATH, 'kernel_error.html')).read()
-
-#-----------------------------------------------------------------------------
-# Control widgets
-#-----------------------------------------------------------------------------
-class IPythonControlWidget(TracebackLinksMixin, GetHelpMixin, QTextEdit,
-                           BaseEditMixin):
-    """
-    Subclass of QTextEdit with features from Spyder's mixins to use as the
-    control widget for IPython widgets
-    """
-    QT_CLASS = QTextEdit
-    visibility_changed = Signal(bool)
-    go_to_error = Signal(str)
-    focus_changed = Signal()
-    
-    def __init__(self, parent=None):
-        QTextEdit.__init__(self, parent)
-        BaseEditMixin.__init__(self)
-        TracebackLinksMixin.__init__(self)
-        GetHelpMixin.__init__(self)
-
-        self.calltip_widget = CallTipWidget(self, hide_timer_on=True)
-        self.found_results = []
-
-        # To not use Spyder calltips obtained through the monitor
-        self.calltips = False
-
-    def showEvent(self, event):
-        """Reimplement Qt Method"""
-        self.visibility_changed.emit(True)
-
-    def _key_question(self, text):
-        """ Action for '?' and '(' """
-        self.current_prompt_pos = self.parentWidget()._prompt_pos
-        if self.get_current_line_to_cursor():
-            last_obj = self.get_last_obj()
-            if last_obj and not last_obj.isdigit():
-                self.show_object_info(last_obj)
-        self.insert_text(text)
-    
-    def keyPressEvent(self, event):
-        """Reimplement Qt Method - Basic keypress event handler"""
-        event, text, key, ctrl, shift = restore_keyevent(event)
-        if key == Qt.Key_Question and not self.has_selected_text():
-            self._key_question(text)
-        elif key == Qt.Key_ParenLeft and not self.has_selected_text():
-            self._key_question(text)
-        else:
-            # Let the parent widget handle the key press event
-            QTextEdit.keyPressEvent(self, event)
-
-    def focusInEvent(self, event):
-        """Reimplement Qt method to send focus change notification"""
-        self.focus_changed.emit()
-        return super(IPythonControlWidget, self).focusInEvent(event)
-    
-    def focusOutEvent(self, event):
-        """Reimplement Qt method to send focus change notification"""
-        self.focus_changed.emit()
-        return super(IPythonControlWidget, self).focusOutEvent(event)
-
-
-class IPythonPageControlWidget(QTextEdit, BaseEditMixin):
-    """
-    Subclass of QTextEdit with features from Spyder's mixins.BaseEditMixin to
-    use as the paging widget for IPython widgets
-    """
-    QT_CLASS = QTextEdit
-    visibility_changed = Signal(bool)
-    show_find_widget = Signal()
-    focus_changed = Signal()
-    
-    def __init__(self, parent=None):
-        QTextEdit.__init__(self, parent)
-        BaseEditMixin.__init__(self)
-        self.found_results = []
-    
-    def showEvent(self, event):
-        """Reimplement Qt Method"""
-        self.visibility_changed.emit(True)
-    
-    def keyPressEvent(self, event):
-        """Reimplement Qt Method - Basic keypress event handler"""
-        event, text, key, ctrl, shift = restore_keyevent(event)
-        
-        if key == Qt.Key_Slash and self.isVisible():
-            self.show_find_widget.emit()
-
-    def focusInEvent(self, event):
-        """Reimplement Qt method to send focus change notification"""
-        self.focus_changed.emit()
-        return super(IPythonPageControlWidget, self).focusInEvent(event)
-    
-    def focusOutEvent(self, event):
-        """Reimplement Qt method to send focus change notification"""
-        self.focus_changed.emit()
-        return super(IPythonPageControlWidget, self).focusOutEvent(event)
-
-
-#-----------------------------------------------------------------------------
-# Shell widget
-#-----------------------------------------------------------------------------
-class IPythonShellWidget(RichJupyterWidget):
-    """
-    Spyder's IPython shell widget
-
-    This class has custom control and page_control widgets, additional methods
-    to provide missing functionality and a couple more keyboard shortcuts.
-    """
-    focus_changed = Signal()
-    new_client = Signal()
-    
-    def __init__(self, *args, **kw):
-        # To override the Qt widget used by RichIPythonWidget
-        self.custom_control = IPythonControlWidget
-        self.custom_page_control = IPythonPageControlWidget
-        super(IPythonShellWidget, self).__init__(*args, **kw)
-        self.set_background_color()
-        
-        # --- Spyder variables ---
-        self.ipyclient = None
-        
-        # --- Keyboard shortcuts ---
-        self.shortcuts = self.create_shortcuts()
-        
-        # --- IPython variables ---
-        # To send an interrupt signal to the Spyder kernel
-        self.custom_interrupt = True
-        
-        # To restart the Spyder kernel in case it dies
-        self.custom_restart = True
-    
-    #---- Public API ----------------------------------------------------------
-    def set_ipyclient(self, ipyclient):
-        """Bind this shell widget to an IPython client one"""
-        self.ipyclient = ipyclient
-        self.exit_requested.connect(ipyclient.exit_callback)
-
-    def long_banner(self):
-        """Banner for IPython widgets with pylab message"""
-        from IPython.core.usage import default_banner
-        banner = default_banner
-
-        pylab_o = CONF.get('ipython_console', 'pylab', True)
-        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):
-            pylab_message = ("\nPopulating the interactive namespace from "
-                             "numpy and matplotlib")
-            banner = banner + pylab_message
-        
-        sympy_o = CONF.get('ipython_console', 'symbolic_math', True)
-        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)
-"""
-            banner = banner + lines
-        return banner
-    
-    def short_banner(self):
-        """Short banner with Python and IPython versions"""
-        from IPython.core.release import version
-        py_ver = '%d.%d.%d' % (sys.version_info[0], sys.version_info[1],
-                               sys.version_info[2])
-        banner = 'Python %s on %s -- IPython %s' % (py_ver, sys.platform,
-                                                    version)
-        return banner
-
-    def clear_console(self):
-        self.execute("%clear")
-        
-    def reset_namespace(self):
-        """Resets the namespace by removing all names defined by the user"""
-        
-        reply = QMessageBox.question(
-            self,
-            _("Reset IPython namespace"),
-            _("All user-defined variables will be removed."
-            "<br>Are you sure you want to reset the namespace?"),
-            QMessageBox.Yes | QMessageBox.No,
-            )
-
-        if reply == QMessageBox.Yes:
-            self.execute("%reset -f")
-
-    def write_to_stdin(self, line):
-        """Send raw characters to the IPython kernel through stdin"""
-        self.kernel_client.input(line)
-
-    def set_background_color(self):
-        lightbg_o = CONF.get('ipython_console', 'light_color')
-        if not lightbg_o:
-            self.set_default_style(colors='linux')
-
-    def create_shortcuts(self):
-        inspect = config_shortcut(self._control.inspect_current_object,
-                                  context='Console', name='Inspect current object',
-                                  parent=self)
-        clear_console = config_shortcut(self.clear_console, context='Console',
-                                        name='Clear shell', parent=self)
-
-        # Fixed shortcuts
-        fixed_shortcut("Ctrl+T", self, lambda: self.new_client.emit())
-        fixed_shortcut("Ctrl+R", self, lambda: self.reset_namespace())
-        fixed_shortcut(SHORTCUT_INLINE, self,
-                       lambda: self._control.enter_array_inline())
-        fixed_shortcut(SHORTCUT_TABLE, self,
-                       lambda: self._control.enter_array_table())
-
-        return [inspect, clear_console]
-
-    def clean_invalid_var_chars(self, var):
-        """
-        Replace invalid variable chars in a string by underscores
-
-        Taken from http://stackoverflow.com/a/3305731/438386
-        """
-        if PY3:
-            return re.sub('\W|^(?=\d)', '_', var, re.UNICODE)
-        else:
-            return re.sub('\W|^(?=\d)', '_', var)
-
-    def get_signature(self, content):
-        """Get signature from inspect reply content"""
-        data = content.get('data', {})
-        text = data.get('text/plain', '')
-        if text:
-            text = ANSI_OR_SPECIAL_PATTERN.sub('', text)
-            self._control.current_prompt_pos = self._prompt_pos
-            line = self._control.get_current_line_to_cursor()
-            name = line[:-1].split('(')[-1]   # Take last token after a (
-            name = name.split('.')[-1]        # Then take last token after a .
-            # Clean name from invalid chars
-            try:
-                name = self.clean_invalid_var_chars(name).split('_')[-1]
-            except:
-                pass
-            argspec = getargspecfromtext(text)
-            if argspec:
-                # This covers cases like np.abs, whose docstring is
-                # the same as np.absolute and because of that a proper
-                # signature can't be obtained correctly
-                signature = name + argspec
-            else:
-                signature = getsignaturefromtext(text, name)
-            return signature
-        else:
-            return ''
-
-    #---- IPython private methods ---------------------------------------------
-    def _context_menu_make(self, pos):
-        """Reimplement the IPython context menu"""
-        menu = super(IPythonShellWidget, self)._context_menu_make(pos)
-        return self.ipyclient.add_actions_to_context_menu(menu)
-    
-    def _banner_default(self):
-        """
-        Reimplement banner creation to let the user decide if he wants a
-        banner or not
-        """
-        banner_o = CONF.get('ipython_console', 'show_banner', True)
-        if banner_o:
-            return self.long_banner()
-        else:
-            return self.short_banner()
-    
-    def _handle_object_info_reply(self, rep):
-        """
-        Reimplement call tips to only show signatures, using the same style
-        from our Editor and External Console too
-        Note: For IPython 2-
-        """
-        self.log.debug("oinfo: %s", rep.get('content', ''))
-        cursor = self._get_cursor()
-        info = self._request_info.get('call_tip')
-        if info and info.id == rep['parent_header']['msg_id'] and \
-          info.pos == cursor.position():
-            content = rep['content']
-            if content.get('ismagic', False):
-                call_info, doc = None, None
-            else:
-                call_info, doc = call_tip(content, format_call=True)
-                if call_info is None and doc is not None:
-                    name = content['name'].split('.')[-1]
-                    argspec = getargspecfromtext(doc)
-                    if argspec:
-                        # This covers cases like np.abs, whose docstring is
-                        # the same as np.absolute and because of that a proper
-                        # signature can't be obtained correctly
-                        call_info = name + argspec
-                    else:
-                        call_info = getsignaturefromtext(doc, name)
-            if call_info:
-                self._control.show_calltip(_("Arguments"), call_info,
-                                           signature=True, color='#2D62FF')
-
-    def _handle_inspect_reply(self, rep):
-        """
-        Reimplement call tips to only show signatures, using the same style
-        from our Editor and External Console too
-        Note: For IPython 3+
-        """
-        cursor = self._get_cursor()
-        info = self._request_info.get('call_tip')
-        if info and info.id == rep['parent_header']['msg_id'] and \
-          info.pos == cursor.position():
-            content = rep['content']
-            if content.get('status') == 'ok' and content.get('found', False):
-                signature = self.get_signature(content)
-                if signature:
-                    self._control.show_calltip(_("Arguments"), signature,
-                                               signature=True, color='#2D62FF')
-    
-    #---- Qt methods ----------------------------------------------------------
-    def focusInEvent(self, event):
-        """Reimplement Qt method to send focus change notification"""
-        self.focus_changed.emit()
-        return super(IPythonShellWidget, self).focusInEvent(event)
-    
-    def focusOutEvent(self, event):
-        """Reimplement Qt method to send focus change notification"""
-        self.focus_changed.emit()
-        return super(IPythonShellWidget, self).focusOutEvent(event)
-
-
-#-----------------------------------------------------------------------------
-# Client widget
-#-----------------------------------------------------------------------------
-class IPythonClient(QWidget, SaveHistoryMixin):
-    """
-    IPython client or frontend for Spyder
-
-    This is a widget composed of a shell widget (i.e. RichIPythonWidget
-    + our additions = IPythonShellWidget) and a WebView info widget to 
-    print kernel error and other messages.
-    """
-    
-    SEPARATOR = '%s##---(%s)---' % (os.linesep*2, time.ctime())
-    append_to_history = Signal(str, str)
-    
-    def __init__(self, plugin, name, history_filename, connection_file=None, 
-                 hostname=None, sshkey=None, password=None, 
-                 kernel_widget_id=None, menu_actions=None):
-        super(IPythonClient, self).__init__(plugin)
-        SaveHistoryMixin.__init__(self)
-        self.options_button = None
-        
-        # stop button and icon
-        self.stop_button = None
-        self.stop_icon = ima.icon('stop')        
-        self.connection_file = connection_file
-        self.kernel_widget_id = kernel_widget_id
-        self.hostname = hostname
-        self.sshkey = sshkey
-        self.password = password
-        self.name = name
-        self.get_option = plugin.get_option
-        self.shellwidget = IPythonShellWidget(config=self.shellwidget_config(),
-                                              local_kernel=False)
-        self.shellwidget.hide()
-        self.infowidget = WebView(self)
-        self.menu_actions = menu_actions
-        self.history_filename = get_conf_path(history_filename)
-        self.history = []
-        self.namespacebrowser = None
-
-        self.set_infowidget_font()
-        self.loading_page = self._create_loading_page()
-        self.infowidget.setHtml(self.loading_page,
-                                QUrl.fromLocalFile(CSS_PATH))
-
-        vlayout = QVBoxLayout()
-        toolbar_buttons = self.get_toolbar_buttons()
-        hlayout = QHBoxLayout()
-        for button in toolbar_buttons:
-            hlayout.addWidget(button)
-        vlayout.addLayout(hlayout)
-        vlayout.setContentsMargins(0, 0, 0, 0)
-        vlayout.addWidget(self.shellwidget)
-        vlayout.addWidget(self.infowidget)
-        self.setLayout(vlayout)
-        
-        self.exit_callback = lambda: plugin.close_client(client=self)
-        
-    #------ Public API --------------------------------------------------------
-    def show_shellwidget(self, give_focus=True):
-        """Show shellwidget and configure it"""
-        self.infowidget.hide()
-        self.shellwidget.show()
-        self.infowidget.setHtml(BLANK)
-        if give_focus:
-            self.get_control().setFocus()
-        
-        # Connect shellwidget to the client
-        self.shellwidget.set_ipyclient(self)
-        
-        # To save history
-        self.shellwidget.executing.connect(self.add_to_history)
-        
-        # For Mayavi to run correctly
-        self.shellwidget.executing.connect(self.set_backend_for_mayavi)
-        
-        # To update history after execution
-        self.shellwidget.executed.connect(self.update_history)
-        
-        # To update the Variable Explorer after execution
-        self.shellwidget.executed.connect(self.auto_refresh_namespacebrowser)
-        
-        # To show a stop button, when executing a process
-        self.shellwidget.executing.connect(self.enable_stop_button)
-        
-        # To hide a stop button after execution stopped
-        self.shellwidget.executed.connect(self.disable_stop_button)
-    
-    def enable_stop_button(self):
-        self.stop_button.setEnabled(True)
-   
-    def disable_stop_button(self):
-        self.stop_button.setDisabled(True)
-
-    @Slot()
-    def stop_button_click_handler(self):
-        """Method to handle what to do when the stop button is pressed"""
-        self.stop_button.setDisabled(True)
-        # Interrupt computations or stop debugging
-        if not self.shellwidget._reading:
-            self.interrupt_kernel()
-        else:
-            self.shellwidget.write_to_stdin('exit')
-
-    def show_kernel_error(self, error):
-        """Show kernel initialization errors in infowidget"""
-        # Remove explanation about how to kill the kernel (doesn't apply to us)
-        error = error.split('issues/2049')[-1]
-        # Remove unneeded blank lines at the beginning
-        eol = sourcecode.get_eol_chars(error)
-        if eol:
-            error = error.replace(eol, '<br>')
-        while error.startswith('<br>'):
-            error = error[4:]
-        # Remove connection message
-        if error.startswith('To connect another client') or \
-          error.startswith('[IPKernelApp] To connect another client'):
-            error = error.split('<br>')
-            error = '<br>'.join(error[2:])
-        # Don't break lines in hyphens
-        # From http://stackoverflow.com/q/7691569/438386
-        error = error.replace('-', '&#8209')
-            
-        message = _("An error ocurred while starting the kernel")
-        kernel_error_template = Template(KERNEL_ERROR)
-        page = kernel_error_template.substitute(css_path=CSS_PATH,
-                                                message=message,
-                                                error=error)
-        self.infowidget.setHtml(page)
-    
-    def show_restart_animation(self):
-        """Show loading_page while restarting the kernel"""
-        self.shellwidget.hide()
-        self.infowidget.setHtml(self.loading_page)
-        self.infowidget.show()
-    
-    def get_name(self):
-        """Return client name"""
-        return ((_("Console") if self.hostname is None else self.hostname)
-                + " " + self.name)
-    
-    def get_control(self):
-        """Return the text widget (or similar) to give focus to"""
-        # page_control is the widget used for paging
-        page_control = self.shellwidget._page_control
-        if page_control and page_control.isVisible():
-            return page_control
-        else:
-            return self.shellwidget._control
-
-    def get_options_menu(self):
-        """Return options menu"""
-        restart_action = create_action(self, _("Restart kernel"),
-                                       shortcut=QKeySequence("Ctrl+."),
-                                       icon=ima.icon('restart'),
-                                       triggered=self.restart_kernel,
-                                       context=Qt.WidgetWithChildrenShortcut)
-
-        # Main menu
-        if self.menu_actions is not None:
-            actions = [restart_action, None] + self.menu_actions
-        else:
-            actions = [restart_action]
-        return actions
-    
-    def get_toolbar_buttons(self):
-        """Return toolbar buttons list"""
-        #TODO: Eventually add some buttons (Empty for now)
-        # (see for example: spyderlib/widgets/externalshell/baseshell.py)
-        buttons = []
-        # Code to add the stop button 
-        if self.stop_button is None:
-            self.stop_button = create_toolbutton(self, text=_("Stop"),
-                                             icon=self.stop_icon,
-                                             tip=_("Stop the current command"))
-            self.disable_stop_button()
-            # set click event handler
-            self.stop_button.clicked.connect(self.stop_button_click_handler)
-        if self.stop_button is not None:
-            buttons.append(self.stop_button)
-            
-        if self.options_button is None:
-            options = self.get_options_menu()
-            if options:
-                self.options_button = create_toolbutton(self,
-                        text=_('Options'), icon=ima.icon('tooloptions'))
-                self.options_button.setPopupMode(QToolButton.InstantPopup)
-                menu = QMenu(self)
-                add_actions(menu, options)
-                self.options_button.setMenu(menu)
-        if self.options_button is not None:
-            buttons.append(self.options_button)
-
-        return buttons
-
-    def add_actions_to_context_menu(self, menu):
-        """Add actions to IPython widget context menu"""
-        # See spyderlib/widgets/ipython.py for more details on this method
-        inspect_action = create_action(self, _("Inspect current object"),
-                                    QKeySequence(get_shortcut('console',
-                                                    'inspect current object')),
-                                    icon=ima.icon('MessageBoxInformation'),
-                                    triggered=self.inspect_object)
-        clear_line_action = create_action(self, _("Clear line or block"),
-                                          QKeySequence("Shift+Escape"),
-                                          icon=ima.icon('editdelete'),
-                                          triggered=self.clear_line)
-        reset_namespace_action = create_action(self, _("Reset namespace"),
-                                          QKeySequence("Ctrl+R"),
-                                          triggered=self.reset_namespace)
-        clear_console_action = create_action(self, _("Clear console"),
-                                             QKeySequence(get_shortcut('console',
-                                                               'clear shell')),
-                                             icon=ima.icon('editclear'),
-                                             triggered=self.clear_console)
-        quit_action = create_action(self, _("&Quit"), icon=ima.icon('exit'),
-                                    triggered=self.exit_callback)
-        add_actions(menu, (None, inspect_action, clear_line_action,
-                           clear_console_action, reset_namespace_action,
-                           None, quit_action))
-        return menu
-    
-    def set_font(self, font):
-        """Set IPython widget's font"""
-        self.shellwidget._control.setFont(font)
-        self.shellwidget.font = font
-
-    def set_infowidget_font(self):
-        """Set font for infowidget"""
-        font = get_font(option='rich_font')
-        self.infowidget.set_font(font)
-
-    def interrupt_kernel(self):
-        """Interrupt the associanted Spyder kernel if it's running"""
-        self.shellwidget.request_interrupt_kernel()
-
-    @Slot()
-    def restart_kernel(self):
-        """Restart the associanted Spyder kernel"""
-        self.shellwidget.request_restart_kernel()
-
-    @Slot()
-    def inspect_object(self):
-        """Show how to inspect an object with our Help plugin"""
-        self.shellwidget._control.inspect_current_object()
-
-    @Slot()
-    def clear_line(self):
-        """Clear a console line"""
-        self.shellwidget._keyboard_quit()
-
-    @Slot()
-    def clear_console(self):
-        """Clear the whole console"""
-        self.shellwidget.clear_console()
-        
-    @Slot()
-    def reset_namespace(self):
-        """Resets the namespace by removing all names defined by the user"""
-        self.shellwidget.reset_namespace()
-    
-    def if_kernel_dies(self, t):
-        """
-        Show a message in the console if the kernel dies.
-        t is the time in seconds between the death and showing the message.
-        """
-        message = _("It seems the kernel died unexpectedly. Use "
-                    "'Restart kernel' to continue using this console.")
-        self.shellwidget._append_plain_text(message + '\n')
-    
-    def update_history(self):
-        self.history = self.shellwidget._history
-    
-    def set_backend_for_mayavi(self, command):
-        """
-        Mayavi plots require the Qt backend, so we try to detect if one is
-        generated to change backends
-        """
-        calling_mayavi = False
-        lines = command.splitlines()
-        for l in lines:
-            if not l.startswith('#'):
-                if 'import mayavi' in l or 'from mayavi' in l:
-                    calling_mayavi = True
-                    break
-        if calling_mayavi:
-            message = _("Changing backend to Qt for Mayavi")
-            self.shellwidget._append_plain_text(message + '\n')
-            self.shellwidget.execute("%gui inline\n%gui qt")
-    
-    def interrupt_message(self):
-        """
-        Print an interrupt message when the client is connected to an external
-        kernel
-        """
-        message = _("Kernel process is either remote or unspecified. "
-                    "Cannot interrupt")
-        QMessageBox.information(self, "IPython", message)
-    
-    def restart_message(self):
-        """
-        Print a restart message when the client is connected to an external
-        kernel
-        """
-        message = _("Kernel process is either remote or unspecified. "
-                    "Cannot restart.")
-        QMessageBox.information(self, "IPython", message)
-
-    def set_namespacebrowser(self, namespacebrowser):
-        """Set namespace browser widget"""
-        self.namespacebrowser = namespacebrowser
-
-    def auto_refresh_namespacebrowser(self):
-        """Refresh namespace browser"""
-        if self.namespacebrowser:
-            self.namespacebrowser.refresh_table()
-    
-    def shellwidget_config(self):
-        """
-        Generate a Config instance for shell widgets using our config
-        system
-        
-        This lets us create each widget with its own config (as opposed to
-        IPythonQtConsoleApp, where all widgets have the same config)
-        """
-        # ---- IPython config ----
-        try:
-            profile_path = osp.join(get_ipython_dir(), 'profile_default')
-            full_ip_cfg = load_pyconfig_files(['ipython_qtconsole_config.py'],
-                                              profile_path)
-            
-            # From the full config we only select the IPythonWidget section
-            # because the others have no effect here.
-            ip_cfg = Config({'IPythonWidget': full_ip_cfg.IPythonWidget})
-        except:
-            ip_cfg = Config()
-       
-        # ---- Spyder config ----
-        spy_cfg = Config()
-        
-        # Make the pager widget a rich one (i.e a QTextEdit)
-        spy_cfg.IPythonWidget.kind = 'rich'
-        
-        # Gui completion widget
-        completion_type_o = CONF.get('ipython_console', 'completion_type')
-        completions = {0: "droplist", 1: "ncurses", 2: "plain"}
-        spy_cfg.IPythonWidget.gui_completion = completions[completion_type_o]
-
-        # Pager
-        pager_o = self.get_option('use_pager')
-        if pager_o:
-            spy_cfg.IPythonWidget.paging = 'inside'
-        else:
-            spy_cfg.IPythonWidget.paging = 'none'
-        
-        # Calltips
-        calltips_o = self.get_option('show_calltips')
-        spy_cfg.IPythonWidget.enable_calltips = calltips_o
-
-        # Buffer size
-        buffer_size_o = self.get_option('buffer_size')
-        spy_cfg.IPythonWidget.buffer_size = buffer_size_o
-        
-        # Prompts
-        in_prompt_o = self.get_option('in_prompt')
-        out_prompt_o = self.get_option('out_prompt')
-        if in_prompt_o:
-            spy_cfg.IPythonWidget.in_prompt = in_prompt_o
-        if out_prompt_o:
-            spy_cfg.IPythonWidget.out_prompt = out_prompt_o
-        
-        # Merge IPython and Spyder configs. Spyder prefs will have prevalence
-        # over IPython ones
-        ip_cfg._merge(spy_cfg)
-        return ip_cfg
-    
-    #------ Private API -------------------------------------------------------
-    def _create_loading_page(self):
-        """Create html page to show while the kernel is created"""
-        loading_template = Template(LOADING)
-        loading_img = get_image_path('loading_sprites.png')
-        if os.name == 'nt':
-            loading_img = loading_img.replace('\\', '/')
-        message = _("Connecting to kernel...")
-        page = loading_template.substitute(css_path=CSS_PATH,
-                                           loading_img=loading_img,
-                                           message=message)
-        return page
-    
-    #---- Qt methods ----------------------------------------------------------
-    def closeEvent(self, event):
-        """
-        Reimplement Qt method to stop sending the custom_restart_kernel_died
-        signal
-        """
-        kc = self.shellwidget.kernel_client
-        if kc is not None:
-            kc.hb_channel.pause()
diff --git a/spyderlib/widgets/projectexplorer.py b/spyderlib/widgets/projectexplorer.py
deleted file mode 100644
index bda611a..0000000
--- a/spyderlib/widgets/projectexplorer.py
+++ /dev/null
@@ -1,1379 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright © 2009- The Spyder Development Team
-# Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
-
-"""Project Explorer"""
-
-# pylint: disable=C0103
-
-# Standard library imports
-from __future__ import print_function
-import os
-import os.path as osp
-import re
-import shutil
-import xml.etree.ElementTree as ElementTree
-
-# Third party imports
-from qtpy import PYQT5
-from qtpy.compat import getexistingdirectory
-from qtpy.QtCore import QFileInfo, Qt, Signal, Slot
-from qtpy.QtWidgets import (QAbstractItemView, QFileIconProvider, QHBoxLayout,
-                            QHeaderView, QInputDialog, QLabel, QLineEdit,
-                            QMessageBox, QPushButton, QVBoxLayout, QWidget)
-
-# Local imports
-from spyderlib.config.base import _, get_image_path, STDERR
-from spyderlib.py3compat import getcwd, pickle, to_text_string
-from spyderlib.utils import icon_manager as ima
-from spyderlib.utils import misc
-from spyderlib.utils.qthelpers import create_action, get_icon
-from spyderlib.widgets.explorer import FilteredDirView, fixpath, listdir
-from spyderlib.widgets.formlayout import fedit
-from spyderlib.widgets.pathmanager import PathManager
-
-
-def has_children_files(path, include, exclude, show_all):
-    """Return True if path has children files"""
-    try:
-        return len( listdir(path, include, exclude, show_all) ) > 0
-    except (IOError, OSError):
-        return False
-
-
-def is_drive_path(path):
-    """Return True if path is a drive (Windows)"""
-    path = osp.abspath(path)
-    return osp.normpath(osp.join(path, osp.pardir)) == path
-
-
-def get_dir_icon(dirname, project):
-    """Return appropriate directory icon"""
-    if is_drive_path(dirname):
-        return ima.icon('DriveHDIcon')
-    prefix = 'pp_' if dirname in project.get_pythonpath() else ''
-    if dirname == project.root_path:
-        if project.is_opened():
-            return get_icon(prefix + 'project.png')
-        else:
-            return get_icon('project_closed.png')
-    elif osp.isfile(osp.join(dirname, '__init__.py')):
-        return get_icon(prefix + 'package.png')
-    else:
-        return get_icon(prefix + 'folder.png')
-
-
-class Project(object):
-    """Spyder project"""
-    CONFIG_NAME = '.spyderproject'
-    CONFIG_ATTR = ('name', 'related_projects', 'relative_pythonpath', 'opened')
-    
-    def __init__(self):
-        self.name = None
-        self.root_path = None
-        self.related_projects = [] # storing project path, not project objects
-        self.pythonpath = []
-        self.opened = True
-        self.ioerror_flag = False
-
-    def set_root_path(self, root_path):
-        """Set workspace root path"""
-        if self.name is None:
-            self.name = osp.basename(root_path)
-        self.root_path = to_text_string(root_path)
-        config_path = self.__get_project_config_path()
-        if osp.exists(config_path):
-            self.load()
-        else:
-            if not osp.isdir(self.root_path):
-                os.mkdir(self.root_path)
-            self.save()
-            
-    def rename(self, new_name):
-        """Rename project and rename its root path accordingly"""
-        old_name = self.name
-        self.name = new_name
-        pypath = self.relative_pythonpath
-        self.root_path = self.root_path[:-len(old_name)]+new_name
-        self.relative_pythonpath = pypath
-        self.save()
-
-    def _get_relative_pythonpath(self):
-        """Return PYTHONPATH list as relative paths"""
-        # Workaround to replace os.path.relpath (new in Python v2.6):
-        offset = len(self.root_path)+len(os.pathsep)
-        return [path[offset:] for path in self.pythonpath]
-
-    def _set_relative_pythonpath(self, value):
-        """Set PYTHONPATH list relative paths"""
-        self.pythonpath = [osp.abspath(osp.join(self.root_path, path))
-                           for path in value]
-        
-    relative_pythonpath = property(_get_relative_pythonpath,
-                                   _set_relative_pythonpath)
-        
-    def __get_project_config_path(self):
-        """Return project configuration path"""
-        return osp.join(self.root_path, self.CONFIG_NAME)
-        
-    def load(self):
-        """Load project data"""
-        fname = self.__get_project_config_path()
-        try:
-            # Old format (Spyder 2.0-2.1 for Python 2)
-            with open(fname, 'U') as fdesc:
-                data = pickle.loads(fdesc.read())
-        except (pickle.PickleError, TypeError, UnicodeDecodeError,
-                AttributeError):
-            try:
-                # New format (Spyder >=2.2 for Python 2 and Python 3)
-                with open(fname, 'rb') as fdesc:
-                    data = pickle.loads(fdesc.read())
-            except (IOError, OSError, pickle.PickleError):
-                self.ioerror_flag = True
-                return
-        # Compatibilty with old project explorer file format:
-        if 'relative_pythonpath' not in data:
-            print("Warning: converting old configuration file " \
-                            "for project '%s'" % data['name'], file=STDERR)
-            self.pythonpath = data['pythonpath']
-            data['relative_pythonpath'] = self.relative_pythonpath
-        for attr in self.CONFIG_ATTR:
-            setattr(self, attr, data[attr])
-        self.save()
-    
-    def save(self):
-        """Save project data"""
-        data = {}
-        for attr in self.CONFIG_ATTR:
-            data[attr] = getattr(self, attr)
-        try:
-            with open(self.__get_project_config_path(), 'wb') as fdesc:
-                pickle.dump(data, fdesc, 2)
-        except (IOError, OSError):
-            self.ioerror_flag = True
-        
-    def delete(self):
-        """Delete project"""
-        os.remove(self.__get_project_config_path())
-        
-    #------Misc.
-    def get_related_projects(self):
-        """Return related projects path list"""
-        return self.related_projects
-    
-    def set_related_projects(self, related_projects):
-        """Set related projects"""
-        self.related_projects = related_projects
-        self.save()
-        
-    def open(self):
-        """Open project"""
-        self.opened = True
-        self.save()
-        
-    def close(self):
-        """Close project"""
-        self.opened = False
-        self.save()
-        
-    def is_opened(self):
-        """Return True if project is opened"""
-        return self.opened
-    
-    def is_file_in_project(self, fname):
-        """Return True if file *fname* is in one of the project subfolders"""
-        fixed_root = fixpath(self.root_path)
-        return fixpath(fname) == fixed_root \
-               or fixpath(osp.dirname(fname)).startswith(fixed_root)
-               
-    def is_root_path(self, dirname):
-        """Return True if dirname is project's root path"""
-        return fixpath(dirname) == fixpath(self.root_path)
-    
-    def is_in_pythonpath(self, dirname):
-        """Return True if dirname is in project's PYTHONPATH"""
-        return fixpath(dirname) in [fixpath(_p) for _p in self.pythonpath]
-        
-    #------Python Path
-    def get_pythonpath(self):
-        """Return a copy of pythonpath attribute"""
-        return self.pythonpath[:]
-    
-    def set_pythonpath(self, pythonpath):
-        """Set project's PYTHONPATH"""
-        self.pythonpath = pythonpath
-        self.save()
-        
-    def remove_from_pythonpath(self, path):
-        """Remove path from project's PYTHONPATH
-        Return True if path was removed, False if it was not found"""
-        pathlist = self.get_pythonpath()
-        if path in pathlist:
-            pathlist.pop(pathlist.index(path))
-            self.set_pythonpath(pathlist)
-            return True
-        else:
-            return False
-        
-    def add_to_pythonpath(self, path):
-        """Add path to project's PYTHONPATH
-        Return True if path was added, False if it was already there"""
-        pathlist = self.get_pythonpath()
-        if path in pathlist:
-            return False
-        else:
-            pathlist.insert(0, path)
-            self.set_pythonpath(pathlist)
-            return True
-
-
-class Workspace(object):
-    """Spyder workspace
-    Set of projects with common root path parent directory"""
-    CONFIG_NAME = '.spyderworkspace'
-    CONFIG_ATTR = ('name', 'project_paths', )
-    
-    def __init__(self):
-        self.name = None
-        self.root_path = None
-        self.projects = []
-        self.ioerror_flag = False
-        
-    def _get_project_paths(self):
-        """Return workspace projects root path list"""
-        # Convert project absolute paths to paths relative to Workspace root
-        offset = len(self.root_path)+len(os.pathsep)
-        return [proj.root_path[offset:] for proj in self.projects]
-
-    def _set_project_paths(self, pathlist):
-        """Set workspace projects root path list"""
-        # Convert paths relative to Workspace root to project absolute paths
-        for path in pathlist:
-            if path.startswith(self.root_path):
-                # do nothing, this is the old Workspace format
-                root_path = path
-            else:
-                root_path = osp.join(self.root_path, path)
-            self.add_project(root_path)
-            
-    project_paths = property(_get_project_paths, _set_project_paths)
-    
-    def is_valid(self):
-        """Return True if workspace is valid (i.e. root path is defined)"""
-        return self.root_path is not None and osp.isdir(self.root_path)
-    
-    def is_empty(self):
-        """Return True if workspace is empty (i.e. no project)"""
-        if not self.is_valid():
-            return
-        return len(self.projects) == 0
-
-    def set_root_path(self, root_path):
-        """Set workspace root path"""
-        if self.name is None:
-            self.name = osp.basename(root_path)
-        self.root_path = to_text_string(osp.abspath(root_path))
-        config_path = self.__get_workspace_config_path()
-        if osp.exists(config_path):
-            self.load()
-        else:
-            self.save()
-            
-    def set_name(self, name):
-        """Set workspace name"""
-        self.name = name
-        self.save()
-        
-    def __get_workspace_config_path(self):
-        """Return project configuration path"""
-        return osp.join(self.root_path, self.CONFIG_NAME)
-        
-    def load(self):
-        """Load workspace data"""
-        fname = self.__get_workspace_config_path()
-        try:
-            # Old format (Spyder 2.0-2.1 for Python 2)
-            with open(fname, 'U') as fdesc:
-                data = pickle.loads(fdesc.read())
-        except (pickle.PickleError, TypeError, UnicodeDecodeError):
-            try:
-                # New format (Spyder >=2.2 for Python 2 and Python 3)
-                with open(fname, 'rb') as fdesc:
-                    data = pickle.loads(fdesc.read())
-            except (IOError, OSError, pickle.PickleError):
-                self.ioerror_flag = True
-                return
-        for attr in self.CONFIG_ATTR:
-            setattr(self, attr, data[attr])
-        self.save()
-    
-    def save(self):
-        """Save workspace data"""
-        data = {}
-        for attr in self.CONFIG_ATTR:
-            data[attr] = getattr(self, attr)
-        try:
-            with open(self.__get_workspace_config_path(), 'wb') as fdesc:
-                pickle.dump(data, fdesc, 2)
-        except (IOError, OSError):
-            self.ioerror_flag = True
-        
-    def delete(self):
-        """Delete workspace"""
-        os.remove(self.__get_workspace_config_path())
-        
-    #------Misc.
-    def get_ioerror_warning_message(self):
-        """Return a warning message if IOError exception was raised when 
-        loading/saving the workspace or one of its projects"""
-        txt = ""
-        projlist = [_p.name for _p in self.projects if _p.ioerror_flag]
-        if self.ioerror_flag:
-            txt += _("its own configuration file")
-            if projlist:
-                txt += _(" and ")
-            else:
-                txt += "."
-        if projlist:
-            txt += _("the following projects:<br>%s") % ", ".join(projlist)
-        return txt
-        
-    def is_file_in_workspace(self, fname):
-        """Return True if file *fname* is in one of the projects"""
-        return any([proj.is_file_in_project(fname) for proj in self.projects])
-        
-    def is_file_in_closed_project(self, fname):
-        """Return True if file *fname* is in one of the closed projects"""
-        return any([proj.is_file_in_project(fname) for proj in self.projects
-                    if not proj.is_opened()])
-    
-    def is_in_pythonpath(self, dirname):
-        """Return True if dirname is in workspace's PYTHONPATH"""
-        return any([proj.is_in_pythonpath(dirname) for proj in self.projects])
-    
-    def has_project(self, root_path_or_name):
-        """Return True if workspace has a project
-        with given root path or name"""
-        checklist = [project.root_path for project in self.projects
-                     ]+[project.name for project in self.projects]
-        return root_path_or_name in checklist
-
-    def get_source_project(self, fname):
-        """Return project which contains source *fname*"""
-        for project in self.projects:
-            if project.is_file_in_project(fname):
-                return project
-        
-    def get_project_from_name(self, name):
-        """Return project's object from name"""
-        for project in self.projects:
-            if project.name == name:
-                return project
-
-    def get_folder_names(self):
-        """Return all project folder names (root path basename)"""
-        return [osp.basename(proj.root_path) for proj in self.projects]
-        
-    def add_project(self, root_path):
-        """Create project from root path, add it to workspace
-        Return the created project instance"""
-        project = Project()
-        try:
-            project.set_root_path(root_path)
-        except OSError:
-            #  This may happens when loading a Workspace with absolute paths
-            #  which has just been moved to a different location
-            return
-        self.projects.append(project)
-        self.save()
-        
-    def open_projects(self, projects, open_related=True):
-        """Open projects"""
-        for project in projects:
-            project.open()
-            related_projects = project.get_related_projects()
-            if open_related:
-                for projname in related_projects:
-                    for relproj in self.projects:
-                        if relproj.name == projname:
-                            self.open_projects(relproj, open_related=False)
-        self.save()
-        
-    def close_projects(self, projects):
-        """Close projects"""
-        for project in projects:
-            project.close()
-        self.save()
-        
-    def remove_projects(self, projects):
-        """Remove projects"""
-        for project in projects:
-            project.delete()
-            self.projects.pop(self.projects.index(project))
-        self.save()
-        
-    def close_unrelated_projects(self, projects):
-        """Close unrelated projects"""
-        unrelated_projects = []
-        for project in projects:
-            for proj in self.projects:
-                if proj is project:
-                    continue
-                if proj.name in project.get_related_projects():
-                    continue
-                if project.name in proj.get_related_projects():
-                    continue
-                unrelated_projects.append(proj)
-        self.close_projects(unrelated_projects)
-        self.save()
-        return unrelated_projects
-        
-    def rename_project(self, project, new_name):
-        """Rename project, update the related projects if necessary"""
-        old_name = project.name
-        for proj in self.projects:
-            relproj = proj.get_related_projects()
-            if old_name in relproj:
-                relproj[relproj.index(old_name)] = new_name
-                proj.set_related_projects(relproj)
-        project.rename(new_name)
-        self.save()
-        
-    def get_other_projects(self, project):
-        """Return all projects, except given project"""
-        return [_p for _p in self.projects if _p is not project]
-        
-    #------Python Path
-    def get_pythonpath(self):
-        """Return global PYTHONPATH (for all opened projects"""
-        pythonpath = []
-        for project in self.projects:
-            if project.is_opened():
-                pythonpath += project.get_pythonpath()
-        return pythonpath
-
-
-def get_pydev_project_infos(project_path):
-    """Return Pydev project infos: name, related projects and PYTHONPATH"""
-    root = ElementTree.parse(osp.join(project_path, ".pydevproject"))
-    path = []
-    project_root = osp.dirname(project_path)
-    for element in root.getiterator():
-        if element.tag == 'path':
-            path.append(osp.abspath(osp.join(project_root, element.text[1:])))
-
-    root = ElementTree.parse(osp.join(project_path, ".project"))
-    related_projects = []
-    name = None
-    for element in root.getiterator():
-        if element.tag == 'project':
-            related_projects.append(element.text)
-        elif element.tag == 'name' and name is None:
-            name = element.text
-            
-    return name, related_projects, path
-
-
-class IconProvider(QFileIconProvider):
-    """Project tree widget icon provider"""
-    def __init__(self, treeview):
-        super(IconProvider, self).__init__()
-        self.treeview = treeview
-        
-    @Slot(int)
-    @Slot(QFileInfo)
-    def icon(self, icontype_or_qfileinfo):
-        """Reimplement Qt method"""
-        if isinstance(icontype_or_qfileinfo, QFileIconProvider.IconType):
-            return super(IconProvider, self).icon(icontype_or_qfileinfo)
-        else:
-            qfileinfo = icontype_or_qfileinfo
-            fname = osp.normpath(to_text_string(qfileinfo.absoluteFilePath()))
-            if osp.isdir(fname):
-                project = self.treeview.get_source_project(fname)
-                if project is None:
-                    return super(IconProvider, self).icon(qfileinfo)
-                else:
-                    return get_dir_icon(fname, project)
-            else:
-                ext = osp.splitext(fname)[1][1:]
-                icon_path = get_image_path(ext+'.png', default=None)
-                if icon_path is not None:
-                    return get_icon(icon_path)
-                else:
-                    return super(IconProvider, self).icon(qfileinfo)
-
-
-class ExplorerTreeWidget(FilteredDirView):
-    """Explorer tree widget
-    
-    workspace: this is the explorer tree widget root path
-    (this attribute name is specific to project explorer)"""
-
-    select_workspace = Signal()
-    
-    def __init__(self, parent, show_hscrollbar=True):
-        FilteredDirView.__init__(self, parent)
-        
-        self.workspace = Workspace()
-        
-        self.fsmodel.modelReset.connect(self.reset_icon_provider)
-        self.reset_icon_provider()
-
-        self.last_folder = None
-        
-        self.setSelectionMode(FilteredDirView.ExtendedSelection)
-        
-        self.setHeaderHidden(True)
-
-        self.show_hscrollbar = show_hscrollbar
-
-        # Enable drag & drop events
-        self.setDragEnabled(True)
-        self.setDragDropMode(FilteredDirView.DragDrop)
-
-    #------DirView API---------------------------------------------------------
-    def setup_view(self):
-        """Setup view"""
-        FilteredDirView.setup_view(self)
-
-    def create_file_new_actions(self, fnames):
-        """Return actions for submenu 'New...'"""
-        new_project_act = create_action(self, text=_('Project...'),
-                                        icon=get_icon('project_expanded.png'),
-                                        triggered=self.new_project)
-        if self.workspace.is_empty():
-            new_project_act.setText(_('New project...'))
-            return [new_project_act]
-        else:
-            new_actions = FilteredDirView.create_file_new_actions(self, fnames)
-            return [new_project_act, None]+new_actions
-        
-    def create_file_import_actions(self, fnames):
-        """Return actions for submenu 'Import...'"""
-        import_folder_act = create_action(self,
-                                text=_('Existing directory'),
-                                icon=ima.icon('DirOpenIcon'),
-                                triggered=self.import_existing_directory)
-        import_spyder_act = create_action(self,
-                                text=_('Existing Spyder project'),
-                                icon=ima.icon('spyder'),
-                                triggered=self.import_existing_project)
-        import_pydev_act = create_action(self,
-                                text=_('Existing Pydev project'),
-                                icon=get_icon('pydev.png'),
-                                triggered=self.import_existing_pydev_project)
-        return [import_folder_act, import_spyder_act, import_pydev_act]
-        
-    def create_file_manage_actions(self, fnames):
-        """Reimplement DirView method"""
-        only_folders = all([osp.isdir(_fn) for _fn in fnames])
-        projects = [self.get_source_project(fname) for fname in fnames]
-        pjfnames = list(zip(projects, fnames))
-        any_project = any([_pr.is_root_path(_fn) for _pr, _fn in pjfnames])
-        any_folder_in_path = any([_proj.is_in_pythonpath(_fn)
-                                  for _proj, _fn in pjfnames])
-        any_folder_not_in_path = only_folders and \
-                                 any([not _proj.is_in_pythonpath(_fn)
-                                      for _proj, _fn in pjfnames])
-        open_act = create_action(self,
-                            text=_('Open project'),
-                            icon=get_icon('project_expanded.png'),
-                            triggered=lambda:
-                            self.open_projects(projects))
-        close_act = create_action(self,
-                            text=_('Close project'),
-                            icon=get_icon('project_closed.png'),
-                            triggered=lambda:
-                            self.close_projects(projects))
-        close_unrelated_act = create_action(self,
-                            text=_('Close unrelated projects'),
-                            triggered=lambda:
-                            self.close_unrelated_projects(projects))
-        manage_path_act = create_action(self,
-                            icon=get_icon('pythonpath.png'),
-                            text=_('PYTHONPATH manager'),
-                            triggered=lambda:
-                            self.manage_path(projects))
-        relproj_act = create_action(self,
-                            text=_('Edit related projects'),
-                            triggered=lambda:
-                            self.edit_related_projects(projects))
-        state = self.workspace is not None\
-                and len(self.workspace.projects) > 1
-        relproj_act.setEnabled(state)
-                    
-        add_to_path_act = create_action(self,
-                            text=_('Add to PYTHONPATH'),
-                            icon=get_icon('add_to_path.png'),
-                            triggered=lambda:
-                            self.add_to_path(fnames))
-        remove_from_path_act = create_action(self,
-                            text=_('Remove from PYTHONPATH'),
-                            icon=get_icon('remove_from_path.png'),
-                            triggered=lambda:
-                            self.remove_from_path(fnames))
-        properties_act = create_action(self,
-                            text=_('Properties'),
-                            icon=get_icon('advanced.png'),
-                            triggered=lambda:
-                            self.show_properties(fnames))
-
-        actions = []
-        if any_project:
-            if any([not _proj.is_opened() for _proj in projects]):
-                actions += [open_act]
-            if any([_proj.is_opened() for _proj in projects]):
-                actions += [close_act, close_unrelated_act]
-            actions += [manage_path_act, relproj_act, None]
-        
-        if only_folders:
-            if any_folder_not_in_path:
-                actions += [add_to_path_act]
-            if any_folder_in_path:
-                actions += [remove_from_path_act]
-        actions += [None, properties_act, None]
-        actions += FilteredDirView.create_file_manage_actions(self, fnames)
-        return actions
-        
-    def create_context_menu_actions(self):
-        """Reimplement DirView method"""
-        if self.workspace.is_valid():
-            # Workspace's root path is already defined
-            return FilteredDirView.create_context_menu_actions(self)
-        else:
-            return []
-
-    def setup_common_actions(self):
-        """Setup context menu common actions"""
-        actions = FilteredDirView.setup_common_actions(self)
-
-        # Toggle horizontal scrollbar
-        hscrollbar_action = create_action(self, _("Show horizontal scrollbar"),
-                                          toggled=self.toggle_hscrollbar)
-        hscrollbar_action.setChecked(self.show_hscrollbar)
-        self.toggle_hscrollbar(self.show_hscrollbar)
-
-        return actions + [hscrollbar_action]
-
-    #------Public API----------------------------------------------------------
-    @Slot(bool)
-    def toggle_hscrollbar(self, checked):
-        """Toggle horizontal scrollbar"""
-        self.parent_widget.sig_option_changed.emit('show_hscrollbar', checked)
-        self.show_hscrollbar = checked
-        self.header().setStretchLastSection(not checked)
-        self.header().setHorizontalScrollMode(QAbstractItemView.ScrollPerPixel)
-        if PYQT5:
-            self.header().setSectionResizeMode(QHeaderView.ResizeToContents)
-        else:
-            self.header().setResizeMode(QHeaderView.ResizeToContents)
-        
-    def set_folder_names(self, folder_names):
-        """Set folder names"""
-        self.setUpdatesEnabled(False)
-        FilteredDirView.set_folder_names(self, folder_names)
-        self.reset_icon_provider()
-        self.setUpdatesEnabled(True)
-        
-    def reset_icon_provider(self):
-        """Reset file system model icon provider
-        The purpose of this is to refresh files/directories icons"""
-        self.fsmodel.setIconProvider(IconProvider(self))
-
-    def check_for_io_errors(self):
-        """Eventually show a warning message box if IOError exception was
-        raised when loading/saving the workspace or one of its projects"""
-        txt = self.workspace.get_ioerror_warning_message()
-        if txt:
-            QMessageBox.critical(self, _('Workspace'),
-                    _("The workspace was unable to load or save %s<br><br>"
-                      "Please check if you have the permission to write the "
-                      "associated configuration files.") % txt)
-        
-    def set_workspace(self, root_path):
-        """Set project explorer's workspace directory"""
-        self.workspace = Workspace()
-        self.setModel(None)
-        self.fsmodel = None
-        self.proxymodel = None
-        self.setup_fs_model()
-        self.setup_proxy_model()
-        self.workspace.set_root_path(root_path)
-        self.set_root_path(root_path)
-        for index in range(1, self.model().columnCount()):
-            self.hideColumn(index)
-        self.set_folder_names(self.workspace.get_folder_names())
-
-        # The following fixes Issue 952: if we don't reset the "show all" 
-        # option here, we will lose the feature because we have just rebuilt 
-        # the fsmodel object from scratch. This would happen in particular 
-        # when setting the workspace option in the project explorer widget
-        # (see spyderlib/widgets/projectexplorer.py).
-        self.set_show_all(self.show_all)
-
-        self.parent_widget.pythonpath_changed.emit()
-#        print "folders:", self.workspace.get_folder_names()
-#        print "is_valid:", self.workspace.is_valid()
-#        print "is_empty:", self.workspace.is_empty()
-        
-    def get_workspace(self):
-        """Return project explorer's workspace directory"""
-        return self.workspace.root_path
-    
-    def is_in_workspace(self, fname):
-        """Return True if file/directory is in workspace"""
-        return self.workspace.is_file_in_workspace(fname)
-    
-    def get_project_path_from_name(self, name):
-        """Return project root path from name, knowing the workspace path"""
-        return osp.join(self.get_workspace(), name)
-
-    def get_source_project(self, fname):
-        """Return project which contains source *fname*"""
-        return self.workspace.get_source_project(fname)
-        
-    def get_project_from_name(self, name):
-        """Return project's object from name"""
-        return self.workspace.get_project_from_name(name)
-        
-    def get_pythonpath(self):
-        """Return global PYTHONPATH (for all opened projects"""
-        return self.workspace.get_pythonpath()
-        
-    def add_project(self, folder, silent=False):
-        """Add project to tree"""
-        if not self.is_valid_project_root_path(folder, silent=silent):
-            return
-        if not fixpath(folder).startswith(fixpath(self.root_path)):
-            title = _("Import directory")
-            answer = QMessageBox.warning(self, title,
-                            _("The following directory is not in workspace:"
-                              "<br><b>%s</b><br><br>"
-                              "Do you want to continue (and copy the "
-                              "directory to workspace)?") % folder,
-                            QMessageBox.Yes|QMessageBox.No)
-            if answer == QMessageBox.No:
-                return
-            name = self._select_project_name(title,
-                                             default=osp.basename(folder))
-            if name is None:
-                return
-            dst = self.get_project_path_from_name(name)
-            try:
-                shutil.copytree(folder, dst)
-            except EnvironmentError as error:
-                QMessageBox.critical(self, title,
-                                     _("<b>Unable to %s <i>%s</i></b>"
-                                       "<br><br>Error message:<br>%s"
-                                       ) % (_('copy'), folder,
-                                            to_text_string(error)))
-            folder = dst
-        
-        project = self.workspace.add_project(folder)
-        self.set_folder_names(self.workspace.get_folder_names())
-        self.parent_widget.pythonpath_changed.emit()
-        
-        self.check_for_io_errors()
-        
-        return project
-        
-    def open_projects(self, projects, open_related=True):
-        """Open projects"""
-        self.workspace.open_projects(projects, open_related)
-        self.parent_widget.pythonpath_changed.emit()
-        self.reset_icon_provider()
-        for project in projects:
-            self.update(self.get_index(project.root_path))
-        
-    def close_projects(self, projects):
-        """Close projects"""
-        self.workspace.close_projects(projects)
-        self.parent_widget.pythonpath_changed.emit()
-        self.parent_widget.sig_projects_were_closed.emit()
-        self.reset_icon_provider()
-        for project in projects:
-            index = self.get_index(project.root_path)
-            self.update(index)
-            self.collapse(index)
-        
-    def remove_projects(self, projects):
-        """Remove projects"""
-        self.workspace.remove_projects(projects)
-        self.set_folder_names(self.workspace.get_folder_names())
-        self.parent_widget.pythonpath_changed.emit()
-        
-    def close_unrelated_projects(self, projects):
-        """Close unrelated projects"""
-        unrelated_projects = self.workspace.close_unrelated_projects(projects)
-        if unrelated_projects:
-            self.reset_icon_provider()
-            for project in unrelated_projects:
-                self.update(self.get_index(project.root_path))
-        
-    def is_valid_project_root_path(self, root_path, silent=False):
-        """Return True root_path is a valid project root path"""
-        fixed_wr = fixpath(self.root_path)  # workspace root path
-        fixed_pr = fixpath(osp.dirname(root_path))  # project root path
-        if self.workspace.has_project(root_path):
-            if not silent:
-                QMessageBox.critical(self, _("Project Explorer"),
-                                     _("The project <b>%s</b>"
-                                       " is already opened!"
-                                       ) % osp.basename(root_path))
-            return False
-        elif fixed_pr != fixed_wr and fixed_pr.startswith(fixed_wr):
-            if not silent:
-                QMessageBox.warning(self, _("Project Explorer"),
-                                    _("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>") % self.get_workspace())
-        return True
-    
-    def _select_project_name(self, title, default=None):
-        """Select project name"""
-        name = '' if default is None else default
-        while True:
-            name, valid = QInputDialog.getText(self, title, _('Project name:'),
-                                               QLineEdit.Normal, name)
-            if valid and name:
-                name = to_text_string(name)
-                pattern = r'[a-zA-Z][a-zA-Z0-9\_\-]*$'
-                match = re.match(pattern, name)
-                path = self.get_project_path_from_name(name)
-                if self.workspace.has_project(name):
-                    QMessageBox.critical(self, title,
-                                         _("A project named "
-                                           "<b>%s</b> already exists") % name)
-                    continue
-                elif match is None:
-                    QMessageBox.critical(self, title,
-                                         _("Invalid project name.<br><br>"
-                                           "Name must match the following "
-                                           "regular expression:"
-                                           "<br><b>%s</b>") % pattern)
-                    continue
-                elif osp.isdir(path):
-                    answer = QMessageBox.warning(self, title,
-                                    _("The following directory is not empty:"
-                                      "<br><b>%s</b><br><br>"
-                                      "Do you want to continue?") % path,
-                                    QMessageBox.Yes|QMessageBox.No)
-                    if answer == QMessageBox.No:
-                        continue
-                return name
-            else:
-                return
-
-    @Slot()
-    def new_project(self):
-        """Return True if project was created"""
-        title = _('New project')
-        if self.workspace.is_valid():
-            name = self._select_project_name(title)
-            if name is not None:
-                folder = self.get_project_path_from_name(name)
-                self.add_project(folder)
-        else:
-            answer = QMessageBox.critical(self, title,
-                                          _("The current workspace has "
-                                            "not been configured yet.\n"
-                                            "Do you want to do this now?"),
-                                          QMessageBox.Yes|QMessageBox.Cancel)
-            if answer == QMessageBox.Yes:
-                self.select_workspace.emit()
-        
-    def _select_existing_directory(self):
-        """Select existing source code directory,
-        to be used as a new project root path
-        (copied into the current project's workspace directory if necessary)"""
-        if self.last_folder is None:
-            self.last_folder = self.workspace.root_path
-        while True:
-            self.parent_widget.redirect_stdio.emit(False)
-            folder = getexistingdirectory(self, _("Select directory"),
-                                          self.last_folder)
-            self.parent_widget.redirect_stdio.emit(True)
-            if folder:
-                folder = osp.abspath(folder)
-                self.last_folder = folder
-                if not self.is_valid_project_root_path(folder):
-                    continue
-                return folder
-            else:
-                return
-
-    @Slot()
-    def import_existing_directory(self):
-        """Create project from existing directory
-        Eventually copy the whole directory to current workspace"""
-        folder = self._select_existing_directory()
-        if folder is None:
-            return
-        self.add_project(folder)
-    
-    def __select_existing_project(self, typename, configname):
-        """Select existing project"""
-        title = _('Import existing project')
-        while True:
-            folder = self._select_existing_directory()
-            if folder is None:
-                return
-            if not osp.isfile(osp.join(folder, configname)):
-                subfolders = [osp.join(folder, _f) for _f in os.listdir(folder)
-                              if osp.isdir(osp.join(folder, _f))
-                              and osp.isfile(osp.join(folder, _f, configname))]
-                if subfolders:
-                    data = []
-                    for subfolder in subfolders:
-                        data.append((subfolder, False))
-                    comment = _("Select projects to import")
-                    result = fedit(data, title=title, comment=comment)
-                    if result is None:
-                        return
-                    else:
-                        selected_folders = []
-                        for index, is_selected in enumerate(result):
-                            if is_selected:
-                                selected_folders.append(subfolders[index])
-                        return selected_folders
-                else:
-                    QMessageBox.critical(self, title,
-                                     _("The folder <i>%s</i> "
-                                       "does not contain a valid %s project"
-                                       ) % (osp.basename(folder), typename))
-                    continue
-            return folder
-
-    @Slot()
-    def import_existing_project(self):
-        """Import existing project"""
-        folders = self.__select_existing_project("Spyder", Project.CONFIG_NAME)
-        if folders is None:
-            return
-        if not isinstance(folders, (tuple, list)):
-            folders = [folders]
-        for folder in folders:
-            self.add_project(folder, silent=True)
-
-    @Slot()
-    def import_existing_pydev_project(self):
-        """Import existing Pydev project"""
-        folders = self.__select_existing_project("Pydev", ".pydevproject")
-        if folders is None:
-            return
-        if not isinstance(folders, (tuple, list)):
-            folders = [folders]
-        for folder in folders:
-            try:
-                name, related_projects, path = get_pydev_project_infos(folder)
-            except RuntimeError as error:
-                QMessageBox.critical(self,
-                            _('Import existing Pydev project'),
-                            _("<b>Unable to read Pydev project <i>%s</i></b>"
-                              "<br><br>Error message:<br>%s"
-                              ) % (osp.basename(folder),
-                                   to_text_string(error)))
-            finally:
-                project = self.add_project(folder, silent=True)
-                if project is not None:
-                    project.name = name
-                    project.set_related_projects(related_projects)
-                    project.set_pythonpath(path)
-                    self.parent_widget.pythonpath_changed.emit()
-
-    def rename_file(self, fname):
-        """Rename file"""
-        path = FilteredDirView.rename_file(self, fname)
-        if path:
-            project = self.get_source_project(fname)
-            if project.is_root_path(fname):
-                self.workspace.rename_project(project, osp.basename(path))
-                self.set_folder_names(self.workspace.get_folder_names())
-            else:
-                self.remove_path_from_project_pythonpath(project, fname)
-    
-    def remove_tree(self, dirname):
-        """Remove whole directory tree"""
-        FilteredDirView.remove_tree(self, dirname)
-        project = self.get_source_project(dirname)
-        self.remove_path_from_project_pythonpath(project, dirname)
-    
-    def delete_file(self, fname, multiple, yes_to_all):
-        """Delete file"""
-        if multiple:
-            pj_buttons = QMessageBox.Yes|QMessageBox.No|QMessageBox.Cancel
-        else:
-            pj_buttons = QMessageBox.Yes|QMessageBox.No
-        project = self.get_source_project(fname)
-        if project.is_root_path(fname):
-            answer = QMessageBox.warning(self, _("Delete"),
-                            _("Do you really want "
-                              "to delete project <b>%s</b>?<br><br>"
-                              "Note: project files won't be deleted from "
-                              "disk.") % project.name, pj_buttons)
-            if answer == QMessageBox.Yes:
-                self.remove_projects([project])
-                return yes_to_all
-        else:
-            return FilteredDirView.delete_file(self, fname, multiple,
-                                               yes_to_all)
-    
-    def add_to_path(self, fnames):
-        """Add fnames to path"""
-        indexes = []
-        for path in fnames:
-            project = self.get_source_project(path)
-            if project.add_to_pythonpath(path):
-                self.parent_widget.pythonpath_changed.emit()
-                indexes.append(self.get_index(path))
-        if indexes:
-            self.reset_icon_provider()
-            for index in indexes:
-                self.update(index)
-    
-    def remove_path_from_project_pythonpath(self, project, path):
-        """Remove path from project's PYTHONPATH"""
-        ok = project.remove_from_pythonpath(path)
-        self.parent_widget.pythonpath_changed.emit()
-        return ok
-    
-    def remove_from_path(self, fnames):
-        """Remove from path"""
-        indexes = []
-        for path in fnames:
-            project = self.get_source_project(path)
-            if self.remove_path_from_project_pythonpath(project, path):
-                indexes.append(self.get_index(path))
-        if indexes:
-            self.reset_icon_provider()
-            for index in indexes:
-                self.update(index)
-    
-    def manage_path(self, projects):
-        """Manage path"""
-        for project in projects:
-            pathlist = project.get_pythonpath()
-            dlg = PathManager(self, pathlist, sync=False)
-            dlg.exec_()
-            project.set_pythonpath(dlg.get_path_list())
-            self.parent_widget.pythonpath_changed.emit()
-    
-    def edit_related_projects(self, projects):
-        """Edit related projects"""
-        title = _('Related projects')
-        for project in projects:
-            related_projects = project.get_related_projects()
-            data = []
-            other_projects = self.workspace.get_other_projects(project)
-            for proj in other_projects:
-                name = proj.name
-                data.append((name, name in related_projects))
-            comment = _("Select projects which are related to "
-                        "<b>%s</b>") % project.name
-            result = fedit(data, title=title, comment=comment)
-            if result is not None:
-                related_projects = []
-                for index, is_related in enumerate(result):
-                    if is_related:
-                        name = other_projects[index].name
-                        related_projects.append(name)
-                project.set_related_projects(related_projects)
-    
-    def show_properties(self, fnames):
-        """Show properties"""
-        pathlist = sorted(fnames)
-        dirlist = [path for path in pathlist if osp.isdir(path)]
-        for path in pathlist[:]:
-            for folder in dirlist:
-                if path != folder and path.startswith(folder):
-                    pathlist.pop(pathlist.index(path))
-        files, lines = 0, 0
-        for path in pathlist:
-            f, l = misc.count_lines(path)
-            files += f
-            lines += l
-        QMessageBox.information(self, _("Project Explorer"),
-                                _("Statistics on source files only:<br>"
-                                  "(Python, Cython, IPython, Enaml,"
-                                  "C/C++, Fortran)<br><br>"
-                                  "<b>%s</b> files.<br>"
-                                  "<b>%s</b> lines of code."
-                                  ) % (str(files), str(lines)))
-            
-    #---- Internal drag & drop
-    def dragMoveEvent(self, event):
-        """Reimplement Qt method"""
-        index = self.indexAt(event.pos())
-        if index:
-            dst = self.get_filename(index)
-            if osp.isdir(dst):
-                event.acceptProposedAction()
-            else:
-                event.ignore()
-        else:
-            event.ignore()
-
-    def dropEvent(self, event):
-        """Reimplement Qt method"""
-        event.ignore()
-        action = event.dropAction()
-        if action not in (Qt.MoveAction, Qt.CopyAction):
-            return
-        
-#        # QTreeView must not remove the source items even in MoveAction mode:
-#        event.setDropAction(Qt.CopyAction)
-        
-        dst = self.get_filename(self.indexAt(event.pos()))
-        yes_to_all, no_to_all = None, None
-        src_list = [to_text_string(url.toString())
-                    for url in event.mimeData().urls()]
-        if len(src_list) > 1:
-            buttons = QMessageBox.Yes|QMessageBox.YesAll| \
-                      QMessageBox.No|QMessageBox.NoAll|QMessageBox.Cancel
-        else:
-            buttons = QMessageBox.Yes|QMessageBox.No
-        for src in src_list:
-            if src == dst:
-                continue
-            dst_fname = osp.join(dst, osp.basename(src))
-            if osp.exists(dst_fname):
-                if yes_to_all is not None or no_to_all is not None:
-                    if no_to_all:
-                        continue
-                elif osp.isfile(dst_fname):
-                    answer = QMessageBox.warning(self, _('Project explorer'),
-                              _('File <b>%s</b> already exists.<br>'
-                                'Do you want to overwrite it?') % dst_fname,
-                              buttons)
-                    if answer == QMessageBox.No:
-                        continue
-                    elif answer == QMessageBox.Cancel:
-                        break
-                    elif answer == QMessageBox.YesAll:
-                        yes_to_all = True
-                    elif answer == QMessageBox.NoAll:
-                        no_to_all = True
-                        continue
-                else:
-                    QMessageBox.critical(self, _('Project explorer'),
-                                         _('Folder <b>%s</b> already exists.'
-                                           ) % dst_fname, QMessageBox.Ok)
-                    event.setDropAction(Qt.CopyAction)
-                    return
-            try:
-                if action == Qt.CopyAction:
-                    if osp.isfile(src):
-                        shutil.copy(src, dst)
-                    else:
-                        shutil.copytree(src, dst)
-                else:
-                    if osp.isfile(src):
-                        misc.move_file(src, dst)
-                    else:
-                        shutil.move(src, dst)
-                    self.parent_widget.removed.emit(src)
-            except EnvironmentError as error:
-                if action == Qt.CopyAction:
-                    action_str = _('copy')
-                else:
-                    action_str = _('move')
-                QMessageBox.critical(self, _("Project Explorer"),
-                                     _("<b>Unable to %s <i>%s</i></b>"
-                                       "<br><br>Error message:<br>%s"
-                                       ) % (action_str, src,
-                                            to_text_string(error)))
-
-
-class WorkspaceSelector(QWidget):
-    """Workspace selector widget"""
-    TITLE = _('Select an existing workspace directory, or create a new one')
-    TIP = _("<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>.spyderworkspace</b> configuration "
-            "file."
-            "<br><br>"
-            "A <b>Spyder project</b> is a directory with source code (and other "
-            "related files) and a configuration file (named "
-            "<b>.spyderproject</b>) with project settings (PYTHONPATH, linked "
-            "projects, ...).<br>"
-            )
-    
-    selected_workspace = Signal(str)
-
-    def __init__(self, parent):
-        super(WorkspaceSelector, self).__init__(parent)
-        self.browse_btn = None
-        self.create_btn = None
-        self.line_edit = None
-        self.first_time = True
-        
-    def set_workspace(self, path):
-        """Set workspace directory"""
-        self.line_edit.setText(path)
-        
-    def setup_widget(self):
-        """Setup workspace selector widget"""
-        self.line_edit = QLineEdit()
-        self.line_edit.setAlignment(Qt.AlignRight)
-        self.line_edit.setToolTip(_("This is the current workspace directory")\
-                                  +'<br><br>'+self.TIP)
-        self.line_edit.setReadOnly(True)
-        self.line_edit.setDisabled(True)
-        self.browse_btn = QPushButton(ima.icon('DirOpenIcon'), '', self)
-        self.browse_btn.setToolTip(self.TITLE)
-        self.browse_btn.clicked.connect(self.select_directory)
-        layout = QHBoxLayout()
-        layout.addWidget(self.line_edit)
-        layout.addWidget(self.browse_btn)
-        layout.setContentsMargins(0, 0, 0, 0)
-        self.setLayout(layout)
-    
-    def select_directory(self):
-        """Select directory"""
-        if self.first_time:
-            QMessageBox.information(self, self.TITLE, self.TIP)
-            self.first_time = False
-        basedir = to_text_string(self.line_edit.text())
-        if not osp.isdir(basedir):
-            basedir = getcwd()
-        while True:
-            self.parent().redirect_stdio.emit(False)
-            directory = getexistingdirectory(self, self.TITLE, basedir)
-            self.parent().redirect_stdio.emit(True)
-            if not directory:
-                break
-            path = osp.join(directory, Workspace.CONFIG_NAME)
-            if not osp.isfile(path):
-                answer = QMessageBox.warning(self, self.TITLE,
-                              _("The following directory is not a Spyder "
-                                "workspace:<br>%s<br><br>Do you want to "
-                                "create a new workspace in this directory?"
-                                ) % directory, QMessageBox.Yes|QMessageBox.No)
-                if answer == QMessageBox.No:
-                    continue
-            directory = osp.abspath(osp.normpath(directory))
-            self.set_workspace(directory)
-            self.selected_workspace.emit(directory)
-            break
-
-
-class ProjectExplorerWidget(QWidget):
-    """Project Explorer"""
-    sig_option_changed = Signal(str, object)
-    sig_open_file = Signal(str)
-    pythonpath_changed = Signal()
-
-    def __init__(self, parent, name_filters=['*.py', '*.pyw'],
-                 show_all=False, show_hscrollbar=True):
-        QWidget.__init__(self, parent)
-        self.treewidget = None
-        self.selector = None
-        self.setup_layout(name_filters, show_all, show_hscrollbar)
-        
-    def setup_layout(self, name_filters, show_all, show_hscrollbar):
-        """Setup project explorer widget layout"""
-        self.selector = WorkspaceSelector(self)
-        self.selector.setup_widget()
-        self.selector.selected_workspace.connect(self.set_workspace)
-
-        self.treewidget = ExplorerTreeWidget(self,
-                                             show_hscrollbar=show_hscrollbar)
-        self.treewidget.setup(name_filters=name_filters, show_all=show_all)
-        self.treewidget.select_workspace.connect(self.selector.select_directory)
-        
-        layout = QVBoxLayout()
-        layout.setContentsMargins(0, 0, 0, 0)
-        layout.addWidget(self.selector)
-        layout.addWidget(self.treewidget)
-        self.setLayout(layout)
-        
-    def set_workspace(self, path):
-        """Set current workspace"""
-        path = osp.normpath(to_text_string(path))
-        if path is not None and osp.isdir(path):
-            self.treewidget.set_workspace(path)
-            self.selector.set_workspace(path)
-    
-    def check_for_io_errors(self):
-        """Check for I/O errors that may occured when loading/saving 
-        projects or the workspace itself and warn the user"""
-        self.treewidget.check_for_io_errors()
-            
-    def get_workspace(self):
-        """Return current workspace path"""
-        return self.treewidget.get_workspace()
-        
-    def closing_widget(self):
-        """Perform actions before widget is closed"""
-        pass
-        
-    def add_project(self, project):
-        """Add project"""
-        return self.treewidget.add_project(project)
-
-    def get_pythonpath(self):
-        """Return PYTHONPATH"""
-        return self.treewidget.get_pythonpath()
-    
-    def get_source_project(self, fname):
-        """Return project which contains source *fname*"""
-        return self.treewidget.get_source_project(fname)
-
-
-#==============================================================================
-# Tests
-#==============================================================================
-class Test(QWidget):
-    def __init__(self):
-        QWidget.__init__(self)
-        vlayout = QVBoxLayout()
-        self.setLayout(vlayout)
-
-        self.explorer = ProjectExplorerWidget(None, show_all=True)
-        self.explorer.set_workspace(osp.dirname(osp.abspath(__file__)))
-#        p1 = self.explorer.add_project(r"D:/Python/spyder")
-#        p1.set_pythonpath([r"D:\Python\spyder\spyderlib"])
-#        p1.save()
-#        self.treewidget.close_projects(p1)
-#        _p2 = self.explorer.add_project(r"D:\Python\test_project")
-        
-        vlayout.addWidget(self.explorer)
-        
-        hlayout1 = QHBoxLayout()
-        vlayout.addLayout(hlayout1)
-        label = QLabel("<b>Open file:</b>")
-        label.setAlignment(Qt.AlignRight)
-        hlayout1.addWidget(label)
-        self.label1 = QLabel()
-        hlayout1.addWidget(self.label1)
-        self.explorer.sig_open_file.connect(self.label1.setText)
-        
-        hlayout3 = QHBoxLayout()
-        vlayout.addLayout(hlayout3)
-        label = QLabel("<b>Option changed:</b>")
-        label.setAlignment(Qt.AlignRight)
-        hlayout3.addWidget(label)
-        self.label3 = QLabel()
-        hlayout3.addWidget(self.label3)
-        self.explorer.sig_option_changed.connect(
-           lambda x, y: self.label3.setText('option_changed: %r, %r' % (x, y)))
-
-
-def test():
-    from spyderlib.utils.qthelpers import qapplication
-    app = qapplication()
-    test = Test()
-    test.resize(640, 480)
-    test.show()
-    app.exec_()
-
-
-if __name__ == "__main__":
-    test()
diff --git a/spyderlib/widgets/variableexplorer/__init__.py b/spyderlib/widgets/variableexplorer/__init__.py
deleted file mode 100644
index b509a93..0000000
--- a/spyderlib/widgets/variableexplorer/__init__.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright © 2009- The Spyder Development team
-# Licensed under the terms of the MIT License
-# (see spyderlib/__init__.py for details)
-
-"""
-spyderlib.widgets.variableexplorer
-==================================
-
-Variable Explorer related widgets
-"""

-- 
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