Skip to content

Traducción library/frameworks #938

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 7 commits into from
Oct 4, 2020
Merged
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Update library/frameworks.po
Co-authored-by: Cristián Maureira-Fredes <cmaureir@users.noreply.github.com>
  • Loading branch information
eflipe and cmaureir authored Oct 4, 2020
commit 1b57dc2c40bcc9e7404bde7ccb44858458032491
7 changes: 0 additions & 7 deletions library/frameworks.po
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,9 @@ msgid ""
"dictate the structure of your program. Currently the modules described "
"here are all oriented toward writing command-line interfaces."
msgstr ""
<<<<<<< HEAD
"Los módulos descritos en este capitulo son *frameworks* que dictarán en gran "
"medida la estructura de su programa. Actualmente, los módulos descritos aquí "
"están orientados para escribir en las interfaces de línea de comandos."
=======
"Los módulos descritos en este capítulo son *frameworks* que dictarán en "
"gran medida la estructura de su programa. Actualmente, los módulos "
"descritos aquí están orientados para escribir en las interfaces de línea "
"de comandos,"
>>>>>>> 9b119daf3ec0a31ef491ed78d9f9118a9f677891

#: ../Doc/library/frameworks.rst:11
msgid "The full list of modules described in this chapter is:"
Expand Down