Merge branch 'master' into improve-delivery-workflow-further
This commit is contained in:
Julius
commit
b303b48853
32 changed files with 331 additions and 212 deletions
|
|
@ -83,6 +83,11 @@ de:
|
|||
too_long: ist zu lang (nicht mehr als %{count} Zeichen)
|
||||
too_short: ist zu kurz (nicht weniger als %{count} Zeichen)
|
||||
wrong_length: hat die falsche Länge (muss genau %{count} Zeichen haben)
|
||||
models:
|
||||
task:
|
||||
attributes:
|
||||
done:
|
||||
exclusion: erledigte Aufgaben können nicht wöchentlich wiederholt werden
|
||||
template:
|
||||
body: ! 'Bitte überprüfen Sie die folgenden Felder:'
|
||||
header:
|
||||
|
|
@ -1443,7 +1448,7 @@ de:
|
|||
sessions:
|
||||
logged_in: Angemeldet!
|
||||
logged_out: Abgemeldet!
|
||||
login_invalid:
|
||||
login_invalid: Ungültiger Benutzername oder Passwort
|
||||
new:
|
||||
forgot_password: Passwort vergessen?
|
||||
login: Anmelden
|
||||
|
|
@ -1650,12 +1655,6 @@ de:
|
|||
role_finance: Finanzen
|
||||
role_orders: Bestellverwaltung
|
||||
role_suppliers: Lieferanten
|
||||
task_description: Beschreibung
|
||||
task_duration: Vor. Dauer in Stunden
|
||||
task_name: Name für Job
|
||||
task_required_users: Benötige Verantwortliche
|
||||
weekday: Wochentag
|
||||
weekly_task: Monatlichen Job definieren?
|
||||
'no': Nein
|
||||
required:
|
||||
mark: ! '*'
|
||||
|
|
@ -1701,6 +1700,15 @@ de:
|
|||
title: Lagerartikel bearbeiten
|
||||
form:
|
||||
price_hint: Um Chaos zu vermeiden können bis auf weiteres die Preise von angelegten Lagerartikeln nicht mehr verändert werden.
|
||||
history:
|
||||
change_quantity: Veränderung
|
||||
datetime: Zeitpunkt
|
||||
delivery: Lieferung
|
||||
new_quantity: Neuer Bestand
|
||||
order: Bestellung
|
||||
reason: Ereignis
|
||||
stock_changes: Verlauf anzeigen für »%{article_name}«
|
||||
stock_taking: Inventur
|
||||
index:
|
||||
article:
|
||||
article: Artikel
|
||||
|
|
@ -1780,12 +1788,15 @@ de:
|
|||
notice: Aufgabe wurde gelöscht
|
||||
edit:
|
||||
title: Aufgabe bearbeiten
|
||||
warning_periodic: <strong>Warnung:</strong> Diese Aufgabe ist Teil einer Gruppe von <em>wöchentlichen Aufgaben</em>. Beim Speichern wird sie aus der Gruppe ausgeschlossen und in eine <em>gewöhnliche Aufgabe</em> umgewandelt.
|
||||
error_not_found: Keine Arbeitsgruppe gefunden
|
||||
form:
|
||||
search:
|
||||
hint: Nach Nutzerin suchen
|
||||
noresult: Keine Nutzerin gefunden
|
||||
placeholder: Suche ...
|
||||
submit:
|
||||
periodic: Wöchentliche Aufgabe speichern
|
||||
index:
|
||||
show_group_tasks: Gruppenaufgaben anzeigen
|
||||
title: Aufgaben
|
||||
|
|
@ -1809,10 +1820,13 @@ de:
|
|||
new_task: Neue Aufgabe erstellen
|
||||
new:
|
||||
title: Neue Aufgabe erstellen
|
||||
repeated: Aufgabe wird wöchentlich wiederholt
|
||||
set_done:
|
||||
notice: Aufgabenstatus wurde aktualisiert
|
||||
show:
|
||||
accept_task: Aufgabe übernehmen
|
||||
confirm_delete_group: Diese und alle folgenden wöchentlichen Aufgaben wirklich löschen?
|
||||
delete_group: Aufgabe und folgende löschen
|
||||
due_date: Fälligkeitsdatum
|
||||
hours: ! '%{count}h'
|
||||
mark_done: Als erledigt markieren
|
||||
|
|
@ -1820,6 +1834,7 @@ de:
|
|||
title: Aufgabe anzeigen
|
||||
update:
|
||||
notice: Aufgabe wurde aktualisiert
|
||||
notice_converted: Aufgabe wurde aktualisiert und in eine gewöhnliche Aufgabe umgewandelt
|
||||
user:
|
||||
more: Nichts zu tun? %{tasks_link} gibt es bestimmt Arbeit
|
||||
tasks_link: Hier
|
||||
|
|
@ -1829,11 +1844,6 @@ de:
|
|||
workgroup:
|
||||
title: Aufgaben für %{workgroup}
|
||||
title_all: Alle Aufgaben der Gruppe
|
||||
weekly:
|
||||
desc: ! '<p>Jeden <b>%{weekday}</b> hat diese Arbeitsgruppe folgenden Job: <b>%{task}</b></p> <p>Die Wochenaufgaben werden von der Foodsoft automatisch erstellt. Eintragen müsst Ihr Euch aber selber.</p>'
|
||||
edit: Wöchentliche Aufgaben anpassen
|
||||
empty: Noch keine Wochenaufgaben angelegt.
|
||||
title: Wöchentliche Aufgaben
|
||||
time:
|
||||
am: vormittags
|
||||
formats:
|
||||
|
|
@ -1845,6 +1855,7 @@ de:
|
|||
close: Schließen
|
||||
delete: Löschen
|
||||
edit: Bearbeiten
|
||||
history: Verlauf anzeigen
|
||||
marks:
|
||||
close: ! '×'
|
||||
success: ! '<i class="icon icon-ok"></i>'
|
||||
|
|
|
|||
|
|
@ -83,6 +83,11 @@ en:
|
|||
too_long: is too long (no more than %{count} characters)
|
||||
too_short: is too short (use more than %{count} characters)
|
||||
wrong_length: is the wrong length (has to have exactly %{count} characters)
|
||||
models:
|
||||
task:
|
||||
attributes:
|
||||
done:
|
||||
exclusion: finished tasks may not be repeated weekly
|
||||
template:
|
||||
body: ! 'Please check the following fields:'
|
||||
header:
|
||||
|
|
@ -1652,12 +1657,6 @@ en:
|
|||
role_finance: Finances
|
||||
role_orders: Order management
|
||||
role_suppliers: Suppliers
|
||||
task_description: Description
|
||||
task_duration: Duration in hours
|
||||
task_name: Task name
|
||||
task_required_users: People required
|
||||
weekday: Weekday
|
||||
weekly_task: Define monthly task?
|
||||
'no': 'No'
|
||||
required:
|
||||
mark: ! '*'
|
||||
|
|
@ -1703,6 +1702,15 @@ en:
|
|||
title: Edit stock articles
|
||||
form:
|
||||
price_hint: To avoid choas, it is not possible to edit the prices of already added stock articles until further notice.
|
||||
history:
|
||||
change_quantity: Change
|
||||
datetime: Time
|
||||
delivery: Delivery
|
||||
new_quantity: New quantity
|
||||
order: Order
|
||||
reason: Reason
|
||||
stock_changes: Stock quantity changes of ‘%{article_name}’
|
||||
stock_taking: Inventory
|
||||
index:
|
||||
article:
|
||||
article: Article
|
||||
|
|
@ -1782,12 +1790,15 @@ en:
|
|||
notice: Task has been deleted
|
||||
edit:
|
||||
title: Edit task
|
||||
warning_periodic: <strong>Warning:</strong> This task is part of a group of <em>weekly tasks</em>. When saving it will be excluded from the group and it will be converted to a <em>regular task</em>.
|
||||
error_not_found: No workgroup found
|
||||
form:
|
||||
search:
|
||||
hint: Search for user
|
||||
noresult: No user found
|
||||
placeholder: Search ...
|
||||
submit:
|
||||
periodic: Save weekly task
|
||||
index:
|
||||
show_group_tasks: Show group tasks
|
||||
title: Tasks
|
||||
|
|
@ -1811,10 +1822,13 @@ en:
|
|||
new_task: Create new task
|
||||
new:
|
||||
title: Create new tasks
|
||||
repeated: Task is repeated weekly
|
||||
set_done:
|
||||
notice: The state of the task has been updated
|
||||
show:
|
||||
accept_task: Accept task
|
||||
confirm_delete_group: Really delete this and all subsequent tasks?
|
||||
delete_group: Delete task and subsequent
|
||||
due_date: Due date
|
||||
hours: ! '%{count}h'
|
||||
mark_done: Mark task as done
|
||||
|
|
@ -1822,6 +1836,7 @@ en:
|
|||
title: Show task
|
||||
update:
|
||||
notice: Task has been updated
|
||||
notice_converted: Task has been updated and was converted to a regular task
|
||||
user:
|
||||
more: Nothing to do? %{tasks_link} are tasks for sure.
|
||||
tasks_link: Here
|
||||
|
|
@ -1831,11 +1846,6 @@ en:
|
|||
workgroup:
|
||||
title: Tasks for %{workgroup}
|
||||
title_all: All group tasks
|
||||
weekly:
|
||||
desc: ! '<p>Every <b>%{weekday}</b> this workgroup has the following job: <b>%{task}</b></p> <p>The weektask has been created by Foodsoft automatically. You still have to sign up for it yourself.</p>'
|
||||
edit: Edit weekly tasks
|
||||
empty: No weekly tasks created yet.
|
||||
title: Weekly tasks
|
||||
time:
|
||||
am: morning
|
||||
formats:
|
||||
|
|
@ -1847,6 +1857,7 @@ en:
|
|||
close: Close
|
||||
delete: Delete
|
||||
edit: Edit
|
||||
history: Show history
|
||||
marks:
|
||||
close: ! '×'
|
||||
or_cancel: or cancel
|
||||
|
|
|
|||
|
|
@ -81,6 +81,11 @@ nl:
|
|||
too_long: is te lang (niet meer dan %{count} tekens)
|
||||
too_short: is te kort (niet minder dan %{count} tekens)
|
||||
wrong_length: heeft de verkeerde lengte (moet precies %{count} tekens zijn)
|
||||
models:
|
||||
task:
|
||||
attributes:
|
||||
done:
|
||||
exclusion:
|
||||
template:
|
||||
body: ! 'Controleer de volgende velden:'
|
||||
header:
|
||||
|
|
@ -265,10 +270,10 @@ nl:
|
|||
edit_all_table:
|
||||
available_desc: beschikbaar
|
||||
available_short: besch.
|
||||
order_number_desc: bestelnummer
|
||||
order_number_short: best.nr.
|
||||
price_desc: netto prijs
|
||||
price_short: prijs
|
||||
order_number_desc: Bestelnummer
|
||||
order_number_short: Best.nr.
|
||||
price_desc: Netto prijs
|
||||
price_short: Prijs
|
||||
unit_quantity_desc: Groothandelsverpakkingsgrootte
|
||||
unit_quantity_short: Gr.Eenh.
|
||||
form:
|
||||
|
|
@ -542,7 +547,7 @@ nl:
|
|||
total_fc: Som (FC-prijs)
|
||||
units: Eenheden
|
||||
index:
|
||||
title: Gesloten orders
|
||||
title: Gesloten bestellingen
|
||||
invoice:
|
||||
edit: Factuur bewerken
|
||||
invoice_amount: ! 'Factuurbedrag:'
|
||||
|
|
@ -573,8 +578,8 @@ nl:
|
|||
orders:
|
||||
clear: afrekenen
|
||||
cleared: afgerekend (%{amount})
|
||||
close: direct afsluiten
|
||||
confirm: Weet je zeker dat de je bestelling wilt afsluiten?
|
||||
close: direct afrekenen
|
||||
confirm: Weet je zeker dat de je bestelling wilt afrekenen?
|
||||
end: Einde
|
||||
ended: gesloten
|
||||
last_edited_by: Laatst aangepast door
|
||||
|
|
@ -1092,7 +1097,7 @@ nl:
|
|||
number:
|
||||
currency:
|
||||
format:
|
||||
delimiter: ! ','
|
||||
delimiter: ! ' '
|
||||
format: ! '%n %u'
|
||||
precision: 2
|
||||
separator: ! ','
|
||||
|
|
@ -1425,7 +1430,7 @@ nl:
|
|||
description: Omschrijving
|
||||
email: Email
|
||||
note: Notitie
|
||||
order_number: Order nummer
|
||||
order_number: Bestelnummer
|
||||
ordergroup: Huishouden
|
||||
password: Wachtwoord
|
||||
password_confirmation: Wachtwoord herhalen
|
||||
|
|
@ -1450,7 +1455,7 @@ nl:
|
|||
note: Notitie
|
||||
number: Nummer
|
||||
order: Bestelling
|
||||
paid_on: Betaalt op
|
||||
paid_on: Betaald op
|
||||
supplier: Leverancier
|
||||
message:
|
||||
body:
|
||||
|
|
@ -1513,16 +1518,10 @@ nl:
|
|||
workgroup:
|
||||
next_weekly_tasks_number:
|
||||
role_admin:
|
||||
role_article_meta:
|
||||
role_finance:
|
||||
role_article_meta: Artikelbestand
|
||||
role_finance: Financiën
|
||||
role_orders:
|
||||
role_suppliers:
|
||||
task_description:
|
||||
task_duration:
|
||||
task_name:
|
||||
task_required_users:
|
||||
weekday:
|
||||
weekly_task:
|
||||
role_suppliers: Leveranciers
|
||||
'no': Nee
|
||||
required:
|
||||
mark: ! '*'
|
||||
|
|
@ -1568,6 +1567,15 @@ nl:
|
|||
title:
|
||||
form:
|
||||
price_hint:
|
||||
history:
|
||||
change_quantity:
|
||||
datetime:
|
||||
delivery:
|
||||
new_quantity:
|
||||
order:
|
||||
reason:
|
||||
stock_changes:
|
||||
stock_taking:
|
||||
index:
|
||||
article:
|
||||
article:
|
||||
|
|
@ -1647,12 +1655,15 @@ nl:
|
|||
notice:
|
||||
edit:
|
||||
title:
|
||||
warning_periodic:
|
||||
error_not_found:
|
||||
form:
|
||||
search:
|
||||
hint:
|
||||
noresult:
|
||||
placeholder:
|
||||
submit:
|
||||
periodic:
|
||||
index:
|
||||
show_group_tasks:
|
||||
title:
|
||||
|
|
@ -1676,10 +1687,13 @@ nl:
|
|||
new_task:
|
||||
new:
|
||||
title:
|
||||
repeated:
|
||||
set_done:
|
||||
notice:
|
||||
show:
|
||||
accept_task:
|
||||
confirm_delete_group:
|
||||
delete_group:
|
||||
due_date:
|
||||
hours:
|
||||
mark_done:
|
||||
|
|
@ -1687,6 +1701,7 @@ nl:
|
|||
title:
|
||||
update:
|
||||
notice:
|
||||
notice_converted:
|
||||
user:
|
||||
more:
|
||||
tasks_link:
|
||||
|
|
@ -1696,11 +1711,6 @@ nl:
|
|||
workgroup:
|
||||
title:
|
||||
title_all:
|
||||
weekly:
|
||||
desc:
|
||||
edit:
|
||||
empty:
|
||||
title:
|
||||
time:
|
||||
am: morgen
|
||||
formats:
|
||||
|
|
@ -1712,6 +1722,7 @@ nl:
|
|||
close: Sluiten
|
||||
delete: Verwijder
|
||||
edit: Bewerk
|
||||
history:
|
||||
marks:
|
||||
close: ! '×'
|
||||
or_cancel: of annuleren
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue