From b3aabb94c9935e61ba16bb5ab506c123ae29fbf3 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 15 Jun 2015 12:56:23 -0400
Subject: [PATCH] Renamed ssh.Display(Host|Port) to ssh.Advertised(Host|Port)

---
 src/main/java/com/gitblit/wicket/GitBlitWebApp_es.properties |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp_es.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp_es.properties
index 602c79d..791b286 100644
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp_es.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_es.properties
@@ -668,4 +668,5 @@
 gb.repositoryIsFrozen = Este Repositorio est\u00E1 congelado.
 gb.repositoryDoesNotAcceptPatchsets = Este Repositorio no acepta parches.
 gb.serverDoesNotAcceptPatchsets = Este Servidor-Git no acepta parches.
-gb.ticketIsClosed = Este ticket est\u00E1 cerrado.
\ No newline at end of file
+gb.ticketIsClosed = Este ticket est\u00E1 cerrado.
+gb.mergeToDescription = Rama de integraciu00F3n predeterminada para combinar ticket y parches
\ No newline at end of file

--
Gitblit v1.9.1