From 0815f032dedf0bf1f0d60d543f5f1836d9086c8e Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 17 Sep 2014 14:38:42 -0400
Subject: [PATCH] Merged #182 "Add NO CHANGE REQUIRED ticket status"

---
 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