finish initial version of pull request

1 files changed, 26 insertions, 0 deletions

diff --git a/conf/locale/locale_es-ES.ini b/conf/locale/locale_es-ES.ini
index 0736a051bd..951fe7a145 100755
--- a/conf/locale/locale_es-ES.ini
+++ b/conf/locale/locale_es-ES.ini
@@ -319,6 +319,7 @@ repo_name=Nombre del Repositorio
 repo_name_helper=Los grandes nombres de repositorios son cortos, memorables y <strong>únicos</strong>.

 visibility=Visibilidad

 visiblity_helper=Este repositorio es <span class="ui red text">Privado</span>

+visiblity_fork_helper=(Change of this value will affect all forks)

 fork_repo=Hacer Fork del repositorio

 fork_from=Crear un Fork desde

 fork_visiblity_helper=No es posible cambiar la visibilidad de un Fork

@@ -369,6 +370,7 @@ branch_and_tags=Ramas y Etiquetas
 branches=Ramas

 tags=Etiquetas

 issues=Incidencias

+pulls=Pull Requests

 labels=Etiquetas

 milestones=Milestones

 commits=Commits

@@ -461,8 +463,26 @@ issues.label_deletion_success=Etiqueta borrada con éxito!
 

 pulls.compare_changes=Compare Changes

 pulls.compare_changes_desc=Compare two branches and make a pull request for changes.

+pulls.compare_base=base

+pulls.compare_compare=compare

+pulls.filter_branch=Filter branch

 pulls.no_results=No results found.

+pulls.nothing_to_compare=There is nothing to compare because base and head branches are even.

+pulls.has_pull_request=`There is already a pull request between these two targets: <a href="%[1]s/pulls/%[3]d">%[2]s#%[3]d</a>`

 pulls.create=Create Pull Request

+pulls.title_desc=wants to merge %[1]d commits from <code>%[2]s</code> into <code>%[3]s</code>

+pulls.merged_title_desc=merged %[1]d commits from <code>%[2]s</code> into <code>%[3]s</code> %[4]s

+pulls.tab_conversation=Conversation

+pulls.tab_commits=Commits

+pulls.tab_files=Files changed

+pulls.reopen_to_merge=Please reopen this pull request to perform merge operation.

+pulls.merged=Merged

+pulls.has_merged=This pull request has been merged successfully!

+pulls.data_broken=Data of this pull request has been broken due to deletion of fork information.

+pulls.can_auto_merge_desc=You can perform auto-merge operation on this pull request.

+pulls.cannot_auto_merge_desc=You can't perform auto-merge operation because there are conflicts between commits.

+pulls.cannot_auto_merge_helper=Please use command line tool to solve it.

+pulls.merge_pull_request=Merge Pull Request

 

 milestones.new=New Milestone

 milestones.open_tab=%d Open

@@ -508,6 +528,9 @@ settings.transfer_notices_2=- You will conserve access if new owner is an organi
 settings.transfer_form_title=Please enter following information to confirm your operation:

 settings.delete_notices_1=- This operation <strong>CANNOT</strong> be undone.

 settings.delete_notices_2=- This operation will permanently delete the everything of this repository, including Git data, issues, comments and accesses of collaborators.

+settings.delete_notices_fork_1=- If this repository is public, all forks will be became independent after deletion.

+settings.delete_notices_fork_2=- If this repository is private, all forks will be removed at the same time.

+settings.delete_notices_fork_3=- If you want to keep all forks after deletion, please change visibility of this repository to public first.

 settings.update_settings_success=Las opciones del repositorio se han actualizado correctamente.

 settings.transfer_owner=Nuevo Propietario

 settings.make_transfer=Transferir

@@ -896,9 +919,12 @@ notices.delete_success=La notificación del sistema se ha eliminado correctament
 

 [action]

 create_repo=Repositorio creado <a href="%s">%s</a>

+rename_repo=renamed repository from <code>%[1]s</code> to <a href="%[2]s">%[3]s</a>

 commit_repo=hizo push a <a href="%s/src/%s">%[2]s</a> en <a href="%[1]s">%[3]s</a>

 create_issue=`incidencia abierta <a href="%s/issues/%s">%s#%[2]s</a>`

+create_pull_request=`created pull request <a href="%s/pulls/%s">%s#%[2]s</a>`

 comment_issue=`comentó en la incidencia <a href="%s/issues/%s">%s#%[2]s</a>`

+merge_pull_request=`merged pull request <a href="%s/pulls/%s">%s#%[2]s</a>`

 transfer_repo=transfirió el repositorio <code>%s</code> a <a href="%s">%s</a>

 push_tag=hizo push del tag <a href="%s/src/%s">%[2]s</a> a <a href="%[1]s">%[3]s</a>

 compare_2_commits=Ver la comparación de estos 2 commits