diff --git a/Gemfile.lock b/Gemfile.lock
index 4de059d..3ff72f5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -40,7 +40,7 @@ GEM
uber (~> 0.0.4)
http_parser.rb (0.5.3)
i18n (0.6.11)
- json (1.8.1)
+ json (1.8.3)
kramdown (1.4.1)
listen (2.7.9)
celluloid (>= 0.15.2)
@@ -133,3 +133,6 @@ DEPENDENCIES
middleman-deploy
middleman-livereload
wdm (~> 0.1.0)
+
+BUNDLED WITH
+ 1.11.2
diff --git a/README.md b/README.md
index b6cd732..5715e74 100644
--- a/README.md
+++ b/README.md
@@ -9,9 +9,16 @@ Add Your User Group/Conference to the List
1. Fork repository.
2. Open *data/supporters.json* and add your name, location,
link and contact data.
+ - Note that contact data is optional and public, but we recommend adding some.
3. Check if site is working locally if possible (see [setup](#setup)).
4. Open a pull request.
+Why is my contact data public?
+------------------------------
+
+We encourage UG organisers to publicise contact emails and preferably phone numbers. This allows easy approaching and makes clear that contacting you should be the default, not an exception. Also, it allows contacting by direct means, instead of using a third-party-service like the meetups meetup page.
+
+The contact details are published on the CoC page itself to make clear who is responsible for handling incidents and who can be approached using which means.
Additions or Changes to the Code of Conduct?
--------------------------------------------
@@ -32,7 +39,6 @@ Do you want to translate to another language? Great! If you want to translate fr
3. Open a pull request. We will try to find other native speakers and disscuss it there. The discussion may look like [the one for the Spanish translation](https://github.com/rubyberlin/code-of-conduct/pull/23).
-
Setup
-----
diff --git a/config.rb b/config.rb
index b94246b..b149b80 100644
--- a/config.rb
+++ b/config.rb
@@ -16,7 +16,7 @@ def t(id, replacements = {})
set :js_dir, 'javascripts'
set :images_dir, 'images'
-set :displayed_languages, %i(en de es pl fr)
+set :displayed_languages, %i(en de es pl fr it)
configure :build do
activate :minify_css
diff --git a/data/supporters.json b/data/supporters.json
index 0606b74..f1548a9 100644
--- a/data/supporters.json
+++ b/data/supporters.json
@@ -8,9 +8,10 @@
"twitter": "rug_b",
"contacts": [
{
- "name": "Tobias Pfeiffer",
- "phone": "+49 160 205 0792",
- "email": "pragtob@gmail.com"
+ "name": "Tobias Pfeiffer",
+ "phone": "+49 160 205 0792",
+ "email": "pragtob@gmail.com",
+ "twitter": "PragTob"
},
{
"name": "Thilo Utke",
@@ -338,7 +339,7 @@
"city": "Berlin",
"country": "Germany",
"link": "https://groups.google.com/forum/#!forum/creativecodeberlin",
- "twitter": "P5Jam",
+ "twitter": "creativeCodeBLN",
"contacts": [
{
"name": "Rachel Uwa",
@@ -348,12 +349,12 @@
},
{
"name": "Abe Pazos",
- "email": "abe@hamoid.com",
+ "email": "hamoid@gmail.com",
"twitter": "hamoid"
},
{
"name": "Ramin Soleymani",
- "email": "diskordier@gmail.com",
+ "email": "ramin@opentechschool.org",
"twitter": "ramin__"
},
{
@@ -427,6 +428,595 @@
"email": "v@gor.io"
}
]
+ },
+ {
+ "name": "Wizard Amigos",
+ "city": "Berlin",
+ "country": "Germany",
+ "link": "http://wizardamigos.com",
+ "twitter": "wizardamigos",
+ "contacts": [
+ {
+ "name": "Wizard Amigos",
+ "twitter": "wizardamigos",
+ "email": "we@wizardamigos.com"
+ },
+ {
+ "name": "Alexander Praetorius",
+ "twitter": "serapath",
+ "email": "a.praetorius@serapath.de"
+ },
+ {
+ "name": "Nina Breznik",
+ "twitter": "ninabreznik",
+ "email": "ninabreznik@gmail.com"
+ }
+ ]
+ },
+ {
+ "name": "Web Audio Berlin",
+ "city": "Berlin",
+ "country": "Germany",
+ "link": "http://webaudio.berlin",
+ "twitter": "webaudioberlin",
+ "contacts": [
+ {
+ "name": "Jan Monschke",
+ "twitter": "thedeftone",
+ "phone": "+49 157 789 021 18",
+ "email": "jan@janmonschke.com"
+ }
+ ]
+ },
+ {
+ "name": "Berlin Mobile .NET",
+ "city": "Berlin",
+ "country": "Germany",
+ "link": "http://www.meetup.com/Berlin-Mobile-DotNet-Meetup/",
+ "twitter": "BerlinDotNet",
+ "contacts": [
+ {
+ "name": "Nathan Guerin",
+ "twitter": "Gusennan",
+ "email": "nathan.guerin@riseup.net"
+ },
+ {
+ "name": "Daniel Münch",
+ "twitter": "ddotmunch",
+ "email": "dani.munch@gmail.com"
+ }
+ ]
+ },
+ {
+ "name": "Málaga Scala Meetup",
+ "city": "Málaga",
+ "country": "Spain",
+ "link": "http://www.meetup.com/Malaga-Scala",
+ "twitter": "MalagaScala",
+ "contacts": [
+ {
+ "name": "Nando Sola",
+ "twitter": "mr_solo"
+ },
+ {
+ "name": "Sergio Tudela",
+ "twitter": "sergiotudela"
+ },
+ {
+ "name": "Carmel Hassan",
+ "twitter": "karmel"
+ }
+ ]
+ },
+ {
+ "name": "Lambda World Cádiz 2015",
+ "city": "Cádiz",
+ "country": "Spain",
+ "link": "http://www.lambda.world",
+ "twitter": "Lambda_World",
+ "contacts": [
+ {
+ "name": "Jorge Galindo",
+ "twitter": "jorge__galindo"
+ },
+ {
+ "name": "Susana Marló",
+ "twitter": "carabuu_u"
+ },
+ {
+ "name": "Inés Arroyo",
+ "twitter": "toda1dama"
+ }
+ ]
+ },
+ {
+ "name": "Data Science for Social Good Berlin",
+ "city": "Berlin",
+ "country": "Germany",
+ "link": "http://dssg-berlin.org",
+ "twitter": "dssgber",
+ "contacts": [
+ {
+ "name": "Daniel Kirsch",
+ "twitter": "kirel",
+ "phone": "+49 151 15729370",
+ "email": "daniel@dssg-berlin.org"
+ }
+ ]
+ },
+ {
+ "name": "More Micro Modules",
+ "city": "Berlin",
+ "country": "Germany",
+ "link": "http://moremicromodules.org",
+ "twitter": "micromodules",
+ "contacts": [
+ {
+ "name": "Jan Lelis",
+ "twitter": "JanLelis",
+ "email": "mail@janlelis.de"
+ },
+ {
+ "name": "Christoph Grabo",
+ "twitter": "asaaki",
+ "email": "christoph@grabo.berlin"
+ }
+ ]
+ },
+ {
+ "name": "J On The Beach",
+ "city": "Málaga",
+ "country": "Spain",
+ "link": "http://www.jonthebeach.com/",
+ "twitter": "J_OnTheBeach",
+ "contacts": [
+ {
+ "name": "Sergio Tudela",
+ "twitter": "sergiotudela",
+ "email": "info@jonthebeach.com"
+ }
+ ]
+ },
+ {
+ "name": "Silesian Ruby Users Group",
+ "city": "Gliwice",
+ "country": "Poland",
+ "link": "https://srug.pl/",
+ "twitter": "srugpl",
+ "contacts": [
+ {
+ "name": "Kuba Kuźma",
+ "twitter": "qoobaa",
+ "email": "kuba@jah.pl"
+ }
+ ]
+ },
+ {
+ "name": "unKonf 2016",
+ "city": "Mannheim",
+ "country": "Germany",
+ "link": "https://www.unkonf.de/",
+ "twitter": "unkonf",
+ "contacts": [
+ {
+ "name": "Stephan Hochdörfer",
+ "twitter": "shochdoerfer",
+ "email": "info@unKonf.de"
+ }
+ ]
+ },
+ {
+ "name": "PySilesia / Silesian Python Users Group",
+ "city": "Katowice",
+ "country": "Poland",
+ "link": "http://pysilesia.org/",
+ "twitter": "pysilesia",
+ "contacts": [
+ {
+ "name": "Filip Kłębczyk",
+ "twitter": "fk_lx",
+ "email": "fklebczyk@gmail.com"
+ }
+ ]
+ },
+ {
+ "name": "dber - diaspora* Berlin",
+ "city": "Berlin",
+ "country": "Germany",
+ "link": "https://dber.org",
+ "contacts": [
+ {
+ "name": "Lisa Passing",
+ "email": "mail@lislis.de",
+ "diaspora": "lis@wk3.org"
+ }
+ ]
+ },
+ {
+ "name": "React Berlin",
+ "city": "Berlin",
+ "country": "Germany",
+ "link": "http://reactjs.berlin/",
+ "twitter": "reactberlin",
+ "contacts": [
+ {
+ "name": "Tobias Pfeiffer",
+ "phone": "+49 160 205 0792",
+ "email": "pragtob@gmail.com",
+ "twitter": "PragTob"
+ },
+ {
+ "name": "Bodo Tasche",
+ "phone": "+49 1512 7533048",
+ "email": "bodo@tasche.me",
+ "twitter": "bitboxer"
+ },
+ {
+ "name": "Christoph Beck",
+ "email": "aqualung@crapmap.de",
+ "twitter": "chris_bitcrowd"
+ }
+ ]
+ },
+ {
+ "name": "JavaScript and the Internet of Things",
+ "city": "Portland, OR",
+ "country": "USA",
+ "link": "http://www.meetup.com/JavaScript-and-the-Internet-of-Things/",
+ "contacts": [
+ {
+ "name": "Andrew Chalkley",
+ "email": "andrew@chalkley.org",
+ "twitter": "chalkers"
+ },
+ {
+ "name": "Craig Dennis",
+ "twitter": "craigsdennis"
+ }
+ ]
+ },
+ {
+ "name": "EuRuKo 2016",
+ "city": "Sofia",
+ "country": "Bulgaria",
+ "link": "http://euruko2016.org",
+ "twitter": "euruko",
+ "contacts": [
+ {
+ "name": "Svetlozar Todorov",
+ "email": "svetlik@gmail.com"
+ },
+ {
+ "name": "Genadi Samokovarov",
+ "email": "gsamokovarov@gmail.com"
+ },
+ {
+ "name": "Vestimir Markov",
+ "email": "me@vestimir.com"
+ },
+ {
+ "name": "Svetlozar Mihaylov",
+ "email": "svetliomihailov@gmail.com",
+ "phone": "+359 883 33 20 91"
+ }
+ ]
+ },
+ {
+ "name": "Raspberry Pi Hackers MeetUp",
+ "city": "Sevilla",
+ "country": "Spain",
+ "link": "http://www.meetup.com/es-ES/RaspberryPi-Hackers-en-Sevilla/",
+ "twitter": "RaspberryHack",
+ "contacts": [
+ {
+ "name": "Bernardo Ronquillo",
+ "email": "brjapon@psykia.com",
+ "link": "https://es.linkedin.com/in/brjapon",
+ "twitter": "brjapon",
+ "phone": "+34 678 590 171"
+ },
+ {
+ "name": "Víctor Murillo",
+ "email": "victor@psykia.com"
+ },
+ {
+ "name": "Rubén Rodríguez",
+ "email": "ruben@pyskia.com"
+ }
+ ]
+ },
+ {
+ "name": "Sonic Code Sessions",
+ "city": "Berlin",
+ "country": "Germany",
+ "link": "http://spektrumberlin.de/communities/sonic-code-sessions/about.html",
+ "twitter": "scsBLN",
+ "contacts": [
+ {
+ "name": "Abe Pazos",
+ "email": "hamoid@gmail.com",
+ "link": "http://hamoid.com",
+ "twitter": "hamoid"
+ }
+ ]
+ },
+ {
+ "name": "Berlin Node.js Community Meetup",
+ "city": "Berlin",
+ "country": "Germany",
+ "link": "https://ti.to/travisci/berlin-node-js-community-meetup",
+ "contacts": [
+ {
+ "name": "Jenifer Duke",
+ "email": "duke@travis-ci.com",
+ "phone": "+49 170 7986487"
+ },
+ {
+ "name": "Vanja Cosic",
+ "email": "vanja@opbeat.com",
+ "phone": "+45 28 49 16 32"
+ }
+ ]
+ },
+ {
+ "name": "Berlin.JS – Berlin JavaScript usergroup",
+ "city": "Berlin",
+ "country": "Germany",
+ "link": "http://www.berlinjs.org",
+ "twitter": "berlinjs",
+ "contacts": [
+ {
+ "name": "Michele Guido",
+ "twitter": "sheley"
+ },
+ {
+ "name": "Robin Mehner",
+ "twitter": "rmehner",
+ "phone": "+49 160 906 59729",
+ "email": "robin@coding-robin.de"
+ }
+ ]
+ },
+ {
+ "name": "Macoun - Mac OS X and iOS Developer Conference",
+ "city": "Frankfurt",
+ "country": "Germany",
+ "link": "https://macoun.de",
+ "twitter": "MacounFFM",
+ "contacts": [
+ {
+ "name": "Christian Hauser",
+ "phone": "+49 69 981 912 06",
+ "email": "contact@macoun.de"
+ },
+ {
+ "name": "Thomas Biedorf",
+ "phone": "+49 69 981 912 06",
+ "email": "contact@macoun.de"
+ }
+ ]
+ },
+ {
+ "name": "Rustfest",
+ "city": "Berlin",
+ "country": "Germany",
+ "link": "http://rustfest.eu",
+ "twitter": "rustfest",
+ "contacts": [
+ {
+ "name": "Florian Gilcher",
+ "phone": "+49 172 8122469",
+ "email": "florian.gilcher@asquera.de"
+ }
+ ]
+ },
+ {
+ "name": "React.HH",
+ "city": "Hamburg",
+ "country": "Germany",
+ "link": "http://www.meetup.com/de-DE/Hamburg-React-js-Meetup/",
+ "twitter": "reacthh",
+ "contacts": [
+ {
+ "name": "Dave Brotherstone",
+ "phone": "+49 177 5548569",
+ "email": "davegb@pobox.com",
+ "twitter": "bruderstein"
+ },
+ {
+ "name": "Rebecca Spindler",
+ "phone": "+49 170 9322635",
+ "email": "spindler.rebecca@gmail.com",
+ "twitter": "beccspin"
+ },
+ {
+ "name": "Leonard Koch",
+ "email": "leonard@leonardkoch.com",
+ "twitter": "LeonardKoch_"
+ }
+ ]
+ },
+ {
+ "name": "node.HH",
+ "city": "Hamburg",
+ "country": "Germany",
+ "link": "http://www.meetup.com/de-DE/node-HH/",
+ "twitter": "NodeHamburg",
+ "contacts": [
+ {
+ "name": "Gregor Elke",
+ "phone": "+49 174 2100996",
+ "email": "greelgorke@gmail.com",
+ "twitter": "greelgorke"
+ }
+ ]
+ },
+ {
+ "name": "decode hamburg",
+ "city": "Hamburg",
+ "country": "Germany",
+ "link": "https://www.meetup.com/decode-hh/",
+ "twitter": "decodehh",
+ "contacts": [
+ {
+ "name": "Martin Schuhfuss",
+ "phone": "+49 172 5188 662",
+ "email": "m.schuhfuss@gmail.com",
+ "twitter": "usefulthink"
+ },
+ {
+ "name": "Felicitas Kugland",
+ "email": "felicitas.kugland@gmail.com",
+ "twitter": "kotzendekrabbe"
+ }
+ ]
+ },
+ {
+ "name": "HH.JS",
+ "city": "Hamburg",
+ "country": "Germany",
+ "link": "http://www.meetup.com/hamburg-js/",
+ "twitter": "hhjs",
+ "contacts": [
+ {
+ "name": "Martin Kleppe",
+ "phone": "+49 178 236 53 40",
+ "email": "kleppe@gmail.com",
+ "twitter": "aemkei"
+ },
+ {
+ "name": "Felicitas Kugland",
+ "email": "felicitas.kugland@gmail.com",
+ "twitter": "kotzendekrabbe"
+ },
+ {
+ "name": "Rebecca Spindler",
+ "phone": "+49 170 9322635",
+ "email": "spindler.rebecca@gmail.com",
+ "twitter": "beccspin"
+ },
+ {
+ "name": "Daniel Dembach",
+ "phone": "+49 151 22962186",
+ "email": "daniel@dmbch.net",
+ "twitter": "dmbch"
+ }
+ ]
+ },
+ {
+ "name": "CouchDB Meetup Hamburg",
+ "city": "Hamburg",
+ "country": "Germany",
+ "link": "http://www.meetup.com/CouchDB-Meetup-Hamburg/",
+ "twitter": "HamburgCouchDB",
+ "contacts": [
+ {
+ "name": "Klaus Trainer",
+ "phone": "+49 1577 7855886",
+ "email": "klaus_trainer@apache.org",
+ "twitter": "KlausTrainer"
+ }
+ ]
+ },
+ {
+ "name": "DO!Hack 2016",
+ "city": "Dortmund",
+ "country": "Germany",
+ "link": "https://www.dohack.io",
+ "twitter": "dohack_io",
+ "contacts": [
+ {
+ "name": "Christoph Weinzierl",
+ "email": "team@dohack.io",
+ "twitter": "wir3bug"
+ }
+ ]
+ },
+ {
+ "name": "Berlin C++ User Group",
+ "city": "Berlin",
+ "country": "Germany",
+ "link": "http://www.meetup.com/berlincplusplus/",
+ "contacts": [
+ {
+ "name": "Fabio Fracassi",
+ "phone": "+49 172 97 28 955",
+ "email": "f.fracassi@gmx.net"
+ },
+ {
+ "name": "Celine Dedaj",
+ "email": "celine.dedaj@ableton.com"
+ }
+ ]
+ },
+ {
+ "name": "Coding Amigos - collective of freelance developers",
+ "city": "Berlin",
+ "country": "Germany",
+ "link": "http://codingamigos.com",
+ "twitter": "codingamigos",
+ "contacts": [
+ {
+ "name": "Coding Amigos",
+ "twitter": "codingamigos",
+ "email": "we@codingamigos.com"
+ },
+ {
+ "name": "Nina Breznik",
+ "twitter": "ninabreznik",
+ "email": "ninabreznik@gmail.com"
+ },
+ {
+ "name": "Alexander Praetorius",
+ "twitter": "serapath",
+ "email": "a.praetorius@serapath.de"
+ }
+ ]
+ },
+ {
+ "name": "Refugees Work",
+ "city": "Berlin",
+ "country": "Germany",
+ "link": "http://refugeeswork.com",
+ "twitter": "refugeeswork",
+ "contacts": [
+ {
+ "name": "RefugeesWork",
+ "twitter": "refugeeswork",
+ "email": "we@refugeeswork.com"
+ }
+ ]
+ },
+ {
+ "name": "Serverless Usergroup Hamburg",
+ "city": "Hamburg",
+ "country": "Germany",
+ "link": "http://www.meetup.com/Serverless-Hamburg",
+ "contacts": [
+ {
+ "name": "Soenke Ruempler",
+ "twitter": "s0enke",
+ "email": "soenke@ruempler.eu"
+ }
+ ]
+ },
+ {
+ "name": "Hamburg AngularJS Meetup",
+ "city": "Hamburg",
+ "country": "Germany",
+ "link": "http://www.meetup.com/Hamburg-AngularJS-Meetup/",
+ "twitter": "angular_hamburg",
+ "contacts": [
+ {
+ "name": "David Muellerchen",
+ "email": "dave@webdave.de",
+ "twitter": "webdave_de"
+ },
+ {
+ "name": "John Behrens",
+ "twitter": "WebConsultsEu"
+ }
+ ]
}
]
}
diff --git a/source/layouts/layout.erb b/source/layouts/layout.erb
index b7440db..4cfe1fc 100644
--- a/source/layouts/layout.erb
+++ b/source/layouts/layout.erb
@@ -10,7 +10,7 @@
diff --git a/source/localizable/_code-of-conduct.de.md b/source/localizable/_code-of-conduct.de.md
index 6981be1..e1c2149 100644
--- a/source/localizable/_code-of-conduct.de.md
+++ b/source/localizable/_code-of-conduct.de.md
@@ -66,3 +66,8 @@ Geltungsbereich
---------------
Wir erwarten, dass sich alle Teilnehmenden 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 f94684a..31719df 100644
--- a/source/localizable/_code-of-conduct.en.md
+++ b/source/localizable/_code-of-conduct.en.md
@@ -35,6 +35,8 @@ Unacceptable behaviors include: intimidating, harassing, abusive, discriminatory
Harassment includes: harmful or prejudicial verbal or written comments related to gender, sexual orientation, race, religion, disability; inappropriate use of nudity and/or sexual images in public spaces (including presentation slides); deliberate intimidation, stalking or following; harassing photography or recording; sustained disruption of talks or other events; inappropriate physical contact, and unwelcome sexual attention.
+Critical examination of beliefs, including critical commentary on another person’s views, does not, by itself, constitute hostile conduct or harassment. One of the underlying rationales of this Code of Conduct is to promote the free exchange of ideas, not to inhibit it.
+
Consequences of Unacceptable Behavior
-------------------------------------
@@ -66,3 +68,8 @@ 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 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.
diff --git a/source/localizable/_code-of-conduct.es.md b/source/localizable/_code-of-conduct.es.md
index ea0b967..efdadaa 100644
--- a/source/localizable/_code-of-conduct.es.md
+++ b/source/localizable/_code-of-conduct.es.md
@@ -36,6 +36,8 @@ Comportamientos inaceptables incluyen: discursos o acciones intimidantes, acosad
Acoso incluye: daño o perjurio verbal o escrito relacionado con género, orientación sexual, raza, religión, incapacidad; uso inapropiado de imágenes de desnudez en espacios públicos (incluyendo presentaciones digitales); intimidación deliberada, acecho o persecución; fotografías o grabaciones abusivas; interrupción sostenida de presentaciones u de otros eventos; contacto físico inapropiado y atención sexual no deseada.
+El análisis crítico de las opiniones, incuyendo el comentario crítico de las opiniones de las otras personas, no se puede considerar como una conducta hostil o un hostigamiento. Uno de los fundamentos de este Código de Conducta es promover el libre intercambio de ideas, y no inhibir dichos intercambios.
+
Consecuencias del comportamiento inaceptable
--------------------------------------------
@@ -63,3 +65,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 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.
diff --git a/source/localizable/_code-of-conduct.fr.md b/source/localizable/_code-of-conduct.fr.md
index c1b9b0a..a6034fe 100644
--- a/source/localizable/_code-of-conduct.fr.md
+++ b/source/localizable/_code-of-conduct.fr.md
@@ -35,6 +35,8 @@ Sont considérés comme inacceptables : l'intimidation, le harcèlement, la mal
Sont considérés comme du harcèlement : les commentaires blessants ou malveillants (écrits ou verbaux) sur le genre, l'orientation sexuelle, la race, la religion, le handicap ; l'usage inapproprié de la nudité et/ou d'images à connotation sexuelle dans un espace public (y compris des diaporamas de présentations) ; l'intimidation volontaire ; la traque ou harcèlement par les faits (*stalking*) ; le harcèlement photo ou vidéo ; l'interruption ou la perturbation volontaire de présentations ou d'autres événements ; le contact physique inapproprié ou les attentions sexuelles non désirées.
+L'examen critique des opinions, passant notamment par des commentaires critiques des points de vue d'une autre personne, ne constitue pas en soi une attitude hostile ni quelconque harcèlement. Une des raisons sous-jacentes de ce code de conduite est de promouvoir le libre échange d'idées et non de l'inhiber.
+
Conséquences d'un comportement inacceptable
-------------------------------------
diff --git a/source/localizable/_code-of-conduct.it.md b/source/localizable/_code-of-conduct.it.md
index c0cd67c..ed63b05 100644
--- a/source/localizable/_code-of-conduct.it.md
+++ b/source/localizable/_code-of-conduct.it.md
@@ -36,6 +36,8 @@ I comportamenti che riteniamo inaccettabili includono: comportamenti intimidator
Comportamenti molesti includono: commenti scritti o verbali dannosi o pregiudizievoli in relazione al sesso, orientamento sessuale, razza, religione, disabilità fisiche e/o mentali; uso inappropriato di immagini di nudi e/o immagini a sfondo sessuale utilizzate in spazi pubblici (comprese le slide per le presentazioni); intimidazioni, il seguire fisicamente o stalking; molestie sotto forma di fotografie e video non autorizzati; interruzione sostenuta di presentazioni o altri eventi; contatto fisico inappropriato e attenzione sessuale sgradita.
+L'analisi critica delle opinioni di un'altro individuo, inclusa l'argomentazione del loro punto di vista, non costituisce di per sè una molestia, nè puó essere considerata una condotta ostile. Uno dei principi alla base di questo Codice di Condotta è quello di promuovere il libero scambio di idee, non quello di inibirlo.
+
Conseguenze per i comportamenti inaccettabili
-------------------------------------
diff --git a/source/localizable/_code-of-conduct.pl.md b/source/localizable/_code-of-conduct.pl.md
index 0069c4b..527959b 100644
--- a/source/localizable/_code-of-conduct.pl.md
+++ b/source/localizable/_code-of-conduct.pl.md
@@ -41,13 +41,13 @@ Konsekwencje niedopuszczalnych zachowań
Niedopuszczalne zachowanie ze strony dowolnego uczestnika społeczności – w tym sponsorów i osób decyzyjnych – nie będzie tolerowane. Osoby poproszone o zaprzestanie niedopuszczalnego zachowania powinny się natychmiast do danej prośby zastosować.
-Jeśli uczestnik społeczności zachowuje się niedopuszczalnie, organizatorzy mogą podjąć dowolne działania, które uznają za właście, włącznie z tymczasowym lub stałym wyrzuceniem ze społeczności bez ostrzeżenia (i bez zwrotu pieniędzy w przypadku wydarzeń płatnych).
+Jeśli uczestnik społeczności zachowuje się niedopuszczalnie, organizatorzy mogą podjąć dowolne działania, które uznają za właściwe, włącznie z tymczasowym lub stałym wyrzuceniem ze społeczności bez ostrzeżenia (i bez zwrotu pieniędzy w przypadku wydarzeń płatnych).
Jeśli doświadczasz lub widzisz niedopuszczalne zachowanie
---------------------------------------------------------
-Jeśli doświadczas lub widzisz niedopuszczalne zachowanie – lub masz inne uwagi – jak najszybciej powiadom o tym organizatora. Listę organizatorów każdej społeczności wspierającej ten kodeks postępowania znajdziesz na dole tej strony. Organizatorzy są także dostępni by wspomóc uczestników w kontaktach z lokalnymi organami egzekwowania prawa i by wspierać poczucie bezpieczeństwa osób doświadczających niedopuszczalnych zachowań. Jeśli osoba poszkodowana wyrazi zapotrzebowanie, organizatorzy zapewnią też odpowiednią eskortę.
+Jeśli doświadczasz lub widzisz niedopuszczalne zachowanie – lub masz inne uwagi – jak najszybciej powiadom o tym organizatora. Listę organizatorów każdej społeczności wspierającej ten kodeks postępowania znajdziesz na dole tej strony. Organizatorzy są także dostępni by wspomóc uczestników w kontaktach z lokalnymi organami egzekwowania prawa i by wspierać poczucie bezpieczeństwa osób doświadczających niedopuszczalnych zachowań. Jeśli osoba poszkodowana wyrazi zapotrzebowanie, organizatorzy zapewnią też odpowiednią eskortę.
Skargi
@@ -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.