From 22a9488e3ce4d9b5df4fab513d633e701a91de5a Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 13 Aug 2012 16:29:02 -0400
Subject: [PATCH] Merge branch 'master' of https://github.com/Mrbytes/gitblit

---
 src/com/gitblit/wicket/GitBlitWebApp_es.properties |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/com/gitblit/wicket/GitBlitWebApp_es.properties b/src/com/gitblit/wicket/GitBlitWebApp_es.properties
index 61a6e41..46e5126 100644
--- a/src/com/gitblit/wicket/GitBlitWebApp_es.properties
+++ b/src/com/gitblit/wicket/GitBlitWebApp_es.properties
@@ -284,18 +284,18 @@
 gb.lastNDays = \u00FAltimos {0} d\u00EDas
 gb.completeGravatarProfile = Perfil completo en Gravatar.com
 gb.none = nadie
-gb.line = L&iacutenea
+gb.line = L\u00EDenea
 gb.content = Contenido
-gb.empty = vacio
-gb.inherited = inherited
+gb.empty = vac\u00EDo
+gb.inherited = heredado
 gb.deleteRepository = \u00BFBorrar el repositorio \"{0}\"?
 gb.repositoryDeleted = Repositorio ''{0}'' borrado.
 gb.repositoryDeleteFailed = \u00A1Fallo al borrar el repositorio ''{0}''!
-gb.deleteUser = Delete user \"{0}\"?
-gb.userDeleted = User ''{0}'' deleted.
-gb.userDeleteFailed = Failed to delete user ''{0}''!
-gb.time.justNow = just now
-gb.time.today = today
+gb.deleteUser = \u00BFEliminar usuario\"{0}\"?
+gb.userDeleted = Usuario ''{0}'' eliminado.
+gb.userDeleteFailed = \u00A1Fallo al eliminar usuario ''{0}''!
+gb.time.justNow = hace poco
+gb.time.today = hoy
 gb.time.yesterday = ayer
 gb.time.minsAgo = hace {0} min
 gb.time.hoursAgo = hace {0} horas
@@ -309,4 +309,8 @@
 gb.duration.oneMonth = 1 mes
 gb.duration.months = {0} meses
 gb.duration.oneYear = 1 a\u00F1o
-gb.duration.years = {0} a\u00F1os
\ No newline at end of file
+gb.duration.years = {0} a\u00F1os
+gb.authorizationControl = control de autorizaci\u00F3n
+gb.allowAuthenticatedDescription = permitir acceso a todos los usuarios autentificados
+gb.allowNamedDescription = permitir acceso a los usuarios autentificados \u00F3 equipos
+gb.markdownFailure = \u00A1Fallo al analizar el contenido Markdown!
\ No newline at end of file

--
Gitblit v1.9.1