From dd4572ba16822119868dd3776085614761110c5a Mon Sep 17 00:00:00 2001 From: Juan Catalano Date: Mon, 8 Sep 2014 17:55:49 -0300 Subject: [PATCH 1/7] Added license section to the spanish version of the BCoC. --- source/localizable/_code-of-conduct.es.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/source/localizable/_code-of-conduct.es.md b/source/localizable/_code-of-conduct.es.md index 912aad8..f43fa28 100644 --- a/source/localizable/_code-of-conduct.es.md +++ b/source/localizable/_code-of-conduct.es.md @@ -63,3 +63,9 @@ Alcance ------- Se espera que todos los participantes de la comunidad (colaboradores/as —pagos o no—, patrocinadores y otros/as invitados/as) se atengan a este Código de Conducta en todos los lugares de encuentro de la comunidad –online o en persona– así como en todas las comunicaciones uno-a-uno relacionadas con actividades de la comunidad. + + +Licencia y atribución +--------------------- + +El Berlin Code of Conduct por http://rubyberlin.github.io/code-of-conduct/ se encuentra distribuido bajo una licencia Creative‭ ‬Commons‭ ‬Attribution-ShareAlike‭. From a0169a8a7149a185d3fdda32f186871fbc53f230 Mon Sep 17 00:00:00 2001 From: Juan Catalano Date: Wed, 10 Dec 2014 10:11:13 -0300 Subject: [PATCH 2/7] Added license section to the english version of the BCoC. --- source/localizable/_code-of-conduct.en.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/source/localizable/_code-of-conduct.en.md b/source/localizable/_code-of-conduct.en.md index f94684a..de6a8f6 100644 --- a/source/localizable/_code-of-conduct.en.md +++ b/source/localizable/_code-of-conduct.en.md @@ -66,3 +66,7 @@ Scope We expect all community participants (contributors, paid or otherwise; sponsors; and other guests) to abide by this Code of Conduct in all community venues—online and in-person—as well as in all one-on-one communications pertaining to community business. +License‭ ‬and‭ ‬attribution +----------------------- + +Berlin ‬Code‭ ‬of‭ ‬Conduct‭ ‬by http://rubyberlin.github.io/code-of-conduct/ is‭ ‬distributed‭ ‬under‭ ‬a‭ ‬Creative‭ ‬Commons‭ ‬Attribution-ShareAlike‭ ‬license. \ No newline at end of file From 3cbf2de82e1c4d38948e475286a1256c0fe83512 Mon Sep 17 00:00:00 2001 From: Tobias Pfeiffer Date: Sun, 15 Mar 2015 21:08:23 +0100 Subject: [PATCH 3/7] Add a license statement --- source/localizable/_code-of-conduct.en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/localizable/_code-of-conduct.en.md b/source/localizable/_code-of-conduct.en.md index de6a8f6..c3698a2 100644 --- a/source/localizable/_code-of-conduct.en.md +++ b/source/localizable/_code-of-conduct.en.md @@ -69,4 +69,4 @@ We expect all community participants (contributors, paid or otherwise; sponsors; License‭ ‬and‭ ‬attribution ----------------------- -Berlin ‬Code‭ ‬of‭ ‬Conduct‭ ‬by http://rubyberlin.github.io/code-of-conduct/ is‭ ‬distributed‭ ‬under‭ ‬a‭ ‬Creative‭ ‬Commons‭ ‬Attribution-ShareAlike‭ ‬license. \ No newline at end of file +Berlin Code of Conduct is distributed under a Creative Commons Attribution-ShareAlike license. It is based on the [pdx.rb code of conduct](http://pdxruby.org/codeofconduct), which is distributed under the same license. \ No newline at end of file From 5da788f2eea888c639db38c22aff25dc1e7552f8 Mon Sep 17 00:00:00 2001 From: Tobias Pfeiffer Date: Sun, 15 Mar 2015 21:45:09 +0100 Subject: [PATCH 4/7] German version of license and attribution --- source/localizable/_code-of-conduct.de.md | 5 +++-- source/localizable/_code-of-conduct.en.md | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/source/localizable/_code-of-conduct.de.md b/source/localizable/_code-of-conduct.de.md index 776d329..be7179f 100644 --- a/source/localizable/_code-of-conduct.de.md +++ b/source/localizable/_code-of-conduct.de.md @@ -68,6 +68,7 @@ Geltungsbereich Wir erwarten, dass sich alle Teilnehmer der Community (bezahlte oder unbezahlte Beitragende, Sponsoren sowie andere Gäste) an jedweden Veranstaltungsorten der Community - online und offline - sowie in allen persönlichen Gesprächen im Rahmen der Community an diesen Verhaltenskodex halten. +Lizenz und Namensnennung +------------------------ - - +Der Berlin Code of Conduct steht unter der Creative Commons Attribution-ShareAlike Lizenz. Er basiert auf dem [pdx.rb code of conduct](http://pdxruby.org/codeofconduct), der unter der selben Lizenz steht. diff --git a/source/localizable/_code-of-conduct.en.md b/source/localizable/_code-of-conduct.en.md index c3698a2..ebb0db7 100644 --- a/source/localizable/_code-of-conduct.en.md +++ b/source/localizable/_code-of-conduct.en.md @@ -66,6 +66,7 @@ Scope We expect all community participants (contributors, paid or otherwise; sponsors; and other guests) to abide by this Code of Conduct in all community venues—online and in-person—as well as in all one-on-one communications pertaining to community business. + License‭ ‬and‭ ‬attribution ----------------------- From d3c5b7f2f894b56dd9880de455d6e7e9447baa92 Mon Sep 17 00:00:00 2001 From: Piotr Szotkowski Date: Wed, 25 Mar 2015 10:48:59 +0100 Subject: [PATCH 5/7] Polish version of license and attribution --- source/localizable/_code-of-conduct.pl.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/source/localizable/_code-of-conduct.pl.md b/source/localizable/_code-of-conduct.pl.md index 0069c4b..4ca30c4 100644 --- a/source/localizable/_code-of-conduct.pl.md +++ b/source/localizable/_code-of-conduct.pl.md @@ -60,3 +60,9 @@ Zakres ------ Oczekujemy, że wszyscy uczestnicy społeczności (organizatorzy, zarówno opłacani jak i wolontariusze; sponsorzy; pozostali goście) będą przestrzegać tego Kodeksu postępowania we wszelkich miejscach spotkań społeczności – online i w świecie rzeczywistym – jak i w komunikacji prywatnej dotyczącej spraw społeczności. + + +Licencja i uznanie autorstwa +---------------------------- + +Berliński kodeks postępowania jest rozpowszechniany na warunkach licencji Creative Commons Uznanie autorstwa-Na tych samych warunkach. Kodeks został stworzony na podstawie [pdx.rb code of conduct](http://pdxruby.org/codeofconduct), rozpowszechnianego na warunkach tej samej licencji. From af7f625b3bd17b8081f2813bf533c2bf2602e080 Mon Sep 17 00:00:00 2001 From: Piotr Szotkowski Date: Wed, 25 Mar 2015 10:49:23 +0100 Subject: [PATCH 6/7] Fix some rogue Unicode characters in license and attribution --- source/localizable/_code-of-conduct.en.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/localizable/_code-of-conduct.en.md b/source/localizable/_code-of-conduct.en.md index ebb0db7..5c5e2db 100644 --- a/source/localizable/_code-of-conduct.en.md +++ b/source/localizable/_code-of-conduct.en.md @@ -67,7 +67,7 @@ Scope We expect all community participants (contributors, paid or otherwise; sponsors; and other guests) to abide by this Code of Conduct in all community venues—online and in-person—as well as in all one-on-one communications pertaining to community business. -License‭ ‬and‭ ‬attribution +License and attribution ----------------------- -Berlin Code of Conduct is distributed under a Creative Commons Attribution-ShareAlike license. It is based on the [pdx.rb code of conduct](http://pdxruby.org/codeofconduct), which is distributed under the same license. \ No newline at end of file +Berlin Code of Conduct is distributed under a Creative Commons Attribution-ShareAlike license. It is based on the [pdx.rb code of conduct](http://pdxruby.org/codeofconduct), which is distributed under the same license. From 535bd2c365212f2a7cac3e845b0280f945c09c8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Tom=C3=A1s=20Albornoz?= Date: Thu, 26 Mar 2015 16:02:43 +0100 Subject: [PATCH 7/7] Updated license in Spanish text --- source/localizable/_code-of-conduct.es.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/localizable/_code-of-conduct.es.md b/source/localizable/_code-of-conduct.es.md index f43fa28..74a7388 100644 --- a/source/localizable/_code-of-conduct.es.md +++ b/source/localizable/_code-of-conduct.es.md @@ -68,4 +68,4 @@ Se espera que todos los participantes de la comunidad (colaboradores/as —pagos Licencia y atribución --------------------- -El Berlin Code of Conduct por http://rubyberlin.github.io/code-of-conduct/ se encuentra distribuido bajo una licencia Creative‭ ‬Commons‭ ‬Attribution-ShareAlike‭. +El Berlin Code of Conduct se encuentra distribuido bajo una licencia Creative Commons Attribution-ShareAlike. Está basado en el [pdx.rb code of conduct](http://pdxruby.org/codeofconduct), que también es distribuido bajo la misma licencia.