From a37f109ec948448746e495cc2d6245830f18b109 Mon Sep 17 00:00:00 2001 From: mrbytes Date: Sun, 9 Mar 2014 15:38:47 +0100 Subject: [PATCH] Updated esES translation; last string --- src/main/java/com/gitblit/wicket/GitBlitWebApp_es.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp_es.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp_es.properties index 602c79d0..791b286e 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.repositoryIsMirror = Repositorio de s\u00F3lo lectura, es Espejo de otro. 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 -- 2.39.5