Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Merge latest changes in master of http://github.com/foodcoops/foodsoft

Browse source
This commit is contained in:
Julius 2013-06-26 20:23:11 +02:00
commit d0ccf07bc5
20 changed files with 139 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

17
config/locales/de.yml
View file

@ -559,8 +559,8 @@ de:
confirm:
clear: Abschließen
first_paragraph: ! 'Wenn die Bestellung abgeschlossen wird, werden ebenfalls alle Gruppenkonten aktualisiert.<br />Die Konten werden wie folgt belastet:'
or_cancle: oder zurück zur Abrechnung
title: Bestellung abschließen
or_cancel: oder zurück zur Abrechnung
title: Bestellung abrechnen
edit_results_by_articles:
add_article: Artikel hinzufügen
amount: Menge
@ -585,7 +585,7 @@ de:
invoice_date: ! 'Rechnungsdatum:'
invoice_number: ! 'Rechnungsnummer:'
minus_refund_calculated: ! '- Pfand berechnet:'
new: Neue Rechnung erstellen
new: neue Rechnung erstellen
new_body: ! 'Eine Rechnung für diese Bestellung anlegen:'
plus_refund_credited: ! '+ Pfand gutgeschrieben:'
refund_adjusted_amount: ! 'pfandbereinigter Betrag:'
@ -682,23 +682,20 @@ de:
invoices:
edit:
title: Rechnung bearbeiten
form:
delivery: Lieferung
linked: Diese Rechnung ist mit einer %{what_link} verknüpft.
order: Bestellung
index:
action_new: Neue Rechnung anlegen
title: Rechnungen
invoices:
confirm_delete: Bist Du sicher?
delivery: Lieferung
linked: Diese Rechnung ist mit %{what_link} verknüpft.
linked_delivery: einer Lieferung
linked_order: einer Bestellung
new:
back: Züruck
title: Neue Rechnung anlegen
show:
back: Züruck
delivery: Lieferung
linked: Diese Rechnung ist mit einer %{what_link} verknüpft.
title: Rechnung %{number}
order_articles:
edit:
@ -799,7 +796,7 @@ de:
account_balance: Kontostand
available_funds: verfügbares Guthaben
finished_orders: nicht abgerechnete Bestellungen
open_orders: laufende Bestellungen
open_orders: Laufende Bestellungen
title: Guthaben
title: Bestellüberblick
messages:

45
config/locales/en.yml
View file

@ -557,12 +557,12 @@ en:
notice: Order was accounted succesfully, the balance of the account was updated.
close_direct:
alert: ! 'Order can not be closed: %{message}'
notice: Order was closed
notice: Order was closed.
confirm:
clear: Close
first_paragraph: ! 'When the order is closed, all group accounts will be updated.<br />The accounts will be charged as follows:'
or_cancle: or back to accounting
title: Close order
or_cancel: or back to accounting
title: Settle order
edit_results_by_articles:
add_article: Add article
amount: Amount
@ -577,7 +577,7 @@ en:
add_group: Add group
group: Group
total: Total costs
total_fc: Sum (FC-Price)
total_fc: Sum (FC-price)
units: Units
index:
title: Closed orders
@ -587,7 +587,7 @@ en:
invoice_date: ! 'Invoice date:'
invoice_number: ! 'Invoice number:'
minus_refund_calculated: ! '- deposit charged:'
new: Create new invoice
new: create new invoice
new_body: ! 'Create an invoice for this order:'
plus_refund_credited: ! '+ deposit returned:'
refund_adjusted_amount: ! 'amount adjusted for refund:'
@ -617,7 +617,7 @@ en:
ended: ended
last_edited_by: Last edited by
name: Supplier
no_closed_orders: At the moment there are no ended orders.
no_closed_orders: At the moment there are no closed orders.
state: State
summary:
changed: Data was changed!
@ -676,7 +676,7 @@ en:
group: Group
last_transactions: Last transactions
note: Note
open_transactions: not yet accounted
open_transactions: not yet settled
show_all: show all
supplier: supplier
title: Finances
@ -684,23 +684,20 @@ en:
invoices:
edit:
title: Edit invoice
form:
delivery: delivery
linked: This invoice is linked to a %{what_link}.
order: order
index:
action_new: Create new invoice
title: Invoices
invoices:
confirm_delete: Are you sure?
delivery: Delivery
linked: This invoice is linked to %{what_link}.
linked_delivery: a delivery
linked_order: an order
new:
back: Back
title: Create new invoice
show:
back: Back
delivery: delivery
linked: This invoice is linked to a %{what_link}.
title: Invoice %{number}
order_articles:
edit:
@ -753,8 +750,8 @@ en:
desc: View all %{link} here.
open_orders: current orders
title: Orders of %{group}
title_closed: Accounted
title_open: Completed/not accounted
title_closed: settled
title_open: closed/not settled
create:
error_general: The order couldn’t be updated due to a bug.
error_stale: Someone else has ordered in the meantime, couldn't update the order.
@ -793,14 +790,14 @@ en:
index:
closed_orders:
more: more...
title: Closed orders
title: Settled orders
finished_orders:
title: Unaccounted orders
title: Unsettled orders
total_sum: Total sum
funds:
account_balance: Account balance
available_funds: Available credit
finished_orders: Unaccounted orders
finished_orders: unsettled orders
open_orders: Current orders
title: Credit
title: Orders overview
@ -830,7 +827,7 @@ en:
total_price: Total price
unit_price: Unit price
units: Units
closed_by: Accounted by %{user}
closed_by: Settled by %{user}
comment: Comment
comments:
title: Comments
@ -1319,13 +1316,13 @@ en:
ended_orders: Closed orders
ending: End
new_order: Create new order
no_open_orders: There are no current orders.
no_open_orders: There are currently no open orders.
note: Note
open_orders: Current orders
supplier: Supplier
title: Manage orders
model:
error_closed: Order was already accounted for
error_closed: Order was already settled
error_nosel: At least one article must be selected
error_starts_before_ends: must be after the start date (or remain empty)
notice_close: ! 'Order: %{name}, until %{ends}'
@ -1366,10 +1363,10 @@ en:
sort_group: Sorted in groups
supplier: ! 'Supplier:'
title: ! 'Order: %{name}'
warn_not_closed: Warning, order is not accounted yet.
warn_not_closed: Warning, order is not yet settled.
state:
closed: closed
finished: finished
closed: settled
finished: closed
open: open
update:
notice: The order was updated.

41
config/locales/nl.yml
View file

@ -523,8 +523,8 @@ nl:
confirm:
clear: Sluiten
first_paragraph: ! 'Wanneer de bestelling gesloten wordt, worden alle tegoeden van huishoudens bijgewerkt.<br />De tegoeden worden als volgt belast:'
or_cancle: of terug naar afrekenen
title: Order sluiten
or_cancel: of terug naar afrekenen
title: Order afrekenen
edit_results_by_articles:
add_article: Artikel toevoegen
amount: Aantal
@ -549,7 +549,7 @@ nl:
invoice_date: ! 'Factuurdatum:'
invoice_number: ! 'Factuurnummer:'
minus_refund_calculated: ! '- statiegeld berekend:'
new: Factuur toevoegen
new: factuur toevoegen
new_body: ! 'Een factuur aan deze rekening toevoegen:'
plus_refund_credited: ! '+ statiegeld teruggekregen:'
refund_adjusted_amount: ! 'bedrag gecorrigeerd voor statiegeld:'
@ -579,7 +579,7 @@ nl:
ended: beëindigd
last_edited_by: Laatst aangepast door
name: Leverancier
no_closed_orders: Momenteel zijn er geen beëindigde bestellingen.
no_closed_orders: Momenteel zijn er geen gesloten bestellingen.
state: Status
summary:
changed:
@ -646,23 +646,20 @@ nl:
invoices:
edit:
title: Factuur bewerken
form:
delivery: levering
linked: Deze factuur is met aan %{what_link} gekoppeld.
order: bestelling
index:
action_new: Nieuwe factuur toevoegen
title: Facturen
invoices:
confirm_delete: Weet je het zeker?
delivery: Levering
linked: Deze factuur is aan %{what_link} gekoppeld.
linked_delivery: een levering
linked_order: een bestelling
new:
back: Terug
title: Nieuwe factuur toevoegen
show:
back: Terug
delivery: levering
linked: Deze factuur is aan een %{what_link} gekoppeld.
title: Factuur %{number}
order_articles:
edit:
@ -715,7 +712,7 @@ nl:
desc: Bekijk hier alle %{link}.
open_orders: lopende bestellingen
title: Bestellingen van %{group}
title_closed: Afgerekend
title_closed: afgerekend
title_open: gesloten/niet afgerekend
create:
error_general: De bestelling kon niet bijgewerkt worden vanwege een fout.
@ -757,12 +754,12 @@ nl:
more: meer...
title: Afgerekende bestellingen
finished_orders:
title:
title: Niet afgerekende bestellingen
total_sum:
funds:
account_balance:
available_funds:
finished_orders:
finished_orders: niet afgerekende bestellingen
open_orders: Lopende bestellingen
title: Credit
title: Besteloverzicht
@ -1040,7 +1037,7 @@ nl:
email_is_public:
name_is_public:
negative_balance:
order_finished:
order_finished: Informeer me over mijn bestelresultaat (wanneer de bestelling gesloten wordt).
phone_is_public:
send_as_email:
upcoming_tasks:
@ -1175,16 +1172,16 @@ nl:
action_end:
confirm_delete:
confirm_end:
ended_orders:
ended_orders: Gesloten bestellingen
ending:
new_order:
no_open_orders:
no_open_orders: Er zijn momenteel geen lopende bestellingen.
note:
open_orders:
open_orders: Lopende bestellingen
supplier:
title:
model:
error_closed:
error_closed: Bestelling was al afgerekend
error_nosel:
error_starts_before_ends:
notice_close:
@ -1223,11 +1220,11 @@ nl:
sort_group:
supplier:
title:
warn_not_closed:
warn_not_closed: Opgelet, bestelling is nog niet afgerekend.
state:
closed:
finished:
open:
closed: afgerekend
finished: gesloten
open: lopend
update:
notice:
pages: