Skip to content

Commit b2a40f8

Browse files
committed
Merge branch 'traduccion-logginghandlers' of https://github.com/JuliKM/python-docs-es into traduccion-logginghandlers
2 parents 9ecdf64 + 2ce39ed commit b2a40f8

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

library/unittest.po

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,7 @@ msgstr ""
1515
"Project-Id-Version: Python 3.8\n"
1616
"Report-Msgid-Bugs-To: \n"
1717
"POT-Creation-Date: 2022-10-25 19:47+0200\n"
18-
<<<<<<< HEAD
19-
"PO-Revision-Date: 2022-10-31 11:26-0300\n"
20-
=======
2118
"PO-Revision-Date: 2022-10-31 01:06-0300\n"
22-
>>>>>>> 91757ed2adda951f204e66430d90ff3e7267c277
2319
"Last-Translator: Claudia Millán (@clacri)\n"
2420
"Language-Team: python-doc-es\n"
2521
"Language: es\n"
@@ -911,9 +907,9 @@ msgid ""
911907
"on a :class:`TestResult`."
912908
msgstr ""
913909
"Unittest soporta omitir métodos individuales de tests e incluso clases "
914-
"completas de tests. Además, soporta marcar un test como un \"fallo esperado"
915-
"\", un test que está roto y va a fallar, pero no debería ser contado como "
916-
"fallo en :class:`TestResult`."
910+
"completas de tests. Además, soporta marcar un test como un \"fallo "
911+
"esperado\", un test que está roto y va a fallar, pero no debería ser contado "
912+
"como fallo en :class:`TestResult`."
917913

918914
#: ../Doc/library/unittest.rst:537
919915
msgid ""
@@ -2517,8 +2513,9 @@ msgstr "Un ejemplo ilustrando el orden::"
25172513

25182514
#: ../Doc/library/unittest.rst:1651
25192515
msgid ""
2520-
"After running the test, ``events`` would contain ``[\"setUp\", \"asyncSetUp"
2521-
"\", \"test_response\", \"asyncTearDown\", \"tearDown\", \"cleanup\"]``."
2516+
"After running the test, ``events`` would contain ``[\"setUp\", "
2517+
"\"asyncSetUp\", \"test_response\", \"asyncTearDown\", \"tearDown\", "
2518+
"\"cleanup\"]``."
25222519
msgstr ""
25232520
"Después de ejecutar el test, ``events`` contendría ``[“setUp”, "
25242521
"“asyncSetUp”, “test_response”, “asyncTearDown”, “tearDown”, “cleanup”]``."

0 commit comments

Comments
 (0)