Skip to content
This repository has been archived by the owner on Feb 24, 2024. It is now read-only.

New Crowdin updates #4

Closed
wants to merge 103 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
103 commits
Select commit Hold shift + click to select a range
30d37bf
New translations 03-create.md (Japanese)
joelnitta Jan 13, 2024
438465d
New translations 01-basics.md (Ukrainian)
joelnitta Jan 13, 2024
428d64a
New translations 02-setup.md (Ukrainian)
joelnitta Jan 13, 2024
b739636
New translations 03-create.md (Ukrainian)
joelnitta Jan 13, 2024
871d742
New translations 01-basics.md (Spanish)
joelnitta Jan 13, 2024
253ddf3
New translations 01-basics.md (Japanese)
joelnitta Jan 13, 2024
c5d1b6a
New translations 02-setup.md (Spanish)
joelnitta Jan 13, 2024
ceaa1dc
New translations 02-setup.md (Japanese)
joelnitta Jan 13, 2024
56c4abe
New translations 03-create.md (Spanish)
joelnitta Jan 13, 2024
3d110c5
New translations 04-changes.md (Spanish)
joelnitta Jan 13, 2024
75ca55d
New translations 04-changes.md (Japanese)
joelnitta Jan 13, 2024
c75d570
New translations 05-history.md (Spanish)
joelnitta Jan 13, 2024
49e6697
New translations 05-history.md (Japanese)
joelnitta Jan 13, 2024
ee255d5
New translations 06-ignore.md (Spanish)
joelnitta Jan 13, 2024
d24b651
New translations 06-ignore.md (Japanese)
joelnitta Jan 13, 2024
e26d308
New translations 07-github.md (Spanish)
joelnitta Jan 13, 2024
fd51b75
New translations 07-github.md (Japanese)
joelnitta Jan 13, 2024
e0ef5f0
New translations 08-collab.md (Spanish)
joelnitta Jan 13, 2024
c5d047b
New translations 08-collab.md (Japanese)
joelnitta Jan 13, 2024
bc1da98
New translations 09-conflict.md (Spanish)
joelnitta Jan 13, 2024
48e00c4
New translations 09-conflict.md (Japanese)
joelnitta Jan 13, 2024
cf62c87
New translations 10-open.md (Spanish)
joelnitta Jan 13, 2024
cb8a82d
New translations 10-open.md (Japanese)
joelnitta Jan 13, 2024
8367833
New translations 11-licensing.md (Spanish)
joelnitta Jan 13, 2024
8fac001
New translations 11-licensing.md (Japanese)
joelnitta Jan 13, 2024
aedf041
New translations 12-citation.md (Spanish)
joelnitta Jan 13, 2024
a8a7d45
New translations 12-citation.md (Japanese)
joelnitta Jan 13, 2024
cecbc88
New translations 13-hosting.md (Spanish)
joelnitta Jan 13, 2024
4b9f8d8
New translations 13-hosting.md (Japanese)
joelnitta Jan 13, 2024
fa1d88e
New translations 14-supplemental-rstudio.md (Spanish)
joelnitta Jan 13, 2024
d46e502
New translations 14-supplemental-rstudio.md (Japanese)
joelnitta Jan 13, 2024
48c287c
New translations instructor-notes.md (Spanish)
joelnitta Jan 13, 2024
43b88ec
New translations instructor-notes.md (Japanese)
joelnitta Jan 13, 2024
ee59e6c
New translations discuss.md (Spanish)
joelnitta Jan 13, 2024
683ee6d
New translations discuss.md (Japanese)
joelnitta Jan 13, 2024
c1ecdd8
New translations reference.md (Spanish)
joelnitta Jan 13, 2024
96aafe6
New translations reference.md (Japanese)
joelnitta Jan 13, 2024
0ecf698
New translations setup.md (Spanish)
joelnitta Jan 13, 2024
9a964d4
New translations setup.md (Japanese)
joelnitta Jan 13, 2024
44cbf92
New translations learner-profiles.md (Spanish)
joelnitta Jan 13, 2024
321f4fb
New translations learner-profiles.md (Japanese)
joelnitta Jan 13, 2024
7e679ff
New translations code_of_conduct.md (Spanish)
joelnitta Jan 13, 2024
52f84e4
New translations code_of_conduct.md (Japanese)
joelnitta Jan 13, 2024
c636b1b
New translations config.yaml (Spanish)
joelnitta Jan 13, 2024
a6b6566
New translations config.yaml (Japanese)
joelnitta Jan 13, 2024
b80d38b
New translations contributing.md (Spanish)
joelnitta Jan 13, 2024
0142890
New translations contributing.md (Japanese)
joelnitta Jan 13, 2024
611ed6f
New translations license.md (Spanish)
joelnitta Jan 13, 2024
5633268
New translations license.md (Japanese)
joelnitta Jan 13, 2024
ba97182
New translations readme.md (Spanish)
joelnitta Jan 13, 2024
da115f8
New translations readme.md (Japanese)
joelnitta Jan 13, 2024
b41c9df
New translations index.md (Spanish)
joelnitta Jan 13, 2024
b16d379
New translations index.md (Japanese)
joelnitta Jan 13, 2024
f3da5ed
New translations 01-basics.md (Portuguese)
joelnitta Jan 13, 2024
2d0b3d1
New translations 02-setup.md (Portuguese)
joelnitta Jan 13, 2024
bd61cd4
New translations 03-create.md (Portuguese)
joelnitta Jan 13, 2024
6b7c199
New translations 04-changes.md (Portuguese)
joelnitta Jan 13, 2024
adb3f69
New translations 05-history.md (Portuguese)
joelnitta Jan 13, 2024
4575084
New translations 06-ignore.md (Portuguese)
joelnitta Jan 13, 2024
e00cfc4
New translations 07-github.md (Portuguese)
joelnitta Jan 13, 2024
efe7125
New translations 08-collab.md (Portuguese)
joelnitta Jan 13, 2024
debe667
New translations 09-conflict.md (Portuguese)
joelnitta Jan 13, 2024
3215184
New translations 10-open.md (Portuguese)
joelnitta Jan 13, 2024
1bc466a
New translations 11-licensing.md (Portuguese)
joelnitta Jan 13, 2024
2170b23
New translations 12-citation.md (Portuguese)
joelnitta Jan 13, 2024
6e86355
New translations 13-hosting.md (Portuguese)
joelnitta Jan 13, 2024
86020be
New translations 14-supplemental-rstudio.md (Portuguese)
joelnitta Jan 13, 2024
b924fbe
New translations instructor-notes.md (Portuguese)
joelnitta Jan 13, 2024
4f2c98c
New translations discuss.md (Portuguese)
joelnitta Jan 13, 2024
bc6fbd3
New translations reference.md (Portuguese)
joelnitta Jan 13, 2024
5a5430e
New translations setup.md (Portuguese)
joelnitta Jan 13, 2024
cfe6e1e
New translations learner-profiles.md (Portuguese)
joelnitta Jan 13, 2024
c5bc699
New translations code_of_conduct.md (Portuguese)
joelnitta Jan 13, 2024
0c33ee9
New translations config.yaml (Portuguese)
joelnitta Jan 13, 2024
ab0d6f1
New translations contributing.md (Portuguese)
joelnitta Jan 13, 2024
b19cfce
New translations license.md (Portuguese)
joelnitta Jan 13, 2024
5c1d0c0
New translations readme.md (Portuguese)
joelnitta Jan 13, 2024
88e0756
New translations index.md (Portuguese)
joelnitta Jan 13, 2024
2b6b184
New translations 04-changes.md (Ukrainian)
joelnitta Jan 13, 2024
7a095cf
New translations 05-history.md (Ukrainian)
joelnitta Jan 13, 2024
487ba07
New translations 06-ignore.md (Ukrainian)
joelnitta Jan 13, 2024
0b79968
New translations 07-github.md (Ukrainian)
joelnitta Jan 13, 2024
5efd417
New translations 08-collab.md (Ukrainian)
joelnitta Jan 13, 2024
862aee4
New translations 09-conflict.md (Ukrainian)
joelnitta Jan 13, 2024
63b9e57
New translations 10-open.md (Ukrainian)
joelnitta Jan 13, 2024
017528d
New translations 11-licensing.md (Ukrainian)
joelnitta Jan 13, 2024
c30dcb3
New translations 12-citation.md (Ukrainian)
joelnitta Jan 13, 2024
973dd5f
New translations 13-hosting.md (Ukrainian)
joelnitta Jan 13, 2024
2151449
New translations 14-supplemental-rstudio.md (Ukrainian)
joelnitta Jan 13, 2024
27a1f12
New translations instructor-notes.md (Ukrainian)
joelnitta Jan 13, 2024
3b2ea85
New translations discuss.md (Ukrainian)
joelnitta Jan 13, 2024
1c4078b
New translations reference.md (Ukrainian)
joelnitta Jan 13, 2024
9052b0e
New translations setup.md (Ukrainian)
joelnitta Jan 13, 2024
1c3cba5
New translations learner-profiles.md (Ukrainian)
joelnitta Jan 13, 2024
ff26ffc
New translations code_of_conduct.md (Ukrainian)
joelnitta Jan 13, 2024
7b1edf4
New translations config.yaml (Ukrainian)
joelnitta Jan 13, 2024
55541a7
New translations contributing.md (Ukrainian)
joelnitta Jan 13, 2024
a29e056
New translations license.md (Ukrainian)
joelnitta Jan 13, 2024
d06178c
New translations readme.md (Ukrainian)
joelnitta Jan 13, 2024
72a6697
New translations index.md (Ukrainian)
joelnitta Jan 13, 2024
dcfd164
New translations config.yaml (Ukrainian)
joelnitta Jan 13, 2024
3d05e42
New translations index.md (Ukrainian)
joelnitta Jan 13, 2024
59eb410
New translations index.md (Ukrainian)
joelnitta Jan 13, 2024
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
13 changes: 13 additions & 0 deletions locale/es/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
title: Contributor Code of Conduct
---

As contributors and maintainers of this project,
we pledge to follow the [The Carpentries Code of Conduct][coc].

Instances of abusive, harassing, or otherwise unacceptable behavior
may be reported by following our [reporting guidelines][coc-reporting].

[coc-reporting]: https://docs.carpentries.org/topic_folders/policies/incident-reporting.html

[coc]: https://docs.carpentries.org/topic_folders/policies/code-of-conduct.html
140 changes: 140 additions & 0 deletions locale/es/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,140 @@
## Contributing

[The Carpentries][cp-site] ([Software Carpentry][swc-site], [Data
Carpentry][dc-site], and [Library Carpentry][lc-site]) are open source
projects, and we welcome contributions of all kinds: new lessons, fixes to
existing material, bug reports, and reviews of proposed changes are all
welcome.

### Contributor Agreement

By contributing, you agree that we may redistribute your work under our
license. In exchange, we will address your issues and/or assess
your change proposal as promptly as we can, and help you become a member of our
community. Everyone involved in [The Carpentries][cp-site] agrees to abide by
our [code of conduct](CODE_OF_CONDUCT.md).

### How to Contribute

The easiest way to get started is to file an issue to tell us about a spelling
mistake, some awkward wording, or a factual error. This is a good way to
introduce yourself and to meet some of our community members.

1. If you do not have a [GitHub][github] account, you can [send us comments by
email][contact]. However, we will be able to respond more quickly if you use
one of the other methods described below.

2. If you have a [GitHub][github] account, or are willing to [create
one][github-join], but do not know how to use Git, you can report problems
or suggest improvements by [creating an issue][repo-issues]. This allows us
to assign the item to someone and to respond to it in a threaded discussion.

3. If you are comfortable with Git, and would like to add or change material,
you can submit a pull request (PR). Instructions for doing this are
[included below](#using-github). For inspiration about changes that need to
be made, check out the [list of open issues][issues] across the Carpentries.

Note: if you want to build the website locally, please refer to [The Workbench
documentation][template-doc].

### Where to Contribute

1. If you wish to change this lesson, add issues and pull requests here.
2. If you wish to change the template used for workshop websites, please refer
to [The Workbench documentation][template-doc].

### What to Contribute

There are many ways to contribute, from writing new exercises and improving
existing ones to updating or filling in the documentation and submitting [bug
reports][issues] about things that do not work, are not clear, or are missing.
If you are looking for ideas, please see [the list of issues for this
repository][repo-issues], or the issues for [Data Carpentry][dc-issues],
[Library Carpentry][lc-issues], and [Software Carpentry][swc-issues] projects.

Comments on issues and reviews of pull requests are just as welcome: we are
smarter together than we are on our own. **Reviews from novices and newcomers
are particularly valuable**: it's easy for people who have been using these
lessons for a while to forget how impenetrable some of this material can be, so
fresh eyes are always welcome.

### What _Not_ to Contribute

Our lessons already contain more material than we can cover in a typical
workshop, so we are usually _not_ looking for more concepts or tools to add to
them. As a rule, if you want to introduce a new idea, you must (a) estimate how
long it will take to teach and (b) explain what you would take out to make room
for it. The first encourages contributors to be honest about requirements; the
second, to think hard about priorities.

We are also not looking for exercises or other material that only run on one
platform. Our workshops typically contain a mixture of Windows, macOS, and
Linux users; in order to be usable, our lessons must run equally well on all
three.

### Using GitHub

If you choose to contribute via GitHub, you may want to look at [How to
Contribute to an Open Source Project on GitHub][how-contribute]. In brief, we
use [GitHub flow][github-flow] to manage changes:

1. Create a new branch in your desktop copy of this repository for each
significant change.
2. Commit the change in that branch.
3. Push that branch to your fork of this repository on GitHub.
4. Submit a pull request from that branch to the [upstream repository][repo].
5. If you receive feedback, make changes on your desktop and push to your
branch on GitHub: the pull request will update automatically.

NB: The published copy of the lesson is usually in the `main` branch.

Each lesson has a team of maintainers who review issues and pull requests or
encourage others to do so. The maintainers are community volunteers, and have
final say over what gets merged into the lesson.

### Other Resources

The Carpentries is a global organisation with volunteers and learners all over
the world. We share values of inclusivity and a passion for sharing knowledge,
teaching and learning. There are several ways to connect with The Carpentries
community listed at https\://carpentries.org/connect/ including via social
media, slack, newsletters, and email lists. You can also [reach us by
email][contact].

[repo]: https://github.com/swcarpentry/git-novice

[repo-issues]: https://github.com/swcarpentry/git-novice/issues

[contact]: mailto:[email protected]

[cp-site]: https://carpentries.org/

[dc-issues]: https://github.com/issues?q=user%3Adatacarpentry

[dc-lessons]: https://datacarpentry.org/lessons/

[dc-site]: https://datacarpentry.org/

[discuss-list]: https://lists.software-carpentry.org/listinfo/discuss

[github]: https://github.com

[github-flow]: https://guides.github.com/introduction/flow/

[github-join]: https://github.com/join

[how-contribute]: https://egghead.io/courses/how-to-contribute-to-an-open-source-project-on-github

[issues]: https://carpentries.org/help-wanted-issues/

[lc-issues]: https://github.com/issues?q=user%3ALibraryCarpentry

[swc-issues]: https://github.com/issues?q=user%3Aswcarpentry

[swc-lessons]: https://software-carpentry.org/lessons/

[swc-site]: https://software-carpentry.org/

[lc-site]: https://librarycarpentry.org/

[template-doc]: https://carpentries.github.io/workbench/
83 changes: 83 additions & 0 deletions locale/es/LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
---
title: Licenses
---

## Instructional Material

All Carpentries (Software Carpentry, Data Carpentry, and Library Carpentry)
instructional material is made available under the [Creative Commons
Attribution license][cc-by-human]. The following is a human-readable summary of
(and not a substitute for) the [full legal text of the CC BY 4.0
license][cc-by-legal].

You are free:

- to **Share**---copy and redistribute the material in any medium or format
- to **Adapt**---remix, transform, and build upon the material

for any purpose, even commercially.

The licensor cannot revoke these freedoms as long as you follow the license
terms.

Under the following terms:

- **Attribution**---You must give appropriate credit (mentioning that your work
is derived from work that is Copyright (c) The Carpentries and, where
practical, linking to https\://carpentries.org/), provide a [link to the
license][cc-by-human], and indicate if changes were made. You may do so in
any reasonable manner, but not in any way that suggests the licensor endorses
you or your use.

- **No additional restrictions**---You may not apply legal terms or
technological measures that legally restrict others from doing anything the
license permits. With the understanding that:

Notices:

- You do not have to comply with the license for elements of the material in
the public domain or where your use is permitted by an applicable exception
or limitation.
- No warranties are given. The license may not give you all of the permissions
necessary for your intended use. For example, other rights such as publicity,
privacy, or moral rights may limit how you use the material.

## Software

Except where otherwise noted, the example programs and other software provided
by The Carpentries are made available under the [OSI][osi]-approved [MIT
license][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:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the 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.

## Trademark

"The Carpentries", "Software Carpentry", "Data Carpentry", and "Library
Carpentry" and their respective logos are registered trademarks of [Community
Initiatives][ci].

[cc-by-human]: 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

[ci]: https://communityin.org/

[osi]: https://opensource.org
33 changes: 33 additions & 0 deletions locale/es/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
[![Create a Slack Account with us](https://img.shields.io/badge/Create_Slack_Account-The_Carpentries-071159.svg)](https://slack-invite.carpentries.org/)
[![Slack Status](https://img.shields.io/badge/Slack_Channel-swc--git-E01563.svg)](https://carpentries.slack.com/messages/C91JS49HD)

# git-novice

An introduction to version control for novices using Git.
Please see [https://swcarpentry.github.io/git-novice/](https://swcarpentry.github.io/git-novice/) for a rendered version of this material,
[the lesson template documentation][lesson-example]
for instructions on formatting, building, and submitting material,
or run `make` in this directory for a list of helpful commands.

Maintainers:

- [Nima Hejazi][hejazi_nima]: [@nhejazi](https://github.com/nhejazi)
- [Kat Koziar][koziar_kat]: [@kekoziar](https://github.com/kekoziar)
- [Madicken Munk][munk_madicken]: [@munkm](https://github.com/munkm)

Alumni maintainers:

- [Ivan Gonzalez][gonzalez_ivan]: [@iglpdc](https://github.com/iglpdc)
- [Daisie Huang][huang_daisie]: [@daisieh](https://github.com/daisieh)

[lesson-example]: https://swcarpentry.github.io/lesson-example

[hejazi_nima]: https://carpentries.org/instructors/#nhejazi

[koziar_kat]: https://carpentries.org/instructors/#kekoziar

[munk_madicken]: https://carpentries.org/instructors/#munkm

[gonzalez_ivan]: https://carpentries.org/instructors/#iglpdc

[huang_daisie]: https://software-carpentry.org/team/#huang_daisie
70 changes: 70 additions & 0 deletions locale/es/config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
#------------------------------------------------------------
#Values for this lesson.
#------------------------------------------------------------
#Which carpentry is this (swc, dc, lc, or cp)?
#swc: Software Carpentry
#dc: Data Carpentry
#lc: Library Carpentry
#cp: Carpentries (to use for instructor training for instance)
#incubator: The Carpentries Incubator
carpentry: 'swc'
#Overall title for pages.
title: 'Version Control with Git'
#Date the lesson was created (YYYY-MM-DD, this is empty by default)
created: '2014-12-04'
#Comma-separated list of keywords for the lesson
keywords: 'software, data, lesson, The Carpentries'
#Life cycle stage of the lesson
#possible values: pre-alpha, alpha, beta, stable
life_cycle: 'stable'
#License of the lesson materials (recommended CC-BY 4.0)
license: 'CC-BY 4.0'
#Link to the source repository for this lesson
source: 'https://github.com/swcarpentry/git-novice'
#Default branch of your lesson
branch: 'main'
#Who to contact if there are any issues
contact: '[email protected]'
#Navigation ------------------------------------------------
#Use the following menu items to specify the order of
#individual pages in each dropdown section. Leave blank to
#include all pages in the folder.
#Example -------------
#episodes:
#- introduction.md
#- first-steps.md
#learners:
#- setup.md
#instructors:
#- instructor-notes.md
#profiles:
#- one-learner.md
#- another-learner.md
#Order of episodes in your lesson
episodes:
- 01-basics.md
- 02-setup.md
- 03-create.md
- 04-changes.md
- 05-history.md
- 06-ignore.md
- 07-github.md
- 08-collab.md
- 09-conflict.md
- 10-open.md
- 11-licensing.md
- 12-citation.md
- 13-hosting.md
- 14-supplemental-rstudio.md
#Information for Learners
learners:
#Information for Instructors
instructors:
#Learner Profiles
profiles:
#Customisation ---------------------------------------------
#This space below is where custom yaml items (e.g. pinning
#sandpaper and varnish versions) should live
url: 'https://swcarpentry.github.io/git-novice'
analytics: carpentries
lang: en
Loading
Loading