Skip to content

Commit af69045

Browse files
authored
Merge branch 'master' into master
2 parents 97d7012 + e45653b commit af69045

27 files changed

+2489
-43
lines changed

Gemfile.lock

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,18 @@ GEM
2525
ffi (>= 1.3.0)
2626
eventmachine (1.2.7)
2727
execjs (2.7.0)
28-
faraday (0.15.4)
28+
faraday (0.17.0)
2929
multipart-post (>= 1.2, < 3)
30-
ffi (1.11.1)
30+
ffi (1.11.2)
3131
forwardable-extended (2.6.0)
3232
gemoji (3.0.1)
33-
github-pages (200)
33+
github-pages (202)
3434
activesupport (= 4.2.11.1)
3535
github-pages-health-check (= 1.16.1)
3636
jekyll (= 3.8.5)
3737
jekyll-avatar (= 0.6.0)
3838
jekyll-coffeescript (= 1.1.1)
39-
jekyll-commonmark-ghpages (= 0.1.5)
39+
jekyll-commonmark-ghpages (= 0.1.6)
4040
jekyll-default-layout (= 0.1.4)
4141
jekyll-feed (= 0.11.0)
4242
jekyll-gist (= 1.5.0)
@@ -73,18 +73,18 @@ GEM
7373
mercenary (~> 0.3)
7474
minima (= 2.5.0)
7575
nokogiri (>= 1.10.4, < 2.0)
76-
rouge (= 2.2.1)
76+
rouge (= 3.11.0)
7777
terminal-table (~> 1.4)
7878
github-pages-health-check (1.16.1)
7979
addressable (~> 2.3)
8080
dnsruby (~> 1.60)
8181
octokit (~> 4.0)
8282
public_suffix (~> 3.0)
8383
typhoeus (~> 1.3)
84-
html-pipeline (2.12.0)
84+
html-pipeline (2.12.2)
8585
activesupport (>= 2)
8686
nokogiri (>= 1.4)
87-
html-proofer (3.13.0)
87+
html-proofer (3.14.1)
8888
addressable (~> 2.3)
8989
mercenary (~> 0.3)
9090
nokogiri (~> 1.10)
@@ -116,10 +116,10 @@ GEM
116116
jekyll-commonmark (1.3.1)
117117
commonmarker (~> 0.14)
118118
jekyll (>= 3.7, < 5.0)
119-
jekyll-commonmark-ghpages (0.1.5)
119+
jekyll-commonmark-ghpages (0.1.6)
120120
commonmarker (~> 0.17.6)
121-
jekyll-commonmark (~> 1)
122-
rouge (~> 2)
121+
jekyll-commonmark (~> 1.2)
122+
rouge (>= 2.0, < 4.0)
123123
jekyll-default-layout (0.1.4)
124124
jekyll (~> 3.0)
125125
jekyll-feed (0.11.0)
@@ -212,22 +212,22 @@ GEM
212212
jekyll (~> 3.5)
213213
jekyll-feed (~> 0.9)
214214
jekyll-seo-tag (~> 2.1)
215-
minitest (5.11.3)
215+
minitest (5.13.0)
216216
multipart-post (2.1.1)
217-
nokogiri (1.10.4)
217+
nokogiri (1.10.5)
218218
mini_portile2 (~> 2.4.0)
219219
octokit (4.14.0)
220220
sawyer (~> 0.8.0, >= 0.5.3)
221-
parallel (1.17.0)
221+
parallel (1.19.0)
222222
pathutil (0.16.2)
223223
forwardable-extended (~> 2.6)
224224
public_suffix (3.1.1)
225225
rainbow (3.0.0)
226-
rake (13.0.0)
226+
rake (13.0.1)
227227
rb-fsevent (0.10.3)
228228
rb-inotify (0.10.0)
229229
ffi (~> 1.0)
230-
rouge (2.2.1)
230+
rouge (3.11.0)
231231
ruby-enum (0.7.2)
232232
i18n
233233
ruby_dep (1.5.0)

_articles/building-community.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,10 +150,10 @@ For example, here's how [Rubinius](https://github.com/rubinius/rubinius/) starts
150150
### Share ownership of your project
151151

152152
<aside markdown="1" class="pquote">
153-
<img src="https://avatars.githubusercontent.com/sarahsharp?s=180" class="pquote-avatar" alt="avatar">
153+
<img src="https://avatars.githubusercontent.com/sagesharp?s=180" class="pquote-avatar" alt="avatar">
154154
Your leaders will have different opinions, as all healthy communities should! However, you need to take steps to ensure the loudest voice doesn't always win by tiring people out, and that less prominent and minority voices are heard.
155155
<p markdown="1" class="pquote-credit">
156-
@sarahsharp, ["What makes a good community?"](https://sarah.thesharps.us/2015/10/06/what-makes-a-good-community/)
156+
@sagesharp, ["What makes a good community?"](https://sage.thesharps.us/2015/10/06/what-makes-a-good-community/)
157157
</p>
158158
</aside>
159159

_articles/de/building-community.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,14 +162,14 @@ Zum Beispiel: [Rubinius](https://github.com/rubinius/rubinius/) beginnt [den Kon
162162
### Teilen Sie die Eigentümerschaft an Ihrem Projekt
163163

164164
<aside markdown="1" class="pquote">
165-
<img src="https://avatars.githubusercontent.com/sarahsharp?s=180" class="pquote-avatar" alt="avatar">
165+
<img src="https://avatars.githubusercontent.com/sagesharp?s=180" class="pquote-avatar" alt="avatar">
166166

167167
Ihre Projektverantwortlichen werden unterschiedliche Meinungen haben, wie es in allen gesunden Gemeinschaften üblich sein sollte. Sie müssen jedoch dafür sorgen, dass nicht immer die lauteste Stimme gewinnt, weil sie andere Leute ermüdet, und dass weniger prominente Stimmen und Minderheitsmeinungen ebenfalls zu hören sind.
168168

169169
_Your leaders will have different opinions, as all healthy communities should! However, you need to take steps to ensure the loudest voice doesn't always win by tiring people out, and that less prominent and minority voices are heard._
170170

171171
<p markdown="1" class="pquote-credit">
172-
@sarahsharp, ["What makes a good community?"](http://sarah.thesharps.us/2015/10/06/what-makes-a-good-community/)
172+
@sagesharp, ["What makes a good community?"](http://sage.thesharps.us/2015/10/06/what-makes-a-good-community/)
173173
</p>
174174
</aside>
175175

_articles/es/building-community.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,11 @@ Por ejemplo, as&iacute; es como [Rubinius](https://github.com/rubinius/rubinius/
145145
### Comparte la propiedad de tu proyecto
146146

147147
<aside markdown="1" class="pquote">
148-
<img src="https://avatars.githubusercontent.com/sarahsharp?s=180" class="pquote-avatar" alt="avatar">
148+
<img src="https://avatars.githubusercontent.com/sagesharp?s=180" class="pquote-avatar" alt="avatar">
149149
Los l&iacute;deres tendr&aacute;n diferentes opiniones, como deber&iacute;a ocurrir en todas las comunidades saludables. De todos modos, necesitas tomar algunas medidas para asegurar que las voces m&aacute;s potentes no ganen siempre por haber cansado a los dem&aacute;s, y que tambi&eacute;n se escuchen las voces menos potentes y minoritarias.
150150

151151
<p markdown="1" class="pquote-credit">
152-
@sarahsharp, ["What makes a good community?"](https://sarah.thesharps.us/2015/10/06/what-makes-a-good-community/)
152+
@sagesharp, ["What makes a good community?"](https://sage.thesharps.us/2015/10/06/what-makes-a-good-community/)
153153
</p>
154154
</aside>
155155

_articles/fr/building-community.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,10 @@ Par exemple, voici comment [Rubinius](https://github.com/rubinius/rubinius/) com
145145
### Partager la propri&eacute;t&eacute; de votre projet
146146

147147
<aside markdown="1" class="pquote">
148-
<img src="https://avatars.githubusercontent.com/sarahsharp?s=180" class="pquote-avatar" alt="avatar">
148+
<img src="https://avatars.githubusercontent.com/sagesharp?s=180" class="pquote-avatar" alt="avatar">
149149
Vos leaders auront des opinions différentes, comme devraient le faire toutes les communautés en bonne santé ! Cependant, vous devez prendre des mesures pour vous assurer que la voix la plus forte ne gagne pas toujours en fatiguant les gens, et que des voix moins importantes et minoritaires soient entendues.
150150
<p markdown="1" class="pquote-credit">
151-
@sarahsharp, ["What makes a good community?"](https://sarah.thesharps.us/2015/10/06/what-makes-a-good-community/)
151+
@sagesharp, ["What makes a good community?"](https://sage.thesharps.us/2015/10/06/what-makes-a-good-community/)
152152
</p>
153153
</aside>
154154

_articles/id/building-community.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,10 @@ Sebagai contoh, berikut bagaimana cara [Rubinius](https://github.com/rubinius/ru
145145
### Berbagi kepemilikan dari proyek Anda
146146

147147
<aside markdown="1" class="pquote">
148-
<img src="https://avatars.githubusercontent.com/sarahsharp?s=180" class="pquote-avatar" alt="avatar">
148+
<img src="https://avatars.githubusercontent.com/sagesharp?s=180" class="pquote-avatar" alt="avatar">
149149
Pemimpin Anda akan memiliki opini yang berbeda, seperti halnya komunitas lainnya! Namun, Anda perlu mengambil langkah-langkah untuk memastikan bahwa suara terbesar tidak selalu menang, dan suara minoritas akan selalu didengarkan.
150150
<p markdown="1" class="pquote-credit">
151-
@sarahsharp, ["What makes a good community?"](https://sarah.thesharps.us/2015/10/06/what-makes-a-good-community/)
151+
@sagesharp, ["What makes a good community?"](https://sage.thesharps.us/2015/10/06/what-makes-a-good-community/)
152152
</p>
153153
</aside>
154154

_articles/ko/building-community.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,10 @@ CONTRIBUTING 파일에서 새 참여자에게 시작 방법을 명시하십시
146146
### Share ownership of your project
147147

148148
<aside markdown="1" class="pquote">
149-
<img src="https://avatars.githubusercontent.com/sarahsharp?s=180" class="pquote-avatar" alt="avatar">
149+
<img src="https://avatars.githubusercontent.com/sagesharp?s=180" class="pquote-avatar" alt="avatar">
150150
Your leaders will have different opinions, as all healthy communities should! However, you need to take steps to ensure the loudest voice doesn't always win by tiring people out, and that less prominent and minority voices are heard.
151151
<p markdown="1" class="pquote-credit">
152-
@sarahsharp, ["좋은 커뮤니티는 어떻게 만듭니까?"](https://sarah.thesharps.us/2015/10/06/what-makes-a-good-community/)
152+
@sagesharp, ["좋은 커뮤니티는 어떻게 만듭니까?"](https://sage.thesharps.us/2015/10/06/what-makes-a-good-community/)
153153
</p>
154154
</aside>
155155

_articles/legal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ When you create a new project on GitHub, you are given the option to select a li
8484

8585
Most projects never need to change licenses. But occasionally circumstances change.
8686

87-
For example, as your project grows it adds dependencies or users, or your company changes strategies, any of which could require or want a different license. Also, if you neglected to license your project from the start, adding a license is effectively the same as changing licenses. There are three fundamental things to consider when adding or changing a your project's license:
87+
For example, as your project grows it adds dependencies or users, or your company changes strategies, any of which could require or want a different license. Also, if you neglected to license your project from the start, adding a license is effectively the same as changing licenses. There are three fundamental things to consider when adding or changing your project's license:
8888

8989
**It's complicated.** Determining license compatibility and compliance and who holds copyright can get complicated and confusing very quickly. Switching to a new but compatible license for new releases and contributions is different from relicensing all existing contributions. Involve your legal team at the first hint of any desire to change licenses. Even if you have or can obtain permission from your project's copyright holders for a license change, consider the impact of the change on your project's other users and contributors. Think of a license change as a "governance event" for your project that will more likely go smoothly with clear communications and consultation with your project's stakeholders. All the more reason to choose and use an appropriate license for your project from its inception!
9090

_articles/pt/building-community.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,10 @@ Por exemplo, veja como [Rubinius](https://github.com/rubinius/rubinius/) introdu
143143
### Compartilhe a responsabilidade pelo seu projeto
144144

145145
<aside markdown="1" class="pquote">
146-
<img src="https://avatars.githubusercontent.com/sarahsharp?s=180" class="pquote-avatar" alt="avatar">
146+
<img src="https://avatars.githubusercontent.com/sagesharp?s=180" class="pquote-avatar" alt="avatar">
147147
Seus líderes terão opiniões diferentes, como toda comunidade saudável deve ser! Porém, você precisa tomar certas atitudes para assegurar que a voz mais alta não seja sempre a vencedora, por deixar as outras pessoas cansadas, e que minorias e vozes menos proeminentes sejam ouvidas.
148148
<p markdown="1" class="pquote-credit">
149-
@sarahsharp, ["What makes a good community?"](http://sarah.thesharps.us/2015/10/06/what-makes-a-good-community/)
149+
@sagesharp, ["What makes a good community?"](http://sage.thesharps.us/2015/10/06/what-makes-a-good-community/)
150150
</p>
151151
</aside>
152152

_articles/pt/getting-paid.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
lang: pt
33
title: Sendo Pago por Trabalhos Open Source
4-
description: Mantenha seu trabalho open source conseguindo suporte financeiro por seu tempo ou seu porojeto.
4+
description: Mantenha seu trabalho open source conseguindo suporte financeiro por seu tempo ou seu projeto.
55
class: getting-paid
66
order: 7
77
image: /assets/images/cards/getting-paid.png

0 commit comments

Comments
 (0)