summaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authormrbytes <eguervos@msn.com>2014-03-09 15:38:47 +0100
committermrbytes <eguervos@msn.com>2014-03-09 15:38:47 +0100
commita37f109ec948448746e495cc2d6245830f18b109 (patch)
treed186187707d3af914e285f6b913bf89384572797 /src/main/java
parentb34d1257f3ccce852343057451503c982891b322 (diff)
downloadgitblit-a37f109ec948448746e495cc2d6245830f18b109.tar.gz
gitblit-a37f109ec948448746e495cc2d6245830f18b109.zip
Updated esES translation; last string
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/com/gitblit/wicket/GitBlitWebApp_es.properties3
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 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