Merge pull request #220 from wvengen/feature-i18n-cleanup

Some more i18n cleanup
This commit is contained in:
wvengen 2013-12-17 07:20:01 -08:00
commit f47413a60f
20 changed files with 89 additions and 320 deletions

View File

@ -26,6 +26,11 @@ class Ordergroup < Group
User.natural_order.all.reject { |u| (users.include?(u) || u.ordergroup) }
end
# the most recent order this ordergroup was participating in
def last_order
orders.order('orders.starts DESC').first
end
def value_of_open_orders(exclude = nil)
group_orders.in_open_orders.reject{|go| go == exclude}.collect(&:price).sum
end

View File

@ -4,11 +4,11 @@
%table.table.table-striped
%thead
%tr
%th= t '.name'
%th= t '.contact'
%th= t '.address'
%th= t '.members'
%th= t 'admin.actions'
%th= heading_helper Ordergroup, :name
%th= heading_helper Ordergroup, :contact
%th= heading_helper Ordergroup, :contact_address
%th= heading_helper Ordergroup, :user_tokens
%th= t 'ui.actions'
%tbody
- for ordergroup in @ordergroups
%tr{:class => cycle('even','odd', :name => 'groups')}

View File

@ -5,12 +5,12 @@
%thead
%tr
- if FoodsoftConfig[:use_nick]
%th= t '.login'
%th= t '.name'
%th= t '.email'
%th= heading_helper User, :nick
%th= heading_helper User, :name
%th= heading_helper User, :email
%th= t 'admin.access_to'
%th= t '.last_login'
%th(colspan="2")= t 'admin.actions'
%th= heading_helper User, :last_login
%th(colspan="2")= t 'ui.actions'
%tbody
- for user in @users
%tr

View File

@ -7,13 +7,13 @@
%p= t '.member_since', time: distance_of_time_in_words(Time.now, @user.created_on)
%dl
- if FoodsoftConfig[:use_nick]
%dt= t '.nick'
%dt= heading_helper User, :nick
%dd= @user.nick
%dt= t '.name'
%dt= heading_helper User, :name
%dd= h @user.name
%dt= t '.email'
%dt= heading_helper User, :email
%dd= @user.email
%dt= t '.phone'
%dt= heading_helper User, :phone
%dd= @user.phone
%dt= t 'admin.access_to'
%dd= format_roles(@user)

View File

@ -7,7 +7,7 @@
%th= t '.name'
%th= t '.members'
%th= t 'admin.access_to'
%th= t 'admin.actions'
%th= t 'ui.actions'
%tbody
- for workgroup in @workgroups
%tr

View File

@ -107,11 +107,11 @@
%table#stock_articles_for_adding.table.table-hover.stupidtable
%thead
%tr
%th.default-sort{:data => {:sort => 'string'}}= t '.article'
%th= t '.price'
%th= t '.unit'
%th= t '.category'
%th= t '.actions'
%th.default-sort{:data => {:sort => 'string'}}= Article.model_name.human
%th= heading_helper StockArticle, :price
%th= heading_helper StockArticle, :unit
%th= heading_helper StockArticle, :article_category
%th= t 'ui.actions'
%tfoot
%tr
%th{:colspan => 5}
@ -127,11 +127,11 @@
%table.table#stock_changes.stupidtable
%thead
%tr
%th.default-sort{:data => {:sort => 'string'}}= t '.article'
%th= t '.price'
%th= t '.unit'
%th= t '.quantity'
%th= t '.actions'
%th.default-sort{:data => {:sort => 'string'}}= Article.model_name.human
%th= heading_helper StockArticle, :price
%th= heading_helper StockArticle, :unit
%th= heading_helper GroupOrderArticle, :quantity # quantity to order, although technically this will be a StockChange
%th= t 'ui.actions'
%tbody
= f.simple_fields_for :stock_changes do |stock_change_form|
= render :partial => 'stock_change_fields', :locals => {:f => stock_change_form}

View File

@ -17,10 +17,10 @@
%table.table.table-striped(style="width:500px")
%thead
%tr
%th= t '.article'
%th= t '.unit'
%th.numeric= t '.amount'
%th.numeric= t '.price'
%th= Article.model_name.human
%th= heading_helper StockArticle, :unit
%th.numeric= heading_helper GroupOrderArticle, :quantity # quantity to order, although technically this will be a StockChange
%th.numeric= heading_helper Article, :price
%th.numeric= t '.sum'
%tbody
- total_net, total_gross = 0,0

View File

@ -1,14 +1,14 @@
%table.ordered-articles.table.table-striped
%thead
%tr
%th= sort_link_helper t('.article'), "name"
%th= sort_link_helper t('.number'), "order_number"
%th= sort_link_helper Article.model_name.human, "name"
%th= sort_link_helper Article.human_attribute_name(:order_number_short), "order_number"
%th= t('.amount')
%th= t('.amount_per_unit')
%th= heading_helper Article, :units
%th= t('.net')
%th= t('.gross')
%th= t('.tax')
%th= t('.refund')
%th= heading_helper Article, :tax
%th= heading_helper Article, :deposit
%th{:colspan => "2"}
= link_to t('.add_article'), new_finance_order_order_article_path(@order), remote: true,
class: 'btn btn-small'

View File

@ -3,7 +3,7 @@
%thead
%tr
%td
%td{:style => "width:8em"}= t('.group')
%td{:style => "width:8em"}= Ordergroup.model_name.human
%td= t('.units')
%td= t('.total')
%td{:colspan => "3",:style => "width:14em"}

View File

@ -5,7 +5,7 @@
= order_article.units_to_order
- unless order_article.ordered_quantities_equal_to_group_orders?
%span{:style => "color:red;font-weight: bold"} !
%td= order_article.price.unit_quantity.to_s + ' * ' + order_article.article.unit.to_s
%td #{order_article.price.unit_quantity} &times; #{order_article.article.unit}
%td
= number_to_currency(order_article.price.price, :unit => "")
:plain
@ -16,7 +16,7 @@
:plain
/
= number_to_currency(order_article.total_gross_price, :unit => "")
%td= order_article.price.tax
%td #{order_article.price.tax}%
%td= order_article.price.deposit
%td
= link_to t('ui.edit'), edit_finance_order_order_article_path(order_article.order, order_article), remote: true,

View File

@ -8,9 +8,9 @@
%table.table.table-striped
%thead
%tr
%th= t('.date')
%th.numeric= t('.amount')
%th= t('.supplier')
%th= heading_helper Invoice, :date
%th.numeric= heading_helper Invoice, :amount
%th= heading_helper Invoice, :supplier
%th
%tbody
- for invoice in @unpaid_invoices
@ -26,10 +26,10 @@
%table.table.table-striped
%thead
%tr
%th= t('.date')
%th= t('.group')
%th= t('.note')
%th.numeric= t('.amount')
%th= heading_helper FinancialTransaction, :created_on
%th= heading_helper FinancialTransaction, :ordergroup
%th= heading_helper FinancialTransaction, :note
%th.numeric= heading_helper FinancialTransaction, :amount
%tbody
- @financial_transactions.each do |ft|
%tr
@ -45,8 +45,8 @@
%table.table.table-striped
%thead
%tr
%th= t('.supplier')
%th= t('.end')
%th= heading_helper Order, :name
%th= t '.end'
%th.numeric= t('.amount_fc')
%th
%tbody
@ -55,6 +55,6 @@
%td= order.name
%td= format_date(order.ends)
%td.numeric= number_to_currency(order.sum(:fc))
%td= link_to t('.clear'), new_finance_order_path(order_id: order.id), class: 'btn btn-mini'
%td= link_to t('finance.balancing.orders.clear'), new_finance_order_path(order_id: order.id), class: 'btn btn-mini'
- else
= t('.everything_cleared')

View File

@ -23,7 +23,7 @@
%td= format_date invoice.date
%td= format_date invoice.paid_on
%td= number_to_currency invoice.amount
%td= link_to t('.delivery'), [invoice.supplier,invoice.delivery] if invoice.delivery
%td= link_to Delivery.model_name.human, [invoice.supplier,invoice.delivery] if invoice.delivery
%td= link_to format_date(invoice.order.ends), new_finance_order_path(order_id: invoice.order_id) if invoice.order
%td= truncate(invoice.note)
%td= link_to t('ui.edit'), edit_finance_invoice_path(invoice), class: 'btn btn-mini'

View File

@ -4,9 +4,9 @@
%table.table.table-striped
%thead
%tr
%th= sort_link_helper t('.name'), "name", :per_page => @per_page
%th= t '.contact'
%th.numeric= sort_link_helper t('.account_balance'), "account_balance", :per_page => @per_page
%th= sort_link_helper heading_helper(Ordergroup, :name), "name", :per_page => @per_page
%th= heading_helper Ordergroup, :contact
%th.numeric= sort_link_helper heading_helper(Ordergroup, :account_balance), "account_balance", :per_page => @per_page
%th
%tbody
- for ordergroup in @ordergroups

View File

@ -5,15 +5,15 @@
%table.table.table-striped
%thead
%tr
%th= t '.name'
%th= t '.user'
%th= t '.last_ordered'
%th= heading_helper Ordergroup, :name
%th= heading_helper Ordergroup, :user_tokens
%th= heading_helper Ordergroup, :last_order
%tbody
- for ordergroup in @ordergroups
%tr
%td= ordergroup.name
%td=h ordergroup.users.collect { |u| show_user(u) }.join(", ")
%td= format_date ordergroup.orders.order('orders.starts DESC').first.try(:starts)
%td= format_date ordergroup.last_order.try(:starts)
%td= link_to_new_message(message_params: {group_id: ordergroup.id})

View File

@ -1,7 +1,7 @@
%table.table.table-hover
%thead
%tr
%th{:style => "width:40%"}= t '.name'
%th{:style => "width:40%"}= heading_helper Article, :name
%th
%acronym{:title => t('shared.articles.ordered_desc')}= t 'shared.articles.ordered'
%th
@ -10,7 +10,7 @@
%acronym{:title => t('.fc_price_desc')}= t '.fc_price'
%th
%acronym{:title => t('.unit_quantity_desc')}= t '.unit_quantity'
%th= t '.unit'
%th= heading_helper Article, :unit
%th= t '.price'
- for group_order in order.group_orders.ordered

View File

@ -1,14 +1,14 @@
%dl
%dt= t('.description') + ':'
%dt= heading_helper(Ordergroup, :description) + ':'
%dd=h group.description
- if group.is_a?(Ordergroup) and (@current_user.role_admin? or @current_user.role_finance?)
%dt= t('.contact') + ':'
%dt= heading_helper(Ordergroup, :contact) + ':'
%dd=h group.contact
%dt= t('.address') + ':'
%dt= heading_helper(Ordergroup, :contact_address) + ':'
%dd= link_to_gmaps group.contact_address
%dt= t('.access') + ':'
%dd= format_roles(group)
%dt= t('.members') + ':'
%dt= heading_helper(Ordergroup, :user_tokens) + ':'
%dd
- members = group.users
= "(#{members.size})"

View File

@ -15,6 +15,7 @@ de:
name: Name
note: Notiz
order_number: Bestellnummer
order_number_short: Nr.
origin: Herkunft
price: Nettopreis
supplier: Lieferantin
@ -81,11 +82,13 @@ de:
ordergroup:
account_balance: Kontostand
available_funds: Verfügbares Guthaben
contact: Kontakt
contact_address: Adresse
contact_person: Kontaktperson
contact_phone: Telefon
description: Beschreibung
ignore_apple_restriction: Bestellstop bei zu wenig Äpfeln ignorieren
last_order: Zuletst bestellt
name: Name
user_tokens: Mitglieder
page:
@ -131,6 +134,7 @@ de:
user:
email: Email
first_name: Vorname
last_login: Letzter login
last_name: Nachname
name: Name
nick: Benutzername
@ -177,7 +181,6 @@ de:
workgroup: Arbeitsgruppe
admin:
access_to: Zugriff auf
actions: Aktionen
base:
index:
all_ordergroups: Alle Bestellgruppen
@ -215,11 +218,6 @@ de:
workgroup: Arbeitsgruppe
new:
title: Bestellgruppe anlegen
ordergroups:
address: Adresse
contact: Kontakt
members: Mitglieder
name: Name
show:
confirm: Bist Du sicher?
edit: Gruppe/Mitglieder bearbeiten
@ -238,20 +236,11 @@ de:
title: Neue Benutzerin anlegen
show:
confirm: Willst du %{user} wirklich rausschmeißen?
email: Email
groupabos: Gruppenabos
member_since: Mitglied seit %{time}
name: Name
nick: Nick
person: Person
phone: Telefon
preference: Einstellungen
send_message: Nachricht senden
users:
email: Email
last_login: Letzter login
login: Login
name: Name
workgroups:
destroy:
error: ! 'Arbeitsgruppe konnte nicht gelöscht werden: %{error}'
@ -339,15 +328,6 @@ de:
submit: Alle Artikel aktualisieren
title: Alle Artikel von %{supplier} bearbeiten
warning: Achtung, alle Artikel werden aktualisiert!
edit_all_table:
available_desc: verfügbar
available_short: verf.
order_number_desc: Bestellnummer
order_number_short: Best.Nr.
price_desc: Netto!
price_short: Preis
unit_quantity_desc: Gebindegröße
unit_quantity_short: GebGr
form:
title_edit: Artikel bearbeiten
title_new: Neuen Artikel einfügen
@ -410,18 +390,12 @@ de:
edit:
title: Lieferung bearbeiten
form:
actions: Optionen
article: Artikel
category: Kategorie
confirm_foreign_supplier_reedit: Der Lagerartikel »%{name}« wurde erfolgreich gespeichert. Er gehört jedoch nicht zu dem Lieferanten dieser Lieferung. Möchtest Du diesen Lagerartikel erneut bearbeiten?
create_from_blank: Ohne Vorlage anlegen
create_stock_article: Lagerartikel anlegen
price: Nettopreis
quantity: Menge
title_fill_quantities: 2. Liefermenge angeben
title_finish_delivery: 3. Lieferung abschließen
title_select_stock_articles: 1. Lagerartikel auswählen
unit: Einheit
index:
confirm_delete: Bist Du sicher?
new_delivery: Neue Lieferung für %{supplier} anlegen
@ -431,16 +405,12 @@ de:
new:
title: Neue Lieferung von %{supplier}
show:
amount: Menge
article: Artikel
price: Nettopreis
sum: Summe
sum_diff: Brutto - bereinigter Rechnungsbetrag
sum_gross: Bruttosumme
sum_net: Nettosumme
title: Lieferung anzeigen
title_articles: Artikel
unit: Einheit
stock_article_for_adding:
action_add_to_delivery: Liefern
action_edit: Bearbeiten
@ -521,16 +491,10 @@ de:
edit_results_by_articles:
add_article: Artikel hinzufügen
amount: Menge
amount_per_unit: GebGr * Einheit
article: Artikel
gross: Brutto
net: Netto
number: Nr.
refund: Pfand
tax: MwSt
group_order_articles:
add_group: Gruppe hinzufügen
group: Gruppe
total: Gesamtpreis
total_fc: Summe (FC-Preis)
units: Einheiten
@ -617,18 +581,12 @@ de:
amount_change_for: Mengenänderung für %{article}
result_hint: ! 'Einheit: %{unit}'
index:
amount: Betrag
amount_fc: Betrag(FC)
clear: Abrechnen
date: Datum
end: Ende
everything_cleared: Super, alles schon abgerechnet...
group: Gruppe
last_transactions: Letzte Überweisungen
note: Notiz
open_transactions: Noch nicht abgerechnet
show_all: alle anzeigen
supplier: Lieferantin
title: Finanzbereich
unpaid_invoices: Unbezahlte Rechnungen
invoices:
@ -639,7 +597,6 @@ de:
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
@ -661,10 +618,7 @@ de:
search_placeholder: Suchen ...
title: Konten verwalten
ordergroups:
account_balance: Kontostand
account_statement: Kontoauszug
contact: Kontakt
name: Name
new_transaction: Neue Transaktion
update:
notice: Rechnung wurde aktualisiert.
@ -675,10 +629,6 @@ de:
only_active: Nur aktive
only_active_desc: (mindestens einmal in den letzten 3 Monaten bestellt)
title: Bestellgruppen
ordergroups:
last_ordered: zuletzt bestellt
name: Name
user: Mitglieder
users:
index:
body: <p>Hier kannst Du den Mitgliedern Deiner Foodcoop eine Nachricht schreiben.</p> <p>Damit Deine Kontaktdaten einzusehen sind, musst Du sie unter %{profile_link} freigeben.</p>
@ -812,12 +762,8 @@ de:
last_update: Letzte Aktualisiering ist %{when} her
title: Meine Bestellgruppe
transactions:
amount: Betrag
note: Notiz
title: Letzte Transaktionen
view: Kontoauszug anzeigen
when: Wann
where: Wer
ordergroup:
title: Engagement Deiner Bestellgruppe
tasks_move:
@ -1301,20 +1247,14 @@ de:
articles_by_groups:
fc_price: FC-Preis
fc_price_desc: Preis incl. MwSt, Pfand und Foodcoop-Aufschlag
name: Name
price: Gesamtpreis
unit: Einheit
unit_quantity: GebGr
unit_quantity_desc: Gebindegröße
group:
access: Zugriff auf
activated: aktiviert
address: Adresse
apple_limit: Äpfel-Bestellbeschränkung
contact: Kontakt
deactivated: deaktiviert
description: Beschreibung
members: Mitglieder
no_weekly_job: kein wöchentlicher Job definiert
weekly_job: Wöchentlicher Job
group_form_fields:
@ -1547,6 +1487,7 @@ de:
title: Aufgaben für %{workgroup}
title_all: Alle Aufgaben der Gruppe
ui:
actions: Aktionen
close: Schließen
delete: Löschen
edit: Bearbeiten

View File

@ -15,6 +15,7 @@ en:
name: Name
note: Note
order_number: Order number
order_number_short: Nr.
origin: Origin
price: Price (net)
supplier: Supplier
@ -81,11 +82,13 @@ en:
ordergroup:
account_balance: Account balance
available_funds: Available credit
contact: Contact
contact_address: Address
contact_person: Contact person
contact_phone: Phone
description: Description
ignore_apple_restriction: Ignore order stop by apple points restriction
last_order: Last order
name: Name
user_tokens: Members
page:
@ -131,6 +134,7 @@ en:
user:
email: Email
first_name: First name
last_login: Last login
last_name: Last name
name: Name
nick: Username
@ -177,7 +181,6 @@ en:
workgroup: Workgroup
admin:
access_to: access to
actions: Actions
base:
index:
all_ordergroups: All ordergroups
@ -215,11 +218,6 @@ en:
workgroup: workgroup
new:
title: Create ordergroup
ordergroups:
address: Address
contact: Contact
members: Members
name: Name
show:
confirm: Are you sure?
edit: Edit group/members
@ -238,20 +236,11 @@ en:
title: Create new user
show:
confirm: Do you really want to kick out %{user}?
email: Email
groupabos: Group subscriptions
member_since: Member since %{time}
name: Name
nick: Nick
person: Person
phone: Phone
preference: Preferences
send_message: Send message
users:
email: email
last_login: last login
login: login
name: name
workgroups:
destroy:
error: ! 'Workgroup could not be deleted: %{error}'
@ -339,15 +328,6 @@ en:
submit: Update all articles
title: Edit all articles from %{supplier}
warning: ! 'Warning: all articles will be updated!'
edit_all_table:
available_desc: available
available_short: avail
order_number_desc: Order number
order_number_short: Ordernr.
price_desc: Net price
price_short: Price
unit_quantity_desc: Unit quantity
unit_quantity_short: Quantity
form:
title_edit: Edit article
title_new: Add new article
@ -412,18 +392,12 @@ en:
edit:
title: Edit delivery
form:
actions: Tasks
article: Article
category: Category
confirm_foreign_supplier_reedit: The stock article %{name} was successfully saved. However, it belongs to a different supplier than this delivery. Would you like to edit the stock article again?
create_from_blank: Create new article
create_stock_article: Create stock article
price: Netprice
quantity: Quantity
title_fill_quantities: 2. Set delivery quantities
title_finish_delivery: 3. Finish delivery
title_select_stock_articles: 1. Select stock articles
unit: Unit
index:
confirm_delete: Are you sure?
new_delivery: ! 'Create new delivery for %{supplier} '
@ -433,16 +407,12 @@ en:
new:
title: New delivery from %{supplier}
show:
amount: Amount
article: Article
price: Netprice
sum: Sum
sum_diff: Gross - adjusted invoice amount
sum_gross: Gross sum
sum_net: Net sum
title: Show delivery
title_articles: Article
unit: Unit
title_articles: Articles
stock_article_for_adding:
action_add_to_delivery: Add to delivery
action_edit: Edit
@ -525,16 +495,10 @@ en:
edit_results_by_articles:
add_article: Add article
amount: Amount
amount_per_unit: Unit quantity * Unit
article: Article
gross: Gross
net: Net
number: Nr.
refund: Deposit
tax: Tax
group_order_articles:
add_group: Add group
group: Group
total: Total costs
total_fc: Sum (FC-price)
units: Units
@ -621,18 +585,12 @@ en:
amount_change_for: Change amount for %{article}
result_hint: ! 'Unit: %{unit}'
index:
amount: Amount
amount_fc: Amount(FC)
clear: To account
date: Date
end: End
everything_cleared: Great, everything is accounted...
group: Group
last_transactions: Recent transactions
note: Note
open_transactions: Unsettled orders
show_all: show all
supplier: Supplier
title: Finances
unpaid_invoices: Unpaid invoices
invoices:
@ -643,7 +601,6 @@ en:
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
@ -665,10 +622,7 @@ en:
search_placeholder: Search ...
title: Manage accounts
ordergroups:
account_balance: Account balance
account_statement: Account statement
contact: Contact
name: Name
new_transaction: New transaction
update:
notice: Invoice was updated
@ -679,10 +633,6 @@ en:
only_active: Only active groups
only_active_desc: (have placed order at least once in the last 3 months)
title: Ordergroups
ordergroups:
last_ordered: Last ordered
name: Name
user: Users
users:
index:
body: <p>Here you can write a message to the members of your Foodcoop.</p> <p>You have to approve in your %{profile_link} that your contact details are visible.</p>
@ -816,12 +766,8 @@ en:
last_update: Last update was %{when} ago
title: My ordergroup
transactions:
amount: Amount
note: Note
title: Last Transactions
view: Show account statement
when: When
where: Who
ordergroup:
title: Engagement of your ordergroup
tasks_move:
@ -1305,20 +1251,14 @@ en:
articles_by_groups:
fc_price: FC-Price
fc_price_desc: Price including taxes, deposit and Foodcoop-charge
name: Name
price: Total price
unit: Unit
unit_quantity: Lot quantity
unit_quantity_desc: How many units per lot.
group:
access: Access to
activated: activated
address: Address
apple_limit: Apple points order limit
contact: Contact
deactivated: deactivated
description: Description
members: Members
no_weekly_job: No weekly job defined
weekly_job: Weekly job
group_form_fields:
@ -1553,6 +1493,7 @@ en:
title: Tasks for %{workgroup}
title_all: All group tasks
ui:
actions: Actions
close: Close
delete: Delete
edit: Edit

View File

@ -15,6 +15,7 @@ fr:
name: Nom
note: Note
order_number: ! 'Numéro '
order_number_short: Numéro
origin: Lieu de production
price: Prix net
supplier:
@ -81,11 +82,13 @@ fr:
ordergroup:
account_balance: Crédit initial
available_funds: Crédit disponible
contact: Contact
contact_address: Adresse
contact_person: Personne à contacter
contact_phone: Téléphone
description: Description
ignore_apple_restriction: Pour cette cellule, ne pas bloquer les commandes en cas de manque de glands
last_order: dernière commande
name: Nom
user_tokens: Membres
page:
@ -131,6 +134,7 @@ fr:
user:
email: Email
first_name: Prénom
last_login: Dernière connection
last_name: Nom de famille
name: Nom
nick: Identifiant
@ -177,7 +181,6 @@ fr:
workgroup: Équipe
admin:
access_to: accès à
actions: Actions
base:
index:
all_ordergroups: Toutes les cellules
@ -215,11 +218,6 @@ fr:
workgroup: équipe
new:
title: Définir une nouvelle cellule
ordergroups:
address: Adresse
contact: Contact
members: Membres
name: Nom
show:
confirm: T'es sûrE de ton coup?
edit: Modifier les données sur les cellules et/ou leurs membres
@ -238,20 +236,11 @@ fr:
title: Ajouter unE nouveLLE_eau membre
show:
confirm: Veux-tu vraiment expulser %{user}?
email: Email
groupabos: Participation à des équipes
member_since: Membre depuis %{time}
name: Nom
nick: Identifiant
person: Personne
phone: Numéro de téléphone
preference: Préférences
send_message: Envoyer un message
users:
email: email
last_login: dernière connection
login: identifiant
name: nom
workgroups:
destroy:
error: ! 'Cette équipe n''a pas pu être supprimée: %{error}'
@ -339,15 +328,6 @@ fr:
submit: Mettre à jour tous les articles
title: Modifier tous les articles de %{supplier}
warning: Attention, tous les articles sont en train d'être mis à jour!
edit_all_table:
available_desc: disponible
available_short: disp.
order_number_desc: numéro de commande
order_number_short: n°
price_desc: Prix net
price_short: Prix
unit_quantity_desc: Unités par lot
unit_quantity_short: U/L
form:
title_edit:
title_new: Ajouter un nouvel article
@ -416,17 +396,11 @@ fr:
edit:
title: Modifier le réapprovisionnement
form:
actions: Options
article: Article
category: Catégorie
create_from_blank: Ajouter un nouvel article quelconque
create_stock_article: Ajouter un article au stock
price: Prix net
quantity: Quantité
title_fill_quantities: 2. Définir la quantité à livrer
title_finish_delivery: 3. Clore le réapprovisionnement
title_select_stock_articles: 1. Choisir les articles en stock
unit: Unité
index:
confirm_delete: T'es sûrE de ton coup?
new_delivery: Réapprovisionner le stock par %{supplier}
@ -436,16 +410,12 @@ fr:
new:
title: Réapprovisionner le stock par %{supplier}
show:
amount: Quantité
article: Article
price: Prix net
sum: Prix total
sum_diff: montant brut - montant net
sum_gross: prix total brut
sum_net: prix total net
title: Afficher le réapprovisionnement
title_articles: Article
unit: Unité
title_articles: Articles
stock_article_for_adding:
action_add_to_delivery: Commander
action_edit: Modifier
@ -534,16 +504,10 @@ fr:
edit_results_by_articles:
add_article: Ajouter un article
amount: Quantité
amount_per_unit: Poids d'un lot
article: Article
gross: Brut
net: Net
number: Numéro
refund: Consigne
tax: TVA
group_order_articles:
add_group: Créer un nouveau groupe
group: Groupe
total: Prix total
total_fc: Prix total (pour la boufcoop)
units: Nombre d'unités
@ -630,18 +594,12 @@ fr:
amount_change_for: Modification de la quantité de %{article}
result_hint:
index:
amount: Montant
amount_fc: Montant(boufcoop)
clear: Décompter
date: Date
end: Fin
everything_cleared: Super, tout est a déjà été décompté!
group: Cellule
last_transactions: Dernières transactions
note: Note
open_transactions: à décompter
show_all: tout afficher
supplier: FournisseusE_r
title: Espace trésorerie
unpaid_invoices: Factures à régler
invoices:
@ -652,7 +610,6 @@ fr:
title: Factures
invoices:
confirm_delete: T'es sûrE de ton coup?
delivery: Réapprovisionnement
linked: Cette facture est associée à %{what_link}.
linked_delivery: un réapprovisionnement
linked_order: une commande
@ -674,10 +631,7 @@ fr:
search_placeholder: Rechercher ...
title: Crédits des cellules
ordergroups:
account_balance: Crédit disponible
account_statement: Relevé de compte
contact:
name: Nom
new_transaction: Nouvelle transaction
update:
notice: La facture a été mise à jour.
@ -688,10 +642,6 @@ fr:
only_active: Seulement les cellules en activité
only_active_desc: (ayant commandé au moins une fois au cours des 3 derniers mois)
title: Cellules
ordergroups:
last_ordered: dernière commande
name: Nom
user: Membres
users:
index:
body: ! '<p>Cette page sert à envoyer des messages aux autres membres de la coop.</p>
@ -837,12 +787,8 @@ fr:
last_update: La dernière mise à jour date du %{when}
title: Ta cellule
transactions:
amount: Montant
note: Note
title: Dernière transactions
view: Afficher un relevé de compte
when: Quand?
where: Qui?
ordergroup:
title: Niveau de participation de ta cellule
tasks_move:
@ -1307,20 +1253,14 @@ fr:
articles_by_groups:
fc_price: Prix coop
fc_price_desc: Prix avec TVA, consigne et part de la coop inclus.
name: Nom
price: Prix total
unit: Unité
unit_quantity: U/L
unit_quantity_desc: Unités par lot
group:
access: Accès à
activated: activé
address: Adresse
apple_limit: Minimum de glands
contact: Contact
deactivated: désactivé
description: Description
members: Membre
no_weekly_job: aucun boulot hebdomadaire n'a été défini
weekly_job: Boulot hebdomadaire
group_form_fields:
@ -1563,6 +1503,7 @@ fr:
title: Agenda de l'%{workgroup}
title_all: Boulot prévu pour l'équipe
ui:
actions: Actions
close: Fermer
delete: Supprimer
edit: Modifier

View File

@ -15,6 +15,7 @@ nl:
name: Naam
note: Notitie
order_number: Ordernummer
order_number_short: Nr.
origin: Herkomst
price: Netto prijs
supplier: Leverancier
@ -81,11 +82,13 @@ nl:
ordergroup:
account_balance: Tegoed
available_funds: Beschikbaar tegoed
contact: Contact
contact_address: Adres
contact_person: Contactpersoon
contact_phone: Telefoon
description: Omschrijving
ignore_apple_restriction: Bestelstop vanwege appelpunten negeren
last_order: Laatste bestelling
name: Naam
user_tokens: Leden
page:
@ -131,6 +134,7 @@ nl:
user:
email: Email
first_name: Voornaam
last_login: Laatste login
last_name: Achternaam
name: Naam
nick: Gebruikersnaam
@ -177,7 +181,6 @@ nl:
workgroup: Werkgroep
admin:
access_to: toegang tot
actions: Acties
base:
index:
all_ordergroups: Alle huishoudens
@ -215,11 +218,6 @@ nl:
workgroup: werkgroep
new:
title: Huishouden toevoegen
ordergroups:
address: Adres
contact: Contact
members: Leden
name: Naam
show:
confirm: Weet je het zeker?
edit: Groep/leden bewerken
@ -238,20 +236,11 @@ nl:
title: Nieuwe gebruiker toevoegen
show:
confirm: Wil je %{user} daadwerkelijk verwijderen?
email: E-mail
groupabos: Groepslidmaatschappen
member_since: Lid sinds %{time}
name: Naam
nick: Gebruikersnaam
person: Persoon
phone: Telefoon
preference: Voorkeuren
send_message: Bericht versturen
users:
email: e-mail
last_login: laatste login
login: login
name: naam
workgroups:
destroy:
error: ! 'Werkgroep kon niet gewist worden: %{error}'
@ -339,15 +328,6 @@ nl:
submit: Alle artikelen bijwerken
title: Alle artikelen van %{supplier} bewerken
warning: Let op, alle artikelen worden bijgewerkt!
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
unit_quantity_desc: Groothandelsverpakkingsgrootte
unit_quantity_short: Gr.Eenh.
form:
title_edit: Artikel bewerken
title_new: Nieuw artikel toevoegen
@ -412,17 +392,11 @@ nl:
edit:
title: Levering aanpassen
form:
actions: Taken
article: Artikel
category: Categorie
create_from_blank: Nieuw voorraadartikel invoeren
create_stock_article: Voorraadartikel invoeren
price: Netto prijs
quantity: Aantal
title_fill_quantities: 2. Hoeveel mag er geleverd worden
title_finish_delivery: 3. Levering afmaken
title_select_stock_articles: 1. Kies voorraadartikelen
unit: Eenheid
index:
confirm_delete: Zeker weten?
new_delivery: Nieuwe levering maken voor %{supplier}
@ -432,16 +406,12 @@ nl:
new:
title: Nieuwe levering van %{supplier}
show:
amount: Aantal
article: Artikel
price: Netto prijs
sum: Som
sum_diff: Bruto - aangepast factuurbedrag
sum_gross: Brutosom
sum_net: Nettosom
title: Levering tonen
title_articles: Artikel
unit: Eenheid
title_articles: Artikelen
stock_article_for_adding:
action_add_to_delivery: Voeg toe aan levering
action_edit: Bewerk
@ -524,16 +494,10 @@ nl:
edit_results_by_articles:
add_article: Artikel toevoegen
amount: Aantal
amount_per_unit: Gr.Eenh.
article: Artikel
gross: Bruto
net: Netto
number: Nr.
refund: Statiegeld
tax: BTW
group_order_articles:
add_group: Huishouden toevoegen
group: Huishouden
total: Totale prijs
total_fc: Som (FC-prijs)
units: Eenheden
@ -620,18 +584,12 @@ nl:
amount_change_for: Hoeveelheid %{article}
result_hint: ! 'Eenheid: %{unit}'
index:
amount: Bedrag
amount_fc: Bedrag(FC)
clear: Afrekenen
date: Datum
end: Einde
everything_cleared: Mooi zo, alles is verrekend...
group: Groep
last_transactions: Recente transacties
note: Notitie
open_transactions: Nog niet afgerekend
show_all: alle tonen
supplier: Leverancier
title: Financiën
unpaid_invoices: Onbetaalde facturen
invoices:
@ -642,7 +600,6 @@ nl:
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
@ -664,10 +621,7 @@ nl:
search_placeholder: Zoeken ...
title: Tegoeden beheren
ordergroups:
account_balance: Tegoed
account_statement: Rekeningafschrift
contact: Contactpersoon
name: Naam
new_transaction: Nieuwe transactie
update:
notice: Factuur is bijgewerkt
@ -678,10 +632,6 @@ nl:
only_active: Alleen actieve
only_active_desc: (minstens eenmaal in de laatste 3 maanden besteld)
title: Huishoudens
ordergroups:
last_ordered: laatste besteld
name: Naam
user: Leden
users:
index:
body: <p>Hier kun je leden van deze foodcoop een bericht sturen.</p> <p>Om je eigen contactgegevens te laten zien, moet je die vrijgeven op %{profile_link}.</p>
@ -817,12 +767,8 @@ nl:
last_update: Laatst gewijzigd %{when} geleden
title: Mijn huishouden
transactions:
amount: Bedrag
note: Notitie
title: Laatste transacties
view: Rekeningafschrift tonen
when: Wanneer
where: Wie
ordergroup:
title: Betrokkenheid van je huishouden
tasks_move:
@ -1284,20 +1230,14 @@ nl:
articles_by_groups:
fc_price: FC-Prijs
fc_price_desc: Prijs inclusief belasting, statiegeld en foodcoop marge
name: Naam
price: Totaalprijs
unit: Eenheid
unit_quantity: Gr.Eenh.
unit_quantity_desc: Hoeveel eenheden per groothandelsverpakking
group:
access: Toegang tot
activated: actief
address: Adres
apple_limit: Appelpunten bestellingslimiet
contact: Contact
deactivated: inactief
description: Beschrijving
members: Leden
no_weekly_job: geen wekelijkse taak ingesteld
weekly_job: wekelijkse taak
group_form_fields:
@ -1530,6 +1470,7 @@ nl:
title: Taken voor %{workgroup}
title_all: Alle groepstaken
ui:
actions: Acties
close: Sluiten
delete: Verwijder
edit: Bewerk