与我相关模块国际化

app/views/layouts/base_projects.html.erb

@@ -63,7 +63,7 @@
 											<td class="font_index"><%= @project.attachments.count %></td>
 										<tr>
 											<td align="center" width="80px"><strong> <%= link_to(l(:label_member), project_member_path(@project), :class => 'project_infor_tag') %></strong></td>
-											<td align="center" width="80px"><strong> <%= link_to(l(:label_project_defect), project_issues_path(@project), :class => 'project_infor_tag') %></strong></td>
+											<td align="center" width="80px"><strong> <%= link_to(l(:label_project_defects), project_issues_path(@project), :class => 'project_infor_tag') %></strong></td>
 											<td align="center" width="80px"><strong> <%= link_to(l(:label_attachment), project_files_path(@project), :class => 'project_infor_tag') %></strong></td>
 										</tr>
 									</table>

app/views/users/info.html.erb

@@ -12,16 +12,16 @@
 					<td colspan="2" valign="top"><strong> <%= link_to(h(e.user), user_path(e.user)) %></strong><span class="font_lighter">
 						<% if e.instance_of?(JournalsForMessage)%>
 							<% if e.reply_id == User.current.id%>
-								对我的话进行了引用<%if e.jour_type == 'Bid'%><%= link_to('link', respond_path(e.jour))%><% else %><%= link_to('link', feedback_path(e.jour))%><% end %>						
+								<%= l(:label_quote_my_words) %><%if e.jour_type == 'Bid'%><%= link_to('link', respond_path(e.jour))%><% else %><%= link_to('link', feedback_path(e.jour))%><% end %>						
 							<% else %>
-								对需求：<%= link_to(e.jour.name, respond_path(e.jour_id))%>进行了反馈
+								<%= l(:label_about_requirement) %><%= link_to(e.jour.name, respond_path(e.jour_id))%><%= l(:label_have_respond) %>
 							<% end %>
 						<% else %>
 							<% if e.journal_reply.nil? || e.journal_reply.reply_id != User.current.id %>
-								对问题：<%= link_to(e.issue.subject, issue_path(e.journalized_id))%>进行了反馈
+								<%= l(:label_about_issue) %><%= link_to(e.issue.subject, issue_path(e.journalized_id))%><%= l(:label_have_respond) %>
 								
 							<% else %>
-								对我的话进行了引用<%= link_to('link', issue_path(e.issue))%>
+								<%= l(:label_quote_my_words) %><%= link_to('link', issue_path(e.issue))%>
 							<% end %>
 						<% end %>						
 						</span></td>

app/views/welcome/index.html.erb

@@ -158,11 +158,11 @@
 		<% unless User.current.logged? %> <!--modified by young-->
 		<table>
 		<tr>
-    		<td align="right"><label for="username">用户:</label></td>
+    		<td align="right"><label for="username"><%= l(:label_username) %></label></td>
     		<td align="left"><%= text_field_tag 'username', params[:username], :tabindex => '1' %></td>
 		</tr>
 		<tr>
-    		<td align="right"><label for="password">密码:</label></td>
+    		<td align="right"><label for="password"><%= l(:label_password) %></label></td>
     		<td align="left"><%= password_field_tag 'password', nil, :tabindex => '2' %></td>
 		</tr>
 		<% if Setting.openid? %>

config/locales/en.yml

@@ -510,7 +510,7 @@ en:
   label_role_and_permissions: Roles and permissions
   label_role_anonymous: Anonymous
   label_role_non_member: Non member
-  label_member: Member
+  label_member: Members
   label_member_new: New member
   label_member_plural: Members
   label_tracker: Tracker
@@ -573,7 +573,7 @@ en:
   label_no_data: No data to display
   label_change_status: Change status
   label_history: History
-  label_attachment: File
+  label_attachment: Files
   label_attachment_new: New file
   label_attachment_delete: Delete file
   label_attachment_plural: Files
@@ -1119,9 +1119,9 @@ en:
   label_user_activities: "You have no activities,come and join us!"
   label_project_overview: "Overview"
   label_project_tool: "Tool"
-  label_project_defect: "Defect"
+  label_project_defects: "Defects"
   label_project_newother: "See other comments"
-  label_project_newshare: "share"
+  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!"
@@ -1187,7 +1187,7 @@ en:
   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: leave message to me
+  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_new_activity: has new activity
@@ -1210,4 +1210,10 @@ en:
   label_i: I
   label_join_bidding: joined the bidding
   label_bidding_user: Bidding user：
-  label_bidding_reason: Bidding reason：
+  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

config/locales/zh.yml

@@ -261,7 +261,7 @@ zh:
   field_last_login_on: 最后登录
   field_language: 语言
   field_effective_date: 日期
-  field_password: 密码
+  field_password: 密码：
   field_new_password: 新密码
   field_password_confirmation: 确认
   field_version: 版本
@@ -773,7 +773,7 @@ zh:
   label_user_activities: "您当前还没有活动，快来加入我们吧！"
   label_project_overview: "概述"
   label_project_tool: "工具"
-  label_project_defect: "缺陷"
+  label_project_defects: "缺陷"
   label_project_newother: "查看其他评论"
   label_project_newshare: "分享了"
   label_project_newadd: "添加了"
@@ -1219,4 +1219,10 @@ zh:
   label_i: 我
   label_join_bidding: 参与了应标
   label_bidding_user: 应标人：
-  label_bidding_reason: 应标宣言：
+  label_bidding_reason: 应标宣言：
+  label_username: 用户名：
+  label_password: 密码：
+  label_about_requirement: 对需求：
+  label_about_issue: 对问题：
+  label_quote_my_words: 对我的话进行了引用
+  label_have_respond: 进行了反馈