From: François Michonneau Date: Tue, 19 Jun 2018 19:08:03 +0000 (-0400) Subject: merge styles v9.5.2 X-Git-Url: https://git.arvados.org/rnaseq-cwl-training.git/commitdiff_plain/711dc0bea4741e272a3ce83b2dbe71d5401cf675 merge styles v9.5.2 --- 711dc0bea4741e272a3ce83b2dbe71d5401cf675 diff --cc LICENSE.md index 39131e4,8fe9944..e537827 --- a/LICENSE.md +++ b/LICENSE.md @@@ -44,37 -47,37 +44,37 @@@ Avisos ## Software -Except where otherwise noted, the example programs and other software -provided by Software Carpentry and Data Carpentry are made available under the -[OSI][osi]-approved -[MIT license][mit-license]. +Salvo que se indique lo contrario, los programas de ejemplo y otro software +proporcionado por Software Carpentry y Data Carpentry estÃ¡n disponibles bajo el +[OSI][osi]-aprobado +[Licencia de MIT][mit-license]. -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: +Se concede permiso, de forma gratuita, a cualquier persona que obtenga +una copia de este software y los archivos de documentaciÃ³n asociados (el +"Software"), para tratar el Software sin restricciones, incluyendo +sin limitaciÃ³n, los derechos de uso, copia, modificaciÃ³n, fusiÃ³n, publicaciÃ³n, +distribuir, sublicenciar y / o vender copias del Software, y +Permitir a las personas a quienes se les proporciona el Software que lo hagan, sujeto a +las siguientes condiciones: -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. +El aviso de copyright anterior y este aviso de permiso serÃ¡n +incluido en todas las copias o porciones sustanciales del software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +EL SOFTWARE SE PROPORCIONA "TAL CUAL", SIN GARANTÃA DE NINGÃN TIPO, +EXPRESO O IMPLICADO, INCLUIDAS, ENTRE OTRAS, LAS GARANTÃAS DE +COMERCIABILIDAD, APTITUD PARA UN PROPÃSITO PARTICULAR Y +NO INFRACCIÃN EN NINGÃN CASO SERÃN LOS AUTORES O LOS TITULARES DE LOS DERECHOS DE AUTOR +RESPONSABLE POR CUALQUIER RECLAMO, DAÃOS U OTRA RESPONSABILIDAD, YA SEA EN ACCIÃN +DEL CONTRATO, EXTRACONTRACTUAL O DE OTRO TIPO, DERIVADOS, FUERA DE O EN CONEXIÃN +CON EL SOFTWARE O EL USO U OTROS TRATOS EN EL SOFTWARE. -## Trademark +## Marca registrada -"Software Carpentry" and "Data Carpentry" and their respective logos -are registered trademarks of [Community Initiatives][CI]. +"Software Carpentry" y "Data Carpentry" y sus respectivos logos - son marcas registradas de [NumFOCUS][numfocus]. ++son marcas registradas de [Community Initiatives][ci]. -[cc-by-human]: https://creativecommons.org/licenses/by/4.0/ +[cc-por-humano]: https://creativecommons.org/licenses/by/4.0/ [cc-by-legal]: https://creativecommons.org/licenses/by/4.0/legalcode [mit-license]: https://opensource.org/licenses/mit-license.html - [numfocus]: https://numfocus.org/ + [ci]: http://communityin.org/ [osi]: https://opensource.org diff --cc _includes/lc/intro.html index 56aae5a,a4a53ec..e49bac0 --- a/_includes/lc/intro.html +++ b/_includes/lc/intro.html @@@ -1,16 -1,19 +1,15 @@@

- Library Carpentry - is made by librarians, for librarians to help you: + Library Carpentry estÃ¡ hecho por bibliotecarios, para que los bibliotecarios lo ayuden:

automate repetitive, boring, error-prone tasks
create, maintain and analyse sustainable and reusable data
work effectively with IT and systems colleagues
better understand the use of software in research
and much more...

- - Library Carpentry introduces you to the fundamentals of computing - and provides you with a platform for further self-directed learning. - For more information on what we teach and why, please see our paper - "Library Carpentry: software skills training for library professionals". - +

automatizar tareas repetitivas, aburridas y propensas a errores
crear, mantener y analizar datos sostenibles y reutilizables
trabaja eficazmente con los colegas de TI y sistemas
comprender mejor el uso del software en la investigaciÃ³n
y mucho mÃ¡s ...

+ - Â Â Â Â Library Carpentry te presenta los fundamentos de la informÃ¡tica y le proporciona una plataforma para un mayor aprendizaje autodirigido. Para obtener mÃ¡s informaciÃ³n sobre lo que enseÃ±amos y por quÃ© consulte nuestro documento - Â Â Â Â " Library Carpentry: software skills training for library professionals". ++ Library Carpentry te presenta los fundamentos de la informÃ¡tica y le proporciona una plataforma para un mayor aprendizaje autodirigido. Para obtener mÃ¡s informaciÃ³n sobre lo que enseÃ±amos y por quÃ© consulte nuestro documento " Library Carpentry: software skills training for library professionals". + -

diff --cc _includes/lesson_footer.html index 200068d,7df84da..1d82a80 --- a/_includes/lesson_footer.html +++ b/_includes/lesson_footer.html @@@ -3,37 -3,49 +3,49 @@@ {% endcomment %} diff --cc _includes/navbar.html index e1f8acf,868bce8..d7de8e9 --- a/_includes/navbar.html +++ b/_includes/navbar.html @@@ -11,8 -11,8 +11,9 @@@ - {% comment %} Select what logo to display. {% endcomment %} - {% if site.carpentry == "swc" %} ++ + {% comment %} Seleccione quÃ© logotipo mostrar. {% endcomment %} + {% if page.carpentry == "swc" %} @@@ -33,16 -37,16 +38,16 @@@

CÃ³digo de conducta
Code of Conduct
Setup
ConfiguraciÃ³n
- Episodes + Episodos
- {{ episode.title }}