Skip to content

Feat: translation library/idle.po #1341

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 12 commits into from Oct 11, 2021
Prev Previous commit
Next Next commit
Fix: accept current changes
  • Loading branch information
dcristobalhMad committed Aug 20, 2021
commit 0ef60363d8870a26fe7ef929feda32eb0542ed9f
22 changes: 0 additions & 22 deletions library/idle.po
Original file line number Diff line number Diff line change
Expand Up @@ -1070,7 +1070,6 @@ msgstr "Terminaciones"

#: ../Doc/library/idle.rst:477
msgid ""
<<<<<<< HEAD
"Completions are supplied, when requested and available, for module names, attributes "
"of classes or functions, or filenames. Each request method displays a completion box "
"with existing names. (See tab completions below for an exception.) For any box, "
Expand All @@ -1088,27 +1087,6 @@ msgstr ""
"teclas :kbd:`Up`, :kbd:`Down`, :kbd:`PageUp`, :kbd:`PageDown`, :kbd:`Home`, y :kbd:"
"`End`; y con un solo clic dentro del cuadro. Cierra la caja con las teclas :kbd:"
"`Escape`, :kbd:`Enter` y doble :kbd:`Tab` o con clics fuera de la caja. Un doble clic "
=======
"Completions are supplied, when requested and available, for module names, "
"attributes of classes or functions, or filenames. Each request method "
"displays a completion box with existing names. (See tab completions below "
"for an exception.) For any box, change the name being completed and the item "
"highlighted in the box by typing and deleting characters; by hitting :kbd:"
"`Up`, :kbd:`Down`, :kbd:`PageUp`, :kbd:`PageDown`, :kbd:`Home`, and :kbd:"
"`End` keys; and by a single click within the box. Close the box with :kbd:"
"`Escape`, :kbd:`Enter`, and double :kbd:`Tab` keys or clicks outside the "
"box. A double click within the box selects and closes."
msgstr ""
"Cuando se solicitan y están disponibles, se suministran complementos para "
"los nombres de los módulos, los atributos de las clases o las funciones, o "
"los nombres de los archivos. Cada método de solicitud muestra un cuadro de "
"finalización con los nombres existentes. (Para cualquier cuadro, cambie el "
"nombre que se está completando y el elemento resaltado en el cuadro "
"escribiendo y borrando caracteres; pulsando las teclas :kbd:`Up`, :kbd:"
"`Down`, :kbd:`PageUp`, :kbd:`PageDown`, :kbd:`Home`, y :kbd:`End`; y con un "
"solo clic dentro del cuadro. Cierra la caja con las teclas :kbd:`Escape`, :"
"kbd:`Enter` y doble :kbd:`Tab` o con clics fuera de la caja. Un doble clic "
>>>>>>> e2b4e0238dbd335bdf9a063afcec08abcf5ebb58
"dentro de la caja selecciona y cierra."

#: ../Doc/library/idle.rst:488
Expand Down