Updated esES translation; last string

diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp_es.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp_es.properties
index 602c79d0448cc05d45509ed346da7b5f503335bc..791b286ee9c977d7f5729b47ae2faf00aed4687b 100644 (file)
--- 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.repositoryIsMirror = Repositorio de s\u00F3lo lectura, es Espejo de otro.
 gb.repositoryIsFrozen = Este Repositorio est\u00E1 congelado.\r
 gb.repositoryDoesNotAcceptPatchsets = Este Repositorio no acepta parches.\r
 gb.serverDoesNotAcceptPatchsets = Este Servidor-Git no acepta parches.\r
-gb.ticketIsClosed = Este ticket est\u00E1 cerrado.
\ No newline at end of file
+gb.ticketIsClosed = Este ticket est\u00E1 cerrado.\r
+gb.mergeToDescription = Rama de integraciu00F3n predeterminada para combinar ticket y parches
\ No newline at end of file