diff --git a/resources/i18n/es.ts b/resources/i18n/es.ts
index 32a825ba9..9fac123b4 100644
--- a/resources/i18n/es.ts
+++ b/resources/i18n/es.ts
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS><TS version="2.0" language="es" sourcelanguage="">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="es" sourcelanguage="" version="2.0">
 <context>
     <name>AlertsPlugin</name>
     <message>
@@ -97,14 +96,14 @@ Do you want to continue anyway?</source>
     </message>
     <message>
         <location filename="openlp/plugins/alerts/forms/alertform.py" line="190"/>
-        <source>The alert text does not contain &apos;&lt;&gt;&apos;.
+        <source>The alert text does not contain '&lt;&gt;'.
 Do you want to continue anyway?</source>
         <translation>El texto de alerta no contiene &apos;&lt;&gt;&apos;.
 ¿Desea continuar de todos modos?</translation>
     </message>
     <message>
         <location filename="openlp/plugins/alerts/forms/alertform.py" line="107"/>
-        <source>You haven&apos;t specified any text for your alert. 
+        <source>You haven't specified any text for your alert. 
 Please type in some text before clicking New.</source>
         <translation>No ha especificado ningún texto de alerta. Por favor, escriba algún texto antes de hacer clic en Nueva.</translation>
     </message>
@@ -1779,10 +1778,7 @@ Note que los versículos se descargarán según sea necesario, por lo que debe c
     <message numerus="yes">
         <location filename="openlp/plugins/custom/lib/mediaitem.py" line="186"/>
         <source>Are you sure you want to delete the %n selected custom slide(s)?</source>
-        <translation>
-            <numerusform>¿Desea borrar %n diapositiva seleccionada?</numerusform>
-            <numerusform>¿Desea borrar las %n diapositivas seleccionadas?</numerusform>
-        </translation>
+        <translation><numerusform>¿Desea borrar %n diapositiva seleccionada?</numerusform><numerusform>¿Desea borrar las %n diapositivas seleccionadas?</numerusform></translation>
     </message>
 </context>
 <context>
@@ -2479,7 +2475,7 @@ Translators
         %s
     Japanese (ja)
         %s
-    Norwegian Bokm&#xe5;l (nb)
+    Norwegian Bokmål (nb)
         %s
     Dutch (nl)
         %s
@@ -2602,8 +2598,8 @@ Crédito Final
     </message>
     <message>
         <location filename="openlp/core/ui/aboutdialog.py" line="270"/>
-        <source>Copyright &#xa9; 2004-2015 %s
-Portions copyright &#xa9; 2004-2015 %s</source>
+        <source>Copyright © 2004-2015 %s
+Portions copyright © 2004-2015 %s</source>
         <translation>Copyright © 2004-2015 %s
 Portions copyright © 2004-2015 %s</translation>
     </message>
@@ -3962,7 +3958,7 @@ Para detener el Asistente Inicial (no se inicia OpenLP), presione el botón %s a
 <context>
     <name>OpenLP.MainDisplay</name>
     <message>
-        <location filename="openlp/core/ui/maindisplay.py" line="227"/>
+        <location filename="openlp/core/ui/maindisplay.py" line="213"/>
         <source>OpenLP Display</source>
         <translation>Pantalla de OpenLP</translation>
     </message>
@@ -6985,7 +6981,7 @@ Estos archivos serán removidos si continua.</translation>
     </message>
     <message>
         <location filename="openlp/plugins/songs/lib/ui.py" line="37"/>
-        <source>&#xa9;</source>
+        <source>©</source>
         <comment>Copyright symbol.</comment>
         <translation>©</translation>
     </message>
@@ -9149,10 +9145,7 @@ Por favor ingrese versos separados por espacios.</translation>
     <message numerus="yes">
         <location filename="openlp/plugins/songs/lib/mediaitem.py" line="361"/>
         <source>Are you sure you want to delete the %n selected song(s)?</source>
-        <translation>
-            <numerusform>¿Desea borrar %n canción seleccionada?</numerusform>
-            <numerusform>¿Desea borrar las %n canciones seleccionadas?</numerusform>
-        </translation>
+        <translation><numerusform>¿Desea borrar %n canción seleccionada?</numerusform><numerusform>¿Desea borrar las %n canciones seleccionadas?</numerusform></translation>
     </message>
     <message>
         <location filename="openlp/plugins/songs/lib/mediaitem.py" line="128"/>
@@ -9795,4 +9788,4 @@ Por favor ingrese versos separados por espacios.</translation>
         <translation>No se encontraron canciones duplicadas en la base de datos.</translation>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/resources/i18n/et.ts b/resources/i18n/et.ts
index 7c0c5fd66..a02b0a354 100644
--- a/resources/i18n/et.ts
+++ b/resources/i18n/et.ts
@@ -2421,11 +2421,11 @@ Find out more about OpenLP: http://openlp.org/
 OpenLP is written and maintained by volunteers. If you would like to see more free Christian software being written, please consider volunteering by using the button below.</source>
         <translation>OpenLP &lt;version&gt;&lt;revision&gt; - Open Source Lyrics Projection
 
-OpenLP is free church presentation software, or lyrics projection software, used to display slides of songs, Bible verses, videos, images, and even presentations (if Impress, PowerPoint or PowerPoint Viewer is installed) for church worship using a computer and a data projector.
+OpenLP on tasuta kiriku esitlustarkvara või laulusõnade kuvaja, mis kuvab nii laule, piiblikohti, videoid, pilte ning isegi esitlusi (kui on paigaldatud Impress, PowerPoint või PowerPoint Viewer) kasutades selleks ainult arvutit ja projektorit.
 
-Find out more about OpenLP: http://openlp.org/
+Uuri OpenLP kohta lähemalt: http://openlp.org
 
-OpenLP is written and maintained by volunteers. If you would like to see more free Christian software being written, please consider volunteering by using the button below.</translation>
+OpenLP on kirjutanud ja seda haldavad vabatahtlikud. Kui sa tahad näha rohkem tasuta kristlikku tarkvara, siis võib-olla tahad ise vabatahtlikuna kaasa aidata? Klõpsa alumisele nupule</translation>
     </message>
     <message>
         <location filename="openlp/core/ui/aboutdialog.py" line="663"/>