Merge branch 'master' into updated-gems

Conflicts:
	Gemfile.lock

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

@@ -12,7 +12,7 @@
   .well.well-small
     %h3= t('.notes_and_journal')
     #note
-      - unless @order.note.empty?
+      - unless @order.note.blank?
         = simple_format @order.note
       - else
         %p= t('.comment_on_transaction') 

app/views/finance/ordergroups/_ordergroups.html.haml

@@ -5,7 +5,7 @@
   %thead
     %tr
       %th= sort_link_helper t('.name'), "name", :per_page => @per_page
-      %th Kontakt
+      %th= t '.contact'
       %th.numeric= sort_link_helper t('.account_balance'), "account_balance", :per_page => @per_page
       %th
   %tbody
@@ -17,4 +17,4 @@
         %td
           = link_to t('.new_transaction'), new_finance_ordergroup_transaction_path(ordergroup), class: 'btn btn-mini'
           = link_to t('.account_statement'), finance_ordergroup_transactions_path(ordergroup), class: 'btn btn-mini'
-        
+        

app/views/pages/_form.html.haml

@@ -56,7 +56,7 @@
             %pre
               * #{t '.help.list_item_1'}
             %pre
-              ** #{t '.help_list_item_2'}
+              ** #{t '.help.list_item_2'}
         %tr
           %td= t '.help.ordered_list'
           %td

app/views/stock_takings/edit.html.haml

@@ -4,4 +4,4 @@
   = f.input :date
   = f.input :note
   = f.submit
-  = link_to t('ui.cancel'), stock_takings_path
+  = link_to t('ui.or_cancel'), stock_takings_path

app/views/stock_takings/new.html.haml

@@ -14,4 +14,4 @@
     = render :partial => 'stock_change', :collection => @stock_taking.stock_changes
   .form-actions
     = f.submit class: 'btn'
-    = link_to t('ui.cancel'), stock_takings_path
+    = link_to t('ui.or_cancel'), stock_takings_path

app/views/stockit/index.html.haml

@@ -1,4 +1,4 @@
-- title "Lager (#{StockArticle.available.count})"
+- title t('.title', article_count: StockArticle.available.count)
 - content_for :javascript do
   :javascript
     $(function() {

app/views/suppliers/shared_suppliers.haml

@@ -17,7 +17,9 @@
         %td= shared_supplier.note
         %td= shared_supplier.delivery_days
         %td
-          - if shared_supplier.supplier
+          - if shared_supplier.suppliers.any?
             %i.icon-ok
+            = associated_supplier_names(shared_supplier)
+            = link_to t('.subscribe_again'), new_supplier_path(:shared_supplier_id => shared_supplier), class: 'btn'
           - else
             = link_to t('.subscribe'), new_supplier_path(:shared_supplier_id => shared_supplier), class: 'btn'

app/views/tasks/_nav.haml

@@ -4,7 +4,7 @@
 - content_for :sidebar do
   .well.well-small
     %ul.nav.nav-list
-      %li.nav-header Seiten
+      %li.nav-header= t '.pages'
       %li= link_to t('.my_tasks'), user_tasks_path
       %li= link_to t('.all_tasks'), tasks_path
       %li= link_to t('.archive'), archive_tasks_path

app/views/tasks/user.html.haml

@@ -1,4 +1,4 @@
-- title "Meine Aufgaben"
+- title t('.title')
 = render 'nav'
 
 - unless @unaccepted_tasks.empty?