Merge master branch of base

app/views/finance/balancing/_orders.html.haml

@@ -15,7 +15,7 @@
         %tr{:class => cycle("even","odd", :name => "order")}
           %td= link_to truncate(order.name), new_finance_order_path(order_id: order.id)
           %td=h format_time(order.ends) unless order.ends.nil?
-          %td= order.closed? ? t('.cleared', amount: number_to_currency(order.foodcoop_result)) : "beendet"
+          %td= order.closed? ? t('.cleared', amount: number_to_currency(order.foodcoop_result)) : t('.ended')
           %td= order.updated_by.nil? ? '??' : order.updated_by.nick
           %td
             - unless order.closed?
@@ -23,4 +23,4 @@
               = link_to t('.close'), close_direct_finance_order_path(order),
                 :confirm => t('.confirm'), :method => :put, class: 'btn btn-mini'
 - else
-  %i= t('.no_closed_orders')
+  %i= t('.no_closed_orders')

app/views/mailer/reset_password.text.haml

@@ -1 +1 @@
-= t '.text', user: @user.nick, link: @link, expires: I18n.l(@user.reset_password_expires)
+= raw t '.text', user: @user.nick, link: @link, expires: I18n.l(@user.reset_password_expires)