Fix ellipses, 'a[n]' and 'username' (issue #3512). (#3518)

release/v1.15
bugreport0 2018-02-17 00:32:40 +10:30 committed by Lunny Xiao
parent 4b48a45bac
commit 9303fc2015
1 changed files with 17 additions and 17 deletions

View File

@ -17,7 +17,7 @@ page = Page
template = Template
language = Language
notifications = Notifications
create_new = Create...
create_new = Create
user_profile_and_more = User profile and more
signed_in_as = Signed in as
enable_javascript = This website works better with JavaScript
@ -155,12 +155,12 @@ uname_holder = Username or email
password_holder = Password
switch_dashboard_context = Switch Dashboard Context
my_repos = My Repositories
show_more_repos = Show more repositories ...
show_more_repos = Show more repositories
collaborative_repos = Collaborative Repositories
my_orgs = My Organizations
my_mirrors = My Mirrors
view_home = View %s
search_repos = Find a repository ...
search_repos = Find a repository
issues.in_your_repos = In your repositories
@ -249,7 +249,7 @@ Content = Content
require_error = ` cannot be empty.`
alpha_dash_error = ` must be valid alphanumeric or dash(-_) characters.`
alpha_dash_dot_error = ` must be valid alphanumeric, dash(-_) or dot characters.`
git_ref_name_error = ` must be well formed git reference name.`
git_ref_name_error = ` must be a well formed git reference name.`
size_error = ` must be size %s.`
min_size_error = ` must contain at least %s characters.`
max_size_error = ` must contain at most %s characters.`
@ -335,7 +335,7 @@ enable_custom_avatar = Use Custom Avatar
choose_new_avatar = Choose new avatar
update_avatar = Update Avatar Setting
delete_current_avatar = Delete Current Avatar
uploaded_avatar_not_a_image = Uploaded file is not a image.
uploaded_avatar_not_a_image = Uploaded file is not an image.
update_avatar_success = Your avatar setting has been updated.
change_password = Change Password
@ -565,7 +565,7 @@ editor.fork_before_edit = You must fork this repository before editing the file
editor.delete_this_file = Delete this file
editor.must_have_write_access = You must have write access to make or propose changes to this file
editor.file_delete_success = File '%s' has been deleted successfully!
editor.name_your_file = Name your file...
editor.name_your_file = Name your file
editor.filename_help = To add directory, just type it and press /. To remove a directory, go to the beginning of the field and press backspace.
editor.or = or
editor.cancel_lower = cancel
@ -574,10 +574,10 @@ editor.add_tmpl = Add '%s/<filename>'
editor.add = Add '%s'
editor.update = Update '%s'
editor.delete = Delete '%s'
editor.commit_message_desc = Add an optional extended description...
editor.commit_message_desc = Add an optional extended description
editor.commit_directly_to_this_branch = Commit directly to the <strong class="branch-name">%s</strong> branch.
editor.create_new_branch = Create a <strong>new branch</strong> for this commit and start a pull request.
editor.new_branch_name_desc = New branch name...
editor.new_branch_name_desc = New branch name
editor.cancel = Cancel
editor.filename_cannot_be_empty = Filename cannot be empty.
editor.branch_already_exists = Branch '%s' already exists in this repository.
@ -589,7 +589,7 @@ editor.file_changed_while_editing = The file content has been changed since you
editor.file_already_exists = A file with name '%s' already exists in this repository.
editor.no_changes_to_show = There are no changes to show.
editor.fail_to_update_file = Failed to update/create file '%s' with error: %v
editor.add_subdir = Add subdirectory...
editor.add_subdir = Add subdirectory
editor.unable_to_upload_files = Failed to upload files to '%s' with error: %v
editor.upload_files_to_dir = Upload files to '%s'
editor.cannot_commit_to_protected_branch = Can not commit to protected branch '%s'.
@ -626,7 +626,7 @@ issues.new.no_assignee = No assignee
issues.no_ref = No Branch/Tag Specified
issues.create = Create Issue
issues.new_label = New Label
issues.new_label_placeholder = Label name...
issues.new_label_placeholder = Label name
issues.create_label = Create Label
issues.label_templates.title = Load a predefined set of labels
issues.label_templates.info = There are not any labels yet. You can click on the "New Label" button above to create one or use a predefined set below.
@ -897,7 +897,7 @@ settings.tracker_url_format = External Issue Tracker URL Format
settings.tracker_issue_style = External Issue Tracker Naming Style:
settings.tracker_issue_style.numeric = Numeric
settings.tracker_issue_style.alphanumeric = Alphanumeric
settings.tracker_url_format_desc = You can use placeholder <code>{user} {repo} {index}</code> for user name, repository name and issue index.
settings.tracker_url_format_desc = You can use placeholder <code>{user} {repo} {index}</code> for username, repository name and issue index.
settings.enable_timetracker = Enable time tracker
settings.allow_only_contributors_to_track_time = Allow only contributors to track time
settings.pulls_desc = Enable pull requests to accept public contributions
@ -914,7 +914,7 @@ settings.convert_confirm = Confirm Conversion
settings.convert_succeed = Repository has been converted to a regular repository.
settings.transfer = Transfer Ownership
settings.transfer_desc = Transfer this repository to another user or to an organization in which you have admin rights.
settings.transfer_notices_1 = - You will lose access if the new owner is a individual user.
settings.transfer_notices_1 = - You will lose access if the new owner is an individual user.
settings.transfer_notices_2 = - You will preserve access if the new owner is an organization and if you're one of the owners.
settings.transfer_form_title = Please enter the following information to confirm your operation:
settings.wiki_delete = Erase Wiki Data
@ -938,7 +938,7 @@ settings.delete_collaborator = Delete
settings.collaborator_deletion = Collaborator Deletion
settings.collaborator_deletion_desc = This user will no longer have collaboration access to this repository after deletion. Do you want to continue?
settings.remove_collaborator_success = Collaborator has been removed.
settings.search_user_placeholder = Search user...
settings.search_user_placeholder = Search user
settings.org_not_allowed_to_be_collaborator = Organization is not allowed to be added as a collaborator.
settings.user_is_org_member = User is organization member who cannot be added as a collaborator.
settings.add_webhook = Add Webhook
@ -1029,7 +1029,7 @@ settings.remove_protected_branch_success= Branch %s protect options removed succ
settings.protected_branch_deletion=To delete a protected branch
settings.protected_branch_deletion_desc=Anyone with write permissions will be able to push directly to this branch. Are you sure?
settings.default_branch_desc = The default branch is considered the "base" branch in your repository against which all pull requests and code commits are automatically made, unless you specify a different branch.
settings.choose_branch = Choose a branch...
settings.choose_branch = Choose a branch
settings.no_protected_branch = There are no protected branches
diff.browse_source = Browse Source
@ -1063,7 +1063,7 @@ release.title = Title
release.content = Content
release.write = Write
release.preview = Preview
release.loading = Loading...
release.loading = Loading
release.prerelease_desc = This is a pre-release
release.prerelease_helper = We'll point out that this release is not production-ready.
release.cancel = Cancel
@ -1177,7 +1177,7 @@ teams.read_permission_desc = This team grants <strong>Read</strong> access: memb
teams.write_permission_desc = This team grants <strong>Write</strong> access: members can read from and push to the team's repositories.
teams.admin_permission_desc = This team grants <strong>Admin</strong> access: members can read from, push to, and add collaborators to the team's repositories.
teams.repositories = Team Repositories
teams.search_repo_placeholder = Search repository...
teams.search_repo_placeholder = Search repository
teams.add_team_repository = Add Team Repository
teams.remove_repo = Remove
teams.add_nonexistent_repo = "The repository you're trying to add does not exist; please create it first."
@ -1316,7 +1316,7 @@ auths.bind_password_helper = Warning: This password is stored in plain text. It
auths.user_base = User Search Base
auths.user_dn = User DN
auths.attribute_username = Username attribute
auths.attribute_username_placeholder = Leave empty to use sign-in form field value for user name.
auths.attribute_username_placeholder = Leave empty to use sign-in form field value for username.
auths.attribute_name = First name attribute
auths.attribute_surname = Surname attribute
auths.attribute_mail = Email attribute