diff --git a/.htaccess b/.htaccess index 4335c0ea91..63ea4c3ea7 100644 --- a/.htaccess +++ b/.htaccess @@ -115,7 +115,7 @@ RewriteRule ^freesoftware/enterprise/chargeofitsbrand(.*)$ /news/2009/news-20090 # Old staff profiles RewriteRule ^about/(bako|polvani|tuke|maffulli|jakobs|oriordan)(/.*)?$ /about/team [R=301,L] RewriteRule ^about/nanda(/.*)?$ /about/weiden [R=301,L] -RewriteRule ^people/greve(/.*)?$ /about/greve [R=301,L] +RewriteRule ^people/greve(/.*)?$ /about/people/greve [R=301,L] # /en/.* RewriteRule ^en/layout/set/rss/content/view/full/5116 http://blogs.fsfe.org/ciaran/?feed=rss2 [R=301,L] diff --git a/about/funds/2001.en.xhtml b/about/funds/2001.en.xhtml index cd6886c8aa..2a67708ac7 100644 --- a/about/funds/2001.en.xhtml +++ b/about/funds/2001.en.xhtml @@ -46,7 +46,7 @@
[3] Donations to the FSFE made through the German chapter (see German chapter)
-[4] People paid: Georg Greve
+[4] People paid: Georg Greve
[5] T-Shirts, Pins and other goodies as well as tradeshow material and leaflets.
diff --git a/about/funds/2001.fr.xhtml b/about/funds/2001.fr.xhtml index ab8310af37..8ea3fce2d8 100644 --- a/about/funds/2001.fr.xhtml +++ b/about/funds/2001.fr.xhtml @@ -46,7 +46,7 @@[3] Don à la FSFE fait par la délégation allemande (voir Délégation allemande)
-[4] Personne rémunérée : Georg Greve
+[4] Personne rémunérée : Georg Greve
[5] T-Shirts, Pins et autres goodies ainsi que le matériel et les prospectus des expositions et salons.
diff --git a/about/funds/2001.it.xhtml b/about/funds/2001.it.xhtml index f4f87eb44a..f9b019d4d5 100644 --- a/about/funds/2001.it.xhtml +++ b/about/funds/2001.it.xhtml @@ -46,7 +46,7 @@[3] Donazioni alla FSFE effettuate attraverso la sezione tedesca (si veda sezione tedesca).
-[4] Persone retribuite: Georg Greve.
+[4] Persone retribuite: Georg Greve.
[5] Magliette, spille e altri gadget, compreso materiale per le fiere e volantini.
diff --git a/about/funds/2001.nl.xhtml b/about/funds/2001.nl.xhtml index 62b85989dc..1853bba6e8 100644 --- a/about/funds/2001.nl.xhtml +++ b/about/funds/2001.nl.xhtml @@ -46,7 +46,7 @@[3] Donaties aan de FSFE via de Duitse afdeling (zie Duitse afdeling)
-[4] Betaald persoon: Georg Greve
+[4] Betaald persoon: Georg Greve
[5] T-Shirts, pins en andere spullen alsmede beursmateriaal en brochures.
diff --git a/about/funds/2001.ru.xhtml b/about/funds/2001.ru.xhtml index d0994a4ebc..ef4b40313c 100644 --- a/about/funds/2001.ru.xhtml +++ b/about/funds/2001.ru.xhtml @@ -51,7 +51,7 @@ href="/help/thankgnus-2001.html">Благодарностей GNU.[3] Пожертвования, сделанные через германский филиал ЕФСПО (см. филиал в Германии).
-[4] Выплаты получили: Георг
+ [4] Выплаты получили: Георг
Греве. [5] Футболки, значки и другие товары, а также
diff --git a/about/funds/2002.en.xhtml b/about/funds/2002.en.xhtml
index 36d53429ad..86a275a547 100644
--- a/about/funds/2002.en.xhtml
+++ b/about/funds/2002.en.xhtml
@@ -46,7 +46,7 @@
[3] Donations to the FSFE made through the German chapter (see German chapter) [4] People paid: Georg Greve [4] People paid: Georg Greve [5] T-Shirts, Pins and other goodies as well as tradeshow material and leaflets. [3] Don à la FSFE fait par la délégation allemande (voir Délégation allemande) [4] Personne rémunérée : Georg Greve [4] Personne rémunérée : Georg Greve [5] T-Shirts, Pins et autres goodies ainsi que le matériel et les prospectus des expositions et salons. [3] Donazioni alla FSFE effettuate attraverso la sezione tedesca (si veda sezione tedesca). [4] Persone retribuite: Georg Greve. [4] Persone retribuite: Georg Greve. [5] Magliette, spille e altri gadget, compreso materiale per le fiere e volantini.
[3] Пожертвования, сделанные через германский филиал ЕФСПО (см. филиал в Германии).
-[4] Выплаты получили: Георг Греве.
+[4] Выплаты получили: Георг Греве.
[5] Футболки, значки и другие товары, а также материалы и брошюры для выставок.
diff --git a/about/funds/2003.de.xhtml b/about/funds/2003.de.xhtml index 37081fb57a..5760d95419 100644 --- a/about/funds/2003.de.xhtml +++ b/about/funds/2003.de.xhtml @@ -52,7 +52,7 @@ auf der ThankGNUs-Liste einzusehen.[4] Spenden, die vom italienischen Landesverein an die FSFE gemacht wurden
-[5] Einschließlich 16% MwSt. (EUR 6,217.60); bezahlte Leute: Georg Greve
+[5] Einschließlich 16% MwSt. (EUR 6,217.60); bezahlte Leute: Georg Greve
[6] T-Shirts, Anstecker und andere Werbematerialien sowie Messematerial und Flyer.
diff --git a/about/funds/2003.el.xhtml b/about/funds/2003.el.xhtml index 00008d2a8f..92c5b6422e 100644 --- a/about/funds/2003.el.xhtml +++ b/about/funds/2003.el.xhtml @@ -56,7 +56,7 @@[4] Για δωρεές στο FSFE μέσω του Ιταλικού παραρτήματος
[5] Περιλαμβάνεται ΦΠΑ 16% (EUR 6,217.60)· -Έμμισθο προσωπικό: Georg Greve
+Έμμισθο προσωπικό: Georg Greve[6] Μπλουζάκια, καρφίτσες και άλλα αντικείμενα καθώς επίσης υλικό και φυλλάδια για εμπορικές εκθέσεις.
diff --git a/about/funds/2003.en.xhtml b/about/funds/2003.en.xhtml index 84be11602b..9db21991b6 100644 --- a/about/funds/2003.en.xhtml +++ b/about/funds/2003.en.xhtml @@ -51,7 +51,7 @@[4] Donations to the FSFE made through the Italian chapter.
-[5] Including 16%VAT (EUR 6,217.60); People paid: Georg Greve
+[5] Including 16%VAT (EUR 6,217.60); People paid: Georg Greve
[6] T-Shirts, Pins and other goodies as well as tradeshow material and leaflets.
diff --git a/about/funds/2003.fr.xhtml b/about/funds/2003.fr.xhtml index 35e9087848..340f5ac4c3 100644 --- a/about/funds/2003.fr.xhtml +++ b/about/funds/2003.fr.xhtml @@ -51,7 +51,7 @@[4] Don à la FSFE fait par la délégation italienne
-[5] TVA à 16% incluse (€ 6,217.60); Personne payée : Georg Greve
+[5] TVA à 16% incluse (€ 6,217.60); Personne payée : Georg Greve
[6] T-Shirts, Pins et autres goodies ainsi que le matériel et les prospectus des expositions et salons.
diff --git a/about/funds/2003.it.xhtml b/about/funds/2003.it.xhtml index 2d8ee8520c..d7896a5222 100644 --- a/about/funds/2003.it.xhtml +++ b/about/funds/2003.it.xhtml @@ -51,7 +51,7 @@[4] Donazioni alla FSFE effettuate attraverso la sezione italiana.
-[5] Inclusa IVA 16% (6.217,60 €). Persone retribuite: Georg Greve.
+[5] Inclusa IVA 16% (6.217,60 €). Persone retribuite: Georg Greve.
[6] Magliette, spille e altri gadget, compreso materiale per le fiere e volantini.
diff --git a/about/funds/2003.nl.xhtml b/about/funds/2003.nl.xhtml index 095c9da86e..27231bf8a0 100644 --- a/about/funds/2003.nl.xhtml +++ b/about/funds/2003.nl.xhtml @@ -51,7 +51,7 @@[4] Donaties aan de FSFE via de Italiaanse afdeling
-[5] Waarvan 16%BTW (EUR 6,217.60); Betaalde mensen: Georg Greve
+[5] Waarvan 16%BTW (EUR 6,217.60); Betaalde mensen: Georg Greve
[6] T-Shirts, Pins en andere spulletjes ook beursmateriaal, strooibiljetten en brochures.
diff --git a/about/funds/2003.ru.xhtml b/about/funds/2003.ru.xhtml index 3f3dacf54c..f8a812019f 100644 --- a/about/funds/2003.ru.xhtml +++ b/about/funds/2003.ru.xhtml @@ -58,7 +58,7 @@ href="/help/thankgnus-2003.html">Благодарностей GNU. филиал ЕФСПО.[5] Включая 16% НДС (EUR 6 217,60); оплачены -услуги: Георга Греве.
+услуги: Георга Греве.[6] Футболки, значки и другие товары, а также материалы и брошюры для выставок.
diff --git a/about/funds/2004.de.xhtml b/about/funds/2004.de.xhtml index 349c0cf35e..e2de733ec4 100644 --- a/about/funds/2004.de.xhtml +++ b/about/funds/2004.de.xhtml @@ -47,7 +47,7 @@ auf der ThankGNUs-Liste einzusehen.[3] Spenden, die vom deutschen Landesverein an die FSFE gemacht wurden (siehe Deutscher Landesverein)
-[4] bezahlte Leute: Georg Greve, Stefano Maffulli, Joachim Jakobs (Pressesprecher), Matthias Kirschner (Praktikant).
+[4] bezahlte Leute: Georg Greve, Stefano Maffulli, Joachim Jakobs (Pressesprecher), Matthias Kirschner (Praktikant).
[5] T-Shirts, Anstecker und andere Werbematerialien sowie Messematerial und Flyer.
diff --git a/about/funds/2004.el.xhtml b/about/funds/2004.el.xhtml index 675ffd16d7..eacc272c6e 100644 --- a/about/funds/2004.el.xhtml +++ b/about/funds/2004.el.xhtml @@ -50,7 +50,7 @@[3] Για δωρεές στο FSFE μέσω της Γερμανικής αντιπροσωπείας (δείτε Γερμανική αντιπροσωπεία)
-[4] Έμμισθο προσωπικό: Georg Greve, Stefano Maffulli, Joachim Jakobs (Εκπρόσωπος Τύπου), Matthias Kirschner (βοηθός).
+[4] Έμμισθο προσωπικό: Georg Greve, Stefano Maffulli, Joachim Jakobs (Εκπρόσωπος Τύπου), Matthias Kirschner (βοηθός).
[5] Μπλουζάκια, καρφίτσες και άλλα αντικείμενα καθώς επίσης υλικό και φυλλάδια για εμπορικές εκθέσεις.
diff --git a/about/funds/2004.en.xhtml b/about/funds/2004.en.xhtml index 7e1dadd2e3..a4000883f6 100644 --- a/about/funds/2004.en.xhtml +++ b/about/funds/2004.en.xhtml @@ -46,7 +46,7 @@[3] Donations to the FSFE made through the German chapter (see German chapter)
-[4] People paid: Georg Greve, Stefano Maffulli, Joachim Jakobs (Press Speaker), Matthias Kirschner (intern).
+[4] People paid: Georg Greve, Stefano Maffulli, Joachim Jakobs (Press Speaker), Matthias Kirschner (intern).
[5] T-Shirts, Pins and other goodies as well as tradeshow material and leaflets.
diff --git a/about/funds/2004.fr.xhtml b/about/funds/2004.fr.xhtml index ff94f9390b..be9a614a85 100644 --- a/about/funds/2004.fr.xhtml +++ b/about/funds/2004.fr.xhtml @@ -46,7 +46,7 @@[3] Dons à la FSFE faits par la délégation allemande (voir Délégation allemande)
-[4] Personnes rémunérées : Georg Greve, Stefano Maffulli, Joachim Jakobs (Attaché de presse), Matthias Kirschner (stagiaire).
+[4] Personnes rémunérées : Georg Greve, Stefano Maffulli, Joachim Jakobs (Attaché de presse), Matthias Kirschner (stagiaire).
[5] T-Shirts, Pins et autres goodies, ainsi que le matériel et les prospectus des expositions et salons.
diff --git a/about/funds/2004.it.xhtml b/about/funds/2004.it.xhtml index af3e092134..5af8f75f59 100644 --- a/about/funds/2004.it.xhtml +++ b/about/funds/2004.it.xhtml @@ -46,7 +46,7 @@[3] Donazioni alla FSFE effettuate attraverso la sezione tedesca (si veda sezione tedesca).
-[4] Persone retribuite: Georg Greve, Stefano Maffulli, Joachim Jakobs (addetto stampa), Matthias Kirschner (collaboratore).
+[4] Persone retribuite: Georg Greve, Stefano Maffulli, Joachim Jakobs (addetto stampa), Matthias Kirschner (collaboratore).
[5] Magliette, spille e altri gadget, compreso materiale per le fiere e volantini.
diff --git a/about/funds/2004.nl.xhtml b/about/funds/2004.nl.xhtml index 0e571994c1..399832c603 100644 --- a/about/funds/2004.nl.xhtml +++ b/about/funds/2004.nl.xhtml @@ -45,7 +45,7 @@[3] Donaties aan de FSFE via de Duitse afdeling (zie Duitse Afdeling)
-[4] Betaalde mensen: Georg Greve, Stefano Maffulli, Joachim Jakobs (woordvoerder), Matthias Kirschner (intern).
+[4] Betaalde mensen: Georg Greve, Stefano Maffulli, Joachim Jakobs (woordvoerder), Matthias Kirschner (intern).
[5] T-Shirts, Pins en andere spulletjes ook beursmateriaal, strooibiljetten en brochures.
diff --git a/about/funds/2004.ru.xhtml b/about/funds/2004.ru.xhtml index e432d24acd..297de7fec1 100644 --- a/about/funds/2004.ru.xhtml +++ b/about/funds/2004.ru.xhtml @@ -51,7 +51,7 @@ href="/help/thankgnus-2004.html">Благодарностей GNU.[3] Пожертвования, сделанные через германский филиал ЕФСПО (см. филиал в Германии).
-[4] Выплаты получили: Георг
+ [4] Выплаты получили: Георг
Греве, Стефано Мафули, Иоахим Джекобс (пресс-атташе), Матиас Киршнер
(стажер).
[3] Spenden, die vom deutschen Landesverein an die FSFE gemacht wurden (siehe Deutscher Landesverein)
-[4] bezahlte Leute: Georg Greve, Stefano Maffulli, Ciaran O'Riordan, Joachim Jakobs, Karsten Gerloff (Praktikant), Alexander Finkenberger (Praktikant).
+[4] bezahlte Leute: Georg Greve, Stefano Maffulli, Ciaran O'Riordan, Joachim Jakobs, Karsten Gerloff (Praktikant), Alexander Finkenberger (Praktikant).
[5] T-Shirts, Anstecker und andere Werbematerialien sowie Messematerial und Flyer.
diff --git a/about/funds/2005.el.xhtml b/about/funds/2005.el.xhtml index d35b782c9d..41172670cb 100644 --- a/about/funds/2005.el.xhtml +++ b/about/funds/2005.el.xhtml @@ -50,7 +50,7 @@[3] Για δωρεές στο FSFE μέσω της Γερμανικής αντιπροσωπείας (δείτε Γερμανική αντιπροσωπεία)
-[4] Έμμισθο προσωπικό: Georg Greve, Stefano Maffulli, Ciarán O'Riordan, Joachim Jakobs, Karsten Gerloff (βοηθός), Alexander Finkenberger (βοηθός).
+[4] Έμμισθο προσωπικό: Georg Greve, Stefano Maffulli, Ciarán O'Riordan, Joachim Jakobs, Karsten Gerloff (βοηθός), Alexander Finkenberger (βοηθός).
[5] Μπλουζάκια, καρφίτσες και άλλα αντικείμενα καθώς επίσης υλικό και φυλλάδια για εμπορικές εκθέσεις.
diff --git a/about/funds/2005.en.xhtml b/about/funds/2005.en.xhtml index 7cb89d23e0..72785c2827 100644 --- a/about/funds/2005.en.xhtml +++ b/about/funds/2005.en.xhtml @@ -46,7 +46,7 @@[3] Donations to the FSFE made through the German chapter (see German chapter)
-[4] People paid: Georg Greve, Stefano Maffulli, Ciaran O'Riordan, Joachim Jakobs, Karsten Gerloff (intern), Alexander Finkenberger (intern).
+[4] People paid: Georg Greve, Stefano Maffulli, Ciaran O'Riordan, Joachim Jakobs, Karsten Gerloff (intern), Alexander Finkenberger (intern).
[5] T-Shirts, Pins and other goodies as well as tradeshow material and leaflets.
diff --git a/about/funds/2005.fr.xhtml b/about/funds/2005.fr.xhtml index 5c35fe455d..5e52139600 100644 --- a/about/funds/2005.fr.xhtml +++ b/about/funds/2005.fr.xhtml @@ -46,7 +46,7 @@[3] Dons à la FSFE faits par la délégation allemande (voir Délégation allemande)
-[4] Personnes employées : Georg Greve, Stefano Maffulli, Ciaran O'Riordan, Joachim Jakobs, Karsten Gerloff (intern), Alexander Finkenberger (intern).
+[4] Personnes employées : Georg Greve, Stefano Maffulli, Ciaran O'Riordan, Joachim Jakobs, Karsten Gerloff (intern), Alexander Finkenberger (intern).
[5] T-Shirts, Pins et autres goodies, ainsi que le matériel et les prospectus des expositions et salons.
diff --git a/about/funds/2005.it.xhtml b/about/funds/2005.it.xhtml index db3b4aa955..00fe8bb388 100644 --- a/about/funds/2005.it.xhtml +++ b/about/funds/2005.it.xhtml @@ -46,7 +46,7 @@[3] Donazioni alla FSFE effettuate attraverso la sezione tedesca (si veda sezione tedesca).
-[4] Persone retribuite: Georg Greve, Stefano Maffulli, Ciaran O'Riordan, Joachim Jakobs, Karsten Gerloff (tirocinante), Alexander Finkenberger (tirocinante).
+[4] Persone retribuite: Georg Greve, Stefano Maffulli, Ciaran O'Riordan, Joachim Jakobs, Karsten Gerloff (tirocinante), Alexander Finkenberger (tirocinante).
[5] Magliette, spille e altri gadget, compreso materiale per le fiere e volantini.
diff --git a/about/funds/2005.nl.xhtml b/about/funds/2005.nl.xhtml index 573b019c87..d327b7e8e7 100644 --- a/about/funds/2005.nl.xhtml +++ b/about/funds/2005.nl.xhtml @@ -46,7 +46,7 @@[3] Donaties aan de FSFE via de Duitse afdeling (zie Duitse Afdeling)
-[4] Betaalde mensen: Georg Greve, Stefano Maffulli, Ciaran O'Riordan, Joachim Jakobs, Karsten Gerloff (intern), Alexander Finkenberger (intern).
+[4] Betaalde mensen: Georg Greve, Stefano Maffulli, Ciaran O'Riordan, Joachim Jakobs, Karsten Gerloff (intern), Alexander Finkenberger (intern).
[5] T-Shirts, Pins en andere spulletjes ook beursmateriaal, strooibiljetten en brochures.
diff --git a/about/funds/2005.ru.xhtml b/about/funds/2005.ru.xhtml index 0184dcca8e..81f90bc5ce 100644 --- a/about/funds/2005.ru.xhtml +++ b/about/funds/2005.ru.xhtml @@ -51,7 +51,7 @@ href="/help/thankgnus-2005.html">Благодарностей GNU.[3] Пожертвования, сделанные через германский филиал ЕФСПО (см. филиал в Германии).
-[4] Выплаты получили: Георг
+ [4] Выплаты получили: Георг
Греве, Стефано Мафули, Киран О’Риордан, Иоахим Джекобс, Карстен
Герлофф (стажер), Александр Финкенбергер (стажер).
- [6] bezahlte Leute: Georg Greve, + [6] bezahlte Leute: Georg Greve, Stefano Maffulli, Ciaran O'Riordan, Joachim Jakobs, diff --git a/about/funds/2006.el.xhtml b/about/funds/2006.el.xhtml index 232a3412fe..31a1c55145 100644 --- a/about/funds/2006.el.xhtml +++ b/about/funds/2006.el.xhtml @@ -167,7 +167,7 @@
- [6] Έμμισθο προσωπικό: Georg Greve, + [6] Έμμισθο προσωπικό: Georg Greve, Stefano Maffulli, Ciarán O'Riordan, Joachim Jakobs, diff --git a/about/funds/2006.en.xhtml b/about/funds/2006.en.xhtml index 35ba926b81..dc9b6653f9 100644 --- a/about/funds/2006.en.xhtml +++ b/about/funds/2006.en.xhtml @@ -166,7 +166,7 @@
- [6] People paid: Georg Greve, + [6] People paid: Georg Greve, Stefano Maffulli, Ciaran O'Riordan, Joachim Jakobs, diff --git a/about/funds/2006.fr.xhtml b/about/funds/2006.fr.xhtml index bb97d48b2c..f9cb1106c1 100644 --- a/about/funds/2006.fr.xhtml +++ b/about/funds/2006.fr.xhtml @@ -163,7 +163,7 @@
- [6] Personnes rémunérées : Georg Greve, + [6] Personnes rémunérées : Georg Greve, Stefano Maffulli, Ciaran O'Riordan, Joachim Jakobs, diff --git a/about/funds/2006.it.xhtml b/about/funds/2006.it.xhtml index 1c0c483888..86a13944df 100644 --- a/about/funds/2006.it.xhtml +++ b/about/funds/2006.it.xhtml @@ -165,7 +165,7 @@
- [6] Persone retribuite: Georg Greve, + [6] Persone retribuite: Georg Greve, Stefano Maffulli, Ciaran O'Riordan, Joachim Jakobs, diff --git a/about/funds/2006.nl.xhtml b/about/funds/2006.nl.xhtml index b7a75422df..df2dab7028 100644 --- a/about/funds/2006.nl.xhtml +++ b/about/funds/2006.nl.xhtml @@ -165,7 +165,7 @@
- [6] betaalde mensen: Georg Greve, + [6] betaalde mensen: Georg Greve, Stefano Maffulli, Ciaran O'Riordan, Joachim Jakobs, diff --git a/about/funds/2006.ru.xhtml b/about/funds/2006.ru.xhtml index fb1c5c1d0a..587b916d7e 100644 --- a/about/funds/2006.ru.xhtml +++ b/about/funds/2006.ru.xhtml @@ -157,7 +157,7 @@ href="/help/thankgnus-2006.html">Благодарностей GNU.
[5] Внешнее финансирование проектов SELF, FTF и GPLv3.
-[6] Выплаты получили: Георг
+ [6] Выплаты получили: Георг
Греве, Стефано Мафули, Киран O’Риордан, Иоахим Джекобс, Шейн Кофлин,
Йонас Оберг, Александр
Финкенбергер (стажер), Джакомо Подери (стажер), Мария Луиза Карли
diff --git a/about/funds/2007.de.xhtml b/about/funds/2007.de.xhtml
index 850192c7c7..26a97d1b6a 100644
--- a/about/funds/2007.de.xhtml
+++ b/about/funds/2007.de.xhtml
@@ -162,7 +162,7 @@
- [5] Bezahlte Menschen: Georg Greve,
+ [5] Bezahlte Menschen: Georg Greve,
Stefano Maffulli,
Ciaran O'Riordan,
Joachim Jakobs,
diff --git a/about/funds/2007.el.xhtml b/about/funds/2007.el.xhtml
index 67256b07a6..36b8632e3d 100644
--- a/about/funds/2007.el.xhtml
+++ b/about/funds/2007.el.xhtml
@@ -163,7 +163,7 @@
- [5] Έμμισθο προσωπικό: Georg Greve,
+ [5] Έμμισθο προσωπικό: Georg Greve,
Stefano Maffulli,
Ciaran O'Riordan,
Joachim Jakobs,
diff --git a/about/funds/2007.en.xhtml b/about/funds/2007.en.xhtml
index 41235bc684..29ca4970ad 100644
--- a/about/funds/2007.en.xhtml
+++ b/about/funds/2007.en.xhtml
@@ -162,7 +162,7 @@
- [5] People paid: Georg Greve,
+ [5] People paid: Georg Greve,
Stefano Maffulli,
Ciaran O'Riordan,
Joachim Jakobs,
diff --git a/about/funds/2007.fr.xhtml b/about/funds/2007.fr.xhtml
index 73fb71f961..422af0529a 100644
--- a/about/funds/2007.fr.xhtml
+++ b/about/funds/2007.fr.xhtml
@@ -157,7 +157,7 @@
- [5] Personnes rémunérées : Georg Greve,
+ [5] Personnes rémunérées : Georg Greve,
Stefano Maffulli,
Ciaran O'Riordan,
Joachim Jakobs,
diff --git a/about/funds/2007.it.xhtml b/about/funds/2007.it.xhtml
index a280b79c1d..37d2f5349f 100644
--- a/about/funds/2007.it.xhtml
+++ b/about/funds/2007.it.xhtml
@@ -161,7 +161,7 @@
- [5] Persone retribuite: Georg Greve,
+ [5] Persone retribuite: Georg Greve,
Stefano Maffulli,
Ciaran O'Riordan,
Joachim Jakobs,
diff --git a/about/funds/2007.nl.xhtml b/about/funds/2007.nl.xhtml
index 1072967d59..39f9d99da1 100644
--- a/about/funds/2007.nl.xhtml
+++ b/about/funds/2007.nl.xhtml
@@ -163,7 +163,7 @@
- [5] betaalde personen: Georg Greve,
+ [5] betaalde personen: Georg Greve,
Stefano Maffulli,
Ciaran O'Riordan,
Joachim Jakobs,
diff --git a/about/funds/2007.ru.xhtml b/about/funds/2007.ru.xhtml
index fc5cdf37c4..ad58ca6ce9 100644
--- a/about/funds/2007.ru.xhtml
+++ b/about/funds/2007.ru.xhtml
@@ -154,7 +154,7 @@ href="/help/thankgnus-2007.html">Благодарностей GNU
[4] Внешнее финансирование проектов SELF, STACS и FTF.
-[5] Выплаты получили: Георг
+ [5] Выплаты получили: Георг
Греве, Стефано Мафули, Киран O’Риордан, Иоахим Джекобс,
Шейн Кофлин, Йонас
Оберг, Райне Керстен, Анжелина Барлет, Стефан Гармут, Кристоф Тим
diff --git a/about/albers/albers-800.JPG b/about/people/albers/albers-800.JPG
similarity index 100%
rename from about/albers/albers-800.JPG
rename to about/people/albers/albers-800.JPG
diff --git a/about/albers/albers-avatar-300.png b/about/people/albers/albers-avatar-300.png
similarity index 100%
rename from about/albers/albers-avatar-300.png
rename to about/people/albers/albers-avatar-300.png
diff --git a/about/albers/albers-avatar.png b/about/people/albers/albers-avatar.png
similarity index 100%
rename from about/albers/albers-avatar.png
rename to about/people/albers/albers-avatar.png
diff --git a/about/albers/albers.de.xhtml b/about/people/albers/albers.de.xhtml
similarity index 100%
rename from about/albers/albers.de.xhtml
rename to about/people/albers/albers.de.xhtml
diff --git a/about/albers/albers.en.xhtml b/about/people/albers/albers.en.xhtml
similarity index 100%
rename from about/albers/albers.en.xhtml
rename to about/people/albers/albers.en.xhtml
diff --git a/about/albers/albers.jpg b/about/people/albers/albers.jpg
similarity index 100%
rename from about/albers/albers.jpg
rename to about/people/albers/albers.jpg
diff --git a/about/albers/albers.nl.xhtml b/about/people/albers/albers.nl.xhtml
similarity index 100%
rename from about/albers/albers.nl.xhtml
rename to about/people/albers/albers.nl.xhtml
diff --git a/about/gerloff/20101122.EC.standardisation.Gerloff.pdf b/about/people/gerloff/20101122.EC.standardisation.Gerloff.pdf
similarity index 100%
rename from about/gerloff/20101122.EC.standardisation.Gerloff.pdf
rename to about/people/gerloff/20101122.EC.standardisation.Gerloff.pdf
diff --git a/about/gerloff/20110205.FOSDEM.Software.Power.Freedom.pdf b/about/people/gerloff/20110205.FOSDEM.Software.Power.Freedom.pdf
similarity index 100%
rename from about/gerloff/20110205.FOSDEM.Software.Power.Freedom.pdf
rename to about/people/gerloff/20110205.FOSDEM.Software.Power.Freedom.pdf
diff --git a/about/gerloff/Gerloff.20120925.WCC2012.swpat.pdf b/about/people/gerloff/Gerloff.20120925.WCC2012.swpat.pdf
similarity index 100%
rename from about/gerloff/Gerloff.20120925.WCC2012.swpat.pdf
rename to about/people/gerloff/Gerloff.20120925.WCC2012.swpat.pdf
diff --git a/about/gerloff/OKFest.Gerloff.PubSecFS-GettingItRight.pdf b/about/people/gerloff/OKFest.Gerloff.PubSecFS-GettingItRight.pdf
similarity index 100%
rename from about/gerloff/OKFest.Gerloff.PubSecFS-GettingItRight.pdf
rename to about/people/gerloff/OKFest.Gerloff.PubSecFS-GettingItRight.pdf
diff --git a/about/gerloff/SoftwarePatents-BattleForFreeSoftwaresSoul.pdf b/about/people/gerloff/SoftwarePatents-BattleForFreeSoftwaresSoul.pdf
similarity index 100%
rename from about/gerloff/SoftwarePatents-BattleForFreeSoftwaresSoul.pdf
rename to about/people/gerloff/SoftwarePatents-BattleForFreeSoftwaresSoul.pdf
diff --git a/about/gerloff/a2k.netsoc.pdf b/about/people/gerloff/a2k.netsoc.pdf
similarity index 100%
rename from about/gerloff/a2k.netsoc.pdf
rename to about/people/gerloff/a2k.netsoc.pdf
diff --git a/about/gerloff/a2k.netsoc.tar.gz b/about/people/gerloff/a2k.netsoc.tar.gz
similarity index 100%
rename from about/gerloff/a2k.netsoc.tar.gz
rename to about/people/gerloff/a2k.netsoc.tar.gz
diff --git a/about/gerloff/gerloff-public.asc b/about/people/gerloff/gerloff-public.asc
similarity index 100%
rename from about/gerloff/gerloff-public.asc
rename to about/people/gerloff/gerloff-public.asc
diff --git a/about/gerloff/gerloff.de.xhtml b/about/people/gerloff/gerloff.de.xhtml
similarity index 100%
rename from about/gerloff/gerloff.de.xhtml
rename to about/people/gerloff/gerloff.de.xhtml
diff --git a/about/gerloff/gerloff.el.xhtml b/about/people/gerloff/gerloff.el.xhtml
similarity index 100%
rename from about/gerloff/gerloff.el.xhtml
rename to about/people/gerloff/gerloff.el.xhtml
diff --git a/about/gerloff/gerloff.en.xhtml b/about/people/gerloff/gerloff.en.xhtml
similarity index 100%
rename from about/gerloff/gerloff.en.xhtml
rename to about/people/gerloff/gerloff.en.xhtml
diff --git a/about/gerloff/gerloff.fr.xhtml b/about/people/gerloff/gerloff.fr.xhtml
similarity index 100%
rename from about/gerloff/gerloff.fr.xhtml
rename to about/people/gerloff/gerloff.fr.xhtml
diff --git a/about/gerloff/gerloff.it.xhtml b/about/people/gerloff/gerloff.it.xhtml
similarity index 100%
rename from about/gerloff/gerloff.it.xhtml
rename to about/people/gerloff/gerloff.it.xhtml
diff --git a/about/gerloff/gerloff.jpg b/about/people/gerloff/gerloff.jpg
similarity index 100%
rename from about/gerloff/gerloff.jpg
rename to about/people/gerloff/gerloff.jpg
diff --git a/about/gerloff/gerloff.nl.xhtml b/about/people/gerloff/gerloff.nl.xhtml
similarity index 100%
rename from about/gerloff/gerloff.nl.xhtml
rename to about/people/gerloff/gerloff.nl.xhtml
diff --git a/about/gerloff/gerloff.ru.xhtml b/about/people/gerloff/gerloff.ru.xhtml
similarity index 100%
rename from about/gerloff/gerloff.ru.xhtml
rename to about/people/gerloff/gerloff.ru.xhtml
diff --git a/about/greve/Greve-CV.pdf b/about/people/greve/Greve-CV.pdf
similarity index 99%
rename from about/greve/Greve-CV.pdf
rename to about/people/greve/Greve-CV.pdf
index 4ef79f2114..72b4eda0df 100644
Binary files a/about/greve/Greve-CV.pdf and b/about/people/greve/Greve-CV.pdf differ
diff --git a/about/greve/cv.el.xhtml b/about/people/greve/cv.el.xhtml
similarity index 100%
rename from about/greve/cv.el.xhtml
rename to about/people/greve/cv.el.xhtml
diff --git a/about/greve/cv.en.xhtml b/about/people/greve/cv.en.xhtml
similarity index 100%
rename from about/greve/cv.en.xhtml
rename to about/people/greve/cv.en.xhtml
diff --git a/about/greve/greve-public.asc b/about/people/greve/greve-public.asc
similarity index 100%
rename from about/greve/greve-public.asc
rename to about/people/greve/greve-public.asc
diff --git a/about/greve/greve.de.xhtml b/about/people/greve/greve.de.xhtml
similarity index 100%
rename from about/greve/greve.de.xhtml
rename to about/people/greve/greve.de.xhtml
diff --git a/about/greve/greve.el.xhtml b/about/people/greve/greve.el.xhtml
similarity index 100%
rename from about/greve/greve.el.xhtml
rename to about/people/greve/greve.el.xhtml
diff --git a/about/greve/greve.en.xhtml b/about/people/greve/greve.en.xhtml
similarity index 100%
rename from about/greve/greve.en.xhtml
rename to about/people/greve/greve.en.xhtml
diff --git a/about/greve/greve.fr.xhtml b/about/people/greve/greve.fr.xhtml
similarity index 100%
rename from about/greve/greve.fr.xhtml
rename to about/people/greve/greve.fr.xhtml
diff --git a/about/greve/greve.hu.xhtml b/about/people/greve/greve.hu.xhtml
similarity index 100%
rename from about/greve/greve.hu.xhtml
rename to about/people/greve/greve.hu.xhtml
diff --git a/about/greve/greve.it.xhtml b/about/people/greve/greve.it.xhtml
similarity index 100%
rename from about/greve/greve.it.xhtml
rename to about/people/greve/greve.it.xhtml
diff --git a/about/greve/greve.jpg b/about/people/greve/greve.jpg
similarity index 100%
rename from about/greve/greve.jpg
rename to about/people/greve/greve.jpg
diff --git a/about/greve/greve.nl.xhtml b/about/people/greve/greve.nl.xhtml
similarity index 100%
rename from about/greve/greve.nl.xhtml
rename to about/people/greve/greve.nl.xhtml
diff --git a/about/greve/greve.ru.xhtml b/about/people/greve/greve.ru.xhtml
similarity index 100%
rename from about/greve/greve.ru.xhtml
rename to about/people/greve/greve.ru.xhtml
diff --git a/about/kirschner/kirschner-public.asc b/about/people/kirschner/kirschner-public.asc
similarity index 100%
rename from about/kirschner/kirschner-public.asc
rename to about/people/kirschner/kirschner-public.asc
diff --git a/about/kirschner/kirschner.de.xhtml b/about/people/kirschner/kirschner.de.xhtml
similarity index 100%
rename from about/kirschner/kirschner.de.xhtml
rename to about/people/kirschner/kirschner.de.xhtml
diff --git a/about/kirschner/kirschner.el.xhtml b/about/people/kirschner/kirschner.el.xhtml
similarity index 100%
rename from about/kirschner/kirschner.el.xhtml
rename to about/people/kirschner/kirschner.el.xhtml
diff --git a/about/kirschner/kirschner.en.xhtml b/about/people/kirschner/kirschner.en.xhtml
similarity index 100%
rename from about/kirschner/kirschner.en.xhtml
rename to about/people/kirschner/kirschner.en.xhtml
diff --git a/about/kirschner/kirschner.it.xhtml b/about/people/kirschner/kirschner.it.xhtml
similarity index 100%
rename from about/kirschner/kirschner.it.xhtml
rename to about/people/kirschner/kirschner.it.xhtml
diff --git a/about/kirschner/kirschner.jpg b/about/people/kirschner/kirschner.jpg
similarity index 100%
rename from about/kirschner/kirschner.jpg
rename to about/people/kirschner/kirschner.jpg
diff --git a/about/kirschner/kirschner.nl.xhtml b/about/people/kirschner/kirschner.nl.xhtml
similarity index 100%
rename from about/kirschner/kirschner.nl.xhtml
rename to about/people/kirschner/kirschner.nl.xhtml
diff --git a/about/kirschner/kirschner.ru.xhtml b/about/people/kirschner/kirschner.ru.xhtml
similarity index 100%
rename from about/kirschner/kirschner.ru.xhtml
rename to about/people/kirschner/kirschner.ru.xhtml
diff --git a/about/ku/ku.en.xhtml b/about/people/ku/ku.en.xhtml
similarity index 100%
rename from about/ku/ku.en.xhtml
rename to about/people/ku/ku.en.xhtml
diff --git a/about/ku/ku.jpg b/about/people/ku/ku.jpg
similarity index 100%
rename from about/ku/ku.jpg
rename to about/people/ku/ku.jpg
diff --git a/about/lasota/lasota.en.xhtml b/about/people/lasota/lasota.en.xhtml
similarity index 100%
rename from about/lasota/lasota.en.xhtml
rename to about/people/lasota/lasota.en.xhtml
diff --git a/about/lasota/lasota.jpg b/about/people/lasota/lasota.jpg
similarity index 100%
rename from about/lasota/lasota.jpg
rename to about/people/lasota/lasota.jpg
diff --git a/about/mehl/mehl.de.xhtml b/about/people/mehl/mehl.de.xhtml
similarity index 100%
rename from about/mehl/mehl.de.xhtml
rename to about/people/mehl/mehl.de.xhtml
diff --git a/about/mehl/mehl.en.xhtml b/about/people/mehl/mehl.en.xhtml
similarity index 100%
rename from about/mehl/mehl.en.xhtml
rename to about/people/mehl/mehl.en.xhtml
diff --git a/about/mehl/mehl.jpg b/about/people/mehl/mehl.jpg
similarity index 100%
rename from about/mehl/mehl.jpg
rename to about/people/mehl/mehl.jpg
diff --git a/about/mehl/mehl.nl.xhtml b/about/people/mehl/mehl.nl.xhtml
similarity index 100%
rename from about/mehl/mehl.nl.xhtml
rename to about/people/mehl/mehl.nl.xhtml
diff --git a/about/people/people.en.xml b/about/people/people.en.xml
index 7fcbe51d12..230fb71326 100644
--- a/about/people/people.en.xml
+++ b/about/people/people.en.xml
@@ -100,7 +100,7 @@
XMPP: repentinus (at) jabber (dot) fsfe (dot) org
- GnuPG: 0x91349DD8
+ GnuPG: 0x91349DD8