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

Merge remote-tracking branch 'foodcoop-rostock/fix-order-article-update'

Browse source 
Conflicts:
	config/locales/de.yml
	config/locales/en.yml
This commit is contained in:
wvengen 2014-01-20 12:12:00 +01:00
commit 6c0de3dc74
6 changed files with 21 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
config/locales/fr.yml
View file

@ -82,7 +82,7 @@ fr:
missing_units: Unités manquantes
missing_units_short:
units_to_order: Quantité
update_current_price: Mettre à jour le prix global
update_global_price: Mettre à jour le prix global
order_comment:
text: Commenter cette commande...
ordergroup:
@ -1297,7 +1297,7 @@ fr:
private: Le message n'apparaîtra pas dans la boîte de réception du Foodsoft
order_article:
units_to_order:
update_current_price: Modifie aussi le prix des commandes en cours
update_global_price: # ATTENTION, MEANING CHANGED. OLD (NOW WRONG) TRANSLATION WAS 'Modifie aussi le prix des commandes en cours'
stock_article:
copy:
name: Merci de modifier