diff --git a/Makefile b/Makefile index 9328b472a9..947acbeb82 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,9 @@ XSLTOPTS = \ '$$fsf=$(FSF)' \ '$$gnu=$(GNU)' -ENPAGES = $(shell find * -path 'fr' -prune -o \( -regex '.*\.en\.xhtml' -o -regex '[^\.]*\.xhtml' \) -print | sed "s/xhtml$$/html/") +ENPAGESOLD = $(shell find * -path 'fr' -prune -o -regex '[^\.]*\.xhtml' -print | sed "s/xhtml$$/html/") + +ENPAGES = $(shell find * -path 'fr' -prune -o -regex '.*\.en\.xhtml' -print | sed "s/xhtml$$/html/") FRPAGES = $(shell find * -path 'fr' -prune -o -regex '.*\.fr\.xhtml' -print | sed "s/xhtml$$/html/") @@ -49,20 +51,32 @@ ESPAGES = $(shell find * -path 'fr' -prune -o -regex '.*\.es\.xhtml' -print | se # temporary, added by mad@april.org NEWS = news/news.fr.html news/news.en.html news/news.pt.html -all: $(ENPAGES) $(FRPAGES) $(DEPAGES) $(PTPAGES) $(ITPAGES) $(ESPAGES) +all: $(ENPAGESOLD) $(ENPAGES) $(FRPAGES) $(DEPAGES) $(PTPAGES) $(ITPAGES) $(ESPAGES) swpat/patents.en.html: swpat/patents-agenda.en.xml -$(ENPAGES): %.html: %.xhtml fsfe.xsl navigation.en.xsl +$(ENPAGESOLD): %.html: %.xhtml fsfe.xsl navigation.en.xsl @$(ECHO) "Building $@ ..."; \ path=$< ; \ base=`expr $$path : '\(.*\).xhtml'` ; \ filebase=`basename $$base` ; \ dir=`dirname $$path` ; \ root=`dirname $$path | perl -pe 'chop; s:([^/]+):..:g if($$_ ne ".")'` ; \ - $(XSLTPROC) fsfe.xsl $$path $(XSLTOPTS) '$$fsfeurope='$$root '$$filebase='$$filebase '$$path='$$path > $$base.html-temp && (cat $$base.html-temp | perl -p -e '$$| = 1; (s/Date://, s/Author:/by/, s/\$$//g) if(/\$$''Date:/); s/mode: xml \*\*\*/mode: html \*\*\*/' > $$base.html) ; \ + langlinks="`./tools/translate.sh $$base en`" ; \ + $(XSLTPROC) fsfe.xsl $$path $(XSLTOPTS) '$$fsfeurope='$$root '$$filebase='$$filebase '$$path='$$path '$$langlinks='"$$langlinks" > $$base.html-temp && (cat $$base.html-temp | perl -p -e '$$| = 1; (s/Date://, s/Author:/by/, s/\$$//g) if(/\$$''Date:/); s/mode: xml \*\*\*/mode: html \*\*\*/' > $$base.html) ; \ rm -f $$base.html-temp +$(ENPAGES): %.html: %.xhtml fsfe.xsl navigation.en.xsl + @$(ECHO) "Building $@ ..."; \ + path=$< ; \ + base=`expr $$path : '\(.*\).en.xhtml'` ; \ + filebase=`basename $$base` ; \ + dir=`dirname $$path` ; \ + root=`dirname $$path | perl -pe 'chop; s:([^/]+):..:g if($$_ ne ".")'` ; \ + langlinks="`./tools/translate.sh $$base en`" ; \ + $(XSLTPROC) fsfe.xsl $$path $(XSLTOPTS) '$$fsfeurope='$$root '$$filebase='$$filebase.en '$$path='$$path '$$langlinks='"$$langlinks" > $$base.en.html-temp && (cat $$base.en.html-temp | perl -p -e '$$| = 1; (s/Date://, s/Author:/by/, s/\$$//g) if(/\$$''Date:/); s/mode: xml \*\*\*/mode: html \*\*\*/' > $$base.en.html) ; \ + rm -f $$base.en.html-temp + $(FRPAGES): %.html: %.xhtml fsfe.xsl navigation.fr.xsl @$(ECHO) "Building $@ ..."; \ path=$< ; \ diff --git a/about/about.xhtml b/about/about.xhtml index acb18241b3..fe3ea47c64 100644 --- a/about/about.xhtml +++ b/about/about.xhtml @@ -9,14 +9,6 @@
-
- [ - - English | - Português - ] -
-
diff --git a/background.xhtml b/background.xhtml index aea102e1dc..1392b095d6 100644 --- a/background.xhtml +++ b/background.xhtml @@ -9,16 +9,6 @@
-
- [ - - Deutsch | - English | - Français | - Português - ] -
-

Background

diff --git a/boilerplate.en.xhtml b/boilerplate.en.xhtml index cfb4f97c12..0aa4592933 100644 --- a/boilerplate.en.xhtml +++ b/boilerplate.en.xhtml @@ -9,15 +9,6 @@
-
- [ - - Deutsch | - English | - Français - ] -
-

This rocks

diff --git a/contact/contact.xhtml b/contact/contact.xhtml index b4ff10e6cc..7690633ba0 100644 --- a/contact/contact.xhtml +++ b/contact/contact.xhtml @@ -9,16 +9,6 @@
-
- [ - - Deutsch | - English | - Français | - Português - ] -
-

General Discussion

diff --git a/coposys/index.en.xhtml b/coposys/index.en.xhtml index 7f7fd28ce5..0f5b765b1f 100644 --- a/coposys/index.en.xhtml +++ b/coposys/index.en.xhtml @@ -9,13 +9,6 @@
-
- [ - - English | French - ] -
-

Here is a tool to visually represent the geographical diff --git a/de/index.en.xhtml b/de/index.en.xhtml index 36fea31a24..373d522236 100644 --- a/de/index.en.xhtml +++ b/de/index.en.xhtml @@ -9,14 +9,6 @@

-
- [ - - Deutsch | - English - ] -
-

FSF Europe - Chapter Germany

diff --git a/de/speakers/speakers.en.xhtml b/de/speakers/speakers.en.xhtml index aebf07658f..c674355951 100644 --- a/de/speakers/speakers.en.xhtml +++ b/de/speakers/speakers.en.xhtml @@ -9,14 +9,6 @@
-
- [ - - Deutsch | - English - ] -
-

Speakers

diff --git a/documents/documents.xhtml b/documents/documents.xhtml index 7c59b25969..dc5f0b20b8 100644 --- a/documents/documents.xhtml +++ b/documents/documents.xhtml @@ -9,16 +9,6 @@
-
- [ - - Deutsch | - English | - Français | - Português - ] -
-

Documents

diff --git a/documents/doi.xhtml b/documents/doi.xhtml index fad8f59119..766e6dd66b 100644 --- a/documents/doi.xhtml +++ b/documents/doi.xhtml @@ -9,16 +9,6 @@
-
- [ - - Deutsch | - English | - Français | - Português - ] -
-

Declaration of Intent - Free Software Foundation Europe

diff --git a/documents/freesoftware.xhtml b/documents/freesoftware.xhtml index 9f6ccb43a1..eacfde5e62 100644 --- a/documents/freesoftware.xhtml +++ b/documents/freesoftware.xhtml @@ -9,16 +9,6 @@
-
- [ - - Deutsch | - English | - Français | - Português - ] -
-

What is Free Software?

diff --git a/documents/gnuproject.xhtml b/documents/gnuproject.xhtml index c9f287e908..47af65eb43 100644 --- a/documents/gnuproject.xhtml +++ b/documents/gnuproject.xhtml @@ -9,16 +9,6 @@
-
- [ - - Deutsch | - English | - Français | - Português - ] -
-

What is the GNU-Project?

diff --git a/documents/preamble.xhtml b/documents/preamble.xhtml index 9904162291..5a34769ae8 100644 --- a/documents/preamble.xhtml +++ b/documents/preamble.xhtml @@ -9,16 +9,6 @@
-
- [ - - Deutsch | - English | - Français | - Português - ] -
-

Preamble of the Free Software Foundation Europe

diff --git a/documents/whatwedo.xhtml b/documents/whatwedo.xhtml index 18092e59ba..4d8e312ee0 100644 --- a/documents/whatwedo.xhtml +++ b/documents/whatwedo.xhtml @@ -9,15 +9,6 @@
-
- [ - - Deutsch | - English | - Português - ] -
-

What do we do?

diff --git a/documents/whyfs-howto.en.xhtml b/documents/whyfs-howto.en.xhtml index 80642fec9f..84078c229b 100644 --- a/documents/whyfs-howto.en.xhtml +++ b/documents/whyfs-howto.en.xhtml @@ -9,15 +9,6 @@
-
- [ - - Deutsch | - English | - Français - ] -
-

We speak about Free Software

diff --git a/documents/whyfs.en.xhtml b/documents/whyfs.en.xhtml index 7766ad9273..ac8f2dacf3 100644 --- a/documents/whyfs.en.xhtml +++ b/documents/whyfs.en.xhtml @@ -10,18 +10,6 @@
-
- [ - - Deutsch | - English | - Español | - Français | - Italiano | - Português - ] -
-

We speak about Free Software

diff --git a/documents/whyweexist.xhtml b/documents/whyweexist.xhtml index 26a8002430..b738465500 100644 --- a/documents/whyweexist.xhtml +++ b/documents/whyweexist.xhtml @@ -9,15 +9,6 @@
-
- [ - - Deutsch | - English | - Português - ] -
-

Why do we exist?

diff --git a/education/argumentation.xhtml b/education/argumentation.xhtml index 3cecd37a58..f25ce6673b 100644 --- a/education/argumentation.xhtml +++ b/education/argumentation.xhtml @@ -9,16 +9,6 @@
-
- [ - - Deutsch | - English | - Français - ] -
-

Why give precedence to Free Software at school?

diff --git a/education/education.xhtml b/education/education.xhtml index d2c53f8199..8319b5801e 100644 --- a/education/education.xhtml +++ b/education/education.xhtml @@ -9,16 +9,6 @@
-
- [ - - Deutsch | - English | - Français - ] -
-

Education

diff --git a/events/Systems-2001/index.en.xhtml b/events/Systems-2001/index.en.xhtml index 6b08a5753f..c500ceac35 100644 --- a/events/Systems-2001/index.en.xhtml +++ b/events/Systems-2001/index.en.xhtml @@ -9,14 +9,6 @@
-
- [ - - Deutsch | - English - ] -
-

FSF Europe on the Systems 2001

diff --git a/events/Systems-2001/rupp/index.en.xhtml b/events/Systems-2001/rupp/index.en.xhtml index 6a927c5b3d..a98cc63551 100644 --- a/events/Systems-2001/rupp/index.en.xhtml +++ b/events/Systems-2001/rupp/index.en.xhtml @@ -9,14 +9,6 @@
-
- [ - - Deutsch | - English - ] -
-

FSF Europe on the Systems 2001

diff --git a/events/events.en.xhtml b/events/events.en.xhtml index d95f30905f..7c69b452d6 100644 --- a/events/events.en.xhtml +++ b/events/events.en.xhtml @@ -9,15 +9,6 @@
-
- [ - - Deutsch | - English | - Français - ] -
-

Future and planned events

diff --git a/events/passed-2001.en.xhtml b/events/passed-2001.en.xhtml index 927dd155c8..d91492ff66 100644 --- a/events/passed-2001.en.xhtml +++ b/events/passed-2001.en.xhtml @@ -9,15 +9,6 @@
-
- [ - - Deutsch | - English | - Français - ] -
-

Passed events

diff --git a/fr/eucd/eucd-fs.en.xhtml b/fr/eucd/eucd-fs.en.xhtml index 42ed2777b9..692f6a9d26 100644 --- a/fr/eucd/eucd-fs.en.xhtml +++ b/fr/eucd/eucd-fs.en.xhtml @@ -9,15 +9,6 @@
-
- [ - - English | - Español | - Français | - ] -
-

Copyright Extensions threaten Free Software in Europe

diff --git a/fr/eucd/eucd.en.xhtml b/fr/eucd/eucd.en.xhtml index f500aed65a..3ddf6ebe0b 100644 --- a/fr/eucd/eucd.en.xhtml +++ b/fr/eucd/eucd.en.xhtml @@ -9,13 +9,6 @@
-
- [ - - English - ] -
-

EUCD - Copyright extensions that harm

diff --git a/gbn/index.xhtml b/gbn/index.xhtml index ba9538197e..9365736425 100644 --- a/gbn/index.xhtml +++ b/gbn/index.xhtml @@ -9,15 +9,6 @@
-
- [ - Deutsch | - English | - Français | - Português - ] -
-

GNU Business Network

diff --git a/help/donate-2001.xhtml b/help/donate-2001.xhtml index 4c2a22c970..da7e627da2 100644 --- a/help/donate-2001.xhtml +++ b/help/donate-2001.xhtml @@ -9,15 +9,6 @@
-
- [ - - Deutsch | - English | - Italiano - ] -
-

Donations to the FSF Europe

diff --git a/help/donate-2002.xhtml b/help/donate-2002.xhtml index 377450e273..26d4b33ac8 100644 --- a/help/donate-2002.xhtml +++ b/help/donate-2002.xhtml @@ -9,14 +9,6 @@
-
- [ - - Deutsch | - English - ] -
-

Donations to the FSF Europe

diff --git a/help/help.xhtml b/help/help.xhtml index ea93c21be0..9d8052ed68 100644 --- a/help/help.xhtml +++ b/help/help.xhtml @@ -9,16 +9,6 @@
-
- [ - - Deutsch | - English | - Italiano | - Português - ] -
-

How can you help us?

diff --git a/help/thankgnus-2001.xhtml b/help/thankgnus-2001.xhtml index 79a39b16b8..51a0d1f2db 100644 --- a/help/thankgnus-2001.xhtml +++ b/help/thankgnus-2001.xhtml @@ -9,15 +9,6 @@
-
- [ - - Deutsch | - English - Italiano - ] -
-
[ diff --git a/help/thankgnus-2002.xhtml b/help/thankgnus-2002.xhtml index c67c70aa9f..135350113f 100644 --- a/help/thankgnus-2002.xhtml +++ b/help/thankgnus-2002.xhtml @@ -13,15 +13,6 @@
-
- [ - - Deutsch | - English | - Italiano - ] -
-
[ diff --git a/index.xhtml b/index.xhtml index 6a565c0cfb..e60475a472 100644 --- a/index.xhtml +++ b/index.xhtml @@ -9,18 +9,6 @@
-
- [ - - Deutsch | - English | - Español | - Français | - Italiano | - Português - ] -
-

Free Software Foundation Europe

diff --git a/law/law.en.xhtml b/law/law.en.xhtml index ce1d783109..c8aaa5fa44 100644 --- a/law/law.en.xhtml +++ b/law/law.en.xhtml @@ -9,16 +9,6 @@
-
- [ - - Deutsch | - English | - Français | - Português - ] -
-

Secure Free Software in Europe

diff --git a/mailman/index.xhtml b/mailman/index.xhtml index 205616e7e7..77aaab1167 100644 --- a/mailman/index.xhtml +++ b/mailman/index.xhtml @@ -9,16 +9,6 @@
-
- [ - - Deutsch | - English | - Français | - Português - ] -
-

About the Mailing Lists

diff --git a/navigation.en.xsl b/navigation.en.xsl index 952213edd0..81a41ebfcc 100644 --- a/navigation.en.xsl +++ b/navigation.en.xsl @@ -48,6 +48,9 @@

+
+ +
diff --git a/news/article2001-08-23-01.en.xhtml b/news/article2001-08-23-01.en.xhtml index d6f96c6dd2..9c6d9aa6ad 100644 --- a/news/article2001-08-23-01.en.xhtml +++ b/news/article2001-08-23-01.en.xhtml @@ -8,17 +8,6 @@
-
- [ - - Deutsch | - English | - Español | - Français | - Italian | - Português - ] -

Free Software Experts

diff --git a/news/article2001-10-01-01.en.xhtml b/news/article2001-10-01-01.en.xhtml index 22dc7490c7..f6108949a3 100644 --- a/news/article2001-10-01-01.en.xhtml +++ b/news/article2001-10-01-01.en.xhtml @@ -8,13 +8,6 @@
-
- [ - - Deutsch | - English - ] -

diff --git a/news/article2001-10-20-01.en.xhtml b/news/article2001-10-20-01.en.xhtml index 1a93d0b92d..217cbcc276 100644 --- a/news/article2001-10-20-01.en.xhtml +++ b/news/article2001-10-20-01.en.xhtml @@ -8,16 +8,6 @@
-
- [ - - Deutsch | - English | - Español | - Français | - Português - ] -

SourceForge drifting

diff --git a/news/article2001-10-26-01.en.xhtml b/news/article2001-10-26-01.en.xhtml index f550818515..80e4d40dd8 100644 --- a/news/article2001-10-26-01.en.xhtml +++ b/news/article2001-10-26-01.en.xhtml @@ -8,13 +8,6 @@
-
- [ - - English | - Español - ] -

Free Software in Portugal

diff --git a/news/article2001-12-17-01.en.xhtml b/news/article2001-12-17-01.en.xhtml index 52cfc24166..0db21c47ce 100644 --- a/news/article2001-12-17-01.en.xhtml +++ b/news/article2001-12-17-01.en.xhtml @@ -8,14 +8,6 @@
-
- [ - - English | - Português - ] -
-
diff --git a/news/article2002-01-18-01.en.xhtml b/news/article2002-01-18-01.en.xhtml index fcf9aef2e0..bea237bd73 100644 --- a/news/article2002-01-18-01.en.xhtml +++ b/news/article2002-01-18-01.en.xhtml @@ -8,16 +8,6 @@
-
- [ - - English | - Español | - Français | - Português - ] -
-
diff --git a/news/article2002-01-31-01.en.xhtml b/news/article2002-01-31-01.en.xhtml index d3b7d7ca29..b285750797 100644 --- a/news/article2002-01-31-01.en.xhtml +++ b/news/article2002-01-31-01.en.xhtml @@ -9,13 +9,6 @@
-
- [ - - English - ] -
-
diff --git a/news/news.xhtml b/news/news.xhtml index 6f5de9264c..9e95856f35 100644 --- a/news/news.xhtml +++ b/news/news.xhtml @@ -9,16 +9,6 @@
-
- [ - - Deutsch | - English | - Français | - Português - ] -
-
diff --git a/press/index.xhtml b/press/index.xhtml index ab7a6ad87c..8815a3344e 100644 --- a/press/index.xhtml +++ b/press/index.xhtml @@ -9,16 +9,6 @@
-
- [ - - Deutsch | - English | - Français | - Português - ] -
-

Press Contact

diff --git a/server/index.xhtml b/server/index.xhtml index 1c6c3463ec..50476ea2ae 100644 --- a/server/index.xhtml +++ b/server/index.xhtml @@ -9,7 +9,6 @@
-

WebAdministration

diff --git a/speakers/speakers.xhtml b/speakers/speakers.xhtml index 52afc6a37f..cba7b0f575 100644 --- a/speakers/speakers.xhtml +++ b/speakers/speakers.xhtml @@ -9,16 +9,6 @@
-
- [ - - Deutsch | - English | - Français - ] -
-

Speakers

diff --git a/swpat/patents.en.xhtml b/swpat/patents.en.xhtml index 2967f1474a..c3940308c2 100644 --- a/swpat/patents.en.xhtml +++ b/swpat/patents.en.xhtml @@ -10,13 +10,6 @@
-
- [ - - English - ] -
- This agenda lists events that involve a relation between the european or government officials and the european citizens on the subject of Software Patents. It deliberatly omits events diff --git a/swpat/swpat.en.xhtml b/swpat/swpat.en.xhtml index e2779f3e4e..a0cdbe172c 100644 --- a/swpat/swpat.en.xhtml +++ b/swpat/swpat.en.xhtml @@ -9,13 +9,6 @@
-
- [ - - English - ] -
-

Software Patents in Europe