Merge branch 'master' into i18n
Conflicts: Gemfile config/locales/de.yml config/locales/en.yml
This commit is contained in:
wvengen
commit
34a4951e28
21 changed files with 382 additions and 70 deletions
|
|
@ -42,7 +42,10 @@ de:
|
|||
fc_price: Endpreis
|
||||
fc_share: FC-Aufschlag
|
||||
gross_price: Bruttopreis
|
||||
name: Name
|
||||
note: Notiz
|
||||
price: Nettopreis
|
||||
supplier: Lieferantin
|
||||
tax: MwSt
|
||||
unit: Einheit
|
||||
unit_quantity: Gebindegröße
|
||||
|
|
@ -66,6 +69,8 @@ de:
|
|||
supplier: Lieferant
|
||||
stock_article:
|
||||
price: Nettopreis
|
||||
quantity: Lagerbestand
|
||||
quantity_available: Verfügbarer Bestand
|
||||
supplier:
|
||||
address: Adresse
|
||||
contact_person: Ansprechparter_in
|
||||
|
|
@ -839,6 +844,8 @@ de:
|
|||
new_funds: Neuer Kontostand
|
||||
note: Notiz
|
||||
price: Preis
|
||||
reset_article_search: Suche zurücksetzen
|
||||
search_article: Artikel suchen...
|
||||
sum: Summe
|
||||
sum_amount: ! 'Gesamtbestellmenge bisher:'
|
||||
supplier: Lieferant
|
||||
|
|
@ -1739,15 +1746,6 @@ 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
|
||||
|
|
@ -1773,6 +1771,15 @@ de:
|
|||
new:
|
||||
search_text: ! 'Suche nache Artikeln aus allen Katalogen:'
|
||||
title: Neuen Lagerartikel anlegen
|
||||
show:
|
||||
change_quantity: Veränderung
|
||||
datetime: Zeitpunkt
|
||||
delivery: Lieferung
|
||||
new_quantity: Neuer Bestand
|
||||
order: Bestellung
|
||||
reason: Ereignis
|
||||
stock_changes: Verlauf des Lagerbestands
|
||||
stock_taking: Inventur
|
||||
stock_create:
|
||||
notice: Lagerartikel wurde gespeichert.
|
||||
stock_update:
|
||||
|
|
@ -1898,7 +1905,6 @@ de:
|
|||
close: Schließen
|
||||
delete: Löschen
|
||||
edit: Bearbeiten
|
||||
history: Verlauf anzeigen
|
||||
marks:
|
||||
close: ! '×'
|
||||
success: <i class="icon icon-ok"></i>
|
||||
|
|
|
|||
|
|
@ -50,6 +50,7 @@ en:
|
|||
note: Note
|
||||
origin: Origin
|
||||
price: Price
|
||||
supplier: Supplier
|
||||
tax: VAT
|
||||
unit: Unit
|
||||
unit_quantity: Unit quantity
|
||||
|
|
@ -76,6 +77,8 @@ en:
|
|||
supplier: Supplier
|
||||
stock_article:
|
||||
price: Price
|
||||
quantity: Quantity
|
||||
quantity_available: Available quantity
|
||||
supplier:
|
||||
address: Address
|
||||
contact_person: Contact person
|
||||
|
|
@ -858,6 +861,8 @@ en:
|
|||
new_funds: New account balance
|
||||
note: Note
|
||||
price: Price
|
||||
reset_article_search: Reset search
|
||||
search_article: Search for article...
|
||||
sum: Sum
|
||||
sum_amount: Current amount
|
||||
supplier: Supplier
|
||||
|
|
@ -1740,15 +1745,6 @@ 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
|
||||
|
|
@ -1774,6 +1770,15 @@ en:
|
|||
new:
|
||||
search_text: ! 'Search for articles in all catalogues:'
|
||||
title: Add new stock article
|
||||
show:
|
||||
change_quantity: Change
|
||||
datetime: Time
|
||||
delivery: Delivery
|
||||
new_quantity: New quantity
|
||||
order: Order
|
||||
reason: Reason
|
||||
stock_changes: Stock quantity changes
|
||||
stock_taking: Inventory
|
||||
stock_create:
|
||||
notice: Stock article was created.
|
||||
stock_update:
|
||||
|
|
@ -1898,7 +1903,6 @@ en:
|
|||
close: Close
|
||||
delete: Delete
|
||||
edit: Edit
|
||||
history: Show history
|
||||
marks:
|
||||
close: ! '×'
|
||||
success: <i class="icon icon-ok"></i>
|
||||
|
|
|
|||
|
|
@ -42,7 +42,10 @@ fr:
|
|||
fc_price: prix final
|
||||
fc_share: supplément boufcoop
|
||||
gross_price: prix brut
|
||||
name:
|
||||
note:
|
||||
price: prix net
|
||||
supplier:
|
||||
tax: TVA
|
||||
unit: unité
|
||||
unit_quantity: unités par lot
|
||||
|
|
@ -51,6 +54,8 @@ fr:
|
|||
note: note
|
||||
stock_article:
|
||||
price: Prix net
|
||||
quantity:
|
||||
quantity_available:
|
||||
user:
|
||||
first_name: Prénom
|
||||
password: Mot de passe
|
||||
|
|
@ -811,6 +816,8 @@ fr:
|
|||
new_funds: Nouveau solde
|
||||
note: Note
|
||||
price: Prix
|
||||
reset_article_search:
|
||||
search_article:
|
||||
sum: Prix total
|
||||
sum_amount: ! 'Quantité déjà commandée:'
|
||||
supplier: Fourni par
|
||||
|
|
@ -1738,15 +1745,6 @@ fr:
|
|||
title: Modifier l'article
|
||||
form:
|
||||
price_hint: Pour éviter que ça soit le bazar, les prix des articles en stock ne peuvent plus être modifiés.
|
||||
history:
|
||||
change_quantity: Modification
|
||||
datetime: Temps
|
||||
delivery: Réapprovisionnement
|
||||
new_quantity: Nouveau stock
|
||||
order: Commande
|
||||
reason: Raison
|
||||
stock_changes: Afficher l'historique pour "%{article_name}"
|
||||
stock_taking: Inventaire
|
||||
index:
|
||||
article:
|
||||
article: Article
|
||||
|
|
@ -1772,6 +1770,15 @@ fr:
|
|||
new:
|
||||
search_text: ! 'Rechercher des articles dans tous les catalogues:'
|
||||
title: Ajouter un article au stock
|
||||
show:
|
||||
change_quantity: Modification
|
||||
datetime: Temps
|
||||
delivery: Réapprovisionnement
|
||||
new_quantity: Nouveau stock
|
||||
order: Commande
|
||||
reason: Raison
|
||||
stock_changes: Afficher l'historique
|
||||
stock_taking: Inventaire
|
||||
stock_create:
|
||||
notice: L'article a été sauvegardé.
|
||||
stock_update:
|
||||
|
|
@ -1904,7 +1911,6 @@ fr:
|
|||
close: Fermer
|
||||
delete: Supprimer
|
||||
edit: Modifier
|
||||
history: Afficher l'historique
|
||||
marks:
|
||||
close: ! '×'
|
||||
success: <i class="icon icon-ok"></i>
|
||||
|
|
|
|||
|
|
@ -42,7 +42,10 @@ nl:
|
|||
fc_price: prijs foodcoop
|
||||
fc_share: marge foodcoop
|
||||
gross_price: bruto prijs
|
||||
name:
|
||||
note:
|
||||
price: netto prijs
|
||||
supplier:
|
||||
tax: BTW
|
||||
unit: eenheid
|
||||
unit_quantity: groothandelseenheid
|
||||
|
|
@ -51,6 +54,8 @@ nl:
|
|||
note: notitie
|
||||
stock_article:
|
||||
price: prijs
|
||||
quantity:
|
||||
quantity_available:
|
||||
user:
|
||||
first_name: Voornaam
|
||||
password: Wachtwoord
|
||||
|
|
@ -797,6 +802,8 @@ nl:
|
|||
new_funds: Nieuw tegoed
|
||||
note: Notitie
|
||||
price: Prijs
|
||||
reset_article_search:
|
||||
search_article:
|
||||
sum: Som
|
||||
sum_amount: ! 'Huidig totaalbedrag:'
|
||||
supplier: Leverancier
|
||||
|
|
@ -1664,15 +1671,6 @@ nl:
|
|||
title:
|
||||
form:
|
||||
price_hint:
|
||||
history:
|
||||
change_quantity:
|
||||
datetime:
|
||||
delivery:
|
||||
new_quantity:
|
||||
order:
|
||||
reason:
|
||||
stock_changes:
|
||||
stock_taking:
|
||||
index:
|
||||
article:
|
||||
article:
|
||||
|
|
@ -1698,6 +1696,15 @@ nl:
|
|||
new:
|
||||
search_text:
|
||||
title:
|
||||
show:
|
||||
change_quantity:
|
||||
datetime:
|
||||
delivery:
|
||||
new_quantity:
|
||||
order:
|
||||
reason:
|
||||
stock_changes:
|
||||
stock_taking:
|
||||
stock_create:
|
||||
notice: Voorraadsartikel is opgeslagen.
|
||||
stock_update:
|
||||
|
|
@ -1822,7 +1829,6 @@ nl:
|
|||
close: Sluiten
|
||||
delete: Verwijder
|
||||
edit: Bewerk
|
||||
history:
|
||||
marks:
|
||||
close: ! '×'
|
||||
success: <i class="icon icon-ok"></i>
|
||||
|
|
|
|||
|
|
@ -97,8 +97,6 @@ Foodsoft::Application.routes.draw do
|
|||
get :articles_search
|
||||
get :fill_new_stock_article_form
|
||||
end
|
||||
|
||||
get :history
|
||||
end
|
||||
|
||||
resources :suppliers do
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue