aboutsummaryrefslogtreecommitdiffstats
path: root/options/locale/locale_es-ES.ini
diff options
context:
space:
mode:
authorGiteaBot <teabot@gitea.io>2021-03-29 00:12:37 +0000
committerGiteaBot <teabot@gitea.io>2021-03-29 00:12:37 +0000
commit3416e2a82586fca4cd452b93237b979300f55d62 (patch)
treed0537ef555f5d9370ad194b134ac229a98d2536c /options/locale/locale_es-ES.ini
parent3273fb9af18b9356d3c472bf23e9fbb8c7d681f3 (diff)
downloadgitea-3416e2a82586fca4cd452b93237b979300f55d62.tar.gz
gitea-3416e2a82586fca4cd452b93237b979300f55d62.zip
[skip ci] Updated translations via Crowdin
Diffstat (limited to 'options/locale/locale_es-ES.ini')
-rw-r--r--options/locale/locale_es-ES.ini1
1 files changed, 1 insertions, 0 deletions
diff --git a/options/locale/locale_es-ES.ini b/options/locale/locale_es-ES.ini
index 56324ec8c4..a1260e87fc 100644
--- a/options/locale/locale_es-ES.ini
+++ b/options/locale/locale_es-ES.ini
@@ -1790,6 +1790,7 @@ settings.block_on_official_review_requests_desc=Fusionar no será posible cuando
settings.block_outdated_branch=Bloquear fusión si la pull request está desactualizada
settings.block_outdated_branch_desc=La fusión no será posible cuando la rama principal esté detrás de la rama base.
settings.default_branch_desc=Seleccione una rama de repositorio por defecto para los pull request y los commits:
+settings.default_merge_style_desc=Estilo de fusión por defecto para pull requests:
settings.choose_branch=Elija una rama…
settings.no_protected_branch=No hay ramas protegidas.
settings.edit_protected_branch=Editar