summaryrefslogtreecommitdiffstats
path: root/conf/locale/locale_es-ES.ini
diff options
context:
space:
mode:
Diffstat (limited to 'conf/locale/locale_es-ES.ini')
-rwxr-xr-xconf/locale/locale_es-ES.ini1
1 files changed, 1 insertions, 0 deletions
diff --git a/conf/locale/locale_es-ES.ini b/conf/locale/locale_es-ES.ini
index a81371158e..5d5bece965 100755
--- a/conf/locale/locale_es-ES.ini
+++ b/conf/locale/locale_es-ES.ini
@@ -502,6 +502,7 @@ pulls.can_auto_merge_desc=Puede realizar la operación auto-fusionado en este pu
pulls.cannot_auto_merge_desc=No puede realizar la operación de auto-fusionado porque existen conflictos entre los commits.
pulls.cannot_auto_merge_helper=Por favor use la línea de comandos para resolverlo.
pulls.merge_pull_request=Fusionar Pull Request
+pulls.open_unmerged_pull_exists=`You can't perform reopen operation because there is already an open pull request (#%d) from same repository with same merge information and is waiting for merging.`
milestones.new=Nuevo Milestone
milestones.open_tab=%d abiertas