Merge remote-tracking branch 'origin/szzh' into szzh

app/views/boards/_project_show.html.erb

@@ -69,7 +69,7 @@
                 	<span>添加于<%= format_time topic.created_on %></span> 
 				</div>
             </div>
-                	<span class="talk_btn fr">回复<%= link_to (topic.replies_count), board_message_path(@board, topic), :style =>"color:#fff;" %></span>
+                	<span class="talk_btn fr"><%= link_to (l(:label_reply) + topic.replies_count.to_s), board_message_path(@board, topic), :style =>"color:#fff;" %></span>
                 <div class="cl"></div>
              </div><!--讨论主类容 end-->
              <% end %>