Merge from 3.x: PR #3971

spyder-ide · Jan 16, 2017 · 8833dd1 · 8833dd1
2 parents af5566c + 41196df
commit 8833dd1
Show file tree

Hide file tree

Showing 40 changed files with 4,566 additions and 4,318 deletions.
diff --git a/continuous_integration/appveyor/modules_test.bat b/continuous_integration/appveyor/modules_test.bat
@@ -24,6 +24,10 @@ for /r "%SPYDER%" %%f in (*.py) do (
         :: We don't want py.test's to be run here
         echo --- NOT testing %%f ---
         echo.
+    ) else if not "!file:test\=!"=="!file!" (
+        :: We don't want py.test's to be run here
+        echo --- NOT testing %%f ---
+        echo.
     ) else if not "!file:site\=!"=="!file!" (
         :: We can't test our site files
         echo --- NOT testing %%f ---

diff --git a/spyder/locale/es/LC_MESSAGES/spyder.mo b/spyder/locale/es/LC_MESSAGES/spyder.mo