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

app/views/courses/settings/_members.html.erb

@@ -51,7 +51,7 @@
                                          :class => 'icon icon-edit' %>
                     <%= delete_link membership_path(member),
                                     :remote => true,
-                                    :data => (!User.current.admin? && member.include?(User.current) ? {:confirm => l(:text_own_membership_delete_confirmation)} : {}) if member.deletable? %>
+                                    :data => (!User.current.admin? && member.include?(User.current) ? {:confirm => l(:text_own_membership_delete_confirmation)} : {confirm: l(:label_delete_confirm)}) if member.deletable? %>
                   </td>
               <% end %>
               <!--end-->