Merge branch 'master' into allow-no-nickname
Conflicts: app/views/home/ordergroup.html.haml app/views/login/new_password.html.haml app/views/shared/_auto_complete_users.rhtml app/views/shared/memberships/_current_members.rhtml app/views/shared/memberships/_non_members.rhtml
This commit is contained in:
wvengen
commit
66ac3be81f
63 changed files with 428 additions and 438 deletions
|
|
@ -853,10 +853,7 @@ de:
|
|||
no_ordergroups: Leider bist Du kein Mitglied einer Bestellgruppe
|
||||
ordergroup:
|
||||
account_summary: Kontoauszug
|
||||
description: Beschreibung
|
||||
funds: ! 'Verfügbares Guthaben:'
|
||||
invite: Neue Person einladen
|
||||
people: Personen
|
||||
search: Suchen ...
|
||||
title: Meine Bestellgruppe
|
||||
ordergroup_cancelled: Du bist jetzt kein Mitglied der Gruppe %{group} mehr.
|
||||
|
|
@ -906,8 +903,6 @@ de:
|
|||
ordering:
|
||||
confirm_change: Änderungen an dieser Bestellung gehen verloren, wenn zu einer anderen Bestellung gewechselt wird. Möchtest Du trotzdem wechseln?
|
||||
layouts:
|
||||
application1:
|
||||
title: Foodsoft - %{title}
|
||||
email:
|
||||
footer: ! '--
|
||||
|
||||
|
|
@ -1367,28 +1362,6 @@ de:
|
|||
search_user: Nach Nutzerin suchen
|
||||
title: Wöchentliche Jobs
|
||||
user_not_found: Keine Nutzerin gefunden
|
||||
loginInfo:
|
||||
edit_profile: Profil bearbeiten
|
||||
feedback:
|
||||
desc: Fehler gefunden? Vorschlag? Idee? Kritik?
|
||||
title: Feedback
|
||||
help: Hilfe
|
||||
homepage_title: Foodcoop Homepage besuchen
|
||||
logout: Abmelden
|
||||
profile: Profil
|
||||
memberships:
|
||||
current_members:
|
||||
drop: entfernen
|
||||
no_members: ! '%{group} hat keine Mitglieder.'
|
||||
members:
|
||||
already_members: Sind schon Mitglieder
|
||||
desc: Hier kannst Du Mitglieder der Gruppe verwalten oder ein neues Foodcoop-Mitglied in die Gruppe %{link}.
|
||||
invite: einladen
|
||||
invite_someone: Person einladen
|
||||
no_members_yet: Sind noch keine Mitglieder
|
||||
title: Mitglieder von %{group}
|
||||
non_members:
|
||||
add: hinzufügen
|
||||
open_orders:
|
||||
ending: Ende
|
||||
no_open_orders: Derzeit gibt es keine laufenden Bestellungen
|
||||
|
|
@ -1416,7 +1389,6 @@ de:
|
|||
name: Bitte ändern
|
||||
edit_stock_article:
|
||||
price: <ul><li>Preisänderung gesperrt.</li><li>Bei Bedarf %{stock_article_copy_link}.</li></ul>
|
||||
supplier:
|
||||
supplier:
|
||||
min_order_quantity: Die Mindestbestellmenge wird während der Bestellung angezeigt und soll motivieren
|
||||
task:
|
||||
|
|
|
|||
|
|
@ -646,7 +646,7 @@ en:
|
|||
title: Invoice %{number}
|
||||
order_articles:
|
||||
edit:
|
||||
stock_alert:
|
||||
stock_alert: The price of stock articles cannot be changed!
|
||||
title: Update article
|
||||
new:
|
||||
title: Add delivered article to order
|
||||
|
|
@ -858,10 +858,7 @@ en:
|
|||
no_ordergroups: You are unfortunately not a member of an ordergroup.
|
||||
ordergroup:
|
||||
account_summary: Account Statement
|
||||
description: description
|
||||
funds: ! 'Available credit:'
|
||||
invite: Invite a new Person
|
||||
people: People
|
||||
search: Search ...
|
||||
title: My ordergroup
|
||||
ordergroup_cancelled: You cancelled membership of the group %{group}.
|
||||
|
|
@ -911,8 +908,6 @@ en:
|
|||
ordering:
|
||||
confirm_change: Modifications to this order will be lost when you change the order. Do you want to lose the changes you made and continue?
|
||||
layouts:
|
||||
application1:
|
||||
title: Foodsoft - %{title}
|
||||
email:
|
||||
footer: ! '--
|
||||
|
||||
|
|
@ -1372,28 +1367,6 @@ en:
|
|||
search_user: Search user
|
||||
title: Weekly jobs
|
||||
user_not_found: No user found
|
||||
loginInfo:
|
||||
edit_profile: Edit profile
|
||||
feedback:
|
||||
desc: Found a bug? Suggestions? Review?
|
||||
title: Feedback
|
||||
help: Help
|
||||
homepage_title: Visit Foodcoop Homepage
|
||||
logout: Logout
|
||||
profile: Profile
|
||||
memberships:
|
||||
current_members:
|
||||
drop: remove
|
||||
no_members: ! '%{group} has no members.'
|
||||
members:
|
||||
already_members: Are already members
|
||||
desc: Here you can manage members of the group or invite a new Foodcoop-member to the group %{link}.
|
||||
invite: invite
|
||||
invite_someone: Invite someone
|
||||
no_members_yet: Are not members yet
|
||||
title: Members of %{group}
|
||||
non_members:
|
||||
add: add
|
||||
open_orders:
|
||||
ending: Ending
|
||||
no_open_orders: There are no current orders
|
||||
|
|
@ -1421,7 +1394,6 @@ en:
|
|||
name: Please modify
|
||||
edit_stock_article:
|
||||
price: <ul><li>Price changes are forbidden.</li><li>If necessary, %{stock_article_copy_link}.</li></ul>
|
||||
supplier:
|
||||
supplier:
|
||||
min_order_quantity: The minimum amount which has to be orderd will be shown during the order process and should motivate ordering
|
||||
task:
|
||||
|
|
|
|||
|
|
@ -879,10 +879,7 @@ fr:
|
|||
no_ordergroups: Tu ne fais encore partie d'aucune cellule
|
||||
ordergroup:
|
||||
account_summary: Relevé de compte
|
||||
description: Description
|
||||
funds: ! 'Crédit disponible:'
|
||||
invite: Engrainer une nouvelle personne
|
||||
people: Personnes
|
||||
search: Rechercher ...
|
||||
title: Ta cellule
|
||||
ordergroup_cancelled: Tu ne fais plus partie de la cellule %{group}.
|
||||
|
|
@ -932,8 +929,6 @@ fr:
|
|||
ordering:
|
||||
confirm_change:
|
||||
layouts:
|
||||
application1:
|
||||
title: Foodsoft - %{title}
|
||||
email:
|
||||
footer: ! '--
|
||||
|
||||
|
|
@ -1374,28 +1369,6 @@ fr:
|
|||
search_user: Rechercher par utilisatrice
|
||||
title: Boulots hebdomadaires
|
||||
user_not_found: Aucune utilisatrice n'a été trouvée.
|
||||
loginInfo:
|
||||
edit_profile: Modifier le profil
|
||||
feedback:
|
||||
desc: Tu as détecté une erreur? Tu as des propositions, des idées, des critiques?
|
||||
title: Retours
|
||||
help: Aide
|
||||
homepage_title: Vers la page d'accueil de la bouffecoop
|
||||
logout: Te déconnecter
|
||||
profile: Profil
|
||||
memberships:
|
||||
current_members:
|
||||
drop: désinscrire
|
||||
no_members: ! '%{group} n''a aucun membre pour le moment.'
|
||||
members:
|
||||
already_members: Sont déjà membre
|
||||
desc: Sur cette page, tu peux gérer les membres de l'équipe, et aussi %{link} un nouveau membre.
|
||||
invite: engrainer
|
||||
invite_someone: Inviter quelqu'unE
|
||||
no_members_yet: Ne sont pas encore membre
|
||||
title: Membre de %{group}
|
||||
non_members:
|
||||
add: ajouter
|
||||
open_orders:
|
||||
ending: Clôture le
|
||||
no_open_orders: Il n'y a aucune commande en cours en ce moment
|
||||
|
|
@ -1423,7 +1396,6 @@ fr:
|
|||
name: Merci de modifier
|
||||
edit_stock_article:
|
||||
price: <ul><li>Modification du prix enregistrée. </li><li>Si nécessaire %{stock_article_copy_link}.</li></ul>
|
||||
supplier:
|
||||
supplier:
|
||||
min_order_quantity: La quantité minimum à commander est affichée pendant la commande et doit motiver
|
||||
task:
|
||||
|
|
|
|||
|
|
@ -26,15 +26,15 @@ nl:
|
|||
description: Omschrijving
|
||||
name: Naam
|
||||
delivery:
|
||||
delivered_on:
|
||||
note:
|
||||
supplier:
|
||||
delivered_on: Leverdatum
|
||||
note: Notitie
|
||||
supplier: Leverancier
|
||||
financial_transaction:
|
||||
amount: bedrag
|
||||
note: notitie
|
||||
group_order_article:
|
||||
ordergroup_id:
|
||||
result:
|
||||
ordergroup_id: Huishouden
|
||||
result: Hoeveelheid
|
||||
invoice:
|
||||
amount: Bedrag
|
||||
date: Factuurdatum
|
||||
|
|
@ -47,12 +47,12 @@ nl:
|
|||
paid_on: Betaald op
|
||||
supplier: Leverancier
|
||||
message:
|
||||
body:
|
||||
group_id:
|
||||
private:
|
||||
recipient_tokens:
|
||||
sent_to_all:
|
||||
subject:
|
||||
body: Bericht
|
||||
group_id: Groep
|
||||
private: Privé
|
||||
recipient_tokens: Geadresseerden
|
||||
sent_to_all: Aan alle leden sturen
|
||||
subject: Onderwerp
|
||||
order:
|
||||
ends: Eindigt op
|
||||
note: Notitie
|
||||
|
|
@ -71,22 +71,22 @@ nl:
|
|||
name: Naam
|
||||
user_tokens: Leden
|
||||
page:
|
||||
body:
|
||||
body: Bericht
|
||||
parent_id:
|
||||
title:
|
||||
title: Titel
|
||||
stock_article:
|
||||
price: Prijs
|
||||
quantity: Aantal
|
||||
quantity_available: Beschikbaar
|
||||
supplier: Leverancier
|
||||
stock_taking:
|
||||
date:
|
||||
note:
|
||||
date: Datum
|
||||
note: Notitie
|
||||
supplier:
|
||||
address: Adres
|
||||
contact_person: Contactpersoon
|
||||
customer_number: Klantnummer
|
||||
customer_number_short:
|
||||
customer_number_short: Klantnr.
|
||||
delivery_days: Bezorgdagen
|
||||
email: Email
|
||||
fax: Fax
|
||||
|
|
@ -99,14 +99,14 @@ nl:
|
|||
phone2: Telefoon 2
|
||||
url: Homepage
|
||||
task:
|
||||
description:
|
||||
done:
|
||||
due_date:
|
||||
duration:
|
||||
name:
|
||||
required_users:
|
||||
user_list:
|
||||
workgroup:
|
||||
description: Beschrijving
|
||||
done: Gedaan?
|
||||
due_date: Voor wanneer?
|
||||
duration: Tijdsduur
|
||||
name: Naam
|
||||
required_users: Aantal
|
||||
user_list: Verantwoordelijken
|
||||
workgroup: Werkgroep
|
||||
user:
|
||||
email: Email
|
||||
first_name: Voornaam
|
||||
|
|
@ -123,7 +123,7 @@ nl:
|
|||
workgroup:
|
||||
description: Omschrijving
|
||||
name: Naam
|
||||
next_weekly_tasks_number:
|
||||
next_weekly_tasks_number: Hoeveel weken vooruit moet de taak zichtbaar zijn?
|
||||
role_admin: Beheer
|
||||
role_article_meta: Artikelen
|
||||
role_finance: Financiën
|
||||
|
|
@ -297,7 +297,7 @@ nl:
|
|||
error_parse: ! '%{msg} ... in regel %{line}'
|
||||
error_update: ! 'Er trad een fout op bij het bijwerken van artikel ''%{article}'': %{msg}'
|
||||
parse_upload:
|
||||
notice: ! '%{count} artikel zijn geanalyseerd'
|
||||
notice: ! '%{count} artikelen zijn geanalyseerd'
|
||||
sync:
|
||||
notice: Catalogus is bijgewerkt
|
||||
shared_alert: ! '%{supplier} is niet aan een externe database gekoppeld'
|
||||
|
|
@ -393,9 +393,9 @@ nl:
|
|||
title:
|
||||
form:
|
||||
actions:
|
||||
article:
|
||||
category:
|
||||
create_from_blank:
|
||||
article: Artikel
|
||||
category: Categorie
|
||||
create_from_blank: Nieuwe artikel invoeren
|
||||
create_stock_article:
|
||||
price:
|
||||
quantity:
|
||||
|
|
@ -639,7 +639,7 @@ nl:
|
|||
title: Factuur %{number}
|
||||
order_articles:
|
||||
edit:
|
||||
stock_alert:
|
||||
stock_alert: De prijs van voorraadartikelen kan niet aangepast worden!
|
||||
title: Artikel bijwerken
|
||||
new:
|
||||
title: Geleverd artikel aan bestelling toevoegen
|
||||
|
|
@ -850,10 +850,7 @@ nl:
|
|||
no_ordergroups: Jammergenoeg ben je niet aangesloten bij een huishouden.
|
||||
ordergroup:
|
||||
account_summary: Rekeningafschrift
|
||||
description: Omschrijving
|
||||
funds: ! 'Beschikbaar krediet:'
|
||||
invite: Iemand uitnodigen
|
||||
people: Personen
|
||||
search: Zoeken ...
|
||||
title: Mijn huishouden
|
||||
ordergroup_cancelled: Je bent geen lid meer van de groep %{group}.
|
||||
|
|
@ -903,8 +900,6 @@ nl:
|
|||
ordering:
|
||||
confirm_change:
|
||||
layouts:
|
||||
application1:
|
||||
title: Foodsoft - %{title}
|
||||
email:
|
||||
footer: ! '--
|
||||
|
||||
|
|
@ -1279,7 +1274,7 @@ nl:
|
|||
price: Totaalprijs
|
||||
articles_by_groups:
|
||||
fc_price: FC-Prijs
|
||||
fc_price_desc: Prijs inclusief belasting, borg en foodcoop-toeslag
|
||||
fc_price_desc: Prijs inclusief belasting, statiegeld en foodcoop marge
|
||||
name: Naam
|
||||
price: Totaalprijs
|
||||
unit: Eenheid
|
||||
|
|
@ -1301,28 +1296,6 @@ nl:
|
|||
search_user: Gebruiker zoeken
|
||||
title: Wekelijkse taken
|
||||
user_not_found: Geen gebruiker gevonden
|
||||
loginInfo:
|
||||
edit_profile: Profiel aanpassen
|
||||
feedback:
|
||||
desc: Fout gevonden? Opmerking? Idee?
|
||||
title: Feedback
|
||||
help: Help
|
||||
homepage_title: Foodcoop startpagina bezoeken
|
||||
logout: Uitloggen
|
||||
profile: Profiel
|
||||
memberships:
|
||||
current_members:
|
||||
drop: verwijderen
|
||||
no_members: ! '%{group} heeft geen leden.'
|
||||
members:
|
||||
already_members: Zijn al lid
|
||||
desc:
|
||||
invite: uitnodiging
|
||||
invite_someone: Iemand uitnodigen
|
||||
no_members_yet: Zijn nog geen lid
|
||||
title: Leden van %{group}
|
||||
non_members:
|
||||
add: toevoegen
|
||||
open_orders:
|
||||
ending: Einde
|
||||
no_open_orders: Er zijn momenteel geen lopende bestellingen.
|
||||
|
|
@ -1350,7 +1323,6 @@ nl:
|
|||
name:
|
||||
edit_stock_article:
|
||||
price:
|
||||
supplier:
|
||||
supplier:
|
||||
min_order_quantity:
|
||||
task:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue