Skip to content

Traduccion logginghandlers #2137

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.

Sign up for GitHub

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 23 commits into from
Oct 31, 2022
Merged

Traduccion logginghandlers #2137

Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
3d9bc0a
borro espacio
JuliKM Oct 30, 2021
138885e
agrego security warnings
JuliKM Nov 7, 2021
73e52b8
Merge branch 'python-3.10' into 3.10
JuliKM Nov 7, 2021
eda19b8
Arreglo conflicto
JuliKM Dec 18, 2021
cdccbbf
Merge branch 'python:3.10' into 3.10
JuliKM Dec 18, 2021
758524b
Merge branch 'python:3.10' into 3.10
JuliKM Oct 30, 2022
435de3a
Merge branch 'python:3.11' into 3.11
JuliKM Oct 30, 2022
1f0c14e
Merge pull request #3 from python/3.11
JuliKM Oct 31, 2022
ee0930f
Merge branch '3.11' of https://github.com/JuliKM/python-docs-es into …
JuliKM Oct 31, 2022
7f3b18b
remove extra space
JuliKM Oct 31, 2022
6d9e770
solve conflict
JuliKM Oct 31, 2022
a0e7d5a
Merge pull request #5 from JuliKM/JuliKM-patch-1
JuliKM Oct 31, 2022
c7dbd5f
resolve
JuliKM Oct 31, 2022
3565763
Merge pull request #4 from python/3.11
JuliKM Oct 31, 2022
457516c
traducido logginghandlers
JuliKM Oct 31, 2022
abdffee
agrego espacio sobrante
JuliKM Oct 31, 2022
6b8d967
Merge branch '3.11' into traduccion-logginghandlers
JuliKM Oct 31, 2022
2ce39ed
Update unittest.po
JuliKM Oct 31, 2022
9ecdf64
modifico el powrap a 79
JuliKM Oct 31, 2022
b2a40f8
Merge branch 'traduccion-logginghandlers' of https://github.com/JuliK…
JuliKM Oct 31, 2022
6f4a631
powrap
cmaureir Oct 31, 2022
b719e97
Merge branch '3.11' into traduccion-logginghandlers
JuliKM Oct 31, 2022
250e60e
actualizo diccionario
JuliKM Oct 31, 2022
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
Prev Previous commit
Next Next commit
Arreglo conflicto
  • Loading branch information
@JuliKM
JuliKM authored Dec 18, 2021
commit eda19b8387af703cc2e8e7e5b53473e8d8aed9c0
8 changes: 0 additions & 8 deletions library/security_warnings.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,7 @@ msgstr ""
"Project-Id-Version: Python en Español 3.10\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-10-16 21:42+0200\n"
<<<<<<< HEAD
"PO-Revision-Date: 2021-10-30 11:49-0300\n"
=======
"PO-Revision-Date: 2021-10-30 11:31-0300\n"
>>>>>>> 451fe725c28e4b56b001cdc540f2d8a33325cfca
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
Expand Down Expand Up @@ -53,11 +49,7 @@ msgid ""
msgstr ""
":mod:`hashlib`: :ref:`todos los constructores toman un argumento de solo "
"palabra clave \"usedforsecurity\" que deshabilita algoritmos inseguros y "
<<<<<<< HEAD
"bloqueados conocidos <hashlib-usedforsecurity>`"
=======
"bloqueados conocidos. <hashlib-usedforsecurity>`"
>>>>>>> 451fe725c28e4b56b001cdc540f2d8a33325cfca

#: ../Doc/library/security_warnings.rst:16
msgid ""
Expand Down