From 066f6a49520f3e04a4c6ca514d9ff7fb970d7ede Mon Sep 17 00:00:00 2001 From: nicoulas Date: Wed, 9 Jan 2013 01:31:28 +0000 Subject: [PATCH] - we now use only one step of XSL transformation svn path=/trunk/; revision=25134 --- about/legal/de/de.xsl | 15 +- about/members.xsl | 15 +- about/printable/get_h1.xsl | 4 - about/printable/get_moreinfo.xsl | 4 - about/printable/printable.xsl | 19 +- about/team.xsl | 13 +- activities/ftf/avm-gpl-violation.xsl | 16 +- activities/map/de/de.xsl | 15 +- activities/os/os.xsl | 19 +- activities/wipo/wipo.xsl | 15 +- activities/wipo/wiwo.de.xhtml | 21 +- activities/wipo/wiwo.el.xhtml | 20 +- activities/wipo/wiwo.en.xhtml | 21 +- activities/wipo/wiwo.es.xhtml | 22 +- activities/wipo/wiwo.fr.xhtml | 22 +- activities/wipo/wiwo.hu.xhtml | 12 +- activities/wipo/wiwo.it.xhtml | 20 +- activities/wipo/wiwo.nl.xhtml | 23 +- activities/wipo/wiwo.pt.xhtml | 19 +- activities/wipo/wiwo.ru.xhtml | 11 +- activities/wipo/wiwo.xsl | 48 +- associates/associates.ca.xhtml | 2 + associates/associates.da.xhtml | 3 + associates/associates.de.xhtml | 2 + associates/associates.el.xhtml | 2 + associates/associates.en.xhtml | 3 + associates/associates.es.xhtml | 2 + associates/associates.fi.xhtml | 2 + associates/associates.fr.xhtml | 2 + associates/associates.hu.xhtml | 2 + associates/associates.it.xhtml | 2 + associates/associates.nb.xhtml | 2 + associates/associates.nl.xhtml | 2 + associates/associates.pt.xhtml | 2 + associates/associates.ro.xhtml | 2 + associates/associates.ru.xhtml | 2 + associates/associates.sq.xhtml | 3 + associates/associates.sv.xhtml | 2 + associates/associates.tr.xhtml | 2 + associates/associates.xsl | 36 +- at/at.xsl | 15 +- .../askyourcandidates/askyourcandidates.xsl | 19 +- campaigns/finished.xsl | 15 +- campaigns/ilovefs/2012/ilovefs.xsl | 19 +- campaigns/ilovefs/2012/unperfekthaus.xsl | 19 +- campaigns/inactive.xsl | 15 +- campaigns/nledu/nledu.xsl | 19 +- campaigns/pdfreaders/buglist.xsl | 67 ++- campaigns/pdfreaders/pdfreaders.xsl | 41 +- campaigns/pdfreaders/petition.xsl | 50 +- campaigns/projects.xsl | 15 +- campaigns/swpat/documents.xsl | 15 +- campaigns/swpat/memorandum.de.xhtml | 15 +- campaigns/swpat/memorandum.el.xhtml | 17 +- campaigns/swpat/memorandum.en.xhtml | 15 +- campaigns/swpat/memorandum.it.xhtml | 13 +- campaigns/swpat/memorandum.xsl | 39 +- campaigns/valentine/2011/valentine-2011.xsl | 13 +- contact/local.en.xml | 2 +- contact/local.xsl | 81 ++- de/de.xsl | 15 +- default.xsl | 11 + documents/documents.xsl | 15 +- documents/whyfs.xsl | 17 +- donate/thankgnus-2001.xsl | 17 +- donate/thankgnus-2002.xsl | 17 +- donate/thankgnus-2003.xsl | 17 +- donate/thankgnus-2004.xsl | 17 +- donate/thankgnus-2005.xsl | 17 +- donate/thankgnus-2006.xsl | 17 +- donate/thankgnus-2007.xsl | 17 +- donate/thankgnus-2008.xsl | 17 +- donate/thankgnus-2009.xsl | 17 +- donate/thankgnus-2010.xsl | 17 +- donate/thankgnus-2011.xsl | 17 +- donate/thankgnus-2012.xsl | 17 +- donate/thankgnus.xsl | 19 +- events/events.ics.xsl | 6 +- events/events.rss.xsl | 4 +- events/events.xsl | 49 +- fellowship/{fellowship.xsl => default.xsl} | 232 ++++----- fellowship/index.xsl | 31 +- fi/fi.xsl | 15 +- fr/fr.fr.xhtml | 9 +- fr/fr.xsl | 15 +- fsfe.xsl | 442 ++++++++-------- index.en.xhtml | 6 +- index.xsl | 32 +- it/it.xsl | 15 +- news/legal-news.xsl | 20 +- news/news.rss.xsl | 14 +- news/news.xsl | 26 +- news/newsletter.xsl | 57 +-- order/order.xsl | 19 +- press/press.xsl | 17 +- tags/tagged.xsl | 14 +- tags/tags.xsl | 14 +- tools/build.pl | 472 +++++++++--------- tools/texts-ar.xml | 6 + tools/texts-bg.xml | 5 + tools/texts-ca.xml | 8 + tools/texts-content-ar.xml | 10 - tools/texts-content-bg.xml | 10 - tools/texts-content-ca.xml | 13 - tools/texts-content-cs.xml | 13 - tools/texts-content-da.xml | 61 --- tools/texts-content-de.xml | 60 --- tools/texts-content-el.xml | 67 --- tools/texts-content-en.xml | 64 --- tools/texts-content-eo.xml | 10 - tools/texts-content-es.xml | 26 - tools/texts-content-et.xml | 35 -- tools/texts-content-fi.xml | 38 -- tools/texts-content-fr.xml | 37 -- tools/texts-content-hr.xml | 27 - tools/texts-content-hu.xml | 19 - tools/texts-content-it.xml | 40 -- tools/texts-content-ku.xml | 13 - tools/texts-content-mk.xml | 14 - tools/texts-content-nb.xml | 13 - tools/texts-content-nl.xml | 63 --- tools/texts-content-nn.xml | 14 - tools/texts-content-pl.xml | 19 - tools/texts-content-pt.xml | 19 - tools/texts-content-ro.xml | 29 -- tools/texts-content-ru.xml | 65 --- tools/texts-content-sk.xml | 14 - tools/texts-content-sq.xml | 64 --- tools/texts-content-sr.xml | 14 - tools/texts-content-sv.xml | 27 - tools/texts-content-tr.xml | 14 - tools/texts-cs.xml | 8 + tools/texts-da.xml | 60 ++- tools/texts-de.xml | 60 ++- tools/texts-el.xml | 67 ++- tools/texts-en.xml | 67 ++- tools/texts-eo.xml | 5 + tools/texts-es.xml | 25 +- tools/texts-et.xml | 29 ++ tools/texts-fi.xml | 33 +- tools/texts-fr.xml | 41 +- tools/texts-hr.xml | 25 +- tools/texts-hu.xml | 19 + tools/texts-it.xml | 42 +- tools/texts-ku.xml | 8 + tools/texts-mk.xml | 9 + tools/texts-nb.xml | 8 + tools/texts-nl.xml | 62 +++ tools/texts-nn.xml | 9 + tools/texts-pl.xml | 14 + tools/texts-pt.xml | 21 +- tools/texts-ro.xml | 24 + tools/texts-ru.xml | 65 ++- tools/texts-sk.xml | 11 +- tools/{texts-content-sl.xml => texts-sl.xml} | 4 +- tools/texts-sq.xml | 60 ++- tools/texts-sr.xml | 9 + tools/texts-sv.xml | 24 +- tools/texts-tr.xml | 9 + tools/xsltsl/countries.xsl | 24 +- tools/xsltsl/events-utils.xsl | 2 +- tools/xsltsl/feeds.xsl | 55 +- tools/xsltsl/quotes.xsl | 12 +- tools/xsltsl/static-elements.xsl | 70 ++- tools/xsltsl/tagging.xsl | 277 +++++----- tools/xsltsl/translations.xsl | 22 +- uk/uk.xsl | 15 +- 167 files changed, 2166 insertions(+), 2803 deletions(-) create mode 100644 default.xsl rename fellowship/{fellowship.xsl => default.xsl} (86%) delete mode 100644 tools/texts-content-ar.xml delete mode 100644 tools/texts-content-bg.xml delete mode 100644 tools/texts-content-ca.xml delete mode 100644 tools/texts-content-cs.xml delete mode 100644 tools/texts-content-da.xml delete mode 100644 tools/texts-content-de.xml delete mode 100644 tools/texts-content-el.xml delete mode 100644 tools/texts-content-en.xml delete mode 100644 tools/texts-content-eo.xml delete mode 100644 tools/texts-content-es.xml delete mode 100644 tools/texts-content-et.xml delete mode 100644 tools/texts-content-fi.xml delete mode 100644 tools/texts-content-fr.xml delete mode 100644 tools/texts-content-hr.xml delete mode 100644 tools/texts-content-hu.xml delete mode 100644 tools/texts-content-it.xml delete mode 100644 tools/texts-content-ku.xml delete mode 100644 tools/texts-content-mk.xml delete mode 100644 tools/texts-content-nb.xml delete mode 100644 tools/texts-content-nl.xml delete mode 100644 tools/texts-content-nn.xml delete mode 100644 tools/texts-content-pl.xml delete mode 100644 tools/texts-content-pt.xml delete mode 100644 tools/texts-content-ro.xml delete mode 100644 tools/texts-content-ru.xml delete mode 100644 tools/texts-content-sk.xml delete mode 100644 tools/texts-content-sq.xml delete mode 100644 tools/texts-content-sr.xml delete mode 100644 tools/texts-content-sv.xml delete mode 100644 tools/texts-content-tr.xml rename tools/{texts-content-sl.xml => texts-sl.xml} (86%) diff --git a/about/legal/de/de.xsl b/about/legal/de/de.xsl index c4ea8bda0a..e9e1a75e70 100644 --- a/about/legal/de/de.xsl +++ b/about/legal/de/de.xsl @@ -1,12 +1,13 @@ - + + - + @@ -15,14 +16,4 @@ - - - - - - - - - - diff --git a/about/members.xsl b/about/members.xsl index 057766c8ab..d286de953e 100644 --- a/about/members.xsl +++ b/about/members.xsl @@ -1,12 +1,13 @@ - + + - + @@ -43,14 +44,4 @@ - - - - - - - - - - diff --git a/about/printable/get_h1.xsl b/about/printable/get_h1.xsl index 073b48e179..089285db11 100644 --- a/about/printable/get_h1.xsl +++ b/about/printable/get_h1.xsl @@ -9,8 +9,4 @@ - - - - - - diff --git a/about/printable/get_moreinfo.xsl b/about/printable/get_moreinfo.xsl index 059ff4cb88..a820ae2871 100644 --- a/about/printable/get_moreinfo.xsl +++ b/about/printable/get_moreinfo.xsl @@ -6,8 +6,4 @@ - - - - diff --git a/about/printable/printable.xsl b/about/printable/printable.xsl index dee74d9b39..e9bc429302 100644 --- a/about/printable/printable.xsl +++ b/about/printable/printable.xsl @@ -1,7 +1,8 @@ - + + @@ -12,7 +13,7 @@ - + @@ -20,8 +21,8 @@ - - + + @@ -127,15 +128,5 @@ - - - - - - - - - - diff --git a/about/team.xsl b/about/team.xsl index 2bb43688f8..2a3afd117e 100644 --- a/about/team.xsl +++ b/about/team.xsl @@ -3,7 +3,8 @@ - + + - - - - - - - - diff --git a/activities/ftf/avm-gpl-violation.xsl b/activities/ftf/avm-gpl-violation.xsl index 134b9c6d4b..eaee824a69 100644 --- a/activities/ftf/avm-gpl-violation.xsl +++ b/activities/ftf/avm-gpl-violation.xsl @@ -4,10 +4,11 @@ - + + - + @@ -17,15 +18,4 @@ - - - - - - - - - - - diff --git a/activities/map/de/de.xsl b/activities/map/de/de.xsl index 12417b59ce..9b115ab988 100644 --- a/activities/map/de/de.xsl +++ b/activities/map/de/de.xsl @@ -1,26 +1,17 @@ - + + - + - - - - - - - - - - diff --git a/activities/os/os.xsl b/activities/os/os.xsl index cb129d08a4..c2377f65d9 100644 --- a/activities/os/os.xsl +++ b/activities/os/os.xsl @@ -4,7 +4,8 @@ - + + @@ -14,28 +15,16 @@ - - - - - - + [ - + ] - - - - - - - diff --git a/activities/wipo/wipo.xsl b/activities/wipo/wipo.xsl index d5d845f38e..43a059c968 100644 --- a/activities/wipo/wipo.xsl +++ b/activities/wipo/wipo.xsl @@ -1,12 +1,13 @@ - + + - + @@ -38,14 +39,4 @@ - - - - - - - - - - diff --git a/activities/wipo/wiwo.de.xhtml b/activities/wipo/wiwo.de.xhtml index 5b3901f22b..22ffa5bc45 100644 --- a/activities/wipo/wiwo.de.xhtml +++ b/activities/wipo/wiwo.de.xhtml @@ -76,19 +76,16 @@

Unterzeichner

- - Organisationen - Personen + + +

+ Wenn sie ihren Namen oder den ihrer Organisation auch in dieser Liste + sehen wollen, kontaktieren Sie bitte + web@fsfeurope.org. +

+ + - -
-

- Wenn sie ihren Namen oder den ihrer Organisation auch in dieser Liste - sehen wollen, kontaktieren Sie bitte - web@fsfeurope.org. -

-
- $Date$ $Author$ diff --git a/activities/wipo/wiwo.el.xhtml b/activities/wipo/wiwo.el.xhtml index 9baff702c0..cae7dd87b2 100644 --- a/activities/wipo/wiwo.el.xhtml +++ b/activities/wipo/wiwo.el.xhtml @@ -62,18 +62,16 @@ WIPO, αλλά τι είδους οργανισμό χρειαζόμαστε γ

Συμβαλλόμενα μέρη

+ + + +

+ Αν επιθυμείτε να δείτε το όνομά σας ή το όνομα του οργανισμού σας να προστίθεται + σε αυτόν τον κατάλογο, παρακαλούμε επικοινωνήστε στο + web@fsfeurope.org. +

+ - Οργανισμοί - Άτομα - -
-

- Αν επιθυμείτε να δείτε το όνομά σας ή το όνομα του οργανισμού σας να προστίθεται - σε αυτόν τον κατάλογο, παρακαλούμε επικοινωνήστε στο - web@fsfeurope.org. -

-
- $Date$ $Author$ diff --git a/activities/wipo/wiwo.en.xhtml b/activities/wipo/wiwo.en.xhtml index 9fd73a06a9..b5236bd2cf 100644 --- a/activities/wipo/wiwo.en.xhtml +++ b/activities/wipo/wiwo.en.xhtml @@ -75,19 +75,16 @@

Signatories

- - - Organisations - Individuals - -
-

- If you wish to see your name or the name of your organisation - added to this list, please contact web@fsfeurope.org. + + + +

+ If you wish to see your name or the name of your organisation + added to this list, please contact web@fsfeurope.org.

-
- + + $Date$ $Author$ - + @@ -145,15 +146,5 @@ - - - - - - - - - - diff --git a/campaigns/askyourcandidates/askyourcandidates.xsl b/campaigns/askyourcandidates/askyourcandidates.xsl index 68498236c1..52b2d21068 100755 --- a/campaigns/askyourcandidates/askyourcandidates.xsl +++ b/campaigns/askyourcandidates/askyourcandidates.xsl @@ -4,7 +4,8 @@ - + + @@ -14,28 +15,16 @@ - - - - - - + [ - + ] - - - - - - - diff --git a/campaigns/finished.xsl b/campaigns/finished.xsl index 88ee1b6d81..f13caa622c 100644 --- a/campaigns/finished.xsl +++ b/campaigns/finished.xsl @@ -1,11 +1,12 @@ - + + - + @@ -26,14 +27,4 @@ - - - - - - - - - - diff --git a/campaigns/ilovefs/2012/ilovefs.xsl b/campaigns/ilovefs/2012/ilovefs.xsl index 27d8b67045..0ccbd3862b 100755 --- a/campaigns/ilovefs/2012/ilovefs.xsl +++ b/campaigns/ilovefs/2012/ilovefs.xsl @@ -4,7 +4,8 @@ - + + @@ -14,28 +15,16 @@ - - - - - - + [ - + ] - - - - - - - diff --git a/campaigns/ilovefs/2012/unperfekthaus.xsl b/campaigns/ilovefs/2012/unperfekthaus.xsl index 27d8b67045..0ccbd3862b 100755 --- a/campaigns/ilovefs/2012/unperfekthaus.xsl +++ b/campaigns/ilovefs/2012/unperfekthaus.xsl @@ -4,7 +4,8 @@ - + + @@ -14,28 +15,16 @@ - - - - - - + [ - + ] - - - - - - - diff --git a/campaigns/inactive.xsl b/campaigns/inactive.xsl index bcafa0cf56..7d6819c958 100644 --- a/campaigns/inactive.xsl +++ b/campaigns/inactive.xsl @@ -1,11 +1,12 @@ - + + - + @@ -26,14 +27,4 @@ - - - - - - - - - - diff --git a/campaigns/nledu/nledu.xsl b/campaigns/nledu/nledu.xsl index e9fd4de476..d4e024ee6c 100755 --- a/campaigns/nledu/nledu.xsl +++ b/campaigns/nledu/nledu.xsl @@ -4,7 +4,8 @@ - + + @@ -14,28 +15,16 @@ - - - - - - + [ - + ] - - - - - - - diff --git a/campaigns/pdfreaders/buglist.xsl b/campaigns/pdfreaders/buglist.xsl index 9210b35677..54fd01a754 100644 --- a/campaigns/pdfreaders/buglist.xsl +++ b/campaigns/pdfreaders/buglist.xsl @@ -1,11 +1,12 @@ - + + - + @@ -18,7 +19,7 @@ # - + @@ -29,11 +30,11 @@ - + - + @@ -49,18 +50,18 @@ - + - - + @@ -72,24 +73,24 @@ - - - + + + (/ = %) - - - - - - - - - + + + + + + + + + @@ -103,7 +104,7 @@ - + @@ -121,19 +122,19 @@ - - - - - - - - - diff --git a/campaigns/pdfreaders/pdfreaders.xsl b/campaigns/pdfreaders/pdfreaders.xsl index 1484a33e5c..082aaa98d4 100644 --- a/campaigns/pdfreaders/pdfreaders.xsl +++ b/campaigns/pdfreaders/pdfreaders.xsl @@ -1,23 +1,24 @@ - + + - + - + - + - + @@ -26,20 +27,20 @@ - + - - - - - - - - + + + + + + + + @@ -52,7 +53,7 @@ - + @@ -67,14 +68,4 @@ - - - - - - - - - - diff --git a/campaigns/pdfreaders/petition.xsl b/campaigns/pdfreaders/petition.xsl index 1c4c8f10f5..97d8fa24b4 100644 --- a/campaigns/pdfreaders/petition.xsl +++ b/campaigns/pdfreaders/petition.xsl @@ -5,64 +5,46 @@ - + + - - - - - - - - + -

- - () +

+ + ()

    - +
-

- - () +

+ + ()

    - +
-

- - () +

+ + ()

    - +
- - + - - - - - - - - diff --git a/campaigns/projects.xsl b/campaigns/projects.xsl index d08ff885b9..04e4b62901 100644 --- a/campaigns/projects.xsl +++ b/campaigns/projects.xsl @@ -1,11 +1,12 @@ - + + - + @@ -26,14 +27,4 @@ - - - - - - - - - - diff --git a/campaigns/swpat/documents.xsl b/campaigns/swpat/documents.xsl index d5d845f38e..43a059c968 100644 --- a/campaigns/swpat/documents.xsl +++ b/campaigns/swpat/documents.xsl @@ -1,12 +1,13 @@ - + + - + @@ -38,14 +39,4 @@ - - - - - - - - - - diff --git a/campaigns/swpat/memorandum.de.xhtml b/campaigns/swpat/memorandum.de.xhtml index e74adcedef..dbe70c4ac7 100644 --- a/campaigns/swpat/memorandum.de.xhtml +++ b/campaigns/swpat/memorandum.de.xhtml @@ -91,17 +91,16 @@ erlaubt, jedoch Softwarepatentierung eindeutig verhindert.

Prsident
Free Software Foundation Europe (FSFE)

-

- Wenn sie ihren Namen, oder den ihrer Organisation auf dieser - Listen hinzufgen mchten, kontaktieren sie bitte - web@fsfeurope.org. -

+

+ Wenn sie ihren Namen, oder den ihrer Organisation auf dieser + Listen hinzufgen mchten, kontaktieren sie bitte + web@fsfeurope.org. +

+ + - Organisationen - Privatpersonen - $Date$ $Author$ diff --git a/campaigns/swpat/memorandum.el.xhtml b/campaigns/swpat/memorandum.el.xhtml index 7f1466bb31..d6ebb2e1dc 100644 --- a/campaigns/swpat/memorandum.el.xhtml +++ b/campaigns/swpat/memorandum.el.xhtml @@ -89,18 +89,17 @@ Πρόεδρος
Ευρωπαϊκό Ίδρυμα Ελεύθερου Λογισμικού (FSFE)

-

- Αν επιθυμείτε να δείτε το όνομά σας ή το όνομα του οργανισμού στον - οποίο ανήκετε, να προστίθεται σε αυτόν τον κατάλογο, παρακαλούμε - επικοινωνήστε με τη διεύθυνση - web@fsfeurope.org. -

+

+ Αν επιθυμείτε να δείτε το όνομά σας ή το όνομα του οργανισμού στον + οποίο ανήκετε, να προστίθεται σε αυτόν τον κατάλογο, παρακαλούμε + επικοινωνήστε με τη διεύθυνση + web@fsfeurope.org. +

+ + - Οργανισμοί - Άτομα - $Date$ $Author$ diff --git a/campaigns/swpat/memorandum.en.xhtml b/campaigns/swpat/memorandum.en.xhtml index 09534c46e3..90f350aeef 100644 --- a/campaigns/swpat/memorandum.en.xhtml +++ b/campaigns/swpat/memorandum.en.xhtml @@ -84,17 +84,16 @@ prevents software patenting.

President
Free Software Foundation Europe (FSFE)

-

- If you wish to see your name or the name of your organisation added - to this list, please contact - web@fsfeurope.org. -

+

+ If you wish to see your name or the name of your organisation added + to this list, please contact + web@fsfeurope.org. +

+ + - Organisations - Individuals - $Date$ $Author$ diff --git a/campaigns/swpat/memorandum.it.xhtml b/campaigns/swpat/memorandum.it.xhtml index 78406bf365..cb2da31884 100644 --- a/campaigns/swpat/memorandum.it.xhtml +++ b/campaigns/swpat/memorandum.it.xhtml @@ -107,16 +107,15 @@ esplicitamente la brevettabilit Presidente
Free Software Foundation Europe (FSFE)

-

- Se volete aggiungere ai firmatari il vostro nome, o quello della vostra organizzazione, - contattate web@fsfeurope.org. -

+

+ Se volete aggiungere ai firmatari il vostro nome, o quello della vostra organizzazione, + contattate web@fsfeurope.org. +

+ + - Organizzazioni - Individui - $Date$ $Author$ diff --git a/campaigns/swpat/memorandum.xsl b/campaigns/swpat/memorandum.xsl index 65c215edc6..67c35eaebf 100644 --- a/campaigns/swpat/memorandum.xsl +++ b/campaigns/swpat/memorandum.xsl @@ -3,39 +3,22 @@ - + + - - - - - - - - - -
+ + +
+
    - +
- +
    - -
- - + + +
- - - - - - - - diff --git a/campaigns/valentine/2011/valentine-2011.xsl b/campaigns/valentine/2011/valentine-2011.xsl index 82fe2d4536..45f6c01ec3 100644 --- a/campaigns/valentine/2011/valentine-2011.xsl +++ b/campaigns/valentine/2011/valentine-2011.xsl @@ -4,7 +4,8 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:dt="http://xsltsl.org/date-time"> - + + - - - - - - - - - - diff --git a/contact/local.en.xml b/contact/local.en.xml index 5c1edec55e..57c2a00544 100644 --- a/contact/local.en.xml +++ b/contact/local.en.xml @@ -4,7 +4,7 @@ -/at + /at austria@fsfeurope.org diff --git a/contact/local.xsl b/contact/local.xsl index b65222593f..7a53236fe5 100644 --- a/contact/local.xsl +++ b/contact/local.xsl @@ -1,11 +1,12 @@ - + + - + @@ -13,31 +14,32 @@ - - - +

+ + +

- - - - - - Team Homepage - - + + + + + + Team Homepage + + - + - + @@ -52,7 +54,7 @@ - + @@ -61,7 +63,7 @@ - + @@ -70,30 +72,30 @@ - - + + - + , - - - - - - - - - - - - - + + + + + + + + + + + + + - + @@ -101,15 +103,4 @@ - - - - - - - - - - - diff --git a/de/de.xsl b/de/de.xsl index b20727a4b8..122d3a84dc 100644 --- a/de/de.xsl +++ b/de/de.xsl @@ -7,7 +7,8 @@ - + + - + @@ -145,15 +146,5 @@ - - - - - - - - - - diff --git a/default.xsl b/default.xsl new file mode 100644 index 0000000000..ed1832da72 --- /dev/null +++ b/default.xsl @@ -0,0 +1,11 @@ + + + + + + + + diff --git a/documents/documents.xsl b/documents/documents.xsl index 67adfcddf9..2144a1821c 100644 --- a/documents/documents.xsl +++ b/documents/documents.xsl @@ -1,13 +1,14 @@ - + + - + @@ -39,14 +40,4 @@ - - - - - - - - - - diff --git a/documents/whyfs.xsl b/documents/whyfs.xsl index ec6fc6833c..01d25924c4 100644 --- a/documents/whyfs.xsl +++ b/documents/whyfs.xsl @@ -3,22 +3,11 @@ - + + - - - - - - - - - - + diff --git a/donate/thankgnus-2001.xsl b/donate/thankgnus-2001.xsl index 292061bccd..bb74872a91 100644 --- a/donate/thankgnus-2001.xsl +++ b/donate/thankgnus-2001.xsl @@ -1,7 +1,8 @@ - + + @@ -9,7 +10,7 @@ - + @@ -26,7 +27,7 @@ - + @@ -35,15 +36,5 @@ - - - - - - - - - - diff --git a/donate/thankgnus-2002.xsl b/donate/thankgnus-2002.xsl index 292061bccd..bb74872a91 100644 --- a/donate/thankgnus-2002.xsl +++ b/donate/thankgnus-2002.xsl @@ -1,7 +1,8 @@ - + + @@ -9,7 +10,7 @@ - + @@ -26,7 +27,7 @@ - + @@ -35,15 +36,5 @@ - - - - - - - - - - diff --git a/donate/thankgnus-2003.xsl b/donate/thankgnus-2003.xsl index 292061bccd..bb74872a91 100644 --- a/donate/thankgnus-2003.xsl +++ b/donate/thankgnus-2003.xsl @@ -1,7 +1,8 @@ - + + @@ -9,7 +10,7 @@ - + @@ -26,7 +27,7 @@ - + @@ -35,15 +36,5 @@ - - - - - - - - - - diff --git a/donate/thankgnus-2004.xsl b/donate/thankgnus-2004.xsl index 292061bccd..bb74872a91 100644 --- a/donate/thankgnus-2004.xsl +++ b/donate/thankgnus-2004.xsl @@ -1,7 +1,8 @@ - + + @@ -9,7 +10,7 @@ - + @@ -26,7 +27,7 @@ - + @@ -35,15 +36,5 @@ - - - - - - - - - - diff --git a/donate/thankgnus-2005.xsl b/donate/thankgnus-2005.xsl index 292061bccd..bb74872a91 100644 --- a/donate/thankgnus-2005.xsl +++ b/donate/thankgnus-2005.xsl @@ -1,7 +1,8 @@ - + + @@ -9,7 +10,7 @@ - + @@ -26,7 +27,7 @@ - + @@ -35,15 +36,5 @@ - - - - - - - - - - diff --git a/donate/thankgnus-2006.xsl b/donate/thankgnus-2006.xsl index 292061bccd..bb74872a91 100644 --- a/donate/thankgnus-2006.xsl +++ b/donate/thankgnus-2006.xsl @@ -1,7 +1,8 @@ - + + @@ -9,7 +10,7 @@ - + @@ -26,7 +27,7 @@ - + @@ -35,15 +36,5 @@ - - - - - - - - - - diff --git a/donate/thankgnus-2007.xsl b/donate/thankgnus-2007.xsl index 292061bccd..bb74872a91 100644 --- a/donate/thankgnus-2007.xsl +++ b/donate/thankgnus-2007.xsl @@ -1,7 +1,8 @@ - + + @@ -9,7 +10,7 @@ - + @@ -26,7 +27,7 @@ - + @@ -35,15 +36,5 @@ - - - - - - - - - - diff --git a/donate/thankgnus-2008.xsl b/donate/thankgnus-2008.xsl index 292061bccd..bb74872a91 100644 --- a/donate/thankgnus-2008.xsl +++ b/donate/thankgnus-2008.xsl @@ -1,7 +1,8 @@ - + + @@ -9,7 +10,7 @@ - + @@ -26,7 +27,7 @@ - + @@ -35,15 +36,5 @@ - - - - - - - - - - diff --git a/donate/thankgnus-2009.xsl b/donate/thankgnus-2009.xsl index 292061bccd..bb74872a91 100644 --- a/donate/thankgnus-2009.xsl +++ b/donate/thankgnus-2009.xsl @@ -1,7 +1,8 @@ - + + @@ -9,7 +10,7 @@ - + @@ -26,7 +27,7 @@ - + @@ -35,15 +36,5 @@ - - - - - - - - - - diff --git a/donate/thankgnus-2010.xsl b/donate/thankgnus-2010.xsl index 292061bccd..bb74872a91 100644 --- a/donate/thankgnus-2010.xsl +++ b/donate/thankgnus-2010.xsl @@ -1,7 +1,8 @@ - + + @@ -9,7 +10,7 @@ - + @@ -26,7 +27,7 @@ - + @@ -35,15 +36,5 @@ - - - - - - - - - - diff --git a/donate/thankgnus-2011.xsl b/donate/thankgnus-2011.xsl index 292061bccd..bb74872a91 100644 --- a/donate/thankgnus-2011.xsl +++ b/donate/thankgnus-2011.xsl @@ -1,7 +1,8 @@ - + + @@ -9,7 +10,7 @@ - + @@ -26,7 +27,7 @@ - + @@ -35,15 +36,5 @@ - - - - - - - - - - diff --git a/donate/thankgnus-2012.xsl b/donate/thankgnus-2012.xsl index 292061bccd..bb74872a91 100644 --- a/donate/thankgnus-2012.xsl +++ b/donate/thankgnus-2012.xsl @@ -1,7 +1,8 @@ - + + @@ -9,7 +10,7 @@ - + @@ -26,7 +27,7 @@ - + @@ -35,15 +36,5 @@ - - - - - - - - - - diff --git a/donate/thankgnus.xsl b/donate/thankgnus.xsl index 26fd6f70b0..ef77f561b9 100644 --- a/donate/thankgnus.xsl +++ b/donate/thankgnus.xsl @@ -1,11 +1,12 @@ - + + - + @@ -20,7 +21,7 @@ patrons - + @@ -38,7 +39,7 @@ - + @@ -48,15 +49,5 @@ - - - - - - - - - - diff --git a/events/events.ics.xsl b/events/events.ics.xsl index 30ac99e520..9a9a037b13 100644 --- a/events/events.ics.xsl +++ b/events/events.ics.xsl @@ -53,16 +53,16 @@ - + BEGIN:VCALENDAR VERSION:2.0 PRODID:fsfe.org/events/events.ics.xsl - + - diff --git a/events/events.rss.xsl b/events/events.rss.xsl index 7f2ce3e3ad..940a04a403 100644 --- a/events/events.rss.xsl +++ b/events/events.rss.xsl @@ -11,7 +11,7 @@ - + @@ -47,7 +47,7 @@ - diff --git a/events/events.xsl b/events/events.xsl index 359bec261a..854aba61ec 100644 --- a/events/events.xsl +++ b/events/events.xsl @@ -5,7 +5,8 @@ xmlns:dt="http://xsltsl.org/date-time"> - + + - - - - - - - - - - - - - - - + + + + + stylesheet + /look/leaflet.css + + + text/javascript + /scripts/leaflet.js + + + text/javascript + /scripts/map.js + + - - + @@ -61,18 +62,6 @@ - - - - - - - - - - - - diff --git a/fellowship/fellowship.xsl b/fellowship/default.xsl similarity index 86% rename from fellowship/fellowship.xsl rename to fellowship/default.xsl index 837f10f5aa..06c1fdecb0 100644 --- a/fellowship/fellowship.xsl +++ b/fellowship/default.xsl @@ -9,8 +9,8 @@ - - + + @@ -22,7 +22,9 @@ rtl - + + + @@ -232,8 +234,8 @@ - - + + https://fsfe.org @@ -315,126 +317,126 @@ sidebar - + - menu - - + menu + + - - - fellowship + + + fellowship - - /fellowship/ - - + + /fellowship/ + + - - + + - - - + + + - - - - - + + + + + selected - + - - - - - - - - - - - - - - - fsfe + + + + + + + + + + + + + + + fsfe - - / - FSFE - + + / + FSFE + - - + + - - - - - + + + + + - - - - + + + + - - - - selected - - - + + + + selected + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - planet - - http://planet.fsfe.org/ - - - - - + + + planet + + http://planet.fsfe.org/ + + + + + - - - wiki - - http://wiki.fsfe.org/ - Wiki - - - + + + wiki + + http://wiki.fsfe.org/ + Wiki + + + - - + + search @@ -669,7 +671,7 @@ - + @@ -691,7 +693,7 @@ Copyright © 2001-2011 Free Software Foundation Europe. - + .

@@ -771,21 +773,21 @@ - - - + + + - + diff --git a/fellowship/index.xsl b/fellowship/index.xsl index 0ec775bc92..fa6425cf45 100644 --- a/fellowship/index.xsl +++ b/fellowship/index.xsl @@ -1,38 +1,13 @@ - + + - - - - /look/fellowship.css - stylesheet - - - - - - - + - -
- - - - - - - - - diff --git a/fi/fi.xsl b/fi/fi.xsl index 44976289bb..10aee528c6 100644 --- a/fi/fi.xsl +++ b/fi/fi.xsl @@ -7,7 +7,8 @@ - + + - + @@ -145,15 +146,5 @@ - - - - - - - - - - diff --git a/fr/fr.fr.xhtml b/fr/fr.fr.xhtml index e7b88aee11..313b374763 100644 --- a/fr/fr.fr.xhtml +++ b/fr/fr.fr.xhtml @@ -40,11 +40,10 @@ soutien de la liberté logicielle." />

- Actualités RSS - identica - - - + Actualités RSS + identica + +

diff --git a/fr/fr.xsl b/fr/fr.xsl index 108a5d6b08..faeeced70c 100644 --- a/fr/fr.xsl +++ b/fr/fr.xsl @@ -7,7 +7,8 @@ - + + - + @@ -145,15 +146,5 @@ - - - - - - - - - - diff --git a/fsfe.xsl b/fsfe.xsl index 1d0da22d99..f360ed9356 100644 --- a/fsfe.xsl +++ b/fsfe.xsl @@ -1,6 +1,8 @@ - + @@ -13,8 +15,8 @@ - - + + @@ -26,138 +28,146 @@ rtl - + + + - + + - - - - - robots - - - index, follow - noindex - - - + + + + + + + + + + + robots + + + index, follow + noindex + + + - - https://www.fsfe.org - + + https://fsfe.org + + + stylesheet + all + /look/generic.css + text/css + + + stylesheet all - /look/generic.css + /look/genericv.css text/css - - - - stylesheet - all - /look/genericv.css - text/css - - - + + + + stylesheet + print + /look/print.css + text/css + + + stylesheet - print - /look/print.css + all + /look/rtl.css text/css - - - - stylesheet - all - /look/rtl.css - text/css - - - + + + + icon + + + + /graphics/fsfev.png + /graphics/fsfe.ico + + + image/x-icon + + + + alternate + FSFE + /news/news..rss + application/rss+xml + + + + alternate + FSFE + /events/events..rss + application/rss+xml + + + + - icon - - + text/html + alternate + + + ..html + + + + + + + + + + author + - /graphics/fsfev.png - /graphics/fsfe.ico + + + + + + - image/x-icon - - - - alternate - FSFE - /news/news..rss - application/rss+xml - - - - alternate - FSFE - /events/events..rss - application/rss+xml + + + + + + - - - - text/html - alternate - - - ..html - - - - - - - - - - author - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + @@ -190,7 +200,7 @@ - + @@ -379,37 +389,37 @@ - + - + - + - + - + - + @@ -429,9 +439,9 @@ - - - + + + https://fsfe.org @@ -774,19 +784,19 @@ - + - - ..html - - + + ..html + + - + @@ -803,7 +813,7 @@ - + @@ -811,29 +821,29 @@ - + - - infobox - - - - warning yellow - - - - - - - - - warning green - - - - - - + + infobox + + + + warning yellow + + + + + + + + + warning green + + + + + + - + @@ -896,60 +906,58 @@ - - - - + + + + + + + cc-licenses + + + + /graphics/cc-logo.png + Creative Commons logo + + + • + + + + + + +