Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq

app/views/users/user_messages.html.erb

@@ -47,7 +47,7 @@
               <%# 公共贴吧 %>
               <% unless @user_memo_messages.nil? %>
                   <% if @user_memo_messages_count > 0 %>
-                      <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "发布了xiang帖子",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'forum'} %></a></li>
+                      <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "发布了帖子",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'forum'} %></a></li>
                   <% end %>
               <% end %>
               <%# 用户留言 %>