From 83dc2468f574e9cf83515e54268bdb4c03f6d98c Mon Sep 17 00:00:00 2001 From: Unknwon Date: Wed, 2 Sep 2015 16:18:09 -0400 Subject: finish initial version of pull request --- conf/locale/locale_es-ES.ini | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'conf/locale/locale_es-ES.ini') 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 únicos. visibility=Visibilidad visiblity_helper=Este repositorio es Privado +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: %[2]s#%[3]d` pulls.create=Create Pull Request +pulls.title_desc=wants to merge %[1]d commits from %[2]s into %[3]s +pulls.merged_title_desc=merged %[1]d commits from %[2]s into %[3]s %[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 CANNOT 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 %s +rename_repo=renamed repository from %[1]s to %[3]s commit_repo=hizo push a %[2]s en %[3]s create_issue=`incidencia abierta %s#%[2]s` +create_pull_request=`created pull request %s#%[2]s` comment_issue=`comentó en la incidencia %s#%[2]s` +merge_pull_request=`merged pull request %s#%[2]s` transfer_repo=transfirió el repositorio %s a %s push_tag=hizo push del tag %[2]s a %[3]s compare_2_commits=Ver la comparación de estos 2 commits -- cgit v1.2.3