fellowship quotes

svn path=/trunk/; revision=26452

fellowship/index.de.xhtml

@@ -8,7 +8,7 @@
     <h1>Fellowship</h1>
 
     <!-- rotating fellowship quotes from tools/texts-*.xml with fellowship-tag -->
-    <quote-box tag="fellowship" />
+    <!-- <quote-box tag="fellowship" /> -->
 
     <div id="introduction">
       <div class="image">

support/extract_and_import/README.txt

@@ -35,7 +35,7 @@ The download should start now. If not, doublecheck step 1 or wait a bit longer (
 if not, everybody would be able to download sensitive data.
 
 
-## IMPORTING
+## FORMATTING
 If you want to import this data in CiviCRM, you need to format it first. For example, many names are lower/uppercase only or are empty. The Country Codes are not supported in CiviCRM as well. Additionally, some data is completely useless. If you have another feeling, feel free to change the script.
 
 For this, you can use format-supporters.sh in addition to countries.txt. Just define a file to import (default: supporters.csv), the desired filename at output (default: supporters_format.csv) and the CountryCode-to-Country-Name file (default: countries.txt).
@@ -46,4 +46,7 @@ Now execute the shell script in your local terminal:
 After ~5-10 minutes, all entries should be written to the output file. Please do not worry if the output file keeps empty until the end of the script: It writes the data to a temporary file during the execution process.
 
 
-To understand what the script exactly does, please see the comments in the bash script.
+To understand what the script exactly does, please see the comments in the bash script.
+
+
+## IMPORTING

support/extract_and_import/format-supporters.sh

@@ -108,8 +108,8 @@ do
 	
 	
 	# Output of all interesting strings with "" surrounded, only if Firstname not empty
-	# if ! ([ "$FIRSTNAME" = "" ] || [ "$CONFIRMDATE" = "" ]); then		# this also kicks out the first subscripted supporters
-	if [ "$FIRSTNAME" != "" ]; then		# this also contains supporters whose emails are not confirmed yet
+	if ! ([ "$FIRSTNAME" = "" ] || [ "$CONFIRMDATE" = "" ]); then		# this also kicks out the first subscripted supporters, but only in first import
+	# if [ "$FIRSTNAME" != "" ]; then		# this also contains supporters whose emails are not confirmed yet
 		echo "\"$FIRSTNAME\",\"$LASTNAME\",$EMAIL,\"$CCODE\"" >> temp131031.txt
 	fi
 	

tools/texts-en.xml

@@ -219,25 +219,53 @@
     </quote>
 
     <!-- quotes for fellowship page -->
-    <quote id="allison" tag="fellowship" pos="1">
-      <photo>/fellowship/graphics/people/Jeremyallison.jpg</photo>
+    <quote id="morris" tag="fellowship">
+      <photo>/fellowship/graphics/people/annamorris.jpg</photo>
       <txt>
-        Document Freedom Day celebrates the importance of Open Standards for all
-        electronic documents, whether public or private. If we want to <strong>preserve
-        our digital heritage</strong> we all need to select Open Standards, implementable
-        by anyone, as our default storage choice.
+            Free Software challenges you to learn: to do for yourself, to be fearlessly
+            independent when it comes to your tech. In the past few years I have taken
+            pride in watching my skill base catchup with and overtake that of my
+			proprietary-loving peers, even some paid professionals, simply by having a
+			free and curious mindset. Free Software frees you in many ways.
       </txt>
-      <author>Jeremy Allison, Samba core developer</author>
-    </quote>
-    
-    <quote id="beckedahl" tag="fellowship" pos="2">
-      <photo>/fellowship/graphics/people/beckedahl.jpg</photo>
-      <txt>
-        Open Standards garantee a free development of the infrastructure and
-        therefore a self-determined and free communication.
-      </txt>
-      <author>Markus Beckedahl, Digitale Gesellschaft, netzpolitik.org</author>
+      <author>Anna Morris</author>
     </quote>
 
+    <quote id="roy" tag="fellowship">
+      <photo>/fellowship/graphics/people/hugoroy.png</photo>
+      <txt>
+			The Free Software Foundation Europe (FSFE) brings together
+			dedicated and engaged activists from all over Europe to seize the
+			opportunities to secure our rights to use, share, study, and
+			improve software because without Free Software, technology
+			subjugates us instead of enhancing our freedom.
+      </txt>
+      <author>Hugo Roy - French Fellowship Coordinator</author>
+    </quote>
+
+    <quote id="keijzer" tag="fellowship">
+      <photo>/fellowship/graphics/people/kevinkeijzer.jpg</photo>
+      <txt>
+			I joined the Fellowship to stop being 'a minority of one', as George
+			Orwell once put it. I wanted to meet people who shared my ideals and
+			beliefs, so it would no longer feel as if I was fighting the system all
+			by myself. It's reassuring to know that you're not alone, which probably
+			motivates people to keep up with the work they are doing, even if it's
+			not always as successful as they would like it to be.
+      </txt>
+      <author>Kevin Keijzer - Political activist - Member of FSFE's Education team</author>
+    </quote>
+
+    <quote id="nascimento" tag="fellowship">
+      <photo>/fellowship/graphics/people/mauricionascimento.jpg</photo>
+      <txt>
+			Freedom is one of the core values of our Society and one of the basic
+			concepts of Democracy. Supporting and spreading Free Software is one 
+			way to build creative alternatives for social inclusion and to protect our 
+			citizens from the digital exploitation. We are responsible to build a better World
+			as a gift for our future generations.
+      </txt>
+      <author>Mauricio Nascimento - Middlerware Engineer - FSFE Fellowship Coordination team</author>
+    </quote>
   </quotes>  
 </textset>