Skip to content

Merge 3.7 to master #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Dec 27, 2019
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions dict
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,15 @@ ASCII
backspace
batch
C
Circus
comilla
command
default
docstring
docstrings
else
Fibonacci
Flying
if
import
imprimible
Expand All @@ -19,9 +22,12 @@ interactivamente
intermezzo
iterador
m
Mac
Monty
multilínea
multi
option
Perl
Python
python
portable
Expand Down Expand Up @@ -52,9 +58,12 @@ sockets
subíndices
sys
tipado
Tk
tty
tupla
tutorial
Tutorial
Unix
Windows
X
x
8 changes: 4 additions & 4 deletions tutorial/controlflow.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ msgstr ""
"Project-Id-Version: Python 3.7\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-06 11:59-0400\n"
"PO-Revision-Date: 2019-05-22 12:21+0200\n"
"PO-Revision-Date: 2019-12-22 12:00+0100\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Last-Translator: \n"
"Language-Team: es\n"
"Language: es_ES\n"
"X-Generator: Poedit 2.2.1\n"
"X-Generator: Poedit 2.2.4\n"

#: ../Doc/tutorial/controlflow.rst:5
msgid "More Control Flow Tools"
Expand Down Expand Up @@ -305,8 +305,8 @@ msgid ""
msgstr ""
"La primera sentencia del cuerpo de la función puede ser opcionalmente una "
"cadena de texto literal; esta es la cadena de texto de documentación de la "
"función, o :dfn:`docstring`. (Podés encontrar más acerca de docstrings en la "
"sección :ref:`tut-docstrings`.). Existen herramientas que usan las "
"función, o :dfn:`docstring`. (Puedes encontrar más acerca de docstrings en "
"la sección :ref:`tut-docstrings`.). Existen herramientas que usan las "
"``docstrings`` para producir documentación imprimible o disponible en línea, "
"o para dejar que los usuarios busquen interactivamente a través del código; "
"es una buena práctica incluir ``docstrings`` en el código que escribes, y "
Expand Down