finish initial version of pull request

1 files changed, 26 insertions, 0 deletions

diff --git a/conf/locale/locale_zh-HK.ini b/conf/locale/locale_zh-HK.ini
index 2ff6c2ec8f..fa0d3c3afa 100755
--- a/conf/locale/locale_zh-HK.ini
+++ b/conf/locale/locale_zh-HK.ini
@@ -319,6 +319,7 @@ repo_name=倉庫名稱
 repo_name_helper=偉大的倉庫名稱一般都較短、令人深刻並且 <strong>獨一無二</strong> 的。

 visibility=可見度

 visiblity_helper=該倉庫為 <span class="ui red text">私有的</span>

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

 fork_repo=派生倉庫

 fork_from=派生自

 fork_visiblity_helper=派生倉庫無法修改可見性。

@@ -369,6 +370,7 @@ branch_and_tags=分支與標籤
 branches=分支列表

 tags=標籤列表

 issues=問題管理

+pulls=Pull Requests

 labels=標籤

 milestones=里程碑

 commits=提交歷史

@@ -461,8 +463,26 @@ issues.label_deletion_success=標籤刪除成功!
 

 pulls.compare_changes=對比文件變化

 pulls.compare_changes_desc=對比兩個分支間的文件變化及發起一個合併請求。

+pulls.compare_base=base

+pulls.compare_compare=compare

+pulls.filter_branch=Filter branch

 pulls.no_results=未找到結果

+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=新的里程碑

 milestones.open_tab=%d 開啟中

@@ -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=倉庫設置更新成功！

 settings.transfer_owner=新擁有者

 settings.make_transfer=確認轉移倉庫

@@ -896,9 +919,12 @@ notices.delete_success=系統提示刪除成功！
 

 [action]

 create_repo=創建了倉庫 <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 href="%s/src/%s">%[2]s</a> 分支的代碼到 <a href="%[1]s">%[3]s</a>

 create_issue=`創建了問題 <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 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=將倉庫 <code>%s</code> 轉移至 <a href="%s">%s</a>

 push_tag=推送了標籤 <a href="%s/src/%s">%[2]s</a> 到 <a href="%[1]s">%[3]s</a>

 compare_2_commits=查看 2 次提交的內容對比