merging with 1.5 for future hotfixes

.gitignore

@@ -1,4 +1,5 @@
 *.pyc
+*.orig
 
 # Debian buildings
 *.debhelper*

server/src/uds/auths/RegexLdap/Authenticator.py

@@ -32,7 +32,7 @@
 
 @author: Adolfo Gómez, dkmaster at dkmon dot com
 '''
-from __future__ import unicode_literals
+# from __future__ import unicode_literals
 
 from django.utils.translation import ugettext_noop as _
 from uds.core.ui.UserInterface import gui

server/src/uds/locale/es/LC_MESSAGES/djangojs.po

@@ -5,14 +5,15 @@
 # Translators:
 # , 2014
 # Adolfo Gómez <dkmaster@dkmon.com>, 2014
+# blafuente <blafuente@virtualcable.es>, 2014
 # JaviBas <jgonzalez@virtualcable.es>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenUDS\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-04-10 11:41+0200\n"
-"PO-Revision-Date: 2014-04-10 12:26+0000\n"
+"PO-Revision-Date: 2014-06-03 11:17+0000\n"
-"Last-Translator: Adolfo Gómez <dkmaster@dkmon.com>\n"
+"Last-Translator: blafuente <blafuente@virtualcable.es>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/openuds/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -301,7 +302,7 @@ msgstr "Nuevo servicio"
 
 #: static/tmp_js/gui-d-services.js:106
 msgid "Service saving error"
-msgstr "Error guardando servicio"
+msgstr "Error al guardar servicio"
 
 #: static/tmp_js/gui-d-services.js:107
 msgid "Delete service"
@@ -309,7 +310,7 @@ msgstr "Eliminar servicio"
 
 #: static/tmp_js/gui-d-services.js:107
 msgid "Service deletion error"
-msgstr "Error eliminando servicio"
+msgstr "Error al eliminar servicio"
 
 #: static/tmp_js/gui-d-services.js:120
 msgid "New services provider"
@@ -333,7 +334,7 @@ msgstr "Eliminar proveedor de servicios"
 
 #: static/tmp_js/gui-d-services.js:122
 msgid "Services Provider deletion error"
-msgstr "Error de eliminación de proveedor de servicios"
+msgstr "Error al eliminar el proveedor de servicios"
 
 #: static/tmp_js/gui-d-servicespools.js:72
 msgid "Waiting for removal"
@@ -580,11 +581,11 @@ msgstr "Este campo es obligatorio"
 
 #: static/tmp_js/gui.js:213
 msgid "Please fix this field."
-msgstr "Por favor corija este campo."
+msgstr "Por favor corrija este campo."
 
 #: static/tmp_js/gui.js:214
 msgid "Please enter a valid email address."
-msgstr "Introduzca una dirección de correo electrónico válida."
+msgstr "Por favor, introduzca una dirección de correo electrónico válida."
 
 #: static/tmp_js/gui.js:215
 msgid "Please enter a valid URL."
@@ -604,7 +605,7 @@ msgstr "Por favor, introduzca un número válido."
 
 #: static/tmp_js/gui.js:219
 msgid "Please enter only digits."
-msgstr "Introduzca sólo dígitos."
+msgstr "Por favor, introduzca sólo dígitos."
 
 #: static/tmp_js/gui.js:220
 msgid "Please enter a valid credit card number."
@@ -616,11 +617,11 @@ msgstr "Por favor, introduzca el mismo valor de nuevo."
 
 #: static/tmp_js/gui.js:222
 msgid "Please enter no more than {0} characters."
-msgstr "Introduzca no más de {0} caracteres."
+msgstr "Por favor, no introduzca más de {0} caracteres."
 
 #: static/tmp_js/gui.js:223
 msgid "Please enter at least {0} characters."
-msgstr "Introduzca al menos {0} caracteres."
+msgstr "Por favor, introduzca al menos {0} caracteres."
 
 #: static/tmp_js/gui.js:224
 msgid "Please enter a value between {0} and {1} characters long."

server/src/uds/templates/uds/html5/detectJava.html

@@ -26,4 +26,4 @@
 <!--<div>
 <a href="<a href="{% url "uds.web.views.index" %}">{% trans "Go to main page" %}
 </div>-->
-{% endblock %}
+{% endblock %}

server/src/uds/templates/uds/html5/login.html

@@ -105,4 +105,4 @@
 					{% endautoescape %}
 			</div>
 		</div>
-{% endblock %}
+{% endblock %}