From e9b6ffb485ad0551584df1495a055648b9791692 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juan=20Carlos=20Ra=C3=B1a?= <juancarlos@innovasoc.com>
Date: Fri, 4 Dec 2009 00:40:19 +0100
Subject: [PATCH] fix commit lang for merge

---
 main/lang/english/admin.inc.php | 4 +++-
 main/lang/spanish/admin.inc.php | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/main/lang/english/admin.inc.php b/main/lang/english/admin.inc.php
index ad24cb4c89..6b2dccd0d6 100755
--- a/main/lang/english/admin.inc.php
+++ b/main/lang/english/admin.inc.php
@@ -1103,7 +1103,9 @@ $GroupPermissions = "Group Permissions";
 $MessagesSent = "Messages sent";
 $MessagesReceived = "Messages received";
 $CountFriends = "Number of friends";
-
+$SpecialCourse = "Special course";
+$MathMimetexTitle = "mimeTEX mathematical editor";
+$MathMimetexComment = "Enable mimeTeX mathematical editor";
 $MathASCIImathMLTitle = "SCIImathML mathematical editor";
 $MathASCIImathMLComment = "Enable SCIImathML mathematical editor";
 $YoutubeForStudentsTitle = "Allow students to insert videos from YouTube";
diff --git a/main/lang/spanish/admin.inc.php b/main/lang/spanish/admin.inc.php
index 6f0c523b64..93ba78c9eb 100755
--- a/main/lang/spanish/admin.inc.php
+++ b/main/lang/spanish/admin.inc.php
@@ -1103,6 +1103,9 @@ $GroupPermissions = "Permisos del grupo";
 $MessagesSent = "Mensajes enviados";
 $MessagesReceived = "Mensajes recibidos";
 $CountFriends = "Número de amigos";
+$SpecialCourse = "Curso especial";
+$MathMimetexTitle = "Editor matemático mimeTEX";
+$MathMimetexComment = "Habilitar el editor matemático mimeTEX";
 $MathASCIImathMLTitle = "Editor matemático SCIImathML";
 $MathASCIImathMLComment = "Habilitar el editor matemático SCIImathML";
 $YoutubeForStudentsTitle = "Permitir a los estudiantes insertar videos de YouTube";