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

Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh

This commit is contained in:
alan 2015-01-30 14:52:48 +08:00
parent a467736a5e 864ed349e4
commit 661dbe5219
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/views/welcome/index.html.erb
View File

@ -191,6 +191,7 @@
<%end %> <%end %>
<% end %> <% end %>
<% end %> <% end %>
</div> </div>
</ul> </ul>
</div> </div>

9
config/locales/zh.yml
View File

@ -2447,3 +2447,12 @@ zh:
next: "下一页 &raquo;" next: "下一页 &raquo;"
truncate: "..." truncate: "..."
# 项目企业模块
label_all_enterprises: 所有企业
label_my_enterprise: 我的企业
label_enterprise_tips: 暂时还没有该企业对应的项目，系统的其它项目您可能会感兴趣！
label_part_enterprise_tips: 系统的其它项目您可能也会感兴趣！
label_enterprise_nil: 改模块为最新上线模块，目前还未有项目关联到企业！
label_enterprises: 名企