From 18231200d33b62d2d96286b9bbd84476df5d9189 Mon Sep 17 00:00:00 2001
From: Morten Bøgeskov <source@bogeskov.dk>
Date: Mon, 15 Jun 2015 12:51:52 -0400
Subject: [PATCH] Added git.sshDisplay{Port|Host} to hide port forward.
---
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