Merge pull request '20230907_FediverseEDU_addmoderation' (#3727 ) from 20230907_FediverseEDU_addmoderation into master

Reviewed-on: #3727
Merge branch 'master' into 20230907_FediverseEDU_addmoderation
2023-09-07 11:57:54 +00:00 · 2023-09-07 11:42:21 +00:00 · 2023-09-07 13:38:56 +02:00 · 2023-09-07 13:33:00 +02:00
3 changed files with 12 additions and 9 deletions
--- a/news/2023/news-20230712-01.de.xhtml
+++ b/news/2023/news-20230712-01.de.xhtml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <html newsdate="2023-07-12">
-<version>1</version>
+<version>2</version>

 <head>
  <title>Fachtag: „Die Welt nach Facebook, Twitter und YouTube. Eine neue Generation des Internets?”</title>
@ -73,7 +73,8 @@ uns auf Ihre Teilnahme!</p>
  <dd><strong>Workshop 1:</strong><em> Dezentrale Netzwerke als Gegenstand politischer und schulischer Bildung</em> - Björn Friedrich (Studio im Netz e.V.)</dd>
  <dd><strong>Workshop 2:</strong><em> Aller Anfang ist spannend: Nutzung dezentraler Dienste für Privatpersonen und Institutionen</em> - Katharina Nocun und Tobias Diekershoff</dd>
  <dd><strong>Workshop 3:</strong><em> Mitmachen, aber richtig: Der Betrieb eigener Fediverse-Instanzen</em> - padeluun (Digitalcourage) </dd><br />
-  <dd><strong>Abschlusspodium:</strong><em> Wie sieht die Zukunft des Fediverse aus?</em> - Björn Friedrich, Katharina Nocun, padeluun, Stephanie Henkel, Tobias Diekershoff</dd>
+  <dd><strong>Abschlusspodium:</strong><em> Wie sieht die Zukunft des Fediverse aus?</em> - Björn Friedrich, Katharina Nocun, padeluun, Sascha Foerster, Stephanie Henkel, Tobias Diekershoff</dd><br />
+  <dd><strong>Moderation:</strong> Friederike von Franqué (Wikimedia Deuschland)</dd>
 </dl> 
 </div>

--- a/news/2023/news-20230712-01.en.xhtml
+++ b/news/2023/news-20230712-01.en.xhtml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <html newsdate="2023-07-12">
-<version>1</version>
+<version>2</version>

 <head>
  <title>"The world after Facebook, Twitter and YouTube. A new generation of the Internet?"</title>
@ -74,7 +74,8 @@ educational context.
  <dd><strong>Workshop 1:</strong><em> Decentralised networks as a subject of political and school education</em> - Björn Friedrich (Studio im Netz e.V.)</dd>
  <dd><strong>Workshop 2:</strong><em> Using decentralised services for individuals and institutions</em> - Katharina Nocun, Tobias Diekershoff</dd>
  <dd><strong>Workshop 3:</strong><em> Running your own Fediverse instance</em> - padeluun (Digitalcourage)</dd><br />
-  <dd><strong>Closing panel:</strong><em> The future of the Fediverse</em> - Björn Friedrich, Katharina Nocun, padeluun, Stephanie Henkel, Tobias Diekershoff</dd>
+  <dd><strong>Closing panel:</strong><em> The future of the Fediverse</em> - Björn Friedrich, Katharina Nocun, padeluun, Sascha Foerster, Stephanie Henkel, Tobias Diekershoff</dd><br />
+  <dd><strong>Moderation:</strong> Friederike von Franqué (Wikimedia Deuschland)</dd>
 </dl> 
 </div>

--- a/news/2023/news-20230712-01.it.xhtml
+++ b/news/2023/news-20230712-01.it.xhtml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <html newsdate="2023-07-12">
-<version>1</version>
+<version>2</version>

 <head>
  <title>"Il mondo dopo Facebook, Twitter e YouTube. Una nuova generazione di Internet?"</title>
@ -59,6 +59,7 @@ La partecipazione è gratuita, ma è richiesta la registrazione online. Ti aspet
 Neumarkt</strong>, Cäcilienstraße 29-33, 50667 Colonia, Germania
 </dd>
 <dd><em>Registrazione:</em> <a href="https://registration.fsfe.org/FediverseFachtag">https://registration.fsfe.org/FediverseFachtag</a></dd>
+<dd><em>Attenzione:</em> l'evento è al completo. È possibile aggiungere il proprio nome alla lista d'attesa tramite il link qui sopra. La scelta del workshop potrebbe non essere presa in considerazione.</dd>
 </dl>
 </div>

@ -85,7 +86,7 @@ Neumarkt</strong>, Cäcilienstraße 29-33, 50667 Colonia, Germania
  <dt>12:00: Pausa per uno scambio di opinioni e per un pranzo veloce</dt><br />
  <dt></dt>
  <dt>13:00 - 16:00: Workshop pratici in parallelo</dt>
-  <dd><strong>Informazione pratica:</strong> Dalla vita quotidiana di un amministratore del Fediverso - N.N.</dd>
+  <dd><strong>Informazione pratica:</strong> Dalla vita quotidiana di un amministratore del Fediverso - Sascha Foerster (bonn.digital)</dd>
  <dd>
  <strong>Workshop 1:</strong><em> Reti decentralizzate come tematica 
  per l'istruzione politica e scolastica</em> - Björn Friedrich (Studio 
@ -97,11 +98,11 @@ Neumarkt</strong>, Cäcilienstraße 29-33, 50667 Colonia, Germania
  singoli e le istituzioni</em> - Katharina Nocun, Tobias 
  Diekershoff
  </dd>
-  <dd><strong>Workshop 3:</strong><em> Gestione la propria istanza del Fediverso</em> - N.N.</dd><br />
+  <dd><strong>Workshop 3:</strong><em> Gestione la propria istanza del Fediverso</em> - padeluun (Digitalcourage)</dd><br />
  <dd>
  <strong>Tavola rotonda di chiusura:</strong><em> Il futuro del Fediverso</em> - 
-  Katharina Nocun, Björn Friedrich, Tobias Diekershoff, Stephanie Henkel
-  </dd>
+  Björn Friedrich, Katharina Nocun, padeluun, Sascha Foerster, Stephanie Henkel, Tobias Diekershoff</dd><br />
+  <dd><strong>Moderato da:</strong> Friederike von Franqué (Wikimedia Deuschland)</dd>
 </dl> 
 </div>
Author	SHA1	Message	Date
jn	984adae09a	Merge pull request '20230907_FediverseEDU_addmoderation' (#3727 ) from 20230907_FediverseEDU_addmoderation into master All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #3727	2023-09-07 11:57:54 +00:00
jn	531e64db39	Merge branch 'master' into 20230907_FediverseEDU_addmoderation All checks were successful continuous-integration/drone/pr Build is passing Details	2023-09-07 11:42:21 +00:00
Johannes Näder	bd93fe9b35	FediverseEDU: add moderator IT All checks were successful continuous-integration/drone/pr Build is passing Details	2023-09-07 13:38:56 +02:00
Johannes Näder	cc3fd2efea	FediverseEDU add moderation	2023-09-07 13:33:00 +02:00