FSFE/fsfe-website
32
33
Fork 99
Code Issues 67 Pull Requests 19 Wiki Activity

JG fixes selected from english-03.patch sent to ml

Browse Source 
svn path=/trunk/; revision=3537
This commit is contained in:
slef
2003-08-21 23:45:38 +00:00
parent 0f9db719a9
commit 2afc36261a
6 changed files with 49 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
about/graphics/graphics.en.xhtml
+5 -5
View File
@@ -4,19 +4,19 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html lang="en">
<head>
<title>FSF Europe - Graphics &amp; Artworks</title>
<title>FSF Europe - Graphics &amp; Artwork</title>
</head>
<body>
<div> <!-- The header will be inserted here -->
<!-- Begin page content -->
<h1>Graphics &amp; Artworks</h1>
<h1>Graphics &amp; Artwork</h1>
<h3>Sponsoring Buttons</h3>
<p>In order to give <a href="/help/thankgnus.html">donors</a> of
the FSF Europe the possibility to publicly announce their contribution, the FSF Europe provides &quot;sponsoring buttons,&quot; which can be found at <br />
<p>In order to give the FSF Europe <a href="/help/thankgnus.html">donors</a>
the possibility to publicly announce their contribution, the FSF Europe provides &quot;sponsoring buttons,&quot; which can be found at <br />
<code><a href="/about/graphics/sponsoring/">http://fsfeurope.org/about/graphics/sponsoring/</a></code>
</p>
@@ -46,7 +46,7 @@
could be understood as endorsing certain activities, home pages,
products or entities without prior consent of the FSF Europe.
Please contact &lt;<a href="mailto:team@fsfeurope.org?subject=Logo">team@fsfeurope.org</a>&gt; if you wish to know whether
your intended usage is okay or whether you can use it in a certain
your intended usage is suitable and whether you can use it in a certain
context.
</pre>
about/legal/constitution.en.xhtml
+25 -25
View File
@@ -32,11 +32,11 @@ related philosophical and social questions.
<P />
As its acknowledged sister organization, the FSF Europe will join
forces with the Free Software Foundation founded by Richard
M. Stallman in the United States of America. The latter, recognized
tax-exempt charitable organization in the USA, has been dedicating
M. Stallman in the United States of America. The latter, recognised
tax-exempt charitable organisation in the USA, has been dedicating
itself since 1984 to the promotion and distribution of Free software
and in particular the GNU-System, a Unix-like operating system. This
system is mostly known by one of its variants, GNU/Linux, which since
and in particular the GNU-System. This
Operating System is mostly known by one of its variants, GNU/Linux, which since
1993 has been used successfully on many computers.
<BR />
<P />
@@ -47,13 +47,13 @@ to the price, but rather to the following four freedoms:
<LI>freedom: the freedom to use a program for any purpose
</LI>
<LI>freedom: the freedom to study the program and adapt it to your
own needs.
own needs.
</LI>
<LI>freedom: the freedom to make copies for others.
</LI>
<LI>freedom: the freedom to improve a program and make these
improvements available to others, so that the whole community
benefits.
benefits.
</LI>
</OL>
@@ -61,7 +61,7 @@ benefits.
This definition of Free Software goes back to the idea of freely
exchanging knowledge and ideas that can traditionally be found in
scientific fields. Like thoughts, software is non-tangible and
duplicable without loss. Passing feeds an evolutionary process,
is thus duplicable without loss. The sharing feeds an evolutionary process,
advancing thoughts and software.
<BR />
<P />
@@ -72,16 +72,16 @@ science. Accordingly, the promotion of free software is also a
promotion of science.
<BR />
<P />
The distribution of information and the forming of an opinion are done
The distribution of information and forming of an opinion is done
increasingly by digital media, and the trend is to foster the use of
those means for a direct citizen participation to
those means for direct citizen participation in
democracy. Therefore, a central task of the FSF Europe is to train
proficient citizens in these media, thereby promoting democracy.
<BR />
<P />
Digital space (``Cyberspace''), with software as its medium and its
language has an enormous potential for the promotion of all mental and
cultural aspects of mankind. By making it commonly available and
cultural aspects of mankind. By making this software commonly available and
opening up the medium, Free Software grants equal chances and
protection of privacy.
<BR />
@@ -91,15 +91,15 @@ all parts of society is long-term goal and a core aspect of the work
of the FSF Europe.
<BR />
<P />
Therefore the FSF Europe will seek to increase the use of Free
Software in schools and universities in order to parallelize the
Therefore the FSF Europe seeks to increase the use of Free
Software in schools and universities in order to promote
education in real space matters with the creation of understanding and
awareness of problems in virtual space.
<BR />
<P />
Free Software guarantees traceable results and decision-making
processes in science and public life as well as the individual rights
to free development of personality and liberty of opinion. It is the
to free development of personality and freedom to hold opinions. It is the
job of the FSF Europe to carry Free Software into all areas that touch
public life or ``informational human rights'' of citizens.
<BR />
@@ -107,7 +107,7 @@ public life or ``informational human rights'' of citizens.
<H1><A NAME="SECTION00020000000000000000">
Name, seat, financial year</A>
</H1>
</H1>
<P />
<BR />
@@ -121,7 +121,7 @@ registration it leads the additive ``e.V..''
<BR />
<BR />
(2)&nbsp;&nbsp;
The association has its seat in Hamburg.
The association has its seat in Hamburg.
<P />
<BR />
@@ -155,12 +155,12 @@ The goals of the FSF Europe are namely to be achieved by:
in all aspects of the Free Software,
</LI>
<LI>the cooperation and coordination of the national associations
which pursue the same goals
which pursue the same goals
</LI>
<LI>the support of programmers, realizing the charitable goals of the
<LI>the support of programmers, achieving the charitable goals of the
FSF Europe by developing Free Software, through scholarships,
</LI>
<LI>the distribution of the philosophical ideals of Free Software
<LI>the distribution of the philosophical ideals of Free Software
</LI>
<LI>the information and training of the public about the
possibilities and educational potential of Free Software,
@@ -209,7 +209,7 @@ age do not have eligibility for election.
<BR />
(2)&nbsp;&nbsp;
Condition for the acquisition of the membership is a written
application for membership to the executive committee.
application for membership to the executive committee.
<P />
<BR />
@@ -241,7 +241,7 @@ liquidation in the case of legal persons;
</LI>
<LI>by withdrawal from the association;
</LI>
<LI>by exclusion from the association.
<LI>by exclusion from the association.
</LI>
</OL>
@@ -334,7 +334,7 @@ for the FSF Europe.
<BR />
(5)&nbsp;&nbsp;
The national associations can only enter negotiations with authorities
and organizations mainly active in their respective areas.
and organisations mainly active in their respective areas.
<P />
<BR />
@@ -403,7 +403,7 @@ The competence of the executive committee</A>
<BR />
<BR />
(1)&nbsp;&nbsp;
The executive committee is responsibly for all affairs the FSF Europe,
The executive committee is responsible for all affairs of the FSF Europe,
as far as they are not transferred to another organ of the FSF Europe
by statute. It has in particular the following tasks:
@@ -445,8 +445,8 @@ allowances from the means of the FSF Europe or its local
associations. This also applies to separating members.
</LI>
<LI>that funds of the FSF Europe can only partially be used for
other tax-exempt charitable organizations and only if these
organizations use them for constitutional goals.
other tax-exempt charitable organisations and only if these
organisations use them for constitutional goals.
</LI>
<LI>that administrative costs, which are alien to the purpose of the
FSF Europe may not be granted. Same applies to disproportionately high
@@ -643,7 +643,7 @@ The general assembly
(1)&nbsp;&nbsp;
In the general assembly, each member that is a natural person, has a
voice. For the practice of the right to vote another member can be
authorized by written message to the executive committee. The
authorised by written message to the executive committee. The
authorisation is to be given for each general assembly separately. A
member cannot practise the right to vote for more than one third of
all members.
about/legal/legal.en.xhtml
+3 -3
View File
@@ -14,7 +14,7 @@
<h2>Vision</h2>
<p>The vision of the FSF Europe is largely influenced by the vision of
a united Europe. We wanted to form <b>one</b> organization in which we
a united Europe. We wanted to form <b>one</b> organisation in which we
would work together as Europeans across cultural, language, social and
country barriers.</p>
@@ -40,7 +40,7 @@ come through despite these legal shortcomings.</p>
<p>The "legal hack" that we came up with is a modular structure that
allows us to expand it step by step into every country that feels part
of Europe no matter whether it is part of the European Union.</p>
of Europe whether it is part of the European Union or not.</p>
<h3>The Hub </h3>
@@ -68,7 +68,7 @@ registered in Germany with the following constitution:
<p>The chapters are the local legal bodies of the FSF Europe, formed
by the members of the FSF Europe from that country.</p>
<p>They are bound to the FSF Europe through their constitution, but
<p>They are bound to the FSF Europe through their constitutions, but
with the freedom and autonomy to address the local issues in the way
appropriate for the cultural and social identity in those
countries.</p>
about/members.en.xhtml
+2 -2
View File
@@ -88,7 +88,7 @@
<h3>Structural Information</h3>
<p>The vision of the FSF Europe incorporates a strong belief in
<p>The vision of FSF Europe incorporates a strong belief in
the European vision - therefore we sought to create a truly
European association. Unfortunately there is still no legal basis
for this in the EU; especially when taking the non-EU European
@@ -108,7 +108,7 @@
Last update:
<!-- timestamp start -->
$Date: 2003/02/20 16:08:06 $ $Author: greve $
$Date: 2003/06/23 15:42:55 $ $Author: greve $
<!-- timestamp end -->
</body>
about/volunteers.en.xhtml
+3 -3
View File
@@ -22,8 +22,8 @@
<li><b>Volker Dormeyer</b> - Tradeshows &amp; Events<br />
Volker Dormeyer is often put in charge of the FSF Europe booth
at events like tradeshows and has organized many FSF Europe
booths on tradeshows and fairs.
at events like tradeshows and has organised many FSF Europe
booths at tradeshows and fairs.
</li><br />
@@ -32,7 +32,7 @@
Email: <a href="mailto:martin.gerwinski@office.fsfeurope.org">martin.gerwinski@office.fsfeurope.org</a><br />
Martin Gerwinski is working together with Kai Keller in the FSF
Europe office. He does this partially on time sponsored by his company and partially on his own time.
Europe office. He contributes partially on time sponsored by his company and partially in his own time.
</li><br />
tools/translate.sh
+11
View File
@@ -63,6 +63,17 @@ if [ "`echo $LANGS | grep EN`" != "" ]; then
fi
SEPARATOR=" | "
fi
if [ "`echo $LANGS | grep eo`" != "" ]; then
RESULT="$RESULT""$SEPARATOR"
if [ "$LANGUAGE" != "eo" ]; then
RESULT="$RESULT""<a href=\"$BASENAME.eo.html\">"
fi
RESULT="$RESULT""Esperanto"
if [ "$LANGUAGE" != "eo" ]; then
RESULT="$RESULT""</a>"
fi
SEPARATOR=" | "
fi
if [ "`echo $LANGS | grep es`" != "" ]; then
RESULT="$RESULT""$SEPARATOR"
if [ "$LANGUAGE" != "es" ]; then