From 25cfb7aa717d0a475a39eea5ed44e6f336bdf9f0 Mon Sep 17 00:00:00 2001 From: linhk <304431313@qq.com> Date: Sat, 2 Aug 2014 14:43:05 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=B0=B7=E6=AD=8C?= =?UTF-8?q?=E6=B5=8F=E8=A7=88=E5=99=A8=E6=96=B0=E5=BB=BA=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=BA=93=E6=96=87=E6=9C=AC=E6=A1=86=E4=BC=9A=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=A1=AB=E5=86=99=E7=BC=93=E5=AD=98=E5=86=85=E5=AE=B9=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/repositories/_form_create.html.erb | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/app/views/repositories/_form_create.html.erb b/app/views/repositories/_form_create.html.erb index 669f47071..d8c30143e 100644 --- a/app/views/repositories/_form_create.html.erb +++ b/app/views/repositories/_form_create.html.erb @@ -5,7 +5,12 @@ background-color:gray; border:none } - + <%= error_messages_for 'repository' %>
@@ -22,7 +27,10 @@ border:none <% end %>

<%= f.check_box :is_default, :label => :field_repository_is_default %>

-

<%= f.text_field :identifier, :required=>true, :disabled => @repository.identifier_frozen?, :label => l(:label_repository_name)%> + +

+ +<%= f.text_field :identifier,:required=>true,:type=>"hidden", :disabled => @repository.identifier_frozen?, :label => l(:label_repository_name)%> <% unless @repository.identifier_frozen? %> <%= l(:text_length_between, :min => 1, :max => Repository::IDENTIFIER_MAX_LENGTH) %> <%= l(:text_repository_identifier_info).html_safe %> From 65174ad8efb62a9365671d8763a9d30ccb2ecb32 Mon Sep 17 00:00:00 2001 From: linhk <304431313@.com> Date: Tue, 5 Aug 2014 09:19:05 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E9=A1=B9=E7=9B=AE--wiki--=E9=87=8D?= =?UTF-8?q?=E5=AE=9A=E5=90=91/=E9=87=8D=E5=91=BD=E5=90=8D=EF=BC=9A?= =?UTF-8?q?=E2=80=9C=E9=87=8D=E2=80=9D=E5=AD=97=E8=A2=AB=E6=8E=A9=E7=9B=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/repositories/newrepo.html.erb | 2 +- app/views/wiki/rename.html.erb | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/views/repositories/newrepo.html.erb b/app/views/repositories/newrepo.html.erb index 0461d5768..0c95a0335 100644 --- a/app/views/repositories/newrepo.html.erb +++ b/app/views/repositories/newrepo.html.erb @@ -2,5 +2,5 @@

<%= l(:label_repository_new_repos) %>

<%= labelled_form_for :repository, @repository, :url =>project_repositories_path(@project),:html => {:id => 'repository-form'} do |f| %> <%= render :partial => 'form_create', :locals => {:f => f} %> - + <% end %> \ No newline at end of file diff --git a/app/views/wiki/rename.html.erb b/app/views/wiki/rename.html.erb index ee0e49594..1ce11ee83 100644 --- a/app/views/wiki/rename.html.erb +++ b/app/views/wiki/rename.html.erb @@ -1,5 +1,10 @@ <%= wiki_page_breadcrumb(@page) %> - +

<%= h @original_title %>

<%= error_messages_for 'page' %> @@ -9,7 +14,7 @@ :html => { :method => :post } do |f| %>

<%= f.text_field :title, :required => true, :size => 100 %>

-

<%= f.check_box :redirect_existing_links %>

+

<%= f.check_box :redirect_existing_links %>

<%= f.select :parent_id, content_tag('option', '', :value => '') + wiki_page_options_for_select( From 3862f857f78bfdf792d53c51fad8009c3f9e7c81 Mon Sep 17 00:00:00 2001 From: linhk <304431313@.com> Date: Tue, 5 Aug 2014 14:02:39 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=BD=93=E5=B8=96?= =?UTF-8?q?=E5=AD=90=E5=9B=9E=E5=A4=8D=E6=9D=A1=E4=BB=B6=E4=B8=BA=E7=A9=BA?= =?UTF-8?q?=E6=8E=92=E5=88=97=E6=AC=A1=E5=BA=8F=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/memos_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/memos_controller.rb b/app/controllers/memos_controller.rb index d7510c385..1e537ff75 100644 --- a/app/controllers/memos_controller.rb +++ b/app/controllers/memos_controller.rb @@ -84,7 +84,7 @@ class MemosController < ApplicationController @reply_pages = Paginator.new @reply_count, pre_count, page @replies = @memo.children. includes(:author, :attachments). - reorder("#{Memo.table_name}.created_at ASC"). + reorder("#{Memo.table_name}.created_at DESC"). limit(@reply_pages.per_page). offset(@reply_pages.offset). all From d8964d81a845d8c604c3995344289cf167c7881a Mon Sep 17 00:00:00 2001 From: linhk <304431313@.com> Date: Tue, 5 Aug 2014 17:13:50 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=B3=A8=E5=86=8Clastn?= =?UTF-8?q?ame=E8=B6=85=E9=95=BF=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/user.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/user.rb b/app/models/user.rb index b64d0efd7..78bfc75f0 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -174,6 +174,7 @@ class User < Principal validates_format_of :login, :with => /\A[a-z0-9_\-@\.]*\z/i validates_length_of :login, :maximum => LOGIN_LENGTH_LIMIT validates_length_of :firstname, :maximum => 30 + validates_length_of :lastname, :maximum => 30 validates_format_of :mail, :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i, :allow_blank => true validates_length_of :mail, :maximum => MAIL_LENGTH_LIMIT, :allow_nil => true validates_confirmation_of :password, :allow_nil => true From 23c9d5381e34fc46a73e7f66aa5af5edd0b6216a Mon Sep 17 00:00:00 2001 From: linhk <304431313@.com> Date: Wed, 6 Aug 2014 14:41:22 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E5=A1=AB=E5=86=99=E4=BF=A1=E6=81=AF=E7=BB=A7?= =?UTF-8?q?=E7=BB=AD=E4=BF=9D=E7=95=99=20=E4=BF=AE=E6=94=B9=E6=B3=A8?= =?UTF-8?q?=E5=86=8C=E8=A7=81=E9=9D=A2=E4=BC=81=E4=B8=9A=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E5=A7=93=E3=80=81=E5=90=8D=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E9=94=99=E8=AF=AFBug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/account_controller.rb | 13 ++++++-- app/views/account/register.html.erb | 44 +++++++++++++++++++++++++-- 2 files changed, 51 insertions(+), 6 deletions(-) diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb index 085ee0c60..c05d1172c 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -102,7 +102,14 @@ class AccountController < ApplicationController # User self-registration def register # @root_path="/home/pdl/redmine-2.3.2-0/apache2/" -# +# + @cache_identityy = params[:identity]||"" #身份 + @cache_no = params[:no]||"" #学号 + @cache_technical_title = params[:technical_title]||"" #教师职称 + @cache_province = params[:province]||"" #省份 + @cache_city = params[:city]||"" #城市 + @cache_enterprise_name = params[:enterprise_name]||"" #企业 + (redirect_to(home_url); return) unless Setting.self_registration? || session[:auth_source_registration] if request.get? session[:auth_source_registration] = nil @@ -112,8 +119,8 @@ class AccountController < ApplicationController @user = User.new @user.safe_attributes = user_params if params[:identity] == "2" # 2 企业 - @user.firstname = params[:enterprise_name] - @user.lastname = l(:field_enterprise) + #@user.firstname = params[:enterprise_name] + #@user.lastname = l(:field_enterprise) end @user.admin = false @user.register diff --git a/app/views/account/register.html.erb b/app/views/account/register.html.erb index 260d53744..21c8c11b9 100644 --- a/app/views/account/register.html.erb +++ b/app/views/account/register.html.erb @@ -193,7 +193,40 @@ From f173db4c9d545150474cc7bc4ea390289c5b1129 Mon Sep 17 00:00:00 2001 From: linhk <304431313@.com> Date: Wed, 6 Aug 2014 15:58:38 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=E8=8B=B1=E6=96=87=E7=89=88=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=B3=A8=E5=86=8C=E9=A1=B5=E9=9D=A2=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=9A=84Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/locales/en.yml | 4 ++++ config/locales/zh.yml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/config/locales/en.yml b/config/locales/en.yml index e1b93f649..0cffaa8fe 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1473,6 +1473,8 @@ en: label_identity: Identity label_teacher: Teacher label_student: Student + label_enterprise: Enterprise + label_account_developer: Developer label_school_all: Schools label_school_not_fount: Not found by your input query condition. label_other: Other @@ -1799,3 +1801,5 @@ en: # ajax异步验证 modal_valid_passing: can be used. + + diff --git a/config/locales/zh.yml b/config/locales/zh.yml index d6756474f..65d36eed2 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -630,7 +630,7 @@ zh: #by huang # modified by bai label_college: 高校进入 label_enter_college: 进入高校 - label_enterprise: 企业进入 + #label_enterprise: 企业进入 lable_enter_enterprise: 进入企业 label_term: 开课学期 label_spring: 春季学期 From 0c00754057843bf14c77728f4a5dda9b9894c8c1 Mon Sep 17 00:00:00 2001 From: linhk <304431313@.com> Date: Thu, 7 Aug 2014 09:13:01 +0800 Subject: [PATCH 07/16] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=B0=B7=E6=AD=8C?= =?UTF-8?q?=E6=B5=8F=E8=A7=88=E5=99=A8=E5=86=8D=E4=B8=8A=E4=BC=A0=E7=9B=B8?= =?UTF-8?q?=E5=90=8C=E6=96=87=E4=BB=B6=E6=97=B6=E4=B8=8D=E5=8F=AF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/attachments/_form.html.erb | 10 +++++++++- app/views/documents/show.html.erb | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/views/attachments/_form.html.erb b/app/views/attachments/_form.html.erb index b237c7d25..06bf45012 100644 --- a/app/views/attachments/_form.html.erb +++ b/app/views/attachments/_form.html.erb @@ -12,8 +12,16 @@ <% end %> <% end %> + -<%= button_tag "浏览", :type=>"button", :onclick=>"_file.click()" %> +<%= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %> <%= file_field_tag 'attachments[dummy][file]', :id => '_file', diff --git a/app/views/documents/show.html.erb b/app/views/documents/show.html.erb index b7740c951..2964a06ba 100644 --- a/app/views/documents/show.html.erb +++ b/app/views/documents/show.html.erb @@ -1,5 +1,5 @@

- +
<% if User.current.allowed_to?(:edit_documents, @project) %> <%= link_to l(:button_edit), edit_document_path(@document), :class => 'icon icon-edit', :accesskey => accesskey(:edit) %> From 78343effaf38e29060e541969de99bb51a749b69 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Thu, 7 Aug 2014 14:36:28 +0800 Subject: [PATCH 08/16] =?UTF-8?q?em.yml=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/locales/en.yml | 1804 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1804 insertions(+) diff --git a/config/locales/en.yml b/config/locales/en.yml index e69de29bb..33e1eda9b 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -0,0 +1,1804 @@ +en: + # Text direction: Left-to-Right (ltr) or Right-to-Left (rtl) + direction: ltr + date: + formats: + # Use the strftime parameters for formats. + # When no format has been given, it uses default. + # You can provide other formats here if you like! + default: "%m/%d/%Y" + short: "%b %d" + long: "%B %d, %Y" + + day_names: [Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday] + abbr_day_names: [Sun, Mon, Tue, Wed, Thu, Fri, Sat] + + # Don't forget the nil at the beginning; there's no such thing as a 0th month + month_names: [~, January, February, March, April, May, June, July, August, September, October, November, December] + abbr_month_names: [~, Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec] + # Used in date_select and datime_select. + order: + - :year + - :month + - :day + + time: + formats: + default: "%m/%d/%Y %I:%M %p" + time: "%I:%M %p" + short: "%d %b %H:%M" + long: "%B %d, %Y %H:%M" + am: "am" + pm: "pm" + + datetime: + distance_in_words: + half_a_minute: "half a minute" + less_than_x_seconds: + one: "less than 1 second" + other: "less than %{count} seconds" + x_seconds: + one: "1 second" + other: "%{count} seconds" + less_than_x_minutes: + one: "less than a minute" + other: "less than %{count} minutes" + x_minutes: + one: "1 minute" + other: "%{count} minutes" + about_x_hours: + one: "about 1 hour" + other: "about %{count} hours" + x_hours: + one: "1 hour" + other: "%{count} hours" + x_days: + one: "1 day" + other: "%{count} days" + about_x_months: + one: "about 1 month" + other: "about %{count} months" + x_months: + one: "1 month" + other: "%{count} months" + about_x_years: + one: "about 1 year" + other: "about %{count} years" + over_x_years: + one: "over 1 year" + other: "over %{count} years" + almost_x_years: + one: "almost 1 year" + other: "almost %{count} years" + + number: + format: + separator: "." + delimiter: "" + precision: 3 + + human: + format: + delimiter: "" + precision: 3 + storage_units: + format: "%n %u" + units: + byte: + one: "Byte" + other: "Bytes" + kb: "KB" + mb: "MB" + gb: "GB" + tb: "TB" + +# Used in array.to_sentence. + support: + array: + sentence_connector: "and" + skip_last_comma: false + + activerecord: + errors: + template: + header: + one: "1 error prohibited this %{model} from being saved" + other: "%{count} errors prohibited this %{model} from being saved" + messages: + inclusion: "is not included in the list" + exclusion: "is reserved" + invalid: "is invalid" + confirmation: "doesn't match confirmation" + accepted: "must be accepted" + empty: "can't be empty" + blank: "can't be blank" + too_long: "is too long (maximum is %{count} characters)" + too_short: "is too short (minimum is %{count} characters)" + wrong_length: "is the wrong length (should be %{count} characters)" + taken: "has already been taken" + not_a_number: "is not a number" + not_a_date: "is not a valid date" + greater_than: "must be greater than %{count}" + greater_than_or_equal_to: "must be greater than or equal to %{count}" + equal_to: "must be equal to %{count}" + less_than: "must be less than %{count}" + less_than_or_equal_to: "must be less than or equal to %{count}" + odd: "must be odd" + even: "must be even" + greater_than_start_date: "must be greater than start date" + not_same_project: "doesn't belong to the same project" + circular_dependency: "This relation would create a circular dependency" + cant_link_an_issue_with_a_descendant: "An issue cannot be linked to one of its subtasks" + + actionview_instancetag_blank_option: Please select + + attachment_all: "All" + attachment_browse: "Attachment Content Browse" + attachment_sufix_browse: "Attachment Type Browse" + attachment_type: "Attachment Type" + general_text_No: 'No' + general_text_Yes: 'Yes' + general_text_no: 'no' + general_text_yes: 'yes' + general_lang_name: 'English' + general_csv_separator: ',' + general_csv_decimal_separator: '.' + general_csv_encoding: ISO-8859-1 + general_pdf_encoding: UTF-8 + general_first_day_of_week: '7' + + label_approve: Approve + label_refusal: Refusal + notice_account_updated: Account was successfully updated. + notice_account_invalid_creditentials: Invalid user or password + notice_account_password_updated: Password was successfully updated. + notice_account_wrong_password: Wrong password + notice_account_register_done: Account was successfully created. To activate your account, click on the link that was emailed to you. + notice_account_unknown_email: Unknown user. + notice_can_t_change_password: This account uses an external authentication source. Impossible to change the password. + notice_account_lost_email_sent: An email with instructions to choose a new password has been sent to you. + notice_account_activated: Your account has been activated. You can now log in. + notice_successful_create: Successful creation. + notice_successful_update: Successful update. + notice_successful_delete: Successful deletion. + notice_failed_delete: Successful failure. + notice_successful_connection: Successful connection. + notice_file_not_found: The page you were trying to access doesn't exist or has been removed. + notice_locking_conflict: Data has been updated by another user. + notice_not_authorized: You are not authorized to access this page. + notice_not_authorized_archived_project: The project you're trying to access has been archived. + notice_email_sent: "An email was sent to %{value}" + notice_email_error: "An error occurred while sending mail (%{value})" + notice_feeds_access_key_reseted: Your RSS access key was reset. + notice_api_access_key_reseted: Your API access key was reset. + notice_failed_to_save_issues: "Failed to save %{count} issue(s) on %{total} selected: %{ids}." + notice_failed_to_save_time_entries: "Failed to save %{count} time entrie(s) on %{total} selected: %{ids}." + notice_failed_to_save_members: "Failed to save member(s): %{errors}." + notice_no_issue_selected: "No issue is selected! Please, check the issues you want to edit." + notice_account_pending: "Your account was created and is now pending administrator approval." + notice_default_data_loaded: Default configuration successfully loaded. + notice_unable_delete_version: Unable to delete version. + notice_unable_delete_time_entry: Unable to delete time log entry. + notice_issue_done_ratios_updated: Issue done ratios updated. + notice_gantt_chart_truncated: "The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max})" + notice_issue_successful_create: "Issue %{id} created." + notice_issue_update_conflict: "The issue has been updated by an other user while you were editing it." + notice_account_deleted: "Your account has been permanently deleted." + notice_user_successful_create: "User %{id} created." + + error_attachment_empty: "error in add file" + error_class_period_only_num: "class period can only digital" + error_can_t_load_default_data: "Default configuration could not be loaded: %{value}" + error_scm_not_found: "The entry or revision was not found in the repository." + error_scm_command_failed: "An error occurred when trying to access the repository: %{value}" + error_scm_annotate: "The entry does not exist or cannot be annotated." + error_scm_annotate_big_text_file: "The entry cannot be annotated, as it exceeds the maximum text file size." + error_issue_not_found_in_project: 'The issue was not found or does not belong to this project' + error_no_tracker_in_project: 'No tracker is associated to this project. Please check the Project settings.' + error_no_default_issue_status: 'No default issue status is defined. Please check your configuration (Go to "Administration -> Issue statuses").' + error_can_not_delete_custom_field: Unable to delete custom field + error_can_not_delete_tracker: "This tracker contains issues and cannot be deleted." + error_can_not_remove_role: "This role is in use and cannot be deleted." + error_can_not_reopen_issue_on_closed_version: 'An issue assigned to a closed version cannot be reopened' + error_can_not_archive_project: This project cannot be archived + error_issue_done_ratios_not_updated: "Issue done ratios not updated." + error_workflow_copy_source: 'Please select a source tracker or role' + error_workflow_copy_target: 'Please select target tracker(s) and role(s)' + error_unable_delete_issue_status: 'Unable to delete issue status' + error_unable_to_connect: "Unable to connect (%{value})" + error_attachment_too_big: "This file cannot be uploaded because it exceeds the maximum allowed file size (%{max_size})" + error_session_expired: "Your session has expired. Please login again." + warning_attachments_not_saved: "%{count} file(s) could not be saved." + + mail_subject_lost_password: "Your %{value} password" + mail_body_lost_password: 'To change your password, click on the following link:' + mail_subject_register: "Your %{value} account activation" + mail_body_register: 'To activate your account, click on the following link:' + mail_body_account_information_external: "You can use your %{value} account to log in." + mail_body_account_information: Your account information + mail_subject_account_activation_request: "%{value} account activation request" + mail_body_account_activation_request: "A new user (%{value}) has registered. The account is pending your approval:" + mail_subject_reminder: "%{count} issue(s) due in the next %{days} days" + mail_body_reminder: "%{count} issue(s) that are assigned to you are due in the next %{days} days:" + mail_subject_wiki_content_added: "'%{id}' wiki page has been added" + mail_body_wiki_content_added: "The '%{id}' wiki page has been added by %{author}." + mail_subject_wiki_content_updated: "'%{id}' wiki page has been updated" + mail_body_wiki_content_updated: "The '%{id}' wiki page has been updated by %{author}." + + field_name: Name + field_description: Description + field_summary: Summary + field_is_required: Required + field_firstname: Name + field_lastname: Last name + field_mail: Email + field_job_category: Job category # added by bai + field_filename: File + field_file_dense: File Dense + field_filesize: Size + field_downloads: Downloads + field_author: Author + field_created_on: Created + field_updated_on: Updated + field_closed_on: Closed + field_field_format: Format + field_is_for_all: For all projects + field_possible_values: Possible values + field_regexp: Regular expression + field_min_length: Minimum length + field_max_length: Maximum length + field_value: Value + field_category: Category + field_title: Title + field_project: Project + field_issue: Issue + field_status: Status + field_notes: Notes + field_is_closed: Issue closed + field_is_default: Default value + field_tracker: Tracker + field_subject: Subject + field_due_date: Due date + field_assigned_to: Assignee + field_priority: Priority + field_fixed_version: Target version + field_user: User + field_principal: Principal + field_role: Role + field_homepage: Homepage + field_is_public: Public + field_parent: Subproject of + field_is_in_roadmap: Issues displayed in roadmap + field_login: Account/Email + field_mail_notification: Email notifications + field_admin: Administrator + field_last_login_on: Last connection + field_language: Language + field_effective_date: Date + field_password: Password + field_new_password: New password + field_password_confirmation: Confirmation + field_version: Version + field_type: Type + field_host: Host + field_port: Port + field_account: Account + field_base_dn: Base DN + field_attr_login: Login attribute + field_attr_firstname: Firstname attribute + field_attr_lastname: Lastname attribute + field_attr_mail: Email attribute + field_onthefly: On-the-fly user creation + field_start_date: Start date + field_done_ratio: "% Done" + field_auth_source: Authentication mode + field_hide_mail: Hide my email address + field_comments: Comment + field_url: URL + field_start_page: Start page + field_subproject: Subproject + field_hours: Hours + field_activity: Activity + field_spent_on: Date + field_identifier: Identifier + field_is_filter: Used as a filter + field_issue_to: Related issue + field_delay: Delay + field_assignable: Issues can be assigned to this role + field_redirect_existing_links: Redirect existing links + field_estimated_hours: Estimated time + field_column_names: Columns + field_time_entries: Log time + field_time_zone: Time zone + field_searchable: Searchable + field_default_value: Default value + field_comments_sorting: Display comments + field_parent_title: Parent page + field_editable: Editable + field_watcher: Watcher + field_identity_url: OpenID URL + field_content: Content + field_group_by: Group results by + field_sharing: Sharing + field_parent_issue: Parent task + field_member_of_group: "Assignee's group" + field_assigned_to_role: "Assignee's role" + field_text: Text field + field_visible: Visible + field_warn_on_leaving_unsaved: "Warn me when leaving a page with unsaved text" + field_issues_visibility: Issues visibility + field_is_private: Private + field_commit_logs_encoding: Commit messages encoding + field_scm_path_encoding: Path encoding + field_path_to_repository: Path to repository + field_root_directory: Root directory + field_cvsroot: CVSROOT + field_cvs_module: Module + field_repository_is_default: Main repository + field_multiple: Multiple values + field_auth_source_ldap_filter: LDAP filter + field_core_fields: Standard fields + field_timeout: "Timeout (in seconds)" + field_board_parent: Parent forum + field_private_notes: Private notes + field_inherit_members: Inherit members + + setting_app_title: Application title + setting_app_subtitle: Application subtitle + setting_welcome_text: Welcome text + setting_default_language: Default language + setting_login_required: Authentication required + setting_self_registration: Self-registration + setting_attachment_max_size: Maximum attachment size + setting_issues_export_limit: Issues export limit + setting_mail_from: Emission email address + setting_bcc_recipients: Blind carbon copy recipients (bcc) + setting_plain_text_mail: Plain text mail (no HTML) + setting_host_name: Host name and path + setting_text_formatting: Text formatting + setting_wiki_compression: Wiki history compression + setting_feeds_limit: Maximum number of items in Atom feeds + setting_default_projects_public: New projects are public by default + setting_autofetch_changesets: Fetch commits automatically + setting_sys_api_enabled: Enable WS for repository management + setting_commit_ref_keywords: Referencing keywords + setting_commit_fix_keywords: Fixing keywords + setting_autologin: Autologin + setting_date_format: Date format + setting_time_format: Time format + setting_cross_project_issue_relations: Allow cross-project issue relations + setting_cross_project_subtasks: Allow cross-project subtasks + setting_issue_list_default_columns: Default columns displayed on the issue list + setting_repositories_encodings: Attachments and repositories encodings + setting_emails_header: Email header + setting_emails_footer: Email footer + setting_protocol: Protocol + setting_per_page_options: Objects per page options + setting_user_format: Users display format + setting_activity_days_default: Days displayed on project activity + setting_display_subprojects_issues: Display subprojects issues on main projects by default + setting_enabled_scm: Enabled SCM + setting_mail_handler_body_delimiters: "Truncate emails after one of these lines" + setting_mail_handler_api_enabled: Enable WS for incoming emails + setting_mail_handler_api_key: API key + setting_sequential_project_identifiers: Generate sequential project identifiers + setting_gravatar_enabled: Use Gravatar user icons + setting_gravatar_default: Default Gravatar image + setting_diff_max_lines_displayed: Maximum number of diff lines displayed + setting_file_max_size_displayed: Maximum size of text files displayed inline + setting_repository_log_display_limit: Maximum number of revisions displayed on file log + setting_openid: Allow OpenID login and registration + setting_password_min_length: Minimum password length + setting_new_project_user_role_id: Role given to a non-admin user who creates a project + setting_default_projects_modules: Default enabled modules for new projects + setting_issue_done_ratio: Calculate the issue done ratio with + setting_issue_done_ratio_issue_field: Use the issue field + setting_issue_done_ratio_issue_status: Use the issue status + setting_start_of_week: Start calendars on + setting_rest_api_enabled: Enable REST web service + setting_cache_formatted_text: Cache formatted text + setting_default_notification_option: Default notification option + setting_commit_logtime_enabled: Enable time logging + setting_commit_logtime_activity_id: Activity for logged time + setting_gantt_items_limit: Maximum number of items displayed on the gantt chart + setting_issue_group_assignment: Allow issue assignment to groups + setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues + setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed + setting_unsubscribe: Allow users to delete their own account + setting_session_lifetime: Session maximum lifetime + setting_session_timeout: Session inactivity timeout + setting_thumbnails_enabled: Display attachment thumbnails + setting_thumbnails_size: Thumbnails size (in pixels) + setting_non_working_week_days: Non-working days + setting_jsonp_enabled: Enable JSONP support + setting_default_projects_tracker_ids: Default trackers for new projects + + permission_add_project: Create project + permission_add_subprojects: Create subprojects + permission_edit_project: Edit project + permission_close_project: Close / reopen the project + permission_select_project_modules: Select project modules + permission_manage_members: Manage members + permission_manage_project_activities: Manage project activities + permission_manage_versions: Manage versions + permission_manage_categories: Manage issue categories + permission_view_issues: View Issues + permission_add_issues: Add issues + permission_edit_issues: Edit issues + permission_manage_issue_relations: Manage issue relations + permission_set_issues_private: Set issues public or private + permission_set_own_issues_private: Set own issues public or private + permission_add_issue_notes: Add notes + permission_edit_issue_notes: Edit notes + permission_edit_own_issue_notes: Edit own notes + permission_view_private_notes: View private notes + permission_set_notes_private: Set notes as private + permission_move_issues: Move issues + permission_delete_issues: Delete issues + permission_manage_public_queries: Manage public queries + permission_save_queries: Save queries + permission_view_gantt: View gantt chart + permission_view_calendar: View calendar + permission_view_issue_watchers: View watchers list + permission_add_issue_watchers: Add watchers + permission_delete_issue_watchers: Delete watchers + permission_log_time: Log spent time + permission_view_time_entries: View spent time + permission_edit_time_entries: Edit time logs + permission_edit_own_time_entries: Edit own time logs + permission_manage_news: Manage news + permission_comment_news: Comment news + permission_view_documents: View documents + permission_add_documents: Add documents + permission_edit_documents: Edit documents + permission_delete_documents: Delete documents + permission_manage_files: Manage files + permission_view_files: View files + permission_manage_wiki: Manage wiki + permission_rename_wiki_pages: Rename wiki pages + permission_delete_wiki_pages: Delete wiki pages + permission_view_wiki_pages: View wiki + permission_view_wiki_edits: View wiki history + permission_edit_wiki_pages: Edit wiki pages + permission_delete_wiki_pages_attachments: Delete attachments + permission_protect_wiki_pages: Protect wiki pages + permission_manage_repository: Manage repository + permission_browse_repository: Browse repository + permission_view_changesets: View changesets + permission_commit_access: Commit access + permission_manage_boards: Manage forums + permission_view_messages: View messages + permission_add_messages: Post messages + permission_edit_messages: Edit messages + permission_edit_own_messages: Edit own messages + permission_delete_messages: Delete messages + permission_delete_own_messages: Delete own messages + permission_export_wiki_pages: Export wiki pages + permission_manage_subtasks: Manage subtasks + permission_manage_related_issues: Manage related issues + permission_view_journals_for_messages: View journals messages + permission_view_courses: View courses + permission_new_course: Create course + permission_configure_course: Configure course + permission_close_course: Close/open course + permission_new_assignment: Create assignment + permission_edit_assignment: Edit assignment + permission_delete_assignment: Delete assignment + permission_new_placeholder: Create placeholder + permission_edit_placeholder: Edit placeholder + permission_delete_placeholder: Delete placeholder + permission_commit_content: Commit content + permission_new_course_notify: Create course notify + permission_edit_course_notify: Eidt course notify + permission_delete_course_notify: Delete course notify + permission_view_assignment: View assignment + permission_view_placeholder: View placeholder + permission_view_course_messages: View course messages + permission_view_real_name: View real name + permission_view_students: View students + permission_export_homeworks: Export homeworks + + project_module_issue_tracking: Issue tracking + project_module_time_tracking: Time tracking + project_module_news: News + project_module_documents: Documents + project_module_files: Files + project_module_wiki: Wiki + project_module_repository: Repository + project_module_boards: Forums + project_module_calendar: Calendar + project_module_gantt: Gantt + + label_user: User + label_user_plural: Users + label_user_new: New user + label_user_anonymous: Anonymous + label_project: Project + label_activity_project: 'Project: ' #added by bai + label_project_new: New project + label_project_plural: Projects + label_project_deposit: Projects + label_x_projects: + zero: no projects + one: 1 project + other: "%{count} projects" + label_project_all: All Projects + label_project_latest: Latest projects + label_issue: Issue + label_issue_new: New issue + label_issue_plural: Issues + label_issue_view_all: View all issues + label_issues_by: "Issues by %{value}" + label_issue_added: Issue added + label_issue_updated: Issue updated + label_issue_note_added: Note added + label_issue_status_updated: Status updated + label_issue_priority_updated: Priority updated + label_document: Document + label_document_new: New document + label_document_plural: Documents + label_document_added: Document added + label_document_public_info: "If you don't choose public, only the project's members can see the document." + label_role: Role + label_role_plural: Roles + label_role_new: New role + label_role_and_permissions: Roles and permissions + label_role_anonymous: Anonymous + label_role_non_member: Non member + label_member: Members + label_member_new: New member + label_member_plural: Members + label_tracker: Tracker + label_tracker_plural: Trackers + label_tracker_new: New tracker + label_workflow: Workflow + label_issue_status: Issue status + label_issue_status_plural: Issue statuses + label_issue_status_new: New status + label_issue_category: Issue category + label_issue_category_plural: Issue categories + label_issue_category_new: New category + label_custom_field: Custom field + label_custom_field_plural: Custom fields + label_custom_field_new: New custom field + label_enumerations: Enumerations + label_enumeration_new: New value + label_information: Information + label_information_plural: Information + label_please_login: Please log in + label_register: Sign up + label_login_with_open_id_option: or login with OpenID + label_password_lost: Lost password + label_home: Home + label_my_page: My page + label_my_account: My account + label_my_message: My messages + label_my_projects: My projects + label_my_page_block: My page block + label_administration: Administration + label_login: Login + label_logout: Sign out + label_help: Help + label_reported_issues: Reported issues + label_assigned_to_me_issues: Issues assigned to me + label_last_login: Last connection + label_registered_on: Registered on + label_activity: Activities + label_overall_activity: Overall activity + label_user_activity: "%{value}'s activity" + label_new: New + label_new_user: registered a new account + label_logged_as: Logged in as + label_environment: Environment + label_authentication: Authentication + label_auth_source: Authentication mode + label_auth_source_new: New authentication mode + label_auth_source_plural: Authentication modes + label_subproject_plural: Subprojects + label_subproject_new: New subproject + label_and_its_subprojects: "%{value} and its subprojects" + label_min_max_length: Min - Max length + label_list: List + label_date: Date + label_integer: Integer + label_float: Float + label_boolean: Boolean + label_string: Text + label_text: Long text + label_attribute: Attribute + label_attribute_plural: Attributes + label_no_data: No data to display + label_change_status: Change status + label_history: History + label_attachment: Files + label_attachment_new: New file + label_attachment_delete: Delete file + label_attachment_plural: Files + label_file_added: File added + label_report: Report + label_report_plural: Reports + label_news: News + label_news_new: Add news + label_news_plural: News + label_news_latest: Latest news + label_news_view_all: View all news + label_news_added: News added + label_news_comment_added: Comment added to a news + label_settings: Settings + label_overview: Activities + label_version: Version + label_version_new: New version + label_version_plural: Versions + label_close_versions: Close completed versions + label_confirmation: Confirmation + label_export_to: 'Also available in:' + label_read: Read... + label_public_projects: Public projects + label_open_issues: open + label_open_issues_plural: open + label_closed_issues: closed + label_closed_issues_plural: closed + label_x_open_issues_abbr_on_total: + zero: 0 open / %{total} + one: 1 open / %{total} + other: "%{count} open / %{total}" + label_x_open_issues_abbr: + zero: 0 open + one: 1 open + other: "%{count} open" + label_x_closed_issues_abbr: + zero: 0 closed + one: 1 closed + other: "%{count} closed" + label_x_issues: + zero: 0 issues + one: 1 issue + other: "%{count} issues" + label_total: Total + label_total_time: Total time + label_permissions: Permissions + label_current_status: Current status + label_new_statuses_allowed: New statuses allowed + label_all: all + label_any: any + label_none: none + label_nobody: nobody + label_next: Next + label_previous: Previous + label_used_by: Used by + label_details: Details + label_add_note: Add a note + label_per_page: Per page + label_calendar: Calendar + label_months_from: months from + label_gantt: Gantt + label_internal: Internal + label_last_changes: "last %{count} changes" + label_change_view_all: View all changes + label_personalize_page: Personalize this page + label_comment: Comment + label_comment_plural: Comments + label_x_comments: + zero: no comments + one: 1 comment + other: "%{count} comments" + label_comment_add: Add a comment + label_comment_added: Comment added + label_comment_delete: Delete comments + label_query: Custom query + label_query_plural: Custom queries + label_query_new: New query + label_my_queries: My custom queries + label_filter_add: Add filter + label_filter_plural: Query condition + label_equals: is + label_not_equals: is not + label_in_less_than: in less than + label_in_more_than: in more than + label_in_the_next_days: in the next + label_in_the_past_days: in the past + label_in_users: 'in the user ' + label_greater_or_equal: '>=' + label_less_or_equal: '<=' + label_between: between + label_in: in + label_today: today + label_all_time: all time + label_yesterday: yesterday + label_this_week: this week + label_last_week: last week + label_last_n_weeks: "last %{count} weeks" + label_last_n_days: "last %{count} days" + label_this_month: this month + label_last_month: last month + label_this_year: this year + label_date_range: Date range + label_less_than_ago: less than days ago + label_more_than_ago: more than days ago + label_ago: days ago + label_contains: contains + label_not_contains: doesn't contain + label_any_issues_in_project: any issues in project + label_any_issues_not_in_project: any issues not in project + label_no_issues_in_project: no issues in project + label_day_plural: days + label_repository: Repository + #add by tan + label_repository_new: Repository setting + label_repository_no: Have no repository？ + label_repository_new_repos: New repository + #end + label_repository_plural: Repositories + label_browse: Browse + label_branch: Branch + label_tag: Tag + label_revision: Revision + label_revision_plural: Revisions + label_revision_id: "Revision %{value}" + label_associated_revisions: Associated revisions + label_added: added + label_modified: modified + label_copied: copied + label_renamed: renamed + label_deleted: deleted + label_latest_revision: Latest revision + label_latest_revision_plural: Latest revisions + label_view_revisions: View revisions + label_view_all_revisions: View all revisions + label_max_size: Maximum size + label_sort_highest: Move to top + label_sort_higher: Move up + label_sort_lower: Move down + label_sort_lowest: Move to bottom + label_roadmap: Roadmap + label_roadmap_due_in: "Due in %{value}" + label_roadmap_overdue: "%{value} late" + label_roadmap_no_issues: No issues for this version + label_search: Search + label_result_plural: Results + label_all_words: All words + label_wiki: Wiki + label_wiki_edit: Wiki edit + label_wiki_edit_plural: Wiki edits + label_wiki_page: Wiki page + label_wiki_page_plural: Wiki pages + label_index_by_title: Index by title + label_index_by_date: Index by date + label_current_version: Current version + label_preview: Preview + label_feed_plural: Feeds + label_changes_details: Details of all changes + label_issue_tracking: Issue tracking + label_spent_time: Spent time + label_overall_spent_time: Overall spent time + label_f_hour: "%{value} hour" + label_f_hour_plural: "%{value} hours" + label_time_tracking: Time tracking + label_change_plural: Changes + label_statistics: Statistics + label_commits_per_month: Commits per month + label_commits_per_author: Commits per author + label_diff: diff + label_view_diff: View differences + label_diff_inline: inline + label_diff_side_by_side: side by side + label_options: Options + label_copy_workflow_from: Copy workflow from + label_permissions_report: Permissions report + label_watched_issues: Watched issues + label_related_issues: Related issues + label_applied_status: Applied status + label_loading: Loading... + label_relation_new: New relation + label_relation_delete: Delete relation + label_relates_to: Related to + label_duplicates: Duplicates + label_duplicated_by: Duplicated by + label_blocks: Blocks + label_blocked_by: Blocked by + label_precedes: Precedes + label_follows: Follows + label_copied_to: Copied to + label_copied_from: Copied from + label_end_to_start: end to start + label_end_to_end: end to end + label_start_to_start: start to start + label_start_to_end: start to end + label_stay_logged_in: Stay logged in + label_disabled: disabled + label_show_completed_versions: Show completed versions + label_me: me + label_board: Forums + label_board_description: Bring together the wisdom of crowds, and solve problems for you！ + label_board_new: New forum + label_board_plural: Forums + label_board_locked: Locked + label_board_sticky: Sticky + label_topic_plural: Topics + field_sticky: '' + field_locked: '' + field_lock: '' + label_message_plural: Messages + label_message_last: Last message + label_message_new: New message + label_message_posted: Message added + label_reply_plural: Replies + label_send_information: Send account information to the user + label_year: Year + label_month: Month + label_week: Week + label_date_from: From + label_date_to: To + label_language_based: Based on user's language + label_sort_by: "Sort by %{value}" + label_send_test_email: Send a test email + label_feeds_access_key: RSS access key + label_missing_feeds_access_key: Missing a RSS access key + label_feeds_access_key_created_on: "RSS access key created %{value} ago" + label_module_plural: Modules + label_added_time_by: "Added by %{author} %{age} ago" + label_updated_time_by: "Updated by %{author} %{age} ago" + label_updated_time: "Updated %{value} ago" + label_jump_to_a_project: Jump to a project... + label_file_plural: Files + label_changeset_plural: Changesets + label_default_columns: Default columns + label_no_change_option: (No change) + label_bulk_edit_selected_issues: Bulk edit selected issues + label_bulk_edit_selected_time_entries: Bulk edit selected time entries + label_theme: Theme + label_default: Default + label_search_titles_only: Search titles only + label_user_mail_option_all: "For any event on all my projects" + label_user_mail_option_selected: "For any event on the selected projects only..." + label_user_mail_option_none: "No events" + label_user_mail_option_only_my_events: "Only for things I watch or I'm involved in" + label_user_mail_option_only_assigned: "Only for things I am assigned to" + label_user_mail_option_only_owner: "Only for things I am the owner of" + label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself" + label_registration_activation_by_email: account activation by email + label_registration_manual_activation: manual account activation + label_registration_automatic_activation: automatic account activation + label_display_per_page: "Per page: %{value}" + label_age: Age + label_change_properties: Change properties + label_general: General + label_more: More + label_scm: SCM + label_plugins: Plugins + label_ldap_authentication: LDAP authentication + label_downloads_abbr: D/L + label_optional_description: Optional description + label_add_another_file: Add another file + label_preferences: Preferences + label_chronological_order: In chronological order + label_reverse_chronological_order: In reverse chronological order + label_planning: Planning + label_incoming_emails: Incoming emails + label_generate_key: Generate a key + label_issue_watchers: Watchers + label_example: Example + label_display: Display + label_sort: Sort + label_ascending: Ascending + label_descending: Descending + label_date_from_to: From %{start} to %{end} + label_wiki_content_added: Wiki page added + label_wiki_content_updated: Wiki page updated + label_group: Group + label_group_plural: Groups + label_group_new: New group + label_time_entry_plural: Spent time + label_version_sharing_none: Not shared + label_version_sharing_descendants: With subprojects + label_version_sharing_hierarchy: With project hierarchy + label_version_sharing_tree: With project tree + label_version_sharing_system: With all projects + label_update_issue_done_ratios: Update issue done ratios + label_copy_source: Source + label_copy_target: Target + label_copy_same_as_target: Same as target + label_display_used_statuses_only: Only display statuses that are used by this tracker + label_api_access_key: API access key + label_missing_api_access_key: Missing an API access key + label_api_access_key_created_on: "API access key created %{value} ago" + label_profile: Profile + label_subtask_plural: Subtasks + label_project_copy_notifications: Send email notifications during the project copy + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" + label_additional_workflow_transitions_for_author: Additional transitions allowed when the user is the author + label_additional_workflow_transitions_for_assignee: Additional transitions allowed when the user is the assignee + label_issues_visibility_all: All issues + label_issues_visibility_public: All non private issues + label_issues_visibility_own: Issues created by or assigned to the user + label_git_report_last_commit: Report last commit for files and directories + label_parent_revision: Parent + label_child_revision: Child + label_export_options: "%{export_format} export options" + label_copy_attachments: Copy attachments + label_copy_subtasks: Copy subtasks + label_item_position: "%{position} of %{count}" + label_completed_versions: Completed versions + label_search_for_watchers: Search for watchers to add + label_session_expiration: Session expiration + label_show_closed_projects: View closed projects + label_status_transitions: Status transitions + label_fields_permissions: Fields permissions + label_readonly: Read-only + label_required: Required + label_attribute_of_project: "Project's %{name}" + label_attribute_of_issue: "Issue's %{name}" + label_attribute_of_author: "Author's %{name}" + label_attribute_of_assigned_to: "Assignee's %{name}" + label_attribute_of_user: "User's %{name}" + label_attribute_of_fixed_version: "Target version's %{name}" + label_cross_project_descendants: With subprojects + label_cross_project_tree: With project tree + label_cross_project_hierarchy: With project hierarchy + label_cross_project_system: With all projects + label_gantt_progress_line: Progress line + label_files_filter: Files Filter： + + button_login: Login + button_submit: Submit + button_save: Save + button_check_all: Check all + button_uncheck_all: Uncheck all + button_collapse_all: Collapse all + button_expand_all: Expand all + button_delete: Delete + button_create: Create + button_create_and_continue: Create and continue + button_test: Test + button_edit: Edit + button_edit_associated_wikipage: "Edit associated Wiki page: %{page_title}" + button_add: Add + button_change: Change + button_apply: Query + button_clear: Cancel query + button_lock: Lock + button_unlock: Unlock + button_download: Download + button_list: List + button_view: View + button_move: Move + button_move_and_follow: Move and follow + button_back: Back + button_cancel: Cancel + button_activate: Activate + button_sort: Sort + button_log_time: Log time + button_rollback: Rollback to this version + button_watch: Watch + button_unwatch: Unwatch + button_reply: Reply + button_archive: Archive + button_unarchive: Unarchive + button_reset: Reset + button_rename: Rename + button_change_password: Change password + button_copy: Copy + button_copy_and_follow: Copy and follow + button_annotate: Annotate + button_update: Update + button_configure: Configure + button_quote: Quote + button_duplicate: Duplicate + button_show: Show + button_hide: Hide + button_edit_section: Edit this section + button_export: Export + button_delete_my_account: Delete my account + button_close: Close + button_reopen: Reopen + + status_active: active + status_registered: registered + status_locked: locked + + project_status_active: active + project_status_closed: closed + project_status_archived: archived + + version_status_open: open + version_status_locked: locked + version_status_closed: closed + + field_active: Active + + text_select_mail_notifications: Select actions for which email notifications should be sent. + text_regexp_info: eg. ^[A-Z0-9]+$ + text_min_max_length_info: 0 means no restriction + text_project_destroy_confirmation: Are you sure you want to delete this project and related data? + text_subprojects_destroy_warning: "Its subproject(s): %{value} will be also deleted." + text_workflow_edit: Select a role and a tracker to edit the workflow + text_are_you_sure: Are you sure? + text_journal_changed: "%{label} changed from %{old} to %{new}" + text_journal_changed_no_detail: "%{label} updated" + text_journal_set_to: "%{label} set to %{value}" + text_journal_deleted: "%{label} deleted (%{old})" + text_journal_added: "%{label} %{value} added" + text_tip_issue_begin_day: issue beginning this day + text_tip_issue_end_day: issue ending this day + text_tip_issue_begin_end_day: issue beginning and ending this day + text_project_identifier_info: 'Only lower case letters (a-z), numbers, dashes and underscores are allowed, must start with a lower case letter.
Once saved, the identifier cannot be changed.' + text_caracters_maximum: "%{count} characters maximum." + text_caracters_minimum: "Must be at least %{count} characters long." + text_length_between: "Length between %{min} and %{max} characters." + text_tracker_no_workflow: No workflow defined for this tracker + text_unallowed_characters: Unallowed characters + text_comma_separated: Multiple values allowed (comma separated). + text_line_separated: Multiple values allowed (one line for each value). + text_issues_ref_in_commit_messages: Referencing and fixing issues in commit messages + text_issue_added: "Issue %{id} has been reported by %{author}." + text_issue_updated: "Issue %{id} has been updated by %{author}." + text_wiki_destroy_confirmation: Are you sure you want to delete this wiki and all its content? + text_issue_category_destroy_question: "Some issues (%{count}) are assigned to this category. What do you want to do?" + text_issue_category_destroy_assignments: Remove category assignments + text_issue_category_reassign_to: Reassign issues to this category + text_user_mail_option: "For unselected projects, you will only receive notifications about things you watch or you're involved in (eg. issues you're the author or assignee)." + text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded." + text_load_default_configuration: Load the default configuration + text_status_changed_by_changeset: "Applied in changeset %{value}." + text_time_logged_by_changeset: "Applied in changeset %{value}." + text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s)?' + text_issues_destroy_descendants_confirmation: "This will also delete %{count} subtask(s)." + text_time_entries_destroy_confirmation: 'Are you sure you want to delete the selected time entr(y/ies)?' + text_select_project_modules: 'Select modules to enable for this project:' + text_default_administrator_account_changed: Default administrator account changed + text_file_repository_writable: Attachments directory writable + text_plugin_assets_writable: Plugin assets directory writable + text_rmagick_available: RMagick available (optional) + text_destroy_time_entries_question: "%{hours} hours were reported on the issues you are about to delete. What do you want to do?" + text_destroy_time_entries: Delete reported hours + text_assign_time_entries_to_project: Assign reported hours to the project + text_reassign_time_entries: 'Reassign reported hours to this issue:' + text_user_wrote: "%{value} wrote:" + text_enumeration_destroy_question: "%{count} objects are assigned to this value." + text_enumeration_category_reassign_to: 'Reassign them to this value:' + text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/configuration.yml and restart the application to enable them." + text_repository_usernames_mapping: "Select or update the Trustie user mapped to each username found in the repository log.\nUsers with the same Trustie and repository username or email are automatically mapped." + text_diff_truncated: '... This diff was truncated because it exceeds the maximum size that can be displayed.' + text_custom_field_possible_values_info: 'One line for each value' + text_wiki_page_destroy_question: "This page has %{descendants} child page(s) and descendant(s). What do you want to do?" + text_wiki_page_nullify_children: "Keep child pages as root pages" + text_wiki_page_destroy_children: "Delete child pages and all their descendants" + text_wiki_page_reassign_children: "Reassign child pages to this parent page" + text_own_membership_delete_confirmation: "You are about to remove some or all of your permissions and may no longer be able to edit this project after that.\nAre you sure you want to continue?" + text_zoom_in: Zoom in + text_zoom_out: Zoom out + text_warn_on_leaving_unsaved: "The current page contains unsaved text that will be lost if you leave this page." + text_scm_path_encoding_note: "Default: UTF-8" + text_git_repository_note: Repository is bare and local (e.g. /gitrepo, c:\gitrepo) + text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo) + text_scm_command: Command + text_scm_command_version: Version + text_scm_config: You can configure your SCM commands in config/configuration.yml. Please restart the application after editing it. + text_scm_command_not_available: SCM command is not available. Please check settings on the administration panel. + text_issue_conflict_resolution_overwrite: "Apply my changes anyway (previous notes will be kept but some changes may be overwritten)" + text_issue_conflict_resolution_add_notes: "Add my notes and discard my other changes" + text_issue_conflict_resolution_cancel: "Discard all my changes and redisplay %{link}" + text_account_destroy_confirmation: "Are you sure you want to proceed?\nYour account will be permanently deleted, with no way to reactivate it." + text_session_expiration_settings: "Warning: changing these settings may expire the current sessions including yours." + text_project_closed: This project is closed and read-only. + text_turning_multiple_off: "If you disable multiple values, multiple values will be removed in order to preserve only one value per item." + text_applied_project: "User %{id} Apply Join Project %{project}" + + default_role_manager: Manager + default_role_developer: Developer + default_role_reporter: Reporter + default_tracker_bug: Bug + default_tracker_feature: Feature + default_tracker_support: Support + default_issue_status_new: New + default_issue_status_in_progress: In Progress + default_issue_status_resolved: Resolved + default_issue_status_feedback: Feedback + default_issue_status_closed: Closed + default_issue_status_rejected: Rejected + default_doc_category_user: User documentation + default_doc_category_tech: Technical documentation + default_priority_low: Low + default_priority_normal: Normal + default_priority_high: High + default_priority_urgent: Urgent + default_priority_immediate: Immediate + default_activity_design: Design + default_activity_development: Development + + enumeration_issue_priorities: Issue priorities + enumeration_doc_categories: Document categories + enumeration_activities: Activities + enumeration_system_activity: System Activity + description_filter: Filter + description_search: Searchfield + description_choose_project: Projects + description_project_scope: Search scope + description_notes: Notes + description_message_content: Message content + description_query_sort_criteria_attribute: Sort attribute + description_query_sort_criteria_direction: Sort direction + description_user_mail_notification: Mail notification settings + description_available_columns: Available Columns + description_selected_columns: Selected Columns + description_all_columns: All Columns + description_issue_category_reassign: Choose issue category + description_wiki_subpages_reassign: Choose new parent page + description_date_range_list: Choose range from list + description_date_range_interval: Choose range by selecting start and end date + description_date_from: Enter start date + description_date_to: Enter end date + text_repository_identifier_info: 'Only lower case letters (a-z), numbers, dashes and underscores are allowed.
Once saved, the identifier cannot be changed.' + + #modify by mkz + #by young + label_requirement: Calls + label_requirement_focus: Calls # modified by bai + label_developer: Users + label_investor: Investor： + label_theme: Theme + label_logged_as_new: Current user + button_register: Register + issue_list: Issue list + lastest_respond: Lastest reply + label_news_lastest: Lastest news + label_version_display_settings: Display settings + label_versions_progress: Complete schedule + label_versions_description: Versions description + label_my_photo: My photo + label_documents_sort: Order setting： + label_activities_settings: Display settings + #end + + label_joined_course: Joined Courses + label_created_course: Created Courses + label_borad_course: Course Borad + + #huang + label_file_new: Download + label_user_edit: "Edit information" + label_user_info: "User information" #huang 添加 + label_user_watcher: "Following" # huang添加的 # modified by bai + label_user_fans: "Followed by" # modified by bai + + # modify by men + label_x_user_fans: + zero: fan + one: fan + other: fans + #end + label_user_commits: "Code commits" + label_user_watchered: "Followed by" # huang添加的 + label_user_newfeedback: "Messages" ## huang添加的 # modified by bai + label_user_login: "Last login:" + label_user_mail: "E-mail:" + label_user_joinin: "Join date:" + label_user_activities: "You have no activities,come and join us!" + label_user_activities_other: The user has no activities now！ + label_project_overview: "Overview" + label_project_tool: "Tool" + label_project_issues: "Issues" + label_project_newother: "See other comments" + label_project_newshare: "has shared" + label_project_newadd: "added" + label_project_unadd: "No project,go to creat it!" + label_project_un: "You haven't joined any project!" + #end by huang + + #added by liuping + button_unfollow: Unfollow + button_follow: Follow + label_delete_confirm: Confirm delete？ + label_more_tags: More + label_tags_bid: Call name + label_tags_bid_description: call description + label_tags_issue_description: issue description + label_tags_all_objects: all objects + label_apply_project: Apply Project + label_apply_project_waiting: "Application has been submitted, please wait for administrator review." + label_unapply_project: Unsubscribe + + #fq + button_leave_meassge: Submit + label_leave_message_to: leave %{name} a message + label_leave_message: Message content + label_message: message board + field_add: Add before %{time} + button_more: More + label_user_response: Feedback # modified by bai + label_bidding_project: projects + button_bidding: I will participate in it + label_new_call: New call + label_user_information: My informations + + #Customer added！Added by nie + label_create_time: Created time + label_current_contributors: current contributors + #modify by men + label_x_current_contributors: + zero: current contributor + one: current contributor + other: current contributors + #end + label_lines_of_code: lines of code + label_since_last_commits: since last commit + label_users_on_trustie: User + label_front: first page + label_commit_on: commit times + #modify by men + label_x_commit_on: + zero: commit time + one: commit time + other: commit times + #end + label_follow_people: following # modified by bai + #modify by men + label_x_follow_people: + zero: Follower + one: Follower + other: Followers + #end + label_member_since: joined + label_contribute_to: Participates %{project_count} projects： + #modify by men + label_x_contribute_to: + zero: Participates %{count} project： + one: Participates %{count} project： + other: Participates %{count} projects： + #end + label_total_commit: Totally %{total_commit} commits # modified by bai + #modify by men + label_x_total_commit: + zero: Totally %{count} commit + one: Totally %{count} commit + other: Totally %{count} commits + #end + label_upload_profile: Upload avatar + label_type_as: Type as + label_status_as: Status as + label_priority_as: Priority as + label_member_list: Member list + label_author_name: Posted by %{author_name} + label_comments_count: (%{count} comments) + label_post_on: posts on + label_find_all_comments: view all comments + label_updated_time_on: " Updated on %{value} " + label_call_list: Calls list + + label_requirement_list: Requirement list + label_x_biding_project: #modify by men + zero: project + one: project + other: projects + #end + label_x_responses: #modify by men + zero: comment + one: comment + other: comments + #end + label_x_followers: #modified by men + zero: Follower + one: Follower + other: Followers + #end + + + + label_price: price： + label_RMB_sign: ￥ + label_investment_budget: Investment budget： + label_investment_time_limit: Investment time limit： + label_my_respond: Feedbacks： # modified by bai + label_respond_requirement: has commented this call + label_deadline: deadline yyyy-mm-dd + label_requirement_name: give your requirement a name ~~ + label_requirement_description: content：descript your requirement + label_requirement_bargain_money: type in your rewards(ex. money, reward, grade) + label_wrong_budget: The error format of money + label_wrong_date: wrong date format, input right date yyyy-mm-dd + button_upload_photo: Upload photo + label_leave_me_message: left a message to me + label_leave_others_message: leave message to him/her + label_leave_a_message: Leave him/her a message： + label_leave_your_message: Leave a message to you + label_new_activities: ' has new activity in' # modified by bai + label_new_activity: ' has new activity in' + label_i_new_activity: ' have new activity in' + label_create_project: had participated in + label_praise: praise + label_cancel_praise: cancel praise + label_bid_reason: Please show your reason + default_tracker_task: Task + label_create_new_projects_description: Create a new project, you will open a magical journey of collaborative creation and development！ + label_call_for_bids_description: Publish your call for anything, feel the excitement of hundreds respond to a single call！ + label_create_course_description: Create a new course, let us share the public resources in the course community which are more than you can imagine！ + label_news: News + label_news_description: Track the latest activities of projects, and obtain the latest information！ + label_milestone: Milestone + label_milestone_description: Review the commits, branches and versions of your project！ + label_features: Features + label_has_praisers: praisers(%{count}) + label_has_watchers: following(%{count}) # modified by bai + label_has_fans: followed by(%{count}) # modified by bai + #modify by men + label_x_has_fans: + zero: fan(%{count}) + one: fan(%{count}) + other: fans(%{count}) + #end + label_me: me + label_my: my + label_i: I + label_join_bidding: joined the bidding + label_bidding_user: Bidding user： + label_bidding_reason: Bidding reason： + label_username: username： + label_password: password： + label_about_requirement: about requirement： + label_about_issue: about issue： + label_quote_my_words: ' quoted my words' + label_have_respond: had a respond + label_welcome: Welcome + + label_goto: Go to>> + label_join: join Trustie！ + label_repository_new: link to existing SVN repository + label_repository_path: path of repository + label_repository_new_repos: create a new repository + label_repository_no: have no repository? + label_welcome_page_to: Participate %{project_count} projects！ + label_repository_path_not_null: repository path can't be null + label_password_not_null: password can't be blank + label_exist_repository_path: Define exist repository's path of URL and format must be file:///, http://, https://, svn:// + label_project_no_activity: The project has no activities now！ + label_follow_no_requirement: You don't have followed any requirements！ + label_no_user_respond_you: There is no respond for you！ + label_tags_issue: issue： + label_tags_project_name: Project name： + label_tags_project_description: Project description： + label_tags_user_mail: User E-mail： + label_tags_user_name: User Name： + label_tags_numbers: Tag numbers： + label_max_number: Open label nickname is displayed on the web site of your,Must be at most 25 characters long. + label_all_revisions: All revisions： + label_repository_name: Repository name + label_upassword_info: The password can be shared in the group + label_how_commit_code: How to commit code： + label_how_commit_code_chinese: Chinese + label_welcome_leave_message: Hi!The platform is currently in beta version.If you have any comments and suggestions, please + label_welcome_click_me: Click me + label_issue_praise: Good question，praise！ + label_issue_tread: Poor question，tread！ + label_issue_praise_over: Praised over！ + label_issue_tread_over: Treaded over！ + label_issue_appraise_over: Appraised over！ + label_welcome_my_respond: Please leave your comments and suggestions here！ + label_no_current_fans: the user has no fans now + label_no_current_watchers: the user hasn't watched others + label_project_tool_response: Response + label_course_feedback: Feedback + label_tags_search_result: Search Results + label_active_call: call + label_tags_call: Calls + label_user_extensions: Other information + label_boy: Man + label_girl: Woman + field_gender: Gender + field_birthday: Birthday + field_brief_introduction: Info + field_location: Location + field_occupation: Position + field_work_experience: Work experience(year) + field_zip_code: Zip code + label_reward: reward： + label_credit: credit： + label_choose_reward: choose reward + label_money: money + label_reward_1: others + label_bids_credit: credit + label_bids_credit_number: points + field_budget: reward + field_deadline: deadline + label_tags_selected: Selected Tags + label_tags_related: Related Tags + button_project_tags_add: Add + label_issue_query_condition: Query condition + label_homework_source: Task + label_issue_query: Query + label_issue_cancel_query: Cancel query + field_reward_type: The type of reward + label_tags_no: no tags now！ + label_bid_publish: published + label_bid_project: projects + label_project_no_follow: The project hasn't been followed now！ + label_no_bid_project: has no participate project + label_bids_reward_method: Reward： + label_bids_reward_what: input what for reward + label_call_bonus: bonus + label_bids_form_new_description: Publish a requirement,a competition or a course work. + label_bids_new_money: input the award money,such as 500,2.5 etc. + label_bids_new_credit: input the work corresponding course credits,such as 3,2.5 etc. + label_bids_new_content: input the award content,such as certificate,things etc. + label_user_login_tips: You havn't logged in,for leaving message please login first + label_user_login_new: login + label_project_sort: the way of sorting + #modified by bai + label_sort_by_time: sorted by time + label_sort_by_active: sorted by active + label_sort_by_influence: sorted by influence + #end + label_bids_published: published + label_bids_published_ago: ago + label_welcome_trustie: Trustie + label_welcome_trustie_project: Online projects hosting platform + label_welcome_trustie_course: Online Courses practice platform + label_welcome_trustie_contest: Online Contests practice platform + label_welcome_trustie_project_description: Software for Chinese college students and practitioners to provide social-oriented project management, code hosting, resource sharing, cooperation and exchange. + label_welcome_trustie_course_description: Teachers and Students for Chinese universities to provide social-oriented curriculum management, resource sharing, cooperation achieved, collaborative research. + label_welcome_trustie_contest_description: Software for Chinese college students and practitioners to provide social-oriented contest management, code hosting, resource sharing, cooperation and exchange. + label_welcome_trustie_description: a socialized collaboration platform for project management, collaborative research, software development and software crowdsourcing for creative university students and entrepreneurs. + label_user_project: Projects + label_bid_respond_quote: Respond + label_bid_if_agreement: If you like me, please press me #bai + label_bid_respond_delete: Delete + label_newfeedback_message: messages + label_newfeedback_quote: Respond + label_newfeedback_delete: Delete + label_user_all_activity: All activities + label_user_activity_myself: About me + label_user_all_respond: All replies + label_layouts_feedback: Messages + label_have_feedback: Have + label_of_feedback: Of + label_welcome_participate: participates + #modify by men + label_x_welcome_participate: + zero: participate + one: participate + other: participates + #end + label_welcome_participate_project: projects + label_projects_feedback: responded to the project + label_projects_feedback_respond: Respond + label_projects_feedback_respond_success: Respond success + button_projects_feedback_respond: Respond + label_projects_feedback_respond_content: Please input your words + label_in_issues: in the issue： + label_in_bids: in the call： + label_in_users: in the user： + label_user_create_project: has created + +#added by bai + label_identity: Identity + label_teacher: Teacher + label_student: Student + label_school_all: Schools + label_school_not_fount: Not found by your input query condition. + label_other: Other + label_gender: Gender + label_gender_male: male + label_gender_female: female + label_location: Location +#end + label_course: Course + label_course_new: New course + label_public_info: "If you don't choose public, only the project's members can see the project." + label_course_public_info: "If you don't choose public, only the course's members can see the course." + label_course_student: Student + label_homework: Task + label_course_new_homework: New homework + label_course_homework_list: Homework List + label_course_homework_new: new homework + + label_x_course_data: + zero: File + one: File + other: Files + + label_x_base_courses_student: + zero: student + one: students + other: students + label_x_base_courses_teacher: + zero: teacher + one: teachers + other: teachers + #add by men + label_brief_introduction: Personality words + label_technical_title: Title + label_technicl_title_professor: Professor + label_technicl_title_associate_professor: Associate professor + label_technicl_title_lecturer: Lecturer + label_technicl_title_teaching_assistant: Teaching assistant + label_account_identity_teacher: Teacher + label_account_identity_student: Student + label_account_identity_developer: Developer + label_account_identity_enterprise: Enterprise + label_account_identity_choose: --Please choose your identity-- + label_enter_college: College Entrance + lable_enter_enterprise: Enterprise Entrance + label_homework_info: Status + label_question_student: Feedback + label_student_response: Feedback + label_my_question: Please raise your questions here！ + label_teacher_homework: "Teacher's name" + label_course_homework: Corresponding courses + label_course_done: finished courses + label_course_doing: Doing course + label_limit_time: Deadline + label_commit_homework: Submitted Task + label_no_course_project: No submitted work！ + button_clear_requirement: Cancel +#end + label_x_bids_responses: #modify by huang + zero: response + one: response + other: responses + #end + label_teaching_course: My Courses + label_release_homework: Released Tasks + label_term: Term + label_spring: spring term + label_summer: summer term + label_autumn: autumn term + label_winter: winter term + text_command: The password is required when applying a course, and it will be released by the teacher of. + label_enterprise_into: Enterprise Entrance + label_college_into: College Entrance + label_user_course: Courses + label_new_course: Courses + field_tea_name: Teacher + label_course_college: College + label_x_task: + zero: Task + one: Task + other: Tasks + label_project_course_unadd: You have no course,creat one now！ + label_my_create_honework_no_homework: no task now！ + label_my_homework_no_homework: no task now！ + label_x_member: + zero: member + one: member + other: members + label_x_data: + zero: file + one: file + other: files + label_bid_show_course_name: Course + label_bid_show_teacher_name: Teacher + label_bid_contest_show_course_name: Course + label_bid_contest_show_teacher_name: Teacher + label_x_homework_project: + zero: submitted task + one: submitted task + other: submitted tasks + label_new_homework: Tasks + label_new_contest: Contests + label_contest_list: Contests list + label_newtype_contest: Release contest + label_question_requirement: introduce a question！ + label_contest_requirement: has commented this contest + button_bidding_homework: To take part in contest + label_bids_form_contest_new_description: Enterprise or college can release a contest here. + label_contest_name: Input the name of the contest + label_contest_description: Content：description your contest + label_main_teacher: Main teacher + label_main_term: Term + label_teacher_work_unit: Position + label_course_overview: Status + label_course_file: File + label_stores_index: Resource search + label_course_news: News + #wang + label_contest_userresponse: Userresponse + label_contest_joincontest: Joincontest + label_contest_notification: Notification + #end + label_x_base_courses_member: + zero: member + one: member + other: members + + label_bids_task_list: Tasks list + label_join_course: join course + label_exit_course: exit course + label_new_join: Join + label_new_join_order: Please input the course order. + label_homeworks_form_new_description: Release a task,the submit form of the task may be accessory or project,setting in the task form. + label_course_settings: Setting + field_homework_type: Submit form + label_task_submit_form_accessory: Submitted as accessory + label_task_submit_form_project: Submitted as project + label_news_notice: Release course news + + role_of_course: Role + label_student: student + label_teacher: teacher + label_ta: teacher assistant + label_in_course: in course + label_assign_homework: assigned homewok + label_noawards: No awards + label_user_location: Location + label_requirement_enterprise: Requirements + label_requirement_enterprise_list: Requirements List + label_contest_innovate: Competition community + label_software_user: Users + label_course_practice: Courses + label_course_all: Teacher + label_teacher_all: Student + label_user_home: User Space + + field_hidden_repo: code protected + label_newbie_faq: newbie FAQ + label_hot_project: 'HOT Projects' + label_memo_create_succ: Memo was successfully created. + label_memo_create_fail: Memo was failures created. + label_forum_create_succ: Forum was successfully created. + label_forum_create_fail: Forum was failures created. + label_forum_edit: Editing forum + label_memo_create: publish + label_memo_new: new memo + label_memo_edit: edit memo + label_project_module_forums: Forums + label_forum: Forum + label_tags_forum_description: Forum description + label_tags_forum: Call forum + label_memo_locked: 'Topic is locked' + label_downloads_list: enter file list. + label_sumbit_empty: search bar need container. + label_reply_empty: Reply Cann't Empty. + label_setup_time: Start date + label_endup_time: Over date + label_class_period: Class hour + label_class_hour: period + label_activity_time: publish date + + label_your_course: your course + label_have_message : have a new message + label_login_prompt: Email/NickName + :lable_not_receive_mail: Click here don't receive email form site！ +#added by linchun as competition# + + label_current_hot_contest: Latest Hot Competition + label_current_attendingcontest_work: Latest Competition Work + label_issue_feedback_activities: Question&Feedback + label_more_information: More... + label_my_question: My-question + label_my_feedback: My-feedback + label_release_time: Release-time + label_question_sponsor: Sponsor + label_final_reply: Final-reply + label_reply: Reply + label_weixin: WeiXin + label_search_intimation: please input the keywords + label_work_quantity: work + label_projects_management_platform: Projects-platform + label_courses_management_platform: Courses-platform + label_contests_management_platform: Competitions-platform + label_contest_work: Competition work + label_contests_reward_method: Reward method + label_attendingcontestwork_developers: Developers + label_attendingcontestwork_release_time: Release time + label_attendingcontestwork_belongs_contest: Contesting + label_attendingcontestwork_belongs_type: Work-type + label_attendingcontestwork_release_person: Release person + label_attendingcontestwork_adaptive_system: Adaptive-system + label_attendingcontestwork_download: Work download + label_attendingcontestwork_average_scores: Average score + label_attendingcontestwork_deposit_project: Deposit project + label_attendingcontestwork_sorting_intimation: You can re-scoring, but just record the last scoring result! + + label_upload_files: Files-upload + label_upload_softwarepackage: Softwarepackage-upload + label_upload_cuttingphoto: Photo-upload + label_system_platform: Platform + label_nextstep: Next + label_participate: Participate + label_setting: Setting + label_contest_project: Competition-project + label_contest_softapplication: Competition-application + label_contest_response: Feedback + label_contest_watchers: Watchers + label_contest_work: Competition-work + button_contesting_as_project: Competition(New-project) + button_contesting_as_application: Competition(Release-app) + label_release_softapplication: Release-application + label_upload_softapplication_packets: Upload-apppacket + label_upload_softapplication_photo: Upload-appphoto + label_upload_softapplication_packets_mustpacketed: Works code and ralated-document must be packaged before upload. + label_upload_softapplication_photo_condition: The best works. 0~4 (redundant pictures would not show page), each is less than 5M, photo format such as gif,jpg,png etc. + label_updated_caution: Note:if you edit the work, the uploaded screenshot and package will be deleted, please re-load! + label_softapplication_name: App-name + label_work_name: Work name + label_softapplication_description: App-description + label_work_description: Work description + label_work_scores: Work score + label_work_rating: Work rating + label_work_tishi: You can re-scoring, but just record the last scoring result! + label_work_scores_proportion: Score porportion + label_softapplication_type: App-type + label_work_type: Work type + label_work_photo: Work photo + label_work_comment: Work comment + label_softapplication_version_available: Version + label_running_platform: Running platform + label_softapplication_developer: Upload person + label_softapplication_developers: Developers + label_work_deposit_project_url: Deposit url + label_work_deposit_project: Deposit project + label_softapplication_name_condition: Less than 50 characters + label_softapplication_description_condition: Less than 250 characters + label_user_login_softapplication_board: You are not logged in, please log in and then participate in the evaluation! + label_user_login_attending_contest: You are not logged in, please log in and then join the competition! + label_contest_description_no: No description + label_no_contest_softapplication: No application + label_button_ok: Ok + label_tags_contest: Competition tag + label_final_scores: Final scores + label_rating_person_amount: Rating person + label_tags_contest_description: Contest description + label_release_add_contest_succeed: The application succeed released and added! + label_add_contest_succeed_fail: Added fails, the application has been joined the competition! + label_no_ftapplication: No application + label_edit_softapplication: Edit application + label_edit_work: Edit work + label_contest_delete: Delete contest + label_noawards_current: No awards + label_softapplication: Application software + label_attending_contest: Joining + label_new_attendingcontest_work: New competition work + label_workname_lengthlimit: Less than 50 characters + label_workdescription_lengthlimit: Less than 250 characters + label_please_input_password: Please input the competition password! + label_please_select_project: Please select the project! + label_upload_softworkpacket_photo: Upload work package and screenshots + label_reward: Reward + label_please_select_contestingsoftapplication: Please select the competition application! + label_attendingcontest_time: Join-contest time + label_attendingcontest_spoksman: Join-contest representive + label_wellmeaning_intimation_contentone: Note:if you are ready attenging contest, please click"New competition work"! + label_wellmeaning_intimation_contenttwo: if you have already completed the development, and just release your work, you can not select"Deposit project"! + label_wellmeaning_intimation_contentthree: if you want to deposit the competition data and code, and want to keep track of the development and code-submission,please selcet a created project from"Deposit project", if you have no project, please click"New project"! + + notice_attendingcontest_work_successfully_created: Congratulations, competition work successfully created! + notice_softapplication_was_successfully_updated: Congratulations, competition work successfully updated! + + label_contest_notification: Notice + lable_contest_user: Release person + label_contest_innovate_community: Competition community + + label_user_login_score_and_comment: You are not logged in, please log in and then score and comment the work! + label_user_login_notificationcomment: You are not logged in, please log in and then comment the notification! + label_contest_work_list: Competition work list + + + label_borad_project: Project-borad + label_search_intimation: please input the searching keywords! + label_update_time: Update time + label_project_notice: release the notice + label_no_file_uploaded: No file uploaded + label_forum_new: New forum + label_memo_new_from_forum: Release memo + + label_user_grade: Individual score + label_active_homework: homework + label_course_term: Semester + label_comment_time: Comment time + label_bidding_user_studentcode: Student ID + + label_organizers: Organizer + label_organizers_information: National Key Laboratory of Parallel and Distributed Processing, NUDT + label_organizers_information_institute: Department of Computer Sciencer and Technology + label_copyright: Copyright + label_contact_us: Contact us + label_record: 湘ICP备09019772 + label_check_comment: Check comment + label_notification: Notification +#end + + # ajax异步验证 + modal_valid_passing: can be used. + + label_company_name: Company Name + notice_account_invalid_creditentials_new: You have not to the mailbox activation From f3fe5d918e46b0876115e64ddb37f56aedf1c48f Mon Sep 17 00:00:00 2001 From: zhanghaitao <562681745@qq.com> Date: Thu, 7 Aug 2014 15:54:05 +0800 Subject: [PATCH 09/16] =?UTF-8?q?#832=20=E7=8A=B6=E6=80=81=E8=81=94?= =?UTF-8?q?=E5=8A=A8=E9=97=AE=E9=A2=98=E7=9A=84=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/issues/_attributes.html.erb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/views/issues/_attributes.html.erb b/app/views/issues/_attributes.html.erb index e44578243..b17283f3b 100644 --- a/app/views/issues/_attributes.html.erb +++ b/app/views/issues/_attributes.html.erb @@ -50,15 +50,18 @@ var _v= obj; if(_v==100) { - //alert(3); + //var select=$("select[id='issue_status_id']"); + $("select[id='issue_status_id']").find("option[value='3']").attr("selected","selected"); } else if(_v==0) { - //alert(1); + //alert(1); + $("select[id='issue_status_id']").find("option[value='1']").attr("selected","selected"); } else if(_v!=100&&_v!=0) { // alert(2); + $("select[id='issue_status_id']").find("option[value='2']").attr("selected","selected"); } } From 387d4820590cb4a97e93cfdaaed302663baa0b7f Mon Sep 17 00:00:00 2001 From: linhk <304431313@.com> Date: Thu, 7 Aug 2014 15:58:00 +0800 Subject: [PATCH 10/16] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=B3=A8=E5=86=8C=E6=97=A0=E5=9C=B0=E5=8C=BA=E3=80=81=E8=BA=AB?= =?UTF-8?q?=E4=BB=BD=E5=8F=AF=E6=B3=A8=E5=86=8C=E6=88=90=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/account_controller.rb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb index c05d1172c..c1b38fa39 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -140,6 +140,15 @@ class AccountController < ApplicationController @user.password, @user.password_confirmation = user_params[:password], user_params[:password_confirmation] end + if(@cache_identityy == "") + flash.now[:error]= l(:label_identity)+l(:'activerecord.errors.messages.empty') + return + end + if(@cache_city == "") + flash.now[:error]= l(:label_location)+l(:'activerecord.errors.messages.empty') + return + end + case Setting.self_registration when '1' register_by_email_activation(@user) From af683f917dd11b87fe5ba5c43d2d78bf40ca150a Mon Sep 17 00:00:00 2001 From: linhk <304431313@.com> Date: Thu, 7 Aug 2014 16:09:50 +0800 Subject: [PATCH 11/16] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=E5=90=8D=E9=9D=9E=E6=B3=95=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=88=90=E5=8A=9F=E6=96=B0=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/repository.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/repository.rb b/app/models/repository.rb index 57a818270..c2736dd30 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -42,7 +42,7 @@ class Repository < ActiveRecord::Base validates_uniqueness_of :identifier, :scope => :project_id, :allow_blank => true validates_exclusion_of :identifier, :in => %w(show entry raw changes annotate diff show stats graph) # donwcase letters, digits, dashes, underscores but not digits only - validates_format_of :identifier, :with => /^[a-zA-Z0-9_\-]+$/, :allow_blank => true + validates_format_of :identifier, :with => /^[a-z0-9_\-]+$/, :allow_blank => true # Checks if the SCM is enabled when creating a repository validate :repo_create_validation, :on => :create From d087c5231462359ddc12828f83a060db6a627e5f Mon Sep 17 00:00:00 2001 From: chenmin <19763783@qq.com> Date: Thu, 7 Aug 2014 16:20:46 +0800 Subject: [PATCH 12/16] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb index deb590d1f..d7d579dd1 100644 --- a/app/views/courses/show.html.erb +++ b/app/views/courses/show.html.erb @@ -1,4 +1,4 @@ -<% if @events_by_day.size >0 %> +<% if @events_by_day != nil && @events_by_day.size >0 %>

From d9a9867f964fb48546e52bfd6168fa42cc788b51 Mon Sep 17 00:00:00 2001 From: zhanghaitao <562681745@qq.com> Date: Thu, 7 Aug 2014 16:41:31 +0800 Subject: [PATCH 13/16] =?UTF-8?q?#815=20=E4=B8=AD=E8=8B=B1=E6=96=87?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/locales/zh.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/config/locales/zh.yml b/config/locales/zh.yml index ab754feaf..572862174 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -315,7 +315,7 @@ zh: field_auth_source: 认证模式 field_hide_mail: 隐藏我的邮件地址 field_comments: 注释 - field_url: URL + field_url: 路径 field_start_page: 起始页 field_subproject: 子项目 field_hours: 小时 @@ -979,7 +979,7 @@ zh: label_change_properties: 修改属性 label_general: 一般 label_more: 更多>> - label_scm: SCM + label_scm: 管理系统 label_plugins: 插件 label_ldap_authentication: LDAP 认证 label_downloads_abbr: D/L @@ -1552,6 +1552,7 @@ zh: label_have_respond: 进行了反馈 label_welcome: 欢迎 label_join: 加入Trustie！ + label_repository_path: 库路径 label_board_description: 七嘴八舌，汇聚众人智慧，为您排忧解难！ label_create_course_description: 课程小社区，创建新课程，让我们共同分享多到想不到的公共资源！ label_welcome_page_to: 参与了 %{project_count} 个项目！ From cb4869fd20efda4ada60d33f0e91f6bd7ba0b789 Mon Sep 17 00:00:00 2001 From: linhk <304431313@.com> Date: Thu, 7 Aug 2014 17:16:00 +0800 Subject: [PATCH 14/16] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=E5=90=8D=E9=95=BF255=E4=B8=AA?= =?UTF-8?q?=E5=AD=97=E7=AC=A6=E6=97=B6=E5=BC=82=E5=B8=B8=20=E8=A7=A3?= =?UTF-8?q?=E5=86=B3=E7=89=88=E6=9C=AC=E5=BA=93=E5=90=8D=E9=95=BF=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E7=95=8C=E9=9D=A2=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/repository.rb | 4 ++-- app/views/projects/settings/_repositories.html.erb | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/models/repository.rb b/app/models/repository.rb index c2736dd30..260069f94 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -21,8 +21,8 @@ class Repository < ActiveRecord::Base include Redmine::Ciphering include Redmine::SafeAttributes - # Maximum length for repository identifiers - IDENTIFIER_MAX_LENGTH = 255 + # Maximum length for repository ideflashntifiers + IDENTIFIER_MAX_LENGTH = 254 belongs_to :project has_many :changesets, :order => "#{Changeset.table_name}.committed_on DESC, #{Changeset.table_name}.id DESC" diff --git a/app/views/projects/settings/_repositories.html.erb b/app/views/projects/settings/_repositories.html.erb index 4ad14bf84..f4b505065 100644 --- a/app/views/projects/settings/_repositories.html.erb +++ b/app/views/projects/settings/_repositories.html.erb @@ -1,7 +1,7 @@ <% project_path_cut = RepositoriesHelper::PROJECT_PATH_CUT %> <% ip = RepositoriesHelper::REPO_IP_ADDRESS %> <% if @project.repositories.any? %> - +
@@ -14,16 +14,16 @@ <% @project.repositories.sort.each do |repository| %> - - + <%if repository.scm_name=="Git"%> - + <%else %> - + <% end %>
<%= l(:field_identifier) %>
+ <%= link_to repository.identifier, {:controller => 'repositories', :action => 'show',:id => @project, :repository_id => repository.identifier_param} if repository.identifier.present? %> <%= checked_image repository.is_default? %><%=h repository.scm_name %><%=h repository.scm_name %>http://<%= repository.login.to_s %>_<%= repository.identifier.to_s%>@<%= ip %><%=h repository.url.slice(project_path_cut, repository.url.length) %>http://<%= repository.login.to_s %>_<%= repository.identifier.to_s%>@<%= ip %><%=h repository.url.slice(project_path_cut, repository.url.length) %><%=h repository.url %><%=h repository.url %> From eac85b338fb891f6b103bd4e660ba4bae9cc8e83 Mon Sep 17 00:00:00 2001 From: zhanghaitao <562681745@qq.com> Date: Thu, 7 Aug 2014 17:56:29 +0800 Subject: [PATCH 15/16] =?UTF-8?q?=E6=A0=87=E7=A4=BA=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/_form.html.erb | 4 ++-- app/views/repositories/_form.html.erb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/projects/_form.html.erb b/app/views/projects/_form.html.erb index 7c84bf84b..512c2df82 100644 --- a/app/views/projects/_form.html.erb +++ b/app/views/projects/_form.html.erb @@ -9,8 +9,8 @@ <%= f.text_area :description, :rows => 8, :class => 'wiki-edit', :style => "font-size:small;width:490px;margin-left:10px;" %>

-

<%= f.text_field :identifier, :required => true, :size => 60, :style => "width:488px;", :disabled => @project.identifier_frozen?, :maxlength => Project::IDENTIFIER_MAX_LENGTH, - value:"#{User.current.id.to_s + '_' +format_time(Time.now).to_s}" %> +

<%= f.text_field :identifier, :required => true, :size => 60, :style => "width:488px;", :disabled => @project.identifier_frozen?, :maxlength => Project::IDENTIFIER_MAX_LENGTH, + value:"#{User.current.id.to_s + '_' +Time.now.to_s.gsub(' ','_').gsub(':','').gsub('+','')}" %> <% unless @project.identifier_frozen? %> <%= l(:text_length_between, :min => 1, :max => Project::IDENTIFIER_MAX_LENGTH) %> <%= l(:text_project_identifier_info).html_safe %> <% end %>

diff --git a/app/views/repositories/_form.html.erb b/app/views/repositories/_form.html.erb index b9a3a6c83..1fabf47c8 100644 --- a/app/views/repositories/_form.html.erb +++ b/app/views/repositories/_form.html.erb @@ -12,7 +12,7 @@

<%= f.check_box :is_default, :label => :field_repository_is_default %>

<%= f.text_field :identifier, :required => true, :disabled => @repository.identifier_frozen?, - value:"#{User.current.id.to_s + '_' +format_time(Time.now).to_s}"%> + value:"#{User.current.id.to_s + '_' +Time.now.to_s.gsub(' ','_').gsub(':','').gsub('+','')}"%> <% unless @repository.identifier_frozen? %> <%= l(:text_length_between, :min => 1, :max => Repository::IDENTIFIER_MAX_LENGTH) %> <%= l(:text_repository_identifier_info).html_safe %> <% end %>

From 70a1839e74d1b39c26113226eb4587f0bcbee4e7 Mon Sep 17 00:00:00 2001 From: linhk <304431313@.com> Date: Fri, 8 Aug 2014 09:30:48 +0800 Subject: [PATCH 16/16] =?UTF-8?q?=E8=8B=B1=E6=96=87=E7=95=8C=E9=9D=A2-?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=B8=8B=E6=8B=89=E8=8F=9C=E5=8D=95=EF=BC=88?= =?UTF-8?q?=E6=88=91=E7=9A=84=E8=AF=BE=E7=A8=8B=E3=80=81=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E3=80=81=E7=BC=96=E8=BE=91=E8=B5=84=E6=96=99=EF=BC=89=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_base_header.html.erb | 14 +++++++------- config/locales/en.yml | 1 + 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/views/layouts/_base_header.html.erb b/app/views/layouts/_base_header.html.erb index fafc49c0a..3a7a6a8ee 100644 --- a/app/views/layouts/_base_header.html.erb +++ b/app/views/layouts/_base_header.html.erb @@ -27,7 +27,7 @@ #@nav_dispaly_user_label = 1 end %> -
+
@@ -44,8 +44,8 @@ <% if User.current.user_extensions && [UserExtensions::TEACHER, UserExtensions::STUDENT].include?(User.current.user_extensions.identity) -%> <% hasCourse=true%> -
  • <%=link_to l(:label_my_course), {:controller => 'users', :action => 'user_courses', id: User.current.id, host: Setting.course_domain} %> -
      +
    • <%=link_to l(:label_my_course), {:controller => 'users', :action => 'user_courses', id: User.current.id, host: Setting.course_domain} %> +
        <% User.current.courses.each do |course| %> <% if !course_endTime_timeout?(course) %>
      • <%= link_to course.name.truncate(10, omission: '...'), {:controller => 'courses',:action => 'show',id:course.id, host: Setting.course_domain} %>
        • @@ -56,7 +56,7 @@ <% end -%> <% end %> -
      • <%= link_to l(:label_my_projects), {:controller => 'users', :action => 'user_projects', id: User.current.id, host: Setting.project_domain} %> +
      • <%= link_to l(:label_my_projects), {:controller => 'users', :action => 'user_projects', id: User.current.id, host: Setting.project_domain} %> <% if hasCourse %>
          @@ -68,7 +68,7 @@ <% end %>
        • -
      • <%=link_to l(:label_user_edit), {:controller => 'my', :action=> 'account', host: Setting.user_domain}%> +
      • <%=link_to l(:label_user_edit), {:controller => 'my', :action=> 'account', host: Setting.user_domain}%>
      • @@ -76,9 +76,9 @@ <%=link_to l(:label_my_message)+'('+User.current.count_new_jour.to_s+')', { :controller => 'users', :action => 'user_newfeedback', id: User.current.id, host: Setting.user_domain }, {:class => 'my-message'} if User.current.logged?%>
    -
    • +
    <% end -%> - <%#= render_menu :top_menu if User.current.logged? || !Setting.login_required? -%> + <%#= render_menu :top_menu if User.current.logged? || !Setting.login_required? -%> <%= render_dynamic_nav if User.current.logged? || !Setting.login_required? -%> <%# 自建导航条在base页面中以 (@nav_dispaly......) 开头变量设定， 全局搜索即可发现 %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 33e1eda9b..1d7b01d4f 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1158,6 +1158,7 @@ en: #huang label_file_new: Download label_user_edit: "Edit information" + label_my_course: "My Course" label_user_info: "User information" #huang 添加 label_user_watcher: "Following" # huang添加的 # modified by bai label_user_fans: "Followed by" # modified by bai