Merge branch 'april19' into 'master' (d71cb3b9) · Commits · glow / chaostreffbern_website

content/events.json

+37 −4

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@
		"name_en": "Regular Meetings",
		"events": [
		{
		"start": "2019-03-19 19:00",
		"start": "2019-04-02 19:00",
		"duration": "3h",
		"location": "Kyburgstrasse 13, 3013 Bern",
		"summary_en": "The weekly meeting of the Chaostreff Bern",
		@@ -13,10 +13,10 @@
		"title": "Chaostreff Bern",
		"url_de": "/de/treff.html",
		"url_en": "/en/treff.html",
		"location_url": "treff.html#hackerspace"
		"location_url": "hackerspace.html"
		},
		{
		"start": "2019-03-26 19:00",
		"start": "2019-04-09 19:00",
		"duration": "3h",
		"location": "Kyburgstrasse 13, 3013 Bern",
		"summary_en": "The weekly meeting of the Chaostreff Bern",
		@@ -24,7 +24,40 @@
		"title": "Chaostreff Bern",
		"url_de": "/de/treff.html",
		"url_en": "/en/treff.html",
		"location_url": "treff.html#hackerspace"
		"location_url": "hackerspace.html"
		},
		{
		"start": "2019-04-16 19:00",
		"duration": "3h",
		"location": "Kyburgstrasse 13, 3013 Bern",
		"summary_en": "The weekly meeting of the Chaostreff Bern",
		"summary_de": "Das wöchentliche Treffen des Chaostreff Bern",
		"title": "Chaostreff Bern",
		"url_de": "/de/treff.html",
		"url_en": "/en/treff.html",
		"location_url": "hackerspace.html"
		},
		{
		"start": "2019-04-23 19:00",
		"duration": "3h",
		"location": "Kyburgstrasse 13, 3013 Bern",
		"summary_en": "The weekly meeting of the Chaostreff Bern",
		"summary_de": "Das wöchentliche Treffen des Chaostreff Bern",
		"title": "Chaostreff Bern",
		"url_de": "/de/treff.html",
		"url_en": "/en/treff.html",
		"location_url": "hackerspace.html"
		},
		{
		"start": "2019-04-30 19:00",
		"duration": "3h",
		"location": "Kyburgstrasse 13, 3013 Bern",
		"summary_en": "The weekly meeting of the Chaostreff Bern",
		"summary_de": "Das wöchentliche Treffen des Chaostreff Bern",
		"title": "Chaostreff Bern",
		"url_de": "/de/treff.html",
		"url_en": "/en/treff.html",
		"location_url": "hackerspace.html"
		}
		]
		},

content/pages/de/hackerspace.md

+8 −5

Original line number	Diff line number	Diff line
		@@ -11,11 +11,14 @@ Der Chaostreff Bern hat seinen eigenen Hackerspace. Dieser kann von allen Mitgli

		### Lage und Anreise

		Adresse: <address>Kyburgstrasse 13, 3013 Bern, Schweiz</address>
		Adresse:
		<address>
		Kyburgstrasse 13<br />
		3013 Bern<br />
		Schweiz
		</address>

		[https://www.openstreetmap.org/?mlat=46.95634&mlon=7.44833#map=19/46.95638/7.44833](https://www.openstreetmap.org/?mlat=46.95634&mlon=7.44833#map=19/46.95638/7.44833)

		Erreichbar ist er einfach via Bus, zu Fuss oder mit dem Fahrrad:
		Erreichbar ist der Hackerspace via Bus, zu Fuss oder mit dem Fahrrad:

		* Bus Linie 20 (Ab Bern Hauptbahnhof Richtung Wankdorf Bahnhof) bis zur Station "Lorraine":
		* 3 Minuten Fahrt
		@@ -33,7 +36,7 @@ Der Chaostreff Bern verfügt über einen eigenen Parkplatz für Motorkraftfahrze

		Alle Mitglieder des Chaostreff Bern haben rund um die Uhr Zugang zum Hackerspace.

		Während des wöchentlichen [Chaostreff](treff.html) ist der Raum offen und Besuch ist herzlich willkommen. Gerne geben wir dir auch eine Führung.
		Während des wöchentlichen [Chaostreff](treff.html) ist der Raum offen und Besuch ist herzlich willkommen. Gerne geben wir dir auch eine Führung. Sollte die Türe nicht offen sein, rufe die folgende Nummer an und lasse es 3 mal klingenl, es kommt dann jemand um dir die Türe zu öffnen. <a href="tel:+41315080312">+41 31 508 03 12</a>

		## Besuch

content/pages/de/impressum.md

+10 −1

Original line number	Diff line number	Diff line
		@@ -12,7 +12,16 @@ Based on a work at <a xmlns:dct="http://purl.org/dc/terms/" href="https://git.ch

		## Contact

		Mailing List<br />
		Postanschrift<br />
		<span class="glyphicon glyphicon-home"></span>
		<address>
		Chaostreff Bern<br />
		Kyburgstrasse 13<br />
		3013 Bern<br />
		Schweiz
		</address>

		Mailing Liste<br />
		<span class="glyphicon glyphicon-link"></span>
		[Mailman](http://sonne.alt-f4.ch/cgi-bin/mailman/listinfo/bern)

content/pages/en/hackerspace.md

+7 −4

Original line number	Diff line number	Diff line
		@@ -11,9 +11,12 @@ The Chaostreff Bern has it's own Hackerspace. It can be used by all members of t

		### Location and getting there

		Address: <address>Kyburgstrasse 13, 3013 Bern, Schweiz</address>

		[https://www.openstreetmap.org/?mlat=46.95634&mlon=7.44833#map=19/46.95638/7.44833](https://www.openstreetmap.org/?mlat=46.95634&mlon=7.44833#map=19/46.95638/7.44833)
		Address:
		<address>
		Kyburgstrasse 13<br />
		3013 Bern<br />
		Schweiz
		</address>

		You can easily reach the space by Bus, bicycle or even by foot:

		@@ -33,7 +36,7 @@ The Chaostreff Bern has its own parking lot for motor vehicles. It is right next

		All members of Chaostreff Bern have round-the-clock access to Hackerspace.

		During our weekly [meetings](treff.html), the room is open and visitors are welcome. We are also happy to give you a guided tour.
		During our weekly [meetings](treff.html), the room is open and visitors are welcome. We are also happy to give you a guided tour. Should the door be locked, simply call the following number and let it ring 3 times. Someone will come an open the door for you. <a href="tel:+41315080312">+41 31 508 03 12</a>

		## Visit

content/pages/en/impressum.md

+10 −1

Original line number	Diff line number	Diff line
		@@ -12,6 +12,15 @@ Based on a work at <a xmlns:dct="http://purl.org/dc/terms/" href="https://git.ch

		## Contact

		address<br />
		<span class="glyphicon glyphicon-home"></span>
		<address>
		Chaostreff Bern<br />
		Kyburgstrasse 13<br />
		3013 Bern<br />
		Schweiz
		</address>

		Mailing List<br />
		<span class="glyphicon glyphicon-link"></span>
		[Mailman](http://sonne.alt-f4.ch/cgi-bin/mailman/listinfo/bern)
		@@ -20,6 +29,6 @@ Based on a work at <a xmlns:dct="http://purl.org/dc/terms/" href="https://git.ch
		<span class="glyphicon glyphicon-envelope"></span>
		info [at] chaostreffbern.ch

		Sources<br />
		Quellcode<br />
		<span class="glyphicon glyphicon-pencil"></span>
		[GitLab](https://git.chaostreffbern.ch/chaostreffbern/chaostreffbern_website)