@@ -11,11 +11,7 @@ msgstr ""
1111"Project-Id-Version :Python 3.8\n "
1212"Report-Msgid-Bugs-To :\n "
1313"POT-Creation-Date :2024-11-21 16:38-0300\n "
14- <<<<<<< HEAD
15- "PO-Revision-Date :2025-02-03 09:07-0300\n "
16- =======
17- "PO-Revision-Date :2025-02-03 17:14-0300\n "
18- >>>>>>> upstream/3.13
14+ "PO-Revision-Date :2025-02-05 17:10-0300\n "
1915"Last-Translator :srmorita <fr.morac@duocuc.cl>\n "
2016"Language-Team :python-doc-es\n "
2117"Language :es\n "
@@ -438,24 +434,15 @@ msgid ""
438434"``tp_as_number`` structure filled in), and ``0`` otherwise. This function "
439435"always succeeds."
440436msgstr ""
441- <<<<<<< HEAD
442- "Devuelve ``1`` si *o* es un entero índice (tiene la ranura ``nb_index`` de "
443- "la estructura ``tp_as_number`` rellenada), y ``0`` en caso contrario. Esta "
444- =======
445437"Retorna ``1`` si *o* es un entero índice (tiene la ranura ``nb_index`` de la "
446438"estructura ``tp_as_number`` rellenada), y ``0`` en caso contrario. Esta "
447- >>>>>>> upstream/3.13
448439"función siempre finaliza con éxito."
449440
450441#: ../Doc/c-api/number.rst:67 ../Doc/c-api/number.rst:75
451442#: ../Doc/c-api/number.rst:97 ../Doc/c-api/number.rst:195
452443#: ../Doc/c-api/number.rst:241 ../Doc/c-api/number.rst:249
453444msgid "built-in function"
454- <<<<<<< HEAD
455- msgstr "función incorporada"
456- =======
457445msgstr "built-in function"
458- >>>>>>> upstream/3.13
459446
460447#: ../Doc/c-api/number.rst:67
461448msgid "divmod"