diff options
Diffstat (limited to 'conf/locale/locale_es-ES.ini')
| -rw-r--r-- | conf/locale/locale_es-ES.ini | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/conf/locale/locale_es-ES.ini b/conf/locale/locale_es-ES.ini index fbfe94d1..9c61ad2b 100644 --- a/conf/locale/locale_es-ES.ini +++ b/conf/locale/locale_es-ES.ini @@ -616,6 +616,7 @@ pulls.compare_compare=comparar con pulls.filter_branch=Filtrar rama pulls.no_results=Sin resultados. pulls.nothing_to_compare=Nada que comparar. Las dos ramas coinciden. +pulls.nothing_merge_base=There is nothing to compare because two branches have completely different history. pulls.has_pull_request=`Ya existe un pull request entre estas dos ramas: <a href="%[1]s/pulls/%[3]d">%[2]s#%[3]d</a>` pulls.create=Crear Pull Request pulls.title_desc=desea fusionar %[1]d commits de <code>%[2]s</code> en <code>%[3]s</code> @@ -830,7 +831,7 @@ settings.recent_deliveries=Envíos Recientes settings.hook_type=Tipo de Hook settings.add_slack_hook_desc=Añade integración con <a href="%s">Slack</a> a tu repositorio. settings.add_discord_hook_desc=Añade integración con <a href="%s">Slack</a> a tu repositorio. -settings.add_dingtalk_hook_desc=Añade integración con <a href="%s">Dingtalk</a> a tu repositorio. +settings.add_dingtalk_hook_desc=Add <a href="%s">Dingtalk</a> integration to your repository. settings.slack_token=Token settings.slack_domain=Dominio settings.slack_channel=Canal |