jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop

This commit is contained in:
huangjingquan 2013-08-30 22:09:54 +08:00
parent faef617a45 4b43373d7c
commit 2d023f9d18
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config/locales/en.yml
View File

@ -1175,7 +1175,7 @@ en:
label_priority_as: Priority as
label_member_list: Member list
label_author_name: Posted by %{author_name}
label_comments_count: (%{count} numbers of comments)
label_comments_count: (%{count} comments)
label_post_on: posts on
label_find_all_comments: view all comments
label_updated_time_on: " Updated on %{value} "
@ -1201,7 +1201,7 @@ en:
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
label_new_activity: ' has new activity'
label_i_new_activity: have new activity
label_create_project: had participated in
label_praise: praise
@ -1331,8 +1331,8 @@ en:
label_user_activity_myself: About me
label_user_all_respond: All respondes
label_layouts_feedback: Messages
label_welcome_participate: participated in
label_welcome_participate_project: projects！
label_welcome_participate: participates
label_welcome_participate_project: projects
label_projects_feedback: responded to the project
label_projects_feedback_respond: Respond
label_projects_feedback_respond_success: Respond success

2
public/stylesheets/application.css
View File

@ -989,7 +989,7 @@ margin-left:-10px;
text-align:left;
margin-top: 50px;
width:280px;
width:320px;
font-family:微软雅黑,lucida grande,verdana;
font-size:12px;