Skip to content

Commit 4009616

Browse files
authored
Merge branch 'master' into translation
2 parents e8dbe96 + 70a300f commit 4009616

27 files changed

+2393
-15
lines changed

β€Ž.travis.ymlβ€Ž

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ language: node_js
22
node_js:
33
- 6
44
before_install:
5+
- gem install bundler -v 1.16.1
56
- rvm install 2.4.3
67
- npm install -g npm@5
78
install:

β€ŽGemfile.lockβ€Ž

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,10 @@ GEM
8181
octokit (~> 4.0)
8282
public_suffix (~> 3.0)
8383
typhoeus (~> 1.3)
84-
html-pipeline (2.11.0)
84+
html-pipeline (2.11.1)
8585
activesupport (>= 2)
8686
nokogiri (>= 1.4)
87-
html-proofer (3.11.0)
87+
html-proofer (3.11.1)
8888
activesupport (>= 4.2, < 6.0)
8989
addressable (~> 2.3)
9090
mercenary (~> 0.3.2)
@@ -223,7 +223,7 @@ GEM
223223
forwardable-extended (~> 2.6)
224224
public_suffix (3.1.1)
225225
rainbow (3.0.0)
226-
rake (12.3.2)
226+
rake (12.3.3)
227227
rb-fsevent (0.10.3)
228228
rb-inotify (0.10.0)
229229
ffi (~> 1.0)

β€Ž_articles/de/index.htmlβ€Ž

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
layout: index
3+
title: Open Source Guides
34
lang: de
45
permalink: /de/
56
---

β€Ž_articles/es/index.htmlβ€Ž

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
layout: index
3+
title: GuΓ­as de cΓ³digo abierto
34
lang: es
45
permalink: /es/
56
---

β€Ž_articles/finding-users.mdβ€Ž

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ If you don't wish to set up outlets for your project yet, promote your own Twitt
6060

6161
**Consider creating a website for your project.** A website makes your project friendlier and easier to navigate, especially when it's paired with clear documentation and tutorials. Having a website also suggests that your project is active which will make your audience feel more comfortable using it. Provide examples to give people ideas for how to use your project.
6262

63-
[@adrianholovaty](https://news.ycombinator.com/item?id=7531689), co-creator of Django, said that a website was _" by far the best thing we did with Django in the early days"_.
63+
[@adrianholovaty](https://news.ycombinator.com/item?id=7531689), co-creator of Django, said that a website was _"by far the best thing we did with Django in the early days"_.
6464

6565
If your project is hosted on GitHub, you can use [GitHub Pages](https://pages.github.com/) to easily make a website. [Yeoman](http://yeoman.io/), [Vagrant](https://www.vagrantup.com/), and [Middleman](https://middlemanapp.com/) are [a few examples](https://github.com/showcases/github-pages-examples) of excellent, comprehensive websites.
6666

@@ -110,7 +110,7 @@ If you're [new to public speaking](https://speaking.io/), start by finding a loc
110110

111111
If you've never spoken at an event before, it's perfectly normal to feel nervous! Remember that your audience is there because they genuinely want to hear about your work.
112112

113-
As you write your talk, focus on what your audience will find interesting and get value out of. Keep your language friendly and approachable. Smile, breathe and have fun.
113+
As you write your talk, focus on what your audience will find interesting and get value out of. Keep your language friendly and approachable. Smile, breathe, and have fun.
114114

115115
<aside markdown="1" class="pquote">
116116
<img src="/assets/images/finding-users/lena.jpg" class="pquote-avatar" alt="avatar">
@@ -136,7 +136,7 @@ Look for conferences that are specific to your language or ecosystem. Before you
136136

137137
In addition to the strategies outlined above, the best way to invite people to share and contribute to your project is to share and contribute to their projects.
138138

139-
Helping newcomers, sharing resources, and making thoughtful contributions to others' projects will help you build a positive reputation. Being an active member of the open source community will help people have context for your work and be more likely to pay attention to and share your project. Developing relationships with other open source projects can even lead to official partnerships.
139+
Helping newcomers, sharing resources, and making thoughtful contributions to others' projects will help you build a positive reputation. Being an active member in the open source community will help people have context for your work and be more likely to pay attention to and share your project. Developing relationships with other open source projects can even lead to official partnerships.
140140

141141
<aside markdown="1" class="pquote">
142142
<img src="https://avatars.githubusercontent.com/shazow?s=180" class="pquote-avatar" alt="avatar">
@@ -152,7 +152,7 @@ There is no overnight solution to building an audience. Gaining the trust and re
152152

153153
<aside markdown="1" class="pquote">
154154
<img src="https://avatars.githubusercontent.com/ariya?s=180" class="pquote-avatar" alt="avatar">
155-
PhantomJS was released for the first time at the beginning of 2011. (...) I spread the word in the usual ways: I tweeted about it, I wrote blog posts on things you could do with it, I mentioned it during various discussions in meetups. When it became more well known in 2014, I started giving presentations about it.
155+
PhantomJS was released for the first time in the beginning of 2011. (...) I spread the word in the usual ways: I tweeted about it, I wrote blog posts on things you could do with it, I mentioned it during various discussions in meetups. When it became more well known in 2014, I started giving presentations about it.
156156
<p markdown="1" class="pquote-credit">
157157
β€” @ariya, ["Maintainer Stories"](https://github.com/open-source/stories/ariya)
158158
</p>

β€Ž_articles/fr/index.htmlβ€Ž

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
layout: index
3+
title: Open Source Guides
34
lang: fr
45
permalink: /fr/
56
---

β€Ž_articles/getting-paid.mdβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ Depending on your personal circumstances, you can try raising money independentl
112112
Finally, sometimes open source projects put bounties on issues that you might consider helping with.
113113

114114
* @ConnorChristie was able to get paid for [helping](https://web.archive.org/web/20181030123412/https://webcache.googleusercontent.com/search?strip=1&q=cache:https%3A%2F%2Fgithub.com%2FMARKETProtocol%2FMARKET.js%2Fissues%2F14) @MARKETProtocol work on their javascript library [through a bounty on gitcoin](https://gitcoin.co/).
115-
* @mamiM did Japanese translations for @MetaMask after the [issue was funded on Bounties Network](https://beta.bounties.network/bounty/v1/134).
115+
* @mamiM did Japanese translations for @MetaMask after the [issue was funded on Bounties Network](https://explorer.bounties.network/bounty/134).
116116

117117
## Finding funding for your project
118118

β€Ž_articles/how-to-contribute.mdβ€Ž

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,9 @@ A typical open source project has the following types of people:
175175

176176
* **Author:** The person/s or organization that created the project
177177
* **Owner:** The person/s who has administrative ownership over the organization or repository (not always the same as the original author)
178-
* **Maintainers:** Contributors who are responsible for driving the vision and managing the organizational aspects of the project. (They may also be authors or owners of the project.)
179-
* **Contributors:** Everyone who has contributed something back to the project.
180-
* **Community Members:** People who use the project. They might be active in conversations or express their opinion on the project's direction.
178+
* **Maintainers:** Contributors who are responsible for driving the vision and managing the organizational aspects of the project (They may also be authors or owners of the project.)
179+
* **Contributors:** Everyone who has contributed something back to the project
180+
* **Community Members:** People who use the project. They might be active in conversations or express their opinion on the project's direction
181181

182182
Bigger projects may also have subcommittees or working groups focused on different tasks, such as tooling, triage, community moderation, and event organizing. Look on a project's website for a "team" page, or in the repository for governance documentation, to find this information.
183183

@@ -236,7 +236,7 @@ Here's a handy checklist to evaluate whether a project is good for new contribut
236236
<div class="clearfix mb-2">
237237
<input type="checkbox" id="cbox1" class="d-block float-left mt-1 mr-2" value="checkbox">
238238
<label for="cbox1" class="overflow-hidden d-block text-normal">
239-
Does it have a license? Usually, this is a file called LICENSE in the root of the repository.
239+
Does it have a license? Usually, there is a file called LICENSE in the root of the repository.
240240
</label>
241241
</div>
242242

β€Ž_articles/id/index.htmlβ€Ž

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
layout: index
3+
title: Panduan Sumber Terbuka
34
lang: id
45
permalink: /id/
56
---

β€Ž_articles/ko/index.htmlβ€Ž

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
layout: index
3+
title: μ˜€ν”ˆ μ†ŒμŠ€ κ°€μ΄λ“œ
34
lang: ko
45
permalink: /ko/
56
---

0 commit comments

Comments
Β (0)