Merged

naro · Mar 10, 2012 · 97568d9 · 97568d9
2 parents 7de3559 + 97f35d3
commit 97568d9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/docs/developer/settings.rst b/docs/developer/settings.rst
@@ -98,9 +98,6 @@ LFS_RECENT_PRODUCTS_LIMIT
 Addresses
 =========
 
-LFS_INVOICE_EMAIL_REQUIRED
-    If True the e-mail address of the invoice address is required.
-
 LFS_INVOICE_PHONE_REQUIRED
     If True the phone of the invoice address is required.
 
@@ -110,6 +107,12 @@ LFS_INVOICE_COMPANY_NAME_REQUIRED
 LFS_SHIPPING_PHONE_REQUIRED
     If True the phone of the shipping address is required.
 
+LFS_SHIPPING_COMPANY_NAME_REQUIRED
+    If True the company name of the shipping address is required.
+
+LFS_SHIPPING_EMAIL_REQUIRED
+    If True the e-mail of the shipping address is required.
+
 .. _settings_units:
 
 Units

diff --git a/lfs/locale/de/LC_MESSAGES/django.mo b/lfs/locale/de/LC_MESSAGES/django.mo
diff --git a/lfs/locale/de/LC_MESSAGES/django.po b/lfs/locale/de/LC_MESSAGES/django.po
@@ -4260,18 +4260,16 @@ msgstr "Der Gutschein ist für diesen Preis nicht gültig."
 msgid "The voucher doesn't exist."
 msgstr "Dieser Gutschein existiert nicht"
 
-#~ msgid "Packaging Unit"
-#~ msgstr "Verpackungseinheit"
 
 # Additional msgids DO NOT DELETE THIS
-#~ msgid "Left"
-#~ msgstr "Links"
+msgid "Left"
+msgstr "Links"
 
-#~ msgid "Right"
-#~ msgstr "Rechts"
+msgid "Right"
+msgstr "Rechts"
 
-#~ msgid "Average Rating"
-#~ msgstr "Durchschnittliche Bewertung"
+msgid "Average Rating"
+msgstr "Durchschnittliche Bewertung"
 
-#~ msgid "Zip Code"
-#~ msgstr "PLZ"
+msgid "Zip Code"
+msgstr "PLZ"