Browse Source

Merge branch 'website_typos' of georgebs/fsfe-website into master

tags/stw2018
George Brooke-Smith 9 months ago
parent
commit
4d81ea5040

+ 1
- 1
about/about.en.xhtml View File

@@ -73,7 +73,7 @@
<li>
<h3><a href="/about/transparency-commitment.html">Transparency Commitment</a></h3>
<p>
Our transparency commitment including links to our constitution and minutes.
Our transparency commitment, including links to our constitution and minutes.
</p>
<div style="max-width: 300px;">
<img src="/graphics/logo-transparent-civil-society.png" alt="Transparency International Germany" />

+ 7
- 7
about/principles.en.xhtml View File

@@ -22,7 +22,7 @@ regional to a global level.</p>

<p>We form a non-profit non-governmental organisation and network that
itself is part of a global network of people with common goals and
visions. We are not representative for anyone but ourselves and our
visions. We are not representative of anyone, except ourselves and our
work. Our common work and dedication to freedom in all aspects of
digital society is what defines us.</p>

@@ -30,12 +30,12 @@ digital society is what defines us.</p>
becomes more important to keep the vision of Free Software healthy,
solid and alive. In some cases, increased political interest in our
issues also creates desire to exploit them for particular personal
interests regardless of the medium- and long-term effects.</p>
interests, regardless of the medium- and long-term effects.</p>

<p>Therefore, the central component of our work is keeping the legal,
political and social base of Free Software strong, secure and free of
particular interests. This requires deep understanding of Free
Software and related issues. Above all it requires being primarily
Software and related issues. Above all, it requires being primarily
committed to the long-term vision.</p>

<p>We understand this sometimes means having to accept short-term or
@@ -93,9 +93,9 @@ the responsibility to put long-term consensus over personal
opinion.</p>

<p>The FSFE association is fundamentally democratic. All parts of the
FSFE -- members of the association, members of the teams, as well as
FSFE - members of the association, members of the teams, as well as
<a href="http://fellowship.fsfe.org">fellows</a> and members of associate
organisations -- are welcome to actively take part in the decision
organisations - are welcome to actively take part in the decision
making process for the areas of work they participate in.</p>

<p>Members of the association are often proposed by other members, or
@@ -115,8 +115,8 @@ would be difficult to do as a volunteer.</p>
<p>The main criterion for any employment are the needs of the Free
Software Foundation Europe in terms of successfully pursuing its
goals. Whenever possible, we try to hire a person for each job that
has already done the job without getting paid -- either within the
FSFE structures or outside -- because knowledge, dedication and
has already done the job without getting paid - either within the
FSFE structures or outside - because knowledge, dedication and
initiative are virtues of the FSFE.</p>

<p>Ideally we will allow someone to dedicate themselves fully to a task

+ 3
- 3
about/team.en.xhtml View File

@@ -28,14 +28,14 @@
<p>The General Assembly consists of the <a
href="/about/legal/legal.html">FSFE's legal body's</a> members. It is
responsible for strategic planning, budgeting, agenda-setting, exonerating,
and the electing and recalling of the Executive Council and the Financial
as well as the electing and recalling of the Executive Council and Financial
Officer.</p>

<ga-members />
<h2 id="eu-core-team">European Core Team</h2>
<p>Here you can find people working on the day to day tasks of the
organisation on a voluntary or paid basis on core issues: Country team
<p>Here you can find people working on day to day tasks of the
organisation on a voluntary or paid basis around core issues: Country team
coordinators and their deputies, staff, coordinators of special teams,
or system administrators. Not included are a huge number of altering
volunteers from our working team, contributors to our campaigns, or to

+ 4
- 1
activities/ftf/ln-application.en.xhtml View File

@@ -39,7 +39,10 @@
<br /><br />
<div>
<label style="font-weight: normal;" for="obligatory">
<input name="obligatory" id="obligatory" value="yes" required="" type="checkbox" /> I have read and understood and accept the <a href="/activities/ftf/ln-rules.html">rules for the Legal Network</a> and <a href="/about/legal/imprint.html#id-privacy-policy">the FSFE's privacy policy</a>. Accepting these rules is a precondition to join the Legal Network.
<input name="obligatory" id="obligatory" value="yes" required="" type="checkbox" /> I have understood and accepted the <a href="/activities/ftf/ln-rules.html">rules for the Legal Network</a>.
<input name="obligatory" id="obligatory" value="yes" required="" type="checkbox" /> I have read <a href="/about/legal/imprint.html#id-privacy-policy">the FSFE's privacy policy</a>.
<br />
Accepting these rules is a precondition to join the Legal Network.
</label>
</div>
<button name="action" value="sign" type="submit">Send application</button>

+ 2
- 2
associates/associates.en.xhtml View File

@@ -17,7 +17,7 @@
rights by abolishing barriers to Free Software adoption. Or they focus on
encouraging people to use and develop Free Software.</p>

<p>No matter what focus or legal status your group has; we believe it is
<p>No matter what focus or legal status your group has, we believe it is
important to join forces and work together to reach our common goals. With
our associated organisations we want to show that we are a strong movement.
We exchange ideas, coordinate efforts, motivate each other, and find
@@ -27,7 +27,7 @@
please <a href="/contact/contact.html">get in contact with us</a>.</p>

<em>If you are a company and want to show your support for our goals, we
recommend to become <a href="/donate/thankgnus.html">donor of FSFE</a> or
recommend to become <a href="/donate/thankgnus.html">a donor of the FSFE</a> or
one of our associated organisations below.</em>

<associates/>

+ 1
- 1
associates/ceata/associate.en.xml View File

@@ -5,7 +5,7 @@
<name>Fundația Ceata</name>
<description>
<p>
Fundația Ceata is a Romanian Free Software and Free Culture foundation aligned with the Free Software philosophy of the GNU Project. It is incorporated in Bucharest and has local teams in Cluj County and the Republic of Moldova. Ceata (Romanian for "the gang") has started as an informal group in June 2008 and it has become foundation in February 2013. Since its beginning Ceata is heavily involved in Free Software activism, organization of digital freedom events, and development of Free Software and Free Cultural works.
Fundația Ceata is a Romanian Free Software and Free Culture foundation, aligned with the Free Software philosophy of the GNU Project. It is incorporated in Bucharest and has local teams in Cluj County and the Republic of Moldova. Ceata (Romanian for "the gang") was started as an informal group in June 2008 and it became a foundation in February 2013. Since its beginning, Ceata is heavily involved in Free Software activism, organization of digital freedom events, and development of Free Software and Free Cultural works.
</p>
</description>
<link>http://ceata.org/</link>

+ 1
- 1
associates/documentfoundation/associate.en.xml View File

@@ -8,7 +8,7 @@
The Document Foundation is a charitable foundation that works to
eliminate the digital divide in society by giving everyone access to
free (as in freedom) office productivity tools free of charge, thus
enabling them to participate as full citizens in the 21st century. We
enabling them to participate as full citizens in the 21st century. They
support the preservation of mother tongues by encouraging everybody
to translate, document, support, and promote our office productivity
tools into their mother tongue; and enable users to retain rights in

+ 1
- 1
associates/ffii/associate.en.xml View File

@@ -5,7 +5,7 @@
<name>Foundation for a Free Information Infrastructure</name>
<description>
<p>
The FFII is a not-for-profit association registered in twenty European countries, dedicated to the development of information goods for the public benefit, based on copyright, free competition, open standards. More than 850 members, 3,500 companies and 100,000 supporters have entrusted the FFII to act as their voice in public policy questions concerning exclusion rights (intellectual property) in data processing.
The FFII is a not-for-profit association registered in twenty European countries, dedicated to the development of information goods for the public benefit, based on copyright, free competition and open standards. More than 850 members, 3,500 companies and 100,000 supporters have entrusted the FFII to act as their voice in public policy questions concerning exclusion rights (intellectual property) in data processing.
</p>
</description>
<link>http://www.ffii.org/</link>

+ 1
- 1
associates/ffkp/associate.en.xml View File

@@ -8,7 +8,7 @@
The Society for Free Culture and Software is a Swedish non-profit
organisation working for a society built around a free exchange of
knowledge, ideas and culture. The society works inter-disciplinary and
gathers in the conference FSCONS knowledge from several different
gathers knowledge at the conference FSCONS from several different
groups, including Creative Commons, Free Software Foundation Europe,
Wikimedia, FriBit and EFN.
</p>

+ 1
- 1
associates/fsij/associate.en.xml View File

@@ -5,7 +5,7 @@
<name>Free Software Initiative of Japan</name>
<description>
<p>
A Japanese non-profit association to further Free Software.
A Japanese non-profit association for furthering Free Software.
</p>
</description>
<link>http://www.fsij.org</link>

+ 1
- 1
associates/gfoss/associate.en.xml View File

@@ -6,7 +6,7 @@
<description>
<p>
GFOSS – Open Technologies Alliance is a non-profit organization founded
in 2008, 35 Universities and Research Centers are shareholders of GFOSS.
in 2008. 35 Universities and Research Centers are shareholders of GFOSS.
GFOSS' main goal is to promote Openness through the use and the
development of Open Standards and Open Technologies in Education, Public
Administration and Business in Greece.

+ 1
- 1
associates/greek/associate.en.xml View File

@@ -5,7 +5,7 @@
<name>Ελληνική Ένωση Φίλων Ελεύθερου Λογισμικού (Free Software Friends Greek Association)</name>
<description>
<p>
The "Free Software Friends Greek Association" (also called "Greek Linux User Group" and since June 2010 was given also the name "GNU Greece" by Richard M. Stallman) is a greek NGO/Society, whose purpose is to promote GNU/Linux and Free Software in Greece through various activities as seminars, introduction speeches at schools, daily operation of GNU/Linux Labs around Greece and struggle for Free Software in the Greek public sector.
The "Free Software Friends Greek Association" (also called "Greek Linux User Group" and "GNU Greece", the latter being a name given by Richard M. Stallman in June 2010) is a greek NGO/Society, whose purpose is to promote GNU/Linux and Free Software in Greece through various activities, such as seminars, introduction speeches at schools, daily operation of GNU/Linux Labs around Greece, and the struggle for Free Software in the Greek public sector.
</p>
</description>
<link>http://www.greeklug.gr/</link>

+ 1
- 1
associates/opensourcedesign/associate.en.xml View File

@@ -6,7 +6,7 @@
<description>
<p>
Open Source Design's goal is to bring more designers into open
source and free software and connect designers with free and
source and free software, and to connect designers with free and
open source projects.
</p>
</description>

+ 1
- 1
associates/vrijschrift/associate.en.xml View File

@@ -8,7 +8,7 @@
Vrijschrift creates awareness about the economic and social
meaning of free knowledge and culture for our
society. Vrijschrift fulfills both a protecting and promoting
role. Internationally we work together with the Foundation for
role. Internationally they work together with the Foundation for
a Free Information Infrastructure, the Free Software
Foundation Europe, Project Gutenberg and a lot of other
organisations.

+ 1
- 1
contact/contact.en.xhtml View File

@@ -12,7 +12,7 @@
<h1>Contact</h1>
<p id="introduction">We can provide assistance, information, and expertise on a wide variety of issues relating to Free Software. Individuals, communities and businesses are encouraged to contact us with questions. We are proud to maintain the world’s largest private <a href="/activities/ftf/ln.html">network of Free Software legal experts</a>. We have a skilled team that handles <a href="/work.html">policy issues</a>, and a network of specialists who advise on our various <a href="/campaigns/campaigns.html">campaigns</a>.</p>
<p id="introduction">We can provide assistance, information and expertise on a wide variety of issues relating to Free Software. Individuals, communities and businesses are encouraged to contact us with questions. We are proud to maintain the world’s largest private <a href="/activities/ftf/ln.html">network of Free Software legal experts</a>. We have a skilled team that handles <a href="/work.html">policy issues</a>, and a network of specialists who advise on our various <a href="/campaigns/campaigns.html">campaigns</a>.</p>

<div class="grid-50-50">
<div class="box first">

+ 5
- 5
press/press.en.xhtml View File

@@ -52,7 +52,7 @@
<p>The FSFE helps individuals and organisations to understand how Free
Software contributes to freedom, transparency, and self-determination. It
enhances users' rights by abolishing barriers to Free Software adoption,
encourage people to use and develop Free Software, and provide resources to
encouraging people to use and develop Free Software, and providing resources to
enable everyone to further promote Free Software in Europe.</p>


@@ -95,7 +95,7 @@
<h2>Social Media</h2>

<p>
For instant updates and hot news you can also follow us on <a
For instant updates and hot news, you can also follow us on <a
href="https://mastodon.social/@fsfe">Mastodon</a>, <a href="https://diasp.eu/u/fsfe">Diaspora</a>, <a
href="https://twitter.com/fsfe">Twitter</a> and <a href="https://facebook.com/thefsfe">Facebook</a>.
</p>
@@ -143,7 +143,7 @@
</p>

<p>
For general enquiries please see our
For general enquiries, please see our
<a href="/contact/contact.html">contact information</a>.
</p>

@@ -153,7 +153,7 @@

<h2>About FSFE</h2>

<p>The Free Software Foundation Europe was founded in 2001 as a charity to empower users to control technology. You can find our goals defined and the methods we use to achieve them written down in <a href="/about/mission">our mission statement</a>. In <a href="/timeline/timeline">our timeline</a>, we collected our most important achievements to promote and defend software freedom in Europe since 2001 within various areas.</p>
<p>The Free Software Foundation Europe was founded in 2001 as a charity to empower users to control technology. You can find our goals defined in <a href="/about/mission">our mission statement</a>, as well as the methods we use to achieve them. In <a href="/timeline/timeline">our timeline</a>, we collected our most important achievements since 2001 for promoting and defending software freedom in Europe, within various areas.</p>

</div>

@@ -224,7 +224,7 @@
<div>
<h3><a href="/freesoftware/freesoftware.html">Free Software Basics</a></h3>
<p>
Access to software determines who may participate in a digital society. Read about the role of Free Software in key areas in our <a href="/freesoftware/freesoftware.html">introduction to Free Software</a>.
Access to software determines who may participate in a digital society. Read about Free Software's role within key areas in our <a href="/freesoftware/freesoftware.html">introduction to Free Software</a>.
</p>
</div>
</li>

Loading…
Cancel
Save