finish initial version of pull request

1 files changed, 26 insertions, 0 deletions

diff --git a/conf/locale/locale_fr-FR.ini b/conf/locale/locale_fr-FR.ini
index 075e0e24f1..a45c9d1c58 100755
--- a/conf/locale/locale_fr-FR.ini
+++ b/conf/locale/locale_fr-FR.ini
@@ -319,6 +319,7 @@ repo_name=Nom du Référentiel
 repo_name_helper=Idéalement, le nom d'un dépot devrait être court, mémorable et <strong>unique</strong>.

 visibility=Visibilité

 visiblity_helper=Ce dépôt est <span class="ui red text"> privé</span>

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

 fork_repo=Référentiel d'Embranchement

 fork_from=Embranchement de

 fork_visiblity_helper=Un dépôt scindé ne peut pas changer sa visiblité

@@ -369,6 +370,7 @@ branch_and_tags=Branches & Tags
 branches=Branches

 tags=Tags

 issues=Problèmes

+pulls=Pull Requests

 labels=Etiquettes

 milestones=Étapes

 commits=Commissions

@@ -461,8 +463,26 @@ issues.label_deletion_success=Label supprimé avec succès !
 

 pulls.compare_changes=Comparer les changements

 pulls.compare_changes_desc=Comparer deux branches et faire une demande de récupération Pull pour les changements.

+pulls.compare_base=base

+pulls.compare_compare=compare

+pulls.filter_branch=Filter branch

 pulls.no_results=Aucun résultat trouvé.

+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=Nouveau Jalon

 milestones.open_tab=%d Ouvert

@@ -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=Options mises à jour avec succès.

 settings.transfer_owner=Nouveau propriétaire

 settings.make_transfer=Transférer

@@ -896,9 +919,12 @@ notices.delete_success=Note système supprimée avec succès.
 

 [action]

 create_repo=a crée le Référentiel <a href="%s">%s</a>

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

 commit_repo=a soumis à <a href="%s/src/%s">%[2]s</a> chez <a href="%[1]s">%[3]s</a>

 create_issue=`a ouvert un problème <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=`a commenté le problème <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=a transféré le Référentiel <code>%s</code> à <a href="%s">%s</a>

 push_tag=a tagé <a href="%s/src/%s">%[2]s</a> à <a href="%[1]s">%[3]s</a>

 compare_2_commits=Comparer ces 2 commissions