diff --git a/fsfeurope.xsl b/fsfeurope.xsl
index 453f69ec2f..9196484c63 100644
--- a/fsfeurope.xsl
+++ b/fsfeurope.xsl
@@ -245,8 +245,8 @@
               <xsl:text>[XHTML]</xsl:text>
             </xsl:element>
 
-            <!-- Insert the inofficial translation notice if appropriate -->
-            <xsl:if test="/buildinfo/document/@translation='unofficial'">
+            <!-- Insert the appropriate translation notice -->
+            <xsl:if test="/buildinfo/document/@translation!=''">
               <xsl:element name="br"/>
               <xsl:value-of select="/buildinfo/textset/text[@id='translator1']"/>
               <xsl:value-of select="/buildinfo/document/translator"/>
diff --git a/tools/texts-ca.xml b/tools/texts-ca.xml
index 793008a3f2..eab60358e3 100644
--- a/tools/texts-ca.xml
+++ b/tools/texts-ca.xml
@@ -3,7 +3,7 @@
 <textset>
   <text id="copyright">Copyright (C) FSFE.</text>
   <text id="lastchanged"> Actualitzat: </text>
-  <text id="translator1">Gràcies a  </text>
+  <text id="translator1">Gràcies a </text>
   <text id="translator2"> per aquesta traducció no oficial. Si us plau, referiu-vos al </text>
   <text id="translator3">text original</text>
   <text id="translator4"> per a la versió oficial d'aquesta pàgina.</text>
diff --git a/tools/texts-da.xml b/tools/texts-da.xml
index 8a060cd737..2c98784faa 100644
--- a/tools/texts-da.xml
+++ b/tools/texts-da.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
 <textset>
-  <text id="copyright">Copyright (C) FSF Europe.</text>
+  <text id="copyright">Copyright (C) FSFE.</text>
   <text id="lastchanged"> Seneste �ndring: </text>
   <text id="translator1">Vi takker </text>
   <text id="translator2"> for denne uofficielle overs�ttelse. Se den </text>
diff --git a/tools/texts-de.xml b/tools/texts-de.xml
index 5d91cadc81..5c614828cf 100644
--- a/tools/texts-de.xml
+++ b/tools/texts-de.xml
@@ -4,9 +4,9 @@
   <text id="copyright">Copyright (C) FSFE.</text>
   <text id="lastchanged"> Letzte �nderung: </text>
   <text id="translator1">Wir danken </text>
-  <text id="translator2"> f�r diese inoffizielle �bersetzung. Der </text>
+  <text id="translator2"> f�r diese �bersetzung. Lesen Sie auch den </text>
   <text id="translator3">Originaltext</text>
-  <text id="translator4"> ist die offizielle Version.</text>
+  <text id="translator4">.</text>
   <text id="permission">
     Die unver�nderte Wiedergabe und Verteilung dieses 
     gesamten Textes in beliebiger Form ist gestattet, sofern 
diff --git a/tools/texts-el.xml b/tools/texts-el.xml
index 5c40dffbda..09e7b2aeda 100644
--- a/tools/texts-el.xml
+++ b/tools/texts-el.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-7"?>
 
 <textset>
-  <text id="copyright">Copyright (C) FSF Europe.</text>
+  <text id="copyright">Copyright (C) FSFE.</text>
   <text id="lastchanged"> Last changed: </text>
   <text id="translator1">We thank </text>
   <text id="translator2"> for this unofficial translation. Please refer to the </text>
diff --git a/tools/texts-en.xml b/tools/texts-en.xml
index bf3c527f95..f9a2465426 100644
--- a/tools/texts-en.xml
+++ b/tools/texts-en.xml
@@ -4,9 +4,9 @@
   <text id="copyright">Copyright (C) FSFE.</text>
   <text id="lastchanged"> Last changed: </text>
   <text id="translator1">We thank </text>
-  <text id="translator2"> for this unofficial translation. Please refer to the </text>
+  <text id="translator2"> for this translation. Please also see to the </text>
   <text id="translator3">original text</text>
-  <text id="translator4"> for the official version of this page.</text>
+  <text id="translator4"> of this page.</text>
   <text id="permission">
     Verbatim copying and distribution of this entire article is permitted
     in any medium, provided this notice is preserved.
diff --git a/tools/texts-eo.xml b/tools/texts-eo.xml
index 0dc4cf3ebb..0daefcefa4 100644
--- a/tools/texts-eo.xml
+++ b/tools/texts-eo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <textset>
-  <text id="copyright">Copyright (C) FSF Europe.</text>
+  <text id="copyright">Copyright (C) FSFE.</text>
   <text id="lastchanged"> Last changed: </text>
   <text id="translator1">We thank </text>
   <text id="translator2"> for this unofficial translation. Please refer to the </text>
diff --git a/tools/texts-es.xml b/tools/texts-es.xml
index 05f0bd11ae..8ef71ea7ae 100644
--- a/tools/texts-es.xml
+++ b/tools/texts-es.xml
@@ -4,9 +4,9 @@
   <text id="copyright">Copyright (C) FSFE.</text>
   <text id="lastchanged"> �ltima actualizaci�n: </text>
   <text id="translator1">We thank </text>
-  <text id="translator2"> for this unofficial translation. Please refer to the </text>
+  <text id="translator2"> for this translation. Please also see the </text>
   <text id="translator3">original text</text>
-  <text id="translator4"> for the official version of this page.</text>
+  <text id="translator4"> of this page.</text>
   <text id="permission">
       Se permite la copia y distribuci�n de este documento completo
       en cualquier medio, siempre que se incluya este aviso.
diff --git a/tools/texts-fr.xml b/tools/texts-fr.xml
index 828dc8305d..6cd9299e79 100644
--- a/tools/texts-fr.xml
+++ b/tools/texts-fr.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <textset>
-  <text id="copyright">Copyright (C) FSF Europe.</text>
+  <text id="copyright">Copyright (C) FSFE.</text>
   <text id="lastchanged">Dernière modification&#160;:</text>
   <text id="translator1">Nous remercions </text>
   <text id="translator2"> pour cette traduction non-officielle. Référez-vous au </text>
diff --git a/tools/texts-hu.xml b/tools/texts-hu.xml
index 389235abce..2ae1f74f8d 100644
--- a/tools/texts-hu.xml
+++ b/tools/texts-hu.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <textset>
-  <text id="copyright">Copyright (C) FSF Europe.</text>
+  <text id="copyright">Copyright (C) FSFE.</text>
   <text id="lastchanged"> Utolsó módosítás: </text>
   <text id="translator1">Köszönjük, </text>
   <text id="translator2">, hogy elkészítette ezt a nem hivatalos fordítást. Az oldal hivatalos verziójának az </text>
diff --git a/tools/texts-it.xml b/tools/texts-it.xml
index b90fb0e923..a09aae3059 100644
--- a/tools/texts-it.xml
+++ b/tools/texts-it.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
 <textset>
-  <text id="copyright">Copyright (C) FSF Europe.</text>
+  <text id="copyright">Copyright (C) FSFE.</text>
   <text id="lastchanged">Ultima modifica: </text>
   <text id="translator1">Ringraziamo </text>
-  <text id="translator2"> per questa traduzione non ufficiale. Si veda il </text>
+  <text id="translator2"> per questa traduzione. Si veda il </text>
   <text id="translator3">testo originale</text>
   <text id="translator4"> per la versione ufficiale di questa pagina.</text>
   <text id="permission">
diff --git a/tools/texts-ku.xml b/tools/texts-ku.xml
index 3e14067f62..935246da89 100644
--- a/tools/texts-ku.xml
+++ b/tools/texts-ku.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-9"?>
 
 <textset>
-  <text id="copyright">Maf� n�v�s (C) FSF Europe.</text>
+  <text id="copyright">Maf� n�v�s (C) FSFE.</text>
   <text id="lastchanged"> ��k�rin�na Son�: </text>
   <text id="translator1">Em Spasd�k�n </text>
   <text id="translator2"> j� boy v� wergerand�na n� resm�. Kerem b�k�n </text>
diff --git a/tools/texts-no.xml b/tools/texts-no.xml
index 332485fb20..1c61fcb321 100644
--- a/tools/texts-no.xml
+++ b/tools/texts-no.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <textset>
-  <text id="copyright">Copyright (C) FSF Europe.</text>
+  <text id="copyright">Copyright (C) FSFE.</text>
   <text id="lastchanged"> Sist endret: </text>
   <text id="translator1">Takk til </text>
   <text id="translator2"> for denne uoffisielle oversettelsen. Vennligst jamfør </text>
diff --git a/tools/texts-pl.xml b/tools/texts-pl.xml
index 33bcf1e54d..cdfe7c7f9e 100644
--- a/tools/texts-pl.xml
+++ b/tools/texts-pl.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <textset>
-  <text id="copyright">Copyright (C) FSF Europe.</text>
+  <text id="copyright">Copyright (C) FSFE.</text>
   <text id="lastchanged"> Ostatnia aktualizacja: </text>
   <text id="translator1">Podziękowania dla </text>
   <text id="translator2"> za to nieoficjalne tłumaczenie. Prosimy odwołać się do </text>
diff --git a/tools/texts-pt.xml b/tools/texts-pt.xml
index d5d1288f84..d1f48f0a2a 100644
--- a/tools/texts-pt.xml
+++ b/tools/texts-pt.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- This is actually pt_BR, if anybody can change it to pt_PT please do so -->
 <textset>
-  <text id="copyright">Copyright (C) FSF Europe.</text>
+  <text id="copyright">Copyright (C) FSFE.</text>
   <text id="lastchanged">Ultima Alteração:</text>
   <text id="translator1">We thank </text>
   <text id="translator2"> for this unofficial translation. Please refer to the </text>
diff --git a/tools/texts-ro.xml b/tools/texts-ro.xml
index 7a3e4e83ba..18cabb30a2 100644
--- a/tools/texts-ro.xml
+++ b/tools/texts-ro.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <textset>
-  <text id="copyright">Copyright (C) FSF Europa.</text>
+  <text id="copyright">Copyright (C) FSFE.</text>
   <text id="lastchanged"> Ultima modificare: </text>
   <text id="translator1">Îi mulţumim lui </text>
   <text id="translator2"> pentru aceastã traducere neoficialã. Vã rugãm sã consultaţi </text>
diff --git a/tools/texts-ru.xml b/tools/texts-ru.xml
index bc94fb7a7a..7a71486cfc 100644
--- a/tools/texts-ru.xml
+++ b/tools/texts-ru.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <textset>
-  <text id="copyright">Copyright (C) FSF Europe.</text>
+  <text id="copyright">Copyright (C) FSFE.</text>
   <text id="lastchanged"> Последнее изменение: </text>
   <text id="translator1">Мы благодарим </text>
   <text id="translator2"> за этот неофициальный перевод. Пожалуйста проследуйте к </text>
diff --git a/tools/texts-sq.xml b/tools/texts-sq.xml
index 28d5c84ce9..d6462dee5b 100644
--- a/tools/texts-sq.xml
+++ b/tools/texts-sq.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <textset>
-  <text id="copyright">Të drejta kopjimi (C) FSF Europe.</text>
+  <text id="copyright">Të drejta kopjimi (C) FSFE.</text>
   <text id="lastchanged"> Ndryshuar së fundmi: </text>
   <text id="translator1">Falënderojmë </text>
   <text id="translator2"> për këtë përkthim jozyrtar. Ju lutemi referojuni </text>
diff --git a/tools/texts-sr.xml b/tools/texts-sr.xml
index 97d50e6ca2..10c3abcceb 100644
--- a/tools/texts-sr.xml
+++ b/tools/texts-sr.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <textset>
-  <text id="copyright">Copyright (C) FSF Europe.</text>
+  <text id="copyright">Copyright (C) FSFE.</text>
   <text id="lastchanged"> Poslednje izmene: </text>
   <text id="translator1">Zahvaljujemo se </text>
   <text id="translator2"> za ovaj neoficijalni prevod. Pogledajte </text>
diff --git a/tools/texts-tr.xml b/tools/texts-tr.xml
index 20283c3ec7..6a394412e5 100644
--- a/tools/texts-tr.xml
+++ b/tools/texts-tr.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-9"?> 
 <textset>
-  <text id="copyright">Telif Hakk� (C) FSF Avrupa.</text>
+  <text id="copyright">Telif Hakk� (C) FSFE.</text>
   <text id="lastchanged"> Son De�i�iklik: </text>
   <text id="translator1">Bu sayfan�n resmi olmayan �evirisi </text>
   <text id="translator2"> taraf�ndan yap�lm��t�r. Kendisine te�ekk�r ediyoruz. Sayfan�n resmi s�r�m�ne </text>