Commits

Kai Diefenbach committed db2ba42 Merge

Merge

Comments (0)

Files changed (11)

lfs/caching/utils.py

 
 def key_from_instance(instance):
     opts = instance._meta
-    return '%s.%s:%s' % (opts.app_label, opts.module_name, instance.pk)    
+    return '%s.%s:%s' % (opts.app_label, opts.module_name, instance.pk)
 
 class SimpleCacheQuerySet(QuerySet):
     def filter(self, *args, **kwargs):
             if val in kwargs:
                 pk = kwargs[val]
                 break
-        if pk is not None:            
-            opts = self.model._meta            
+        if pk is not None:
+            opts = self.model._meta
             key = '%s.%s:%s' % (opts.app_label, opts.module_name, pk)
             obj = cache.get(key)
             if obj is not None:
                 self._result_cache = [obj]
         return super(SimpleCacheQuerySet, self).filter(*args, **kwargs)
-        
+
 class SimpleCacheManager(models.Manager):
     def get_query_set(self):
-        return SimpleCacheQuerySet(self.model)        
-        
+        return SimpleCacheQuerySet(self.model)
+
+def lfs_get_object(klass, *args, **kwargs):
+    """
+    Uses get() to return an object, or raises a Http404 exception if the object
+    does not exist.
+
+    klass may be a Model, Manager, or QuerySet object. All other passed
+    arguments and keyword arguments are used in the get() query.
+
+    Note: Like with get(), an MultipleObjectsReturned will be raised if more than one
+    object is found.
+    """
+    cache_key = "%s-%s" % (klass.__name__.lower(), kwargs.values()[0])
+    object = cache.get(cache_key)
+    if object is not None:
+        return object
+
+    queryset = _get_queryset(klass)
+
+    try:
+        object = queryset.get(*args, **kwargs)
+    except queryset.model.DoesNotExist:
+        return None
+    else:
+        cache.set(cache_key, object)
+        return object
+
 def lfs_get_object_or_404(klass, *args, **kwargs):
     """
     Uses get() to return an object, or raises a Http404 exception if the object
     object = cache.get(cache_key)
     if object is not None:
         return object
-        
+
     queryset = _get_queryset(klass)
     try:
         object = queryset.get(*args, **kwargs)
+    except queryset.model.DoesNotExist:
+        raise Http404('No %s matches the given query.' % queryset.model._meta.object_name)
+    else:
         cache.set(cache_key, object)
         return object
-    except queryset.model.DoesNotExist:
-        raise Http404('No %s matches the given query.' % queryset.model._meta.object_name)
-        
+
 def clear_cache():
     """Clears the complete cache.
     """
     try:
         cache._cache.flush_all()
     except AttributeError:
-        pass            
+        pass
     else:
         return
 
         cache._expire_info.clear()
     except AttributeError:
         pass
-        

lfs/cart/views.py

 from lfs.catalog.models import Product
 from lfs.catalog.models import Property
 from lfs.catalog.settings import PRODUCT_WITH_VARIANTS
-
 from lfs.cart import utils as cart_utils
 from lfs.cart.models import CartItem
+from lfs.core.utils import l10n_float
 from lfs.shipping import utils as shipping_utils
 from lfs.payment import utils as payment_utils
 from lfs.customer import utils as customer_utils
                     continue
 
                 if property.is_number_field:
-                    try:
-                        value = float(value)
-                    except ValueError:
-                        value = 0.0
-                elif property.is_number_field:
-                    try:
-                        value = int(value)
-                    except ValueError:
-                        value = 0
+                    value = l10n_float(value)
 
                 properties_dict[property_id] = unicode(value)
-
+                                
                 # validate property's value
                 if property.is_number_field:
 
                     if (value < property.unit_min) or (value > property.unit_max):
-                        msg = _(u"%(name)s must be between %(min)s and %(max)s %(unit)s.") % {"name" : property.name, "min" : property.unit_min, "max" : property.unit_max, "unit" : property.unit }
+                        msg = _(u"%(name)s must be between %(min)s and %(max)s %(unit)s.") % {"name" : property.title, "min" : property.unit_min, "max" : property.unit_max, "unit" : property.unit }
                         return lfs.core.utils.set_message_cookie(
                             product.get_absolute_url(), msg)
 
 
                     value = "%.2f" % value
                     if value not in steps:
-                        msg = _(u"Your entered value for %(name)s (%(value)s) is not in valid step width, which is %(step)s.") % {"name": property.name, "value": value, "step" : property.unit_step }
+                        msg = _(u"Your entered value for %(name)s (%(value)s) is not in valid step width, which is %(step)s.") % {"name": property.title, "value": value, "step" : property.unit_step }
                         return lfs.core.utils.set_message_cookie(
                             product.get_absolute_url(), msg)
 
         try:
             amount = float(amount)
             if item.product.manage_stock_amount and amount > item.product.stock_amount:
-                message = _(u"Sorry, but there are only %(amount)s article(s) in stock.") % {"amount" : item.product.stock_amount}
                 amount = item.product.stock_amount
+                if amount < 0:
+                    amount = 0
+                message = _(u"Sorry, but there are only %(amount)s article(s) in stock.") % {"amount" : amount}
         except ValueError:
             amount = 1
 
         else:
             item.amount = amount
 
-        if amount < 0:
-            item.amount = 1.0
-        elif amount == 0:
+        if amount == 0:
             item.delete()
         else:
             item.save()

lfs/catalog/views.py

-import datetime
 # python imports
+import math
 import urllib
-import math
 
 # django imports
 from django.conf import settings
 from lfs.catalog.models import File
 from lfs.catalog.models import Product
 from lfs.catalog.models import ProductPropertyValue
-from lfs.catalog.models import Property
 from lfs.catalog.models import PropertyOption
 from lfs.catalog.settings import PRODUCT_WITH_VARIANTS
 from lfs.catalog.settings import VARIANT
 from lfs.catalog.settings import PROPERTY_VALUE_TYPE_DEFAULT
-from lfs.catalog.settings import PROPERTY_VALUE_TYPE_DISPLAY
 from lfs.catalog.settings import SELECT
 from lfs.catalog.settings import CONTENT_PRODUCTS
 from lfs.core.utils import LazyEncoder

lfs/core/utils.py

 # python imports
 import datetime
-import re
 import sys
 import urllib
 
 from lfs.core.models import Shop
 from lfs.catalog.models import Category
 
+def l10n_float(string):
+    """Takes a country specfic decimal value as string and returns a float.
+    """
+
+    # TODO: Implement a proper transformation with babel or similar
+    if settings.LANGUAGE_CODE == "de":
+        string = string.replace(",", ".")
+
+    try:
+        return float(string)
+    except ValueError:
+        return 0.0
+
 def get_default_shop():
     """Returns the default shop.
     """
 
 def get_current_categories(request, object):
     """Returns all current categories based on given request. Current
-    categories are the current selected category and all parent categories of 
+    categories are the current selected category and all parent categories of
     it.
     """
     if object and object.content_type == "category":

lfs/locale/de/LC_MESSAGES/django.mo

Binary file modified.

lfs/locale/de/LC_MESSAGES/django.po

 msgstr ""
 "Project-Id-Version: LFS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-25 09:26+0200\n"
+"POT-Creation-Date: 2010-07-03 02:11-0500\n"
 "PO-Revision-Date: 2009-02-22 07:20+0100\n"
 "Last-Translator: Kai Diefenbach <kai.diefenbach@iqpp.de>\n"
 "Language-Team: Kai Diefenbach <kai.diefenbach@iqpp.de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cart/models.py:33 cart/migrations/0001_initial.py:23
-#: criteria/models/criteria.py:583 order/models.py:41
-#: order/migrations/0001_initial.py:57
+#: cart/models.py:33 criteria/models/criteria.py:583 order/models.py:40
 #: templates/manage/cart/carts_inline.html:111
 msgid "User"
 msgstr "Benutzer"
 
-#: cart/models.py:34 cart/migrations/0001_initial.py:21 order/models.py:42
-#: order/migrations/0001_initial.py:36
+#: cart/models.py:34 order/models.py:41
 msgid "Session"
 msgstr "Session"
 
-#: cart/models.py:35 cart/models.py:121
-#: cart/migrations/0003_add_date_fields.py:11
-#: cart/migrations/0003_add_date_fields.py:14 catalog/models.py:523
-#: catalog/migrations/0001_initial.py:91
+#: cart/models.py:35 cart/models.py:121 catalog/models.py:524
 #: templates/manage/cart/cart_inline.html:96
 #: templates/manage/cart/cart_inline.html:135
 #: templates/manage/cart/carts_inline.html:105
 msgstr "Erstellungsdatum"
 
 #: cart/models.py:36 cart/models.py:122
-#: cart/migrations/0003_add_date_fields.py:17
-#: cart/migrations/0003_add_date_fields.py:20
 #: templates/manage/cart/cart_inline.html:104
 #: templates/manage/cart/carts_inline.html:108
 #: templates/manage/customer/customer_inline.html:178
 msgid "Modification date"
 msgstr "Änderungsdatum"
 
-#: cart/models.py:118 cart/migrations/0001_initial.py:15
-#: portlet/templatetags/lfs_portlets_tags.py:79
+#: cart/models.py:118 portlet/templatetags/lfs_portlets_tags.py:86
 #: templates/manage/customer/customer_inline.html:170
 #: templates/manage/customer/customers_inline.html:113
 msgid "Cart"
 msgstr "Warenkorb"
 
-#: cart/models.py:119 cart/migrations/0001_initial.py:13
-#: catalog/models.py:1347 catalog/models.py:1596 catalog/models.py:1660
-#: catalog/migrations/0001_initial.py:13 catalog/migrations/0001_initial.py:61
-#: catalog/migrations/0001_initial.py:144 marketing/models.py:12
-#: marketing/models.py:24 marketing/models.py:30
-#: marketing/migrations/0001_initial.py:13
-#: templates/manage/cart/cart_inline.html:138
+#: cart/models.py:119 catalog/models.py:1351 catalog/models.py:1600
+#: catalog/models.py:1664 marketing/models.py:12 marketing/models.py:24
+#: marketing/models.py:30 templates/manage/cart/cart_inline.html:138
 #: templates/manage/product/product.html:71
 #: templates/manage/reviews/review_inline.html:140
 #: templates/manage/reviews/reviews_inline.html:119
 msgid "Product"
 msgstr "Produkt"
 
-#: cart/models.py:120 cart/migrations/0001_initial.py:12
-#: catalog/models.py:1350 catalog/migrations/0001_initial.py:64
+#: cart/models.py:120 catalog/models.py:1354
 #: templates/manage/product/accessories_inline.html:126
 msgid "Quantity"
 msgstr "Menge"
 
-#: cart/models.py:245
+#: cart/models.py:249
 msgid "Cart item"
 msgstr "Artikel"
 
-#: cart/models.py:246 catalog/models.py:1551 catalog/models.py:1575
-#: catalog/models.py:1597 catalog/models.py:1621 catalog/models.py:1662
-#: catalog/migrations/0001_initial.py:15 catalog/migrations/0001_initial.py:71
-#: catalog/migrations/0001_initial.py:134
-#: catalog/migrations/0001_initial.py:145
-#: catalog/migrations/0001_initial.py:165 order/models.py:164
-#: templates/manage/properties/property.html:32
+#: cart/models.py:250 catalog/models.py:1555 catalog/models.py:1579
+#: catalog/models.py:1601 catalog/models.py:1625 catalog/models.py:1666
+#: order/models.py:163 templates/manage/properties/property.html:32
 msgid "Property"
 msgstr "Eigenschaften"
 
 "Ihre Eingabe für %(name)s (%(value)s) ist nicht in der gültigen "
 "Schrittweite. Diese ist: %(step)s"
 
-#: cart/migrations/0002_add_cart_portlet.py:13 catalog/models.py:1472
-#: catalog/models.py:1709 catalog/migrations/0001_initial.py:155
-#: core/models.py:69 core/migrations/0001_initial.py:13 page/models.py:13
-#: page/migrations/0001_initial.py:13
-#: templates/manage/portlets/portlets_inline.html:84
-#: templates/manage/product/images.html:35
-#: templates/manage/static_block/files.html:16
-msgid "Title"
-msgstr "Titel"
-
-#: catalog/models.py:118 catalog/models.py:497 catalog/models.py:1471
-#: catalog/models.py:1623 catalog/models.py:1780
-#: catalog/migrations/0001_initial.py:24 catalog/migrations/0001_initial.py:39
-#: catalog/migrations/0001_initial.py:79
-#: catalog/migrations/0001_initial.py:135
-#: catalog/migrations/0001_initial.py:173 core/models.py:19 core/models.py:142
-#: core/migrations/0001_initial.py:39 core/migrations/0001_initial.py:47
-#: export/models.py:15 manufacturer/models.py:9 payment/models.py:74
-#: payment/migrations/0001_initial.py:13 shipping/models.py:53
-#: shipping/migrations/0001_initial.py:23
+#: cart/views.py:398
+#, python-format
+msgid "Sorry, but there are only %(amount)s article(s) in stock."
+msgstr "Es tut uns leid, aber es sind nur noch %(amount)s Artikel auf Lager."
+
+#: catalog/models.py:119 catalog/models.py:498 catalog/models.py:1475
+#: catalog/models.py:1627 catalog/models.py:1784 core/models.py:19
+#: core/models.py:142 export/models.py:15 manufacturer/models.py:9
+#: payment/models.py:74 shipping/models.py:53
 #: templates/manage/category/products_inline.html:39
 #: templates/manage/category/selected_products.html:39
 #: templates/manage/customer/customer_inline.html:13
 #: templates/manage/product/products_inline.html:18
 #: templates/manage/product/related_products_inline.html:38
 #: templates/manage/product/related_products_inline.html:120
-#: templates/manage/product/variants.html:94
-#: templates/manage/product/variants.html:158
+#: templates/manage/product/variants.html:95
+#: templates/manage/product/variants.html:159
 #: templates/manage/properties/options_inline.html:13
 #: templates/manage/properties/pg_product_values.html:11
 #: templates/manage/properties/pg_products_inline.html:38
 msgid "Name"
 msgstr "Name"
 
-#: catalog/models.py:119 catalog/models.py:498
-#: catalog/migrations/0001_initial.py:40 catalog/migrations/0001_initial.py:80
-#: export/models.py:16 page/models.py:14 page/migrations/0001_initial.py:19
-#: templates/manage/product/variants.html:91
+#: catalog/models.py:120 catalog/models.py:499 export/models.py:16
+#: page/models.py:14 templates/manage/product/variants.html:92
 msgid "Slug"
 msgstr "Slug"
 
-#: catalog/models.py:120 catalog/models.py:558 catalog/models.py:1661
-#: catalog/migrations/0001_initial.py:41
-#: catalog/migrations/0001_initial.py:107 core/models.py:73
-#: core/migrations/0001_initial.py:12
+#: catalog/models.py:121 catalog/models.py:559 catalog/models.py:1665
+#: core/models.py:73
 msgid "Parent"
 msgstr "Kategorie"
 
-#: catalog/models.py:124 catalog/migrations/0001_initial.py:42
+#: catalog/models.py:125
 msgid "Show all products"
 msgstr "Alle Produkte anzeigen"
 
-#: catalog/models.py:126 catalog/models.py:1379 catalog/models.py:1474
+#: catalog/models.py:127 catalog/models.py:1383 catalog/models.py:1478
 #: catalog/settings.py:49 export/models.py:17
 #: templates/manage/manage_base.html:92
 #: templates/manage/cart/carts_inline.html:122
 msgid "Products"
 msgstr "Produkte"
 
-#: catalog/models.py:127 catalog/models.py:504
-#: catalog/migrations/0001_initial.py:43 catalog/migrations/0001_initial.py:84
+#: catalog/models.py:128 catalog/models.py:505
 msgid "Short description"
 msgstr "Kurzbeschreibung"
 
-#: catalog/models.py:128 catalog/models.py:505 catalog/models.py:1805
-#: catalog/migrations/0001_initial.py:44 catalog/migrations/0001_initial.py:85
-#: catalog/migrations/0001_initial.py:127 core/models.py:147
-#: core/migrations/0001_initial.py:26 payment/models.py:76
-#: payment/migrations/0001_initial.py:15 shipping/models.py:54
-#: shipping/migrations/0001_initial.py:24 tax/models.py:9
-#: tax/migrations/0001_initial.py:14
+#: catalog/models.py:129 catalog/models.py:506 catalog/models.py:1809
+#: core/models.py:147 payment/models.py:76 shipping/models.py:54
+#: tax/models.py:9
 msgid "Description"
 msgstr "Beschreibung"
 
-#: catalog/models.py:129 catalog/models.py:1710
-#: catalog/migrations/0001_initial.py:45
-#: catalog/migrations/0001_initial.py:156 core/models.py:148
-#: core/migrations/0001_initial.py:28 payment/models.py:79
-#: payment/migrations/0001_initial.py:18 shipping/models.py:57
-#: shipping/migrations/0001_initial.py:27
+#: catalog/models.py:130 catalog/models.py:1714 core/models.py:148
+#: payment/models.py:79 shipping/models.py:57
 #: templates/manage/product/images.html:32
 msgid "Image"
 msgstr "Bild"
 
-#: catalog/models.py:130 catalog/models.py:1349 catalog/models.py:1475
-#: catalog/models.py:1576 catalog/models.py:1598 catalog/models.py:1625
-#: catalog/models.py:1711 catalog/migrations/0001_initial.py:46
-#: catalog/migrations/0001_initial.py:63
-#: catalog/migrations/0001_initial.py:137
-#: catalog/migrations/0001_initial.py:146
-#: catalog/migrations/0001_initial.py:157
-#: catalog/migrations/0001_initial.py:166
-#: catalog/migrations/0001_initial.py:174 core/models.py:72
-#: core/migrations/0001_initial.py:16 criteria/migrations/0001_initial.py:36
+#: catalog/models.py:131 catalog/models.py:1353 catalog/models.py:1479
+#: catalog/models.py:1580 catalog/models.py:1602 catalog/models.py:1629
+#: catalog/models.py:1715 core/models.py:72
 #: criteria/models/criteria_objects.py:23 marketing/models.py:13
-#: marketing/models.py:31 marketing/migrations/0001_initial.py:12
-#: page/models.py:19 page/migrations/0001_initial.py:17
+#: marketing/models.py:31 page/models.py:19
 #: templates/manage/marketing/topseller_inline.html:122
 #: templates/manage/portlets/portlet_add.html:7
 #: templates/manage/portlets/portlet_edit.html:7
 msgid "Position"
 msgstr "Position"
 
-#: catalog/models.py:131 page/models.py:18
+#: catalog/models.py:132 page/models.py:18
 msgid "Exclude from navigation"
 msgstr "Von Navigation ausschließen"
 
-#: catalog/models.py:133 catalog/models.py:538
-#: catalog/migrations/0001_initial.py:47 core/models.py:149
-#: core/migrations/0001_initial.py:24
+#: catalog/models.py:134 catalog/models.py:539 core/models.py:149
 #: templates/manage/static_block/static_block.html:36
 #: templates/manage/static_block/static_block.html:41
 msgid "Static block"
 msgstr "Statischer Block"
 
-#: catalog/models.py:134
+#: catalog/models.py:135
 msgid "Category template"
 msgstr "Kategorie-Schablone"
 
-#: catalog/models.py:135 catalog/migrations/0001_initial.py:49
+#: catalog/models.py:136
 msgid "Active formats"
 msgstr "Formate aktivieren"
 
-#: catalog/models.py:137 catalog/migrations/0001_initial.py:50
-#: core/models.py:152 core/migrations/0001_initial.py:36
+#: catalog/models.py:138 core/models.py:152
 msgid "Product rows"
 msgstr "Produktzeilen"
 
-#: catalog/models.py:138 catalog/migrations/0001_initial.py:51
-#: core/models.py:151 core/migrations/0001_initial.py:32
+#: catalog/models.py:139 core/models.py:151
 msgid "Product cols"
 msgstr "Produktspalten"
 
-#: catalog/models.py:139 catalog/migrations/0001_initial.py:52
-#: core/models.py:153 core/migrations/0001_initial.py:33
+#: catalog/models.py:140 core/models.py:153
 msgid "Category cols"
 msgstr "Kategoriespalten"
 
-#: catalog/models.py:141 catalog/models.py:509
+#: catalog/models.py:142 catalog/models.py:510
 msgid "Meta title"
 msgstr "Meta Title"
 
-#: catalog/models.py:142 catalog/models.py:510
-#: catalog/migrations/0001_initial.py:53 catalog/migrations/0001_initial.py:86
+#: catalog/models.py:143 catalog/models.py:511
 msgid "Meta keywords"
 msgstr "Meta Keywords"
 
-#: catalog/models.py:143 catalog/models.py:511
-#: catalog/migrations/0001_initial.py:54 catalog/migrations/0001_initial.py:87
+#: catalog/models.py:144 catalog/models.py:512
 msgid "Meta description"
 msgstr "Meta Description"
 
-#: catalog/models.py:499 catalog/migrations/0001_initial.py:81
-#: templates/manage/category/products_inline.html:45
+#: catalog/models.py:500 templates/manage/category/products_inline.html:45
 #: templates/manage/category/selected_products.html:45
 #: templates/manage/marketing/topseller_inline.html:40
 #: templates/manage/marketing/topseller_inline.html:125
 #: templates/manage/product/products_inline.html:21
 #: templates/manage/product/related_products_inline.html:41
 #: templates/manage/product/related_products_inline.html:123
-#: templates/manage/product/variants.html:155
+#: templates/manage/product/variants.html:156
 msgid "SKU"
 msgstr "Artikelnummer"
 
-#: catalog/models.py:500 catalog/models.py:501 catalog/models.py:1483
-#: catalog/models.py:1624 catalog/migrations/0001_initial.py:82
-#: catalog/migrations/0001_initial.py:83
-#: catalog/migrations/0001_initial.py:136
-#: criteria/migrations/0001_initial.py:61 criteria/models/criteria.py:51
-#: order/models.py:49 order/migrations/0001_initial.py:54 payment/models.py:81
-#: payment/models.py:121 payment/migrations/0001_initial.py:20
-#: payment/migrations/0001_initial.py:29 shipping/models.py:60
-#: shipping/models.py:106 shipping/migrations/0001_initial.py:14
-#: shipping/migrations/0001_initial.py:30
-#: templates/manage/cart/cart_inline.html:141
+#: catalog/models.py:501 catalog/models.py:502 catalog/models.py:1487
+#: catalog/models.py:1628 criteria/models/criteria.py:51 order/models.py:48
+#: payment/models.py:81 payment/models.py:121 shipping/models.py:60
+#: shipping/models.py:106 templates/manage/cart/cart_inline.html:141
 #: templates/manage/category/products_inline.html:51
 #: templates/manage/category/selected_products.html:51
-#: templates/manage/criteria/combinedlengthandgirth_criterion.html:12
-#: templates/manage/criteria/country_criterion.html:13
-#: templates/manage/criteria/distance_criterion.html:13
-#: templates/manage/criteria/height_criterion.html:13
-#: templates/manage/criteria/length_criterion.html:13
-#: templates/manage/criteria/payment_method_criterion.html:13
-#: templates/manage/criteria/price_criterion.html:12
-#: templates/manage/criteria/shipping_method_criterion.html:13
+#: templates/manage/criteria/combinedlengthandgirth_criterion.html:14
+#: templates/manage/criteria/country_criterion.html:14
+#: templates/manage/criteria/distance_criterion.html:14
+#: templates/manage/criteria/height_criterion.html:14
+#: templates/manage/criteria/length_criterion.html:12
+#: templates/manage/criteria/payment_method_criterion.html:14
+#: templates/manage/criteria/price_criterion.html:14
+#: templates/manage/criteria/shipping_method_criterion.html:14
 #: templates/manage/criteria/user_criterion.html:14
-#: templates/manage/criteria/weight_criterion.html:13
-#: templates/manage/criteria/width_criterion.html:12
+#: templates/manage/criteria/weight_criterion.html:14
+#: templates/manage/criteria/width_criterion.html:14
 #: templates/manage/customer/customer_inline.html:136
 #: templates/manage/customer/customer_inline.html:181
 #: templates/manage/marketing/rating_mails.html:51
 #: templates/manage/product/products_inline.html:36
 #: templates/manage/product/related_products_inline.html:50
 #: templates/manage/product/related_products_inline.html:132
-#: templates/manage/product/variants.html:97
-#: templates/manage/product/variants.html:166
+#: templates/manage/product/variants.html:98
+#: templates/manage/product/variants.html:167
 #: templates/manage/properties/pg_products_inline.html:44
 #: templates/manage/properties/pg_products_inline.html:94
 #: templates/manage/shipping/shipping_method_prices.html:24
 msgid "Price"
 msgstr "Preis"
 
-#: catalog/models.py:506 templates/manage/product/images.html:18
+#: catalog/models.py:507 templates/manage/product/images.html:18
 #: templates/manage/product/product.html:78
 msgid "Images"
 msgstr "Bilder"
 
-#: catalog/models.py:513
+#: catalog/models.py:514
 msgid "Related products"
 msgstr "Zugehörige Produkte"
 
-#: catalog/models.py:516
+#: catalog/models.py:517
 msgid "Acessories"
 msgstr "Zubehör"
 
-#: catalog/models.py:520 catalog/migrations/0001_initial.py:88
+#: catalog/models.py:521
 #: templates/manage/product/product_filters_inline.html:17
 msgid "For sale"
 msgstr "Im Angebot"
 
-#: catalog/models.py:521 catalog/migrations/0001_initial.py:89
+#: catalog/models.py:522
 msgid "For sale price"
 msgstr "Angebotspreis"
 
-#: catalog/models.py:522 catalog/migrations/0001_initial.py:90
-#: core/models.py:71 core/migrations/0001_initial.py:15 marketing/models.py:32
-#: page/models.py:17 page/migrations/0001_initial.py:16 payment/models.py:75
-#: payment/models.py:123 payment/migrations/0001_initial.py:14
-#: payment/migrations/0001_initial.py:31 shipping/models.py:58
-#: shipping/models.py:111 shipping/migrations/0001_initial.py:16
-#: shipping/migrations/0001_initial.py:28
+#: catalog/models.py:523 core/models.py:71 marketing/models.py:32
+#: page/models.py:17 payment/models.py:75 payment/models.py:123
+#: shipping/models.py:58 shipping/models.py:111
 #: templates/manage/category/products_inline.html:42
 #: templates/manage/category/selected_products.html:42
 #: templates/manage/marketing/topseller_inline.html:43
 #: templates/manage/product/products_inline.html:24
 #: templates/manage/product/related_products_inline.html:44
 #: templates/manage/product/related_products_inline.html:126
-#: templates/manage/product/variants.html:149
+#: templates/manage/product/variants.html:150
 #: templates/manage/reviews/review_inline.html:13
 #: templates/manage/reviews/review_inline.html:52
 #: templates/manage/reviews/review_inline.html:83
 msgid "Active"
 msgstr "Aktiv"
 
-#: catalog/models.py:526 catalog/migrations/0001_initial.py:92
+#: catalog/models.py:527
 msgid "Deliverable"
 msgstr "Lieferbar"
 
-#: catalog/models.py:527 catalog/migrations/0001_initial.py:93
+#: catalog/models.py:528
 msgid "Manual delivery time"
 msgstr "Manuelle Lieferzeit"
 
-#: catalog/models.py:528 catalog/migrations/0001_initial.py:94
-#: shipping/models.py:61 shipping/migrations/0001_initial.py:31
+#: catalog/models.py:529 shipping/models.py:61
 msgid "Delivery time"
 msgstr "Lieferzeit"
 
-#: catalog/models.py:529 catalog/migrations/0001_initial.py:95
+#: catalog/models.py:530
 msgid "Order time"
 msgstr "Dauer Bestellung"
 
-#: catalog/models.py:530 catalog/migrations/0001_initial.py:96
+#: catalog/models.py:531
 msgid "Ordered at"
 msgstr "Bestellt am"
 
-#: catalog/models.py:531 catalog/migrations/0001_initial.py:97
+#: catalog/models.py:532
 msgid "Manage stock amount"
 msgstr "Verwaltung des Lagerbestandes"
 
-#: catalog/models.py:532 catalog/migrations/0001_initial.py:98
-#: catalog/migrations/0002_changed_stock_amount.py:11
-#: catalog/migrations/0002_changed_stock_amount.py:18
+#: catalog/models.py:533
 msgid "Stock amount"
 msgstr "Lagerbestand"
 
-#: catalog/models.py:534
+#: catalog/models.py:535
 msgid "Active packing unit"
 msgstr "Verpackungseinheit aktivieren"
 
-#: catalog/models.py:535
+#: catalog/models.py:536
 msgid "Packing unit"
 msgstr "Verpackungseinheit"
 
-#: catalog/models.py:536 catalog/models.py:1476 catalog/models.py:1804
-#: catalog/migrations/0001_initial.py:126
-#: catalog/migrations/0001_initial.py:175
+#: catalog/models.py:537 catalog/models.py:1480 catalog/models.py:1808
 msgid "Unit"
 msgstr "Einheit"
 
-#: catalog/models.py:541 catalog/migrations/0001_initial.py:99
-#: criteria/migrations/0001_initial.py:14 criteria/models/criteria.py:600
+#: catalog/models.py:542 criteria/models/criteria.py:600
 #: criteria/models/criteria.py:618
 #: templates/manage/criteria/combinedlengthandgirth_criterion.html:17
-#: templates/manage/criteria/country_criterion.html:18
-#: templates/manage/criteria/distance_criterion.html:18
-#: templates/manage/criteria/height_criterion.html:18
-#: templates/manage/criteria/length_criterion.html:18
-#: templates/manage/criteria/payment_method_criterion.html:18
-#: templates/manage/criteria/price_criterion.html:17
-#: templates/manage/criteria/shipping_method_criterion.html:18
-#: templates/manage/criteria/user_criterion.html:19
-#: templates/manage/criteria/weight_criterion.html:18
-#: templates/manage/criteria/width_criterion.html:17
-msgid "Weight"
-msgstr "Gewicht"
-
-#: catalog/models.py:542 catalog/migrations/0001_initial.py:100
-#: criteria/migrations/0001_initial.py:28 criteria/models/criteria.py:253
-#: criteria/models/criteria.py:271 criteria/models/criteria.py:680
-#: templates/manage/criteria/combinedlengthandgirth_criterion.html:13
-#: templates/manage/criteria/country_criterion.html:14
-#: templates/manage/criteria/distance_criterion.html:14
-#: templates/manage/criteria/height_criterion.html:14
-#: templates/manage/criteria/length_criterion.html:14
-#: templates/manage/criteria/payment_method_criterion.html:14
-#: templates/manage/criteria/price_criterion.html:13
-#: templates/manage/criteria/shipping_method_criterion.html:14
-#: templates/manage/criteria/user_criterion.html:15
-#: templates/manage/criteria/weight_criterion.html:14
-#: templates/manage/criteria/width_criterion.html:13
-msgid "Height"
-msgstr "Höhe"
-
-#: catalog/models.py:543 catalog/migrations/0001_initial.py:101
-#: criteria/migrations/0001_initial.py:53 criteria/models/criteria.py:314
-#: criteria/models/criteria.py:332
-#: templates/manage/criteria/combinedlengthandgirth_criterion.html:14
-#: templates/manage/criteria/country_criterion.html:15
-#: templates/manage/criteria/distance_criterion.html:15
-#: templates/manage/criteria/height_criterion.html:15
-#: templates/manage/criteria/length_criterion.html:15
-#: templates/manage/criteria/payment_method_criterion.html:15
-#: templates/manage/criteria/price_criterion.html:14
-#: templates/manage/criteria/shipping_method_criterion.html:15
-#: templates/manage/criteria/user_criterion.html:16
-#: templates/manage/criteria/weight_criterion.html:15
-#: templates/manage/criteria/width_criterion.html:14
-msgid "Length"
-msgstr "Länge"
-
-#: catalog/models.py:544 catalog/migrations/0001_initial.py:102
-#: criteria/migrations/0001_initial.py:69
-#: criteria/migrations/0002_add_girth_criterion.py:14
-#: criteria/models/criteria.py:111 criteria/models/criteria.py:662
-#: templates/manage/criteria/combinedlengthandgirth_criterion.html:16
 #: templates/manage/criteria/country_criterion.html:17
 #: templates/manage/criteria/distance_criterion.html:17
 #: templates/manage/criteria/height_criterion.html:17
 #: templates/manage/criteria/length_criterion.html:17
 #: templates/manage/criteria/payment_method_criterion.html:17
+#: templates/manage/criteria/price_criterion.html:17
+#: templates/manage/criteria/shipping_method_criterion.html:17
+#: templates/manage/criteria/user_criterion.html:17
+#: templates/manage/criteria/weight_criterion.html:17
+#: templates/manage/criteria/width_criterion.html:17
+msgid "Weight"
+msgstr "Gewicht"
+
+#: catalog/models.py:543 criteria/models/criteria.py:253
+#: criteria/models/criteria.py:271 criteria/models/criteria.py:680
+#: templates/manage/criteria/combinedlengthandgirth_criterion.html:11
+#: templates/manage/criteria/country_criterion.html:11
+#: templates/manage/criteria/distance_criterion.html:11
+#: templates/manage/criteria/height_criterion.html:11
+#: templates/manage/criteria/length_criterion.html:13
+#: templates/manage/criteria/payment_method_criterion.html:11
+#: templates/manage/criteria/price_criterion.html:11
+#: templates/manage/criteria/shipping_method_criterion.html:11
+#: templates/manage/criteria/user_criterion.html:11
+#: templates/manage/criteria/weight_criterion.html:11
+#: templates/manage/criteria/width_criterion.html:11
+msgid "Height"
+msgstr "Höhe"
+
+#: catalog/models.py:544 criteria/models/criteria.py:314
+#: criteria/models/criteria.py:332
+#: templates/manage/criteria/combinedlengthandgirth_criterion.html:12
+#: templates/manage/criteria/country_criterion.html:12
+#: templates/manage/criteria/distance_criterion.html:12
+#: templates/manage/criteria/height_criterion.html:12
+#: templates/manage/criteria/length_criterion.html:14
+#: templates/manage/criteria/payment_method_criterion.html:12
+#: templates/manage/criteria/price_criterion.html:12
+#: templates/manage/criteria/shipping_method_criterion.html:12
+#: templates/manage/criteria/user_criterion.html:12
+#: templates/manage/criteria/weight_criterion.html:12
+#: templates/manage/criteria/width_criterion.html:12
+msgid "Length"
+msgstr "Länge"
+
+#: catalog/models.py:545 criteria/models/criteria.py:111
+#: criteria/models/criteria.py:662
+#: templates/manage/criteria/combinedlengthandgirth_criterion.html:16
+#: templates/manage/criteria/country_criterion.html:16
+#: templates/manage/criteria/distance_criterion.html:16
+#: templates/manage/criteria/height_criterion.html:16
+#: templates/manage/criteria/length_criterion.html:16
+#: templates/manage/criteria/payment_method_criterion.html:16
 #: templates/manage/criteria/price_criterion.html:16
-#: templates/manage/criteria/shipping_method_criterion.html:17
-#: templates/manage/criteria/user_criterion.html:18
-#: templates/manage/criteria/weight_criterion.html:17
+#: templates/manage/criteria/shipping_method_criterion.html:16
+#: templates/manage/criteria/user_criterion.html:16
+#: templates/manage/criteria/weight_criterion.html:16
 #: templates/manage/criteria/width_criterion.html:16
 msgid "Width"
 msgstr "Breite"
 
-#: catalog/models.py:547 catalog/migrations/0001_initial.py:103
-#: discounts/models.py:44 manage/views/voucher.py:48 order/models.py:50
-#: order/models.py:127 order/migrations/0001_initial.py:15
-#: order/migrations/0001_initial.py:53 payment/models.py:80
-#: payment/migrations/0001_initial.py:19 shipping/models.py:59
-#: shipping/migrations/0001_initial.py:29 templates/manage/tax/tax.html:35
+#: catalog/models.py:548 discounts/models.py:44 manage/views/voucher.py:48
+#: order/models.py:49 order/models.py:126 payment/models.py:80
+#: shipping/models.py:59 templates/manage/tax/tax.html:35
 #: templates/manage/tax/tax.html.py:39
 #: templates/manage/voucher/vouchers_inline.html:73 voucher/models.py:96
 msgid "Tax"
 msgstr "Mehrwertsteuer"
 
-#: catalog/models.py:548 catalog/migrations/0001_initial.py:104
+#: catalog/models.py:549
 msgid "Subtype"
 msgstr "Produktart"
 
-#: catalog/models.py:552 catalog/migrations/0001_initial.py:105
-#: templates/manage/product/variants.html:221
+#: catalog/models.py:553 templates/manage/product/variants.html:222
 msgid "Default variant"
 msgstr "Variante bearbeiten"
 
-#: catalog/models.py:553 catalog/migrations/0001_initial.py:106
+#: catalog/models.py:554
 msgid "Variants display type"
 msgstr "Ansichtsart für Varianten ändern"
 
-#: catalog/models.py:559 catalog/migrations/0001_initial.py:108
+#: catalog/models.py:560
 msgid "Active name"
 msgstr "Name aktivieren"
 
-#: catalog/models.py:560 catalog/migrations/0001_initial.py:109
+#: catalog/models.py:561
 msgid "Active SKU"
 msgstr "SKU aktivieren"
 
-#: catalog/models.py:561 catalog/migrations/0001_initial.py:110
+#: catalog/models.py:562
 msgid "Active short description"
 msgstr "Beschreibung aktivieren"
 
-#: catalog/models.py:562
+#: catalog/models.py:563
 msgid "Active static bock"
 msgstr "Statischer Block aktivieren"
 
-#: catalog/models.py:563 catalog/migrations/0001_initial.py:111
+#: catalog/models.py:564
 msgid "Active description"
 msgstr "Beschreibung aktivieren"
 
-#: catalog/models.py:564
+#: catalog/models.py:565
 msgid "Active price"
 msgstr "Preis aktivieren"
 
-#: catalog/models.py:565 catalog/migrations/0003_add_for_sale_attributes.py:11
+#: catalog/models.py:566
 msgid "Active for sale"
 msgstr "Im Angebot aktivieren"
 
-#: catalog/models.py:566 catalog/migrations/0003_add_for_sale_attributes.py:14
+#: catalog/models.py:567
 msgid "Active for sale price"
 msgstr "Angebotspreis aktivieren"
 
-#: catalog/models.py:567 catalog/migrations/0001_initial.py:113
+#: catalog/models.py:568
 msgid "Active Images"
 msgstr "Bilder aktivieren"
 
-#: catalog/models.py:568 catalog/migrations/0001_initial.py:114
-#: templates/manage/product/related_products.html:12
+#: catalog/models.py:569 templates/manage/product/related_products.html:12
 msgid "Active related products"
 msgstr "Zugehörige Produkte aktivieren"
 
-#: catalog/models.py:569 catalog/migrations/0001_initial.py:115
-#: templates/manage/product/accessories.html:12
+#: catalog/models.py:570 templates/manage/product/accessories.html:12
 #: templates/manage/properties/pg_products.html:12
 msgid "Active accessories"
 msgstr "Zubehör aktivieren"
 
-#: catalog/models.py:570
+#: catalog/models.py:571
 msgid "Active meta title"
 msgstr "Meta Title aktivieren"
 
-#: catalog/models.py:571 catalog/migrations/0001_initial.py:116
+#: catalog/models.py:572
 msgid "Active meta description"
 msgstr "Beschreibung"
 
-#: catalog/models.py:572 catalog/migrations/0001_initial.py:117
+#: catalog/models.py:573
 msgid "Active meta keywords"
 msgstr "Zugewiesene Bilder"
 
-#: catalog/models.py:573
+#: catalog/models.py:574
 msgid "Active dimensions"
 msgstr "Abmessungen aktivieren"
 
-#: catalog/models.py:574
+#: catalog/models.py:575
 msgid "Product template"
 msgstr "Produkt-Template"
 
-#: catalog/models.py:577
+#: catalog/models.py:578
 msgid "Active price calculation"
 msgstr "Preisberechnung aktivieren"
 
-#: catalog/models.py:578
+#: catalog/models.py:579
 msgid "Price Calculation"
 msgstr "Preisberechnung"
 
-#: catalog/models.py:1348
+#: catalog/models.py:1352
 msgid "Accessory"
 msgstr "Zubehör"
 
-#: catalog/models.py:1473 catalog/models.py:1574
-#: catalog/migrations/0001_initial.py:164 core/models.py:68
+#: catalog/models.py:1476 catalog/models.py:1713 core/models.py:69
+#: page/models.py:13 templates/manage/portlets/portlets_inline.html:84
+#: templates/manage/product/images.html:35
+#: templates/manage/static_block/files.html:16
+msgid "Title"
+msgstr "Titel"
+
+#: catalog/models.py:1477 catalog/models.py:1578 core/models.py:68
 msgid "Group"
 msgstr "Gruppe"
 
-#: catalog/models.py:1477 catalog/migrations/0001_initial.py:176
+#: catalog/models.py:1481
 msgid "Display on product"
 msgstr "Am Produkt anzeigen"
 
-#: catalog/models.py:1480 catalog/migrations/0001_initial.py:179
+#: catalog/models.py:1484
 msgid "Display no results"
 msgstr "Keine Ergebnisse anzeigen"
 
-#: catalog/models.py:1482 catalog/models.py:1665
-#: catalog/migrations/0001_initial.py:180 customer/models.py:100
-#: customer/migrations/0001_initial.py:17 discounts/models.py:43
-#: templates/manage/portlets/portlets_inline.html:81
+#: catalog/models.py:1486 catalog/models.py:1669 customer/models.py:100
+#: discounts/models.py:43 templates/manage/portlets/portlets_inline.html:81
 #: templates/manage/voucher/vouchers_inline.html:67
 msgid "Type"
 msgstr "Typ"
 
-#: catalog/models.py:1484
+#: catalog/models.py:1488
 msgid "Display price"
 msgstr "Price anzeigen"
 
-#: catalog/models.py:1485
+#: catalog/models.py:1489
 #: templates/manage/payment/payment_method_prices.html:8
 #: templates/manage/shipping/shipping_method_prices.html:8
 msgid "Add price"
 msgstr "Preis hinzufügen"
 
-#: catalog/models.py:1488 catalog/models.py:1802
-#: catalog/migrations/0001_initial.py:124
+#: catalog/models.py:1492 catalog/models.py:1806
 msgid "Min"
 msgstr "Min"
 
-#: catalog/models.py:1489 catalog/models.py:1803
-#: catalog/migrations/0001_initial.py:125
+#: catalog/models.py:1493 catalog/models.py:1807
 msgid "Max"
 msgstr "Max"
 
-#: catalog/models.py:1490 catalog/models.py:1496
-#: catalog/migrations/0001_initial.py:182
+#: catalog/models.py:1494 catalog/models.py:1500
 msgid "Step"
 msgstr "Schritt"
 
-#: catalog/models.py:1491
+#: catalog/models.py:1495
 msgid "Decimal places"
 msgstr "Dezimalstellen"
 
-#: catalog/models.py:1495 catalog/migrations/0001_initial.py:181
-#: templates/manage/properties/step_inline.html:3
+#: catalog/models.py:1499 templates/manage/properties/step_inline.html:3
 msgid "Step type"
 msgstr "Schritttyp"
 
-#: catalog/models.py:1501 templates/manage/manage_base.html:98
+#: catalog/models.py:1505 templates/manage/manage_base.html:98
 #: templates/manage/manage_base.html:100
 #: templates/manage/product/product.html:91
 #: templates/manage/properties/add_property.html:6
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: catalog/models.py:1663 discounts/models.py:42 manage/views/voucher.py:43
+#: catalog/models.py:1667 discounts/models.py:42 manage/views/voucher.py:43
 #: templates/manage/voucher/vouchers_inline.html:70
 msgid "Value"
 msgstr "Wert"
 
-#: catalog/models.py:1664
+#: catalog/models.py:1668
 msgid "Value as float"
 msgstr "Wert als Dezimalzahl"
 
-#: catalog/models.py:1705 catalog/models.py:1746
-#: catalog/migrations/0001_initial.py:153
-#: criteria/migrations/0001_initial.py:35
+#: catalog/models.py:1709 catalog/models.py:1750
 #: criteria/models/criteria_objects.py:19
 msgid "Content type"
 msgstr "Inhaltstyp"
 
-#: catalog/models.py:1706 catalog/models.py:1747
-#: catalog/migrations/0001_initial.py:154
-#: criteria/migrations/0001_initial.py:34
-#: criteria/migrations/0001_initial.py:37
+#: catalog/models.py:1710 catalog/models.py:1751
 #: criteria/models/criteria_objects.py:16
 #: criteria/models/criteria_objects.py:20
 msgid "Content id"
 msgstr "Inhalts ID"
 
-#: catalog/models.py:1781
+#: catalog/models.py:1785
 msgid "Display files"
 msgstr "Dateien anzeigen"
 
-#: catalog/models.py:1782 catalog/migrations/0001_initial.py:25
-#: templates/manage/manage_base.html:105
+#: catalog/models.py:1786 templates/manage/manage_base.html:105
 msgid "HTML"
 msgstr "HTML"
 
-#: catalog/models.py:1783 templates/manage/static_block/files.html:2
+#: catalog/models.py:1787 templates/manage/static_block/files.html:2
 #: templates/manage/static_block/static_block.html:37
 msgid "Files"
 msgstr "Dateien"
 msgid "Select"
 msgstr "Auswahlbox"
 
-#: catalog/settings.py:50 portlet/templatetags/lfs_portlets_tags.py:93
+#: catalog/settings.py:50 portlet/templatetags/lfs_portlets_tags.py:100
 #: templates/manage/manage_base.html:94
 #: templates/manage/product/categories.html:3
 #: templates/manage/product/product.html:75
 msgid "month"
 msgstr "Monat"
 
-#: catalog/settings.py:81
+#: catalog/settings.py:82
 msgid "Float field"
 msgstr "Dezimalfeld"
 
-#: catalog/settings.py:82
+#: catalog/settings.py:83
 msgid "Text field"
 msgstr "Textfeld"
 
-#: catalog/settings.py:83
+#: catalog/settings.py:84
 msgid "Select field"
 msgstr "Auswahlfeld"
 
-#: catalog/settings.py:91
+#: catalog/settings.py:92
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: catalog/settings.py:92
+#: catalog/settings.py:93
 msgid "Fixed step"
 msgstr "Feste Schritte"
 
-#: catalog/settings.py:93
+#: catalog/settings.py:94
 msgid "Manual steps"
 msgstr "Manuelle Schritte"
 
-#: catalog/settings.py:106
+#: catalog/settings.py:107
 msgid "Category with products"
 msgstr "Kategorie mit Produkten"
 
-#: catalog/settings.py:110
+#: catalog/settings.py:111
 msgid "Category with subcategories"
 msgstr "Kategorie mit Unterkategorien"
 
-#: catalog/settings.py:118
+#: catalog/settings.py:119
 msgid "Default template"
 msgstr "Standard-Schablone"
 
 msgid "Price has been changed according to your selection."
 msgstr "Der Preis wurde gemäß Ihrer Auswahl geändert."
 
-#: catalog/views.py:144 catalog/views.py:583
+#: catalog/views.py:144 catalog/views.py:587
 msgid "The choosen combination of properties is not deliverable."
 msgstr "Die gewählte Kombination von Eigenschaften ist nicht lieferbar"
 
-#: catalog/migrations/0001_initial.py:48
-msgid "Content"
-msgstr "Inhalt"
-
-#: catalog/migrations/0001_initial.py:62
-msgid "Acessory"
-msgstr "Zubehör"
-
-#: catalog/migrations/0001_initial.py:112
-msgid "Active Price"
-msgstr " Bilder"
-
 #: checkout/forms.py:17 checkout/forms.py:27 customer/models.py:68
-#: customer/migrations/0001_initial.py:37
 #: templates/manage/customer/customers_inline.html:100
 msgid "Firstname"
 msgstr "Vorname"
 
 #: checkout/forms.py:18 checkout/forms.py:28 customer/models.py:69
-#: customer/migrations/0001_initial.py:38
 #: templates/manage/customer/customers_inline.html:94
 msgid "Lastname"
 msgstr "Nachname"
 
 #: checkout/forms.py:19 checkout/forms.py:29 customer/models.py:70
-#: customer/migrations/0003_add_company_name.py:11
 msgid "Company name"
 msgstr "Firmenname"
 
 #: checkout/forms.py:20 checkout/forms.py:30 customer/models.py:71
-#: customer/migrations/0001_initial.py:41
 msgid "Street"
 msgstr "Straße"
 
 msgstr "PLZ"
 
 #: checkout/forms.py:22 checkout/forms.py:32 customer/models.py:73
-#: customer/migrations/0001_initial.py:36
 msgid "City"
 msgstr "Stadt"
 
 #: checkout/forms.py:23 checkout/forms.py:33 criteria/models/criteria.py:205
-#: customer/models.py:75 customer/migrations/0001_initial.py:42
+#: customer/models.py:75
 #: templates/manage/criteria/combinedlengthandgirth_criterion.html:8
+#: templates/manage/criteria/country_criterion.html:8
+#: templates/manage/criteria/distance_criterion.html:8
+#: templates/manage/criteria/height_criterion.html:8
+#: templates/manage/criteria/length_criterion.html:8
+#: templates/manage/criteria/payment_method_criterion.html:8
+#: templates/manage/criteria/price_criterion.html:8
+#: templates/manage/criteria/shipping_method_criterion.html:8
+#: templates/manage/criteria/user_criterion.html:8
+#: templates/manage/criteria/weight_criterion.html:8
+#: templates/manage/criteria/width_criterion.html:8
+msgid "Country"
+msgstr "Land"
+
+#: checkout/forms.py:24 checkout/forms.py:34 customer/models.py:76
+#: templates/manage/order/order_inline.html:147
+msgid "Phone"
+msgstr "Telefon"
+
+#: checkout/forms.py:25 customer/forms.py:28 customer/forms.py:33
+#: templates/manage/order/order_inline.html:131
+msgid "E-mail"
+msgstr "E-Mail"
+
+#: checkout/forms.py:36
+msgid "Account Number"
+msgstr "Kontonnummer"
+
+#: checkout/forms.py:37
+msgid "Bank Indentification Code"
+msgstr "Bankleitzahl"
+
+#: checkout/forms.py:38
+msgid "Bankname"
+msgstr "Name der Bank"
+
+#: checkout/forms.py:39 customer/models.py:90 order/models.py:86
+msgid "Depositor"
+msgstr "Kontoinhaber"
+
+#: checkout/forms.py:43
+msgid "Credit Card Type"
+msgstr "Kartentyp"
+
+#: checkout/forms.py:44
+msgid "Credit Card Owner"
+msgstr "Kartenbesitzer"
+
+#: checkout/forms.py:45
+msgid "Credit Card Number"
+msgstr "Kartennummer"
+
+#: checkout/forms.py:46
+msgid "Expiration Date Month"
+msgstr "Ablaufdatum Monat"
+
+#: checkout/forms.py:47
+msgid "Expiration Date Year"
+msgstr "Ablaufdatum Jahr"
+
+#: checkout/forms.py:48
+msgid "Verification Number"
+msgstr "Prüfnummer"
+
+#: checkout/forms.py:50
+msgid "Same as invoice"
+msgstr "Wie Rechnungsadresse"
+
+#: checkout/forms.py:51
+msgid "Your message to us"
+msgstr "Ihre Nachricht an uns"
+
+#: checkout/forms.py:67
+msgid "This field is required."
+msgstr "Dieses Feld ist erforderlich."
+
+#: checkout/settings.py:7
+msgid "Anonymous and Authenticated"
+msgstr "Anonym und authentifiziert"
+
+#: checkout/settings.py:8
+msgid "Anonymous only"
+msgstr "Nur anonym"
+
+#: checkout/settings.py:9
+msgid "Authenticated only"
+msgstr "Nur authentifiziert"
+
+#: checkout/views.py:56 customer/models.py:77 customer/views.py:42
+#: templates/manage/customer/customers_inline.html:106
+#: templates/manage/marketing/rating_mails.html:42
+#: templates/manage/reviews/review_inline.html:116
+#: templates/manage/reviews/reviews_inline.html:113
+msgid "E-Mail"
+msgstr "E-Mail"
+
+#: checkout/views.py:66 customer/views.py:58
+msgid "You have been logged in."
+msgstr "Sie sind nun angemeldet."
+
+#: checkout/views.py:89 customer/views.py:90
+msgid "You have been registered and logged in."
+msgstr "Sie sind nun registriert und angemeldet."
+
+#: checkout/views.py:199
+msgid "Please confirm our terms and conditions"
+msgstr "Bitte bestätigen Sie unsere AGB."
+
+#: checkout/views.py:425
+msgid "An error has been occured."
+msgstr "Es ist ein Fehler aufgetreten."
+
+#: core/models.py:18
+msgid "Country code"
+msgstr "Ländercode"
+
+#: core/models.py:70
+msgid "Link"
+msgstr "Link"
+
+#: core/models.py:143
+msgid "Shop owner"
+msgstr "Shopbetreiber"
+
+#: core/models.py:144
+msgid "From e-mail address"
+msgstr "E-Mail-Adresse Absender"
+
+#: core/models.py:145
+msgid "Notification email addresses"
+msgstr "E-Mail-Adressen Benachrichtigungen"
+
+#: core/models.py:154
+msgid "Google Analytics ID"
+msgstr "Google Analytics ID"
+
+#: core/models.py:155
+msgid "Google Analytics Site Tracking"
+msgstr "Google Analytics Site Tracking"
+
+#: core/models.py:156
+msgid "Google Analytics E-Commerce Tracking"
+msgstr "Google Analytics E-Commerce Tracking"
+
+#: core/models.py:158 criteria/models/criteria.py:183
+#: templates/manage/shop/default_values.html:64
+msgid "Countries"
+msgstr "Länder"
+
+#: core/models.py:159
+msgid "Default country"
+msgstr "Standardland"
+
+#: core/models.py:160
+msgid "Default Currency"
+msgstr "Standardwährung"
+
+#: core/models.py:162
+msgid "Checkout type"
+msgstr "Checkouttyp"
+
+#: core/settings.py:7
+msgid "Tabs"
+msgstr "Tabs"
+
+#: core/settings.py:8
+msgid "Footer"
+msgstr "Fußzeile"
+
+#: core/templatetags/lfs_tags.py:153
+#: portlet/templatetags/lfs_portlets_tags.py:114
+msgid "Information"
+msgstr "Information"
+
+#: core/templatetags/lfs_tags.py:297
+#, python-format
+msgid "%s tag needs group id as argument"
+msgstr ""
+
+#: core/templatetags/lfs_tags.py:395 core/templatetags/lfs_tags.py:424
+#, python-format
+msgid "%s tag needs no argument"
+msgstr ""
+
+#: core/templatetags/lfs_tags.py:447
+#, python-format
+msgid "%s tag needs product as argument"
+msgstr ""
+
+#: criteria/settings.py:16 criteria/settings.py:24
+msgid "Equal to"
+msgstr "Gleich wie"
+
+#: criteria/settings.py:17 templates/manage/criteria/number_operators.html:4
+msgid "Less than"
+msgstr "Weniger als"
+
+#: criteria/settings.py:18
+msgid "Less than or equal to"
+msgstr "Weniger als oder gleich wie"
+
+#: criteria/settings.py:19 templates/manage/criteria/number_operators.html:6
+msgid "Greater than"
+msgstr "Größer als"
+
+#: criteria/settings.py:20
+msgid "Greater than or equal to"
+msgstr "Größer als oder gleich wie"
+
+#: criteria/settings.py:25
+msgid "Contain"
+msgstr "Beinhaltet"
+
+#: criteria/settings.py:29
+msgid "Is"
+msgstr "Ist"
+
+#: criteria/settings.py:30
+msgid "Is not"
+msgstr "Ist nicht"
+
+#: criteria/settings.py:31
+#: templates/manage/criteria/selection_operators.html:5
+msgid "Is valid"
+msgstr "Ist gültig"
+
+#: criteria/settings.py:32
+#: templates/manage/criteria/selection_operators.html:6
+msgid "Is not valid"
+msgstr "Ist nicht gültig"
+
+#: criteria/models/criteria.py:50 criteria/models/criteria.py:110
+#: criteria/models/criteria.py:182 criteria/models/criteria.py:313
+#: criteria/models/criteria.py:375 criteria/models/criteria.py:468
+#: criteria/models/criteria.py:599 criteria/models/criteria.py:661
+#: criteria/models/criteria.py:723
+msgid "Operator"
+msgstr "Operator"
+
+#: criteria/models/criteria.py:69
+msgid "Cart Price"
+msgstr "Preise Warenkorb"
+
+#: criteria/models/criteria.py:129
+#: templates/manage/criteria/combinedlengthandgirth_criterion.html:9
 #: templates/manage/criteria/country_criterion.html:9
 #: templates/manage/criteria/distance_criterion.html:9
 #: templates/manage/criteria/height_criterion.html:9
 #: templates/manage/criteria/payment_method_criterion.html:9
 #: templates/manage/criteria/price_criterion.html:9
 #: templates/manage/criteria/shipping_method_criterion.html:9
-#: templates/manage/criteria/user_criterion.html:10
+#: templates/manage/criteria/user_criterion.html:9
 #: templates/manage/criteria/weight_criterion.html:9
-#: templates/manage/criteria/width_criterion.html:8
-msgid "Country"
-msgstr "Land"
-
-#: checkout/forms.py:24 checkout/forms.py:34 customer/models.py:76
-#: customer/migrations/0001_initial.py:40
-#: templates/manage/order/order_inline.html:147
-msgid "Phone"
-msgstr "Telefon"
-
-#: checkout/forms.py:25 customer/forms.py:27 customer/forms.py:32
-#: templates/manage/order/order_inline.html:131
-msgid "E-mail"
-msgstr "E-Mail"
-
-#: checkout/forms.py:36
-msgid "Account Number"
-msgstr "Kontonnummer"
-
-#: checkout/forms.py:37
-msgid "Bank Indentification Code"
-msgstr "Bankleitzahl"
-
-#: checkout/forms.py:38
-msgid "Bankname"
-msgstr "Name der Bank"
-
-#: checkout/forms.py:39 customer/models.py:90
-#: customer/migrations/0001_initial.py:27 order/models.py:87
-#: order/migrations/0001_initial.py:35
-msgid "Depositor"
-msgstr "Kontoinhaber"
-
-#: checkout/forms.py:43
-msgid "Credit Card Type"
-msgstr "Kartentyp"
-
-#: checkout/forms.py:44
-msgid "Credit Card Owner"
-msgstr "Kartenbesitzer"
-
-#: checkout/forms.py:45
-msgid "Credit Card Number"
-msgstr "Kartennummer"
-
-#: checkout/forms.py:46
-msgid "Expiration Date Month"
-msgstr "Ablaufdatum Monat"
-
-#: checkout/forms.py:47
-msgid "Expiration Date Year"
-msgstr "Ablaufdatum Jahr"
-
-#: checkout/forms.py:48
-msgid "Verification Number"
-msgstr "Prüfnummer"
-
-#: checkout/forms.py:50
-msgid "Same as invoice"
-msgstr "Wie Rechnungsadresse"
-
-#: checkout/forms.py:51
-msgid "Your message to us"
-msgstr "Ihre Nachricht an uns"
-
-#: checkout/forms.py:67
-msgid "This field is required."
-msgstr "Dieses Feld ist erforderlich."
-
-#: checkout/settings.py:7
-msgid "Anonymous and Authenticated"
-msgstr "Anonym und authentifiziert"
-
-#: checkout/settings.py:8
-msgid "Anonymous only"
-msgstr "Nur anonym"
-
-#: checkout/settings.py:9
-msgid "Authenticated only"
-msgstr "Nur authentifiziert"
-
-#: checkout/views.py:56 customer/models.py:77 customer/views.py:42
-#: customer/migrations/0001_initial.py:39
-#: templates/manage/customer/customers_inline.html:106
-#: templates/manage/marketing/rating_mails.html:42
-#: templates/manage/reviews/review_inline.html:116
-#: templates/manage/reviews/reviews_inline.html:113
-msgid "E-Mail"
-msgstr "E-Mail"
-
-#: checkout/views.py:66 customer/views.py:58
-msgid "You have been logged in."
-msgstr "Sie sind nun angemeldet."
-
-#: checkout/views.py:89 customer/views.py:90
-msgid "You have been registered and logged in."
-msgstr "Sie sind nun registriert und angemeldet."
-
-#: checkout/views.py:199
-msgid "Please confirm our terms and conditions"
-msgstr "Bitte bestätigen Sie unsere AGB."
-
-#: checkout/views.py:421
-msgid "An error has been occured."
-msgstr "Es ist ein Fehler aufgetreten."
-
-#: core/models.py:18 core/migrations/0001_initial.py:45
-msgid "Country code"
-msgstr "Ländercode"
-
-#: core/models.py:70 core/migrations/0001_initial.py:18
-msgid "Link"
-msgstr "Link"
-
-#: core/models.py:143 core/migrations/0001_initial.py:35
-msgid "Shop owner"
-msgstr "Shopbetreiber"
-
-#: core/models.py:144 core/migrations/0001_initial.py:30
-msgid "From e-mail address"
-msgstr "E-Mail-Adresse Absender"
-
-#: core/models.py:145 core/migrations/0001_initial.py:34
-msgid "Notification email addresses"
-msgstr "E-Mail-Adressen Benachrichtigungen"
-
-#: core/models.py:154 core/migrations/0001_initial.py:25
-msgid "Google Analytics ID"
-msgstr "Google Analytics ID"
-
-#: core/models.py:155 core/migrations/0001_initial.py:38
-msgid "Google Analytics Site Tracking"
-msgstr "Google Analytics Site Tracking"
-
-#: core/models.py:156 core/migrations/0001_initial.py:27
-msgid "Google Analytics E-Commerce Tracking"
-msgstr "Google Analytics E-Commerce Tracking"
-
-#: core/models.py:158 criteria/models/criteria.py:183
-#: templates/manage/shop/default_values.html:64
-msgid "Countries"
-msgstr "Länder"
-
-#: core/models.py:159 core/migrations/0001_initial.py:31
-msgid "Default country"
-msgstr "Standardland"
-
-#: core/models.py:160 core/migrations/0002_add_default_currency.py:11
-msgid "Default Currency"
-msgstr "Standardwährung"
-
-#: core/models.py:162 core/migrations/0001_initial.py:29
-msgid "Checkout type"
-msgstr "Checkouttyp"
-
-#: core/settings.py:7
-msgid "Tabs"
-msgstr "Tabs"
-
-#: core/settings.py:8
-msgid "Footer"
-msgstr "Fußzeile"
-
-#: core/templatetags/lfs_tags.py:153
-#: portlet/templatetags/lfs_portlets_tags.py:107
-msgid "Information"
-msgstr "Information"
-
-#: core/templatetags/lfs_tags.py:297
-#, python-format
-msgid "%s tag needs group id as argument"
-msgstr ""
-
-#: core/templatetags/lfs_tags.py:395 core/templatetags/lfs_tags.py:424
-#, python-format
-msgid "%s tag needs no argument"
-msgstr ""
-
-#: core/templatetags/lfs_tags.py:447
-#, python-format
-msgid "%s tag needs product as argument"
-msgstr ""
-
-#: criteria/settings.py:16 criteria/settings.py:24
-msgid "Equal to"
-msgstr "Gleich wie"
-
-#: criteria/settings.py:17 templates/manage/criteria/number_operators.html:4
-msgid "Less than"
-msgstr "Weniger als"
-
-#: criteria/settings.py:18
-msgid "Less than or equal to"
-msgstr "Weniger als oder gleich wie"
-
-#: criteria/settings.py:19 templates/manage/criteria/number_operators.html:6
-msgid "Greater than"
-msgstr "Größer als"
-
-#: criteria/settings.py:20
-msgid "Greater than or equal to"
-msgstr "Größer als oder gleich wie"
-
-#: criteria/settings.py:25
-msgid "Contain"
-msgstr "Beinhaltet"
-
-#: criteria/settings.py:29
-msgid "Is"
-msgstr "Ist"
-
-#: criteria/settings.py:30
-msgid "Is not"
-msgstr "Ist nicht"
-
-#: criteria/settings.py:31
-#: templates/manage/criteria/selection_operators.html:5
-msgid "Is valid"
-msgstr "Ist gültig"
-
-#: criteria/settings.py:32
-#: templates/manage/criteria/selection_operators.html:6
-msgid "Is not valid"
-msgstr "Ist nicht gültig"
-
-#: criteria/migrations/0001_initial.py:12
-#: criteria/migrations/0001_initial.py:45
-#: criteria/migrations/0001_initial.py:52
-#: criteria/migrations/0001_initial.py:60
-#: criteria/migrations/0001_initial.py:68
-#: criteria/migrations/0002_add_girth_criterion.py:13
-#: criteria/migrations/0003_add_payment_method_criterion.py:13
-#: criteria/migrations/0004_add_shipping_method_criterion.py:13
-#: criteria/models/criteria.py:50 criteria/models/criteria.py:110
-#: criteria/models/criteria.py:182 criteria/models/criteria.py:313
-#: criteria/models/criteria.py:375 criteria/models/criteria.py:468
-#: criteria/models/criteria.py:599 criteria/models/criteria.py:661
-#: criteria/models/criteria.py:723
-msgid "Operator"
-msgstr "Operator"
-
-#: criteria/migrations/0001_initial.py:39
-#: criteria/models/criteria_objects.py:15
-msgid "Criterion type"
-msgstr "Typ Kriterium"
-
-#: criteria/models/criteria.py:69
-msgid "Cart Price"
-msgstr "Preise Warenkorb"
-
-#: criteria/models/criteria.py:129
-#: templates/manage/criteria/combinedlengthandgirth_criterion.html:9
+#: templates/manage/criteria/width_criterion.html:9
+msgid "Combined length and girth"
+msgstr "Gurtmaß"
+
+#: criteria/models/criteria.py:376
+#: templates/manage/payment/payment_methods.html:3
+msgid "Payment methods"
+msgstr "Zahlungsweisen"
+
+#: criteria/models/criteria.py:401 payment/models.py:120
+#: templates/manage/criteria/combinedlengthandgirth_criterion.html:13
+#: templates/manage/criteria/country_criterion.html:13
+#: templates/manage/criteria/distance_criterion.html:13
+#: templates/manage/criteria/height_criterion.html:13
+#: templates/manage/criteria/length_criterion.html:11
+#: templates/manage/criteria/payment_method_criterion.html:13
+#: templates/manage/criteria/price_criterion.html:13
+#: templates/manage/criteria/shipping_method_criterion.html:13
+#: templates/manage/criteria/user_criterion.html:13
+#: templates/manage/criteria/weight_criterion.html:13
+#: templates/manage/criteria/width_criterion.html:13
+#: templates/manage/order/order_inline.html:173
+msgid "Payment method"
+msgstr "Zahlungsweise"
+
+#: criteria/models/criteria.py:469
+#: templates/manage/shipping/shipping_methods.html:3
+msgid "Shipping methods"
+msgstr "Lieferarten"
+
+#: criteria/models/criteria.py:494
+#: templates/manage/criteria/combinedlengthandgirth_criterion.html:15
+#: templates/manage/criteria/country_criterion.html:15
+#: templates/manage/criteria/distance_criterion.html:15
+#: templates/manage/criteria/height_criterion.html:15
+#: templates/manage/criteria/length_criterion.html:15
+#: templates/manage/criteria/payment_method_criterion.html:15
+#: templates/manage/criteria/price_criterion.html:15
+#: templates/manage/criteria/shipping_method_criterion.html:15
+#: templates/manage/criteria/user_criterion.html:15
+#: templates/manage/criteria/weight_criterion.html:15
+#: templates/manage/criteria/width_criterion.html:15
+#: templates/manage/order/order_inline.html:170
+msgid "Shipping method"
+msgstr "Lieferart"
+
+#: criteria/models/criteria.py:724 criteria/models/criteria.py:743
+#: templates/manage/criteria/combinedlengthandgirth_criterion.html:10
 #: templates/manage/criteria/country_criterion.html:10
 #: templates/manage/criteria/distance_criterion.html:10
 #: templates/manage/criteria/height_criterion.html:10
 #: templates/manage/criteria/payment_method_criterion.html:10
 #: templates/manage/criteria/price_criterion.html:10
 #: templates/manage/criteria/shipping_method_criterion.html:10
-#: templates/manage/criteria/user_criterion.html:11
+#: templates/manage/criteria/user_criterion.html:10
 #: templates/manage/criteria/weight_criterion.html:10
-#: templates/manage/criteria/width_criterion.html:9
-msgid "Combined length and girth"
-msgstr "Gurtmaß"
-
-#: criteria/models/criteria.py:376
-#: templates/manage/payment/payment_methods.html:3
-msgid "Payment methods"
-msgstr "Zahlungsweisen"
-
-#: criteria/models/criteria.py:401 payment/models.py:120
-#: payment/migrations/0001_initial.py:28
-#: templates/manage/criteria/combinedlengthandgirth_criterion.html:11
-#: templates/manage/criteria/country_criterion.html:12
-#: templates/manage/criteria/distance_criterion.html:12
-#: templates/manage/criteria/height_criterion.html:12
-#: templates/manage/criteria/length_criterion.html:12
-#: templates/manage/criteria/payment_method_criterion.html:12
-#: templates/manage/criteria/shipping_method_criterion.html:12
-#: templates/manage/criteria/user_criterion.html:13
-#: templates/manage/criteria/weight_criterion.html:12
-#: templates/manage/criteria/width_criterion.html:11
-#: templates/manage/order/order_inline.html:173
-msgid "Payment method"
-msgstr "Zahlungsweise"
-
-#: criteria/models/criteria.py:469
-#: templates/manage/shipping/shipping_methods.html:3
-msgid "Shipping methods"
-msgstr "Lieferarten"
-
-#: criteria/models/criteria.py:494
-#: templates/manage/criteria/combinedlengthandgirth_criterion.html:15
-#: templates/manage/criteria/country_criterion.html:16
-#: templates/manage/criteria/distance_criterion.html:16
-#: templates/manage/criteria/height_criterion.html:16
-#: templates/manage/criteria/length_criterion.html:16
-#: templates/manage/criteria/payment_method_criterion.html:16
-#: templates/manage/criteria/price_criterion.html:15
-#: templates/manage/criteria/shipping_method_criterion.html:16
-#: templates/manage/criteria/user_criterion.html:17
-#: templates/manage/criteria/weight_criterion.html:16
-#: templates/manage/criteria/width_criterion.html:15
-#: templates/manage/order/order_inline.html:170
-msgid "Shipping method"
-msgstr "Lieferart"
-
-#: criteria/models/criteria.py:724 criteria/models/criteria.py:743
-#: templates/manage/criteria/combinedlengthandgirth_criterion.html:10
-#: templates/manage/criteria/country_criterion.html:11
-#: templates/manage/criteria/distance_criterion.html:11
-#: templates/manage/criteria/height_criterion.html:11
-#: templates/manage/criteria/length_criterion.html:11
-#: templates/manage/criteria/payment_method_criterion.html:11
-#: templates/manage/criteria/price_criterion.html:11
-#: templates/manage/criteria/shipping_method_criterion.html:11
-#: templates/manage/criteria/user_criterion.html:12
-#: templates/manage/criteria/weight_criterion.html:11
 #: templates/manage/criteria/width_criterion.html:10
 msgid "Distance"
 msgstr "Entfernung"
 
-#: customer/forms.py:34
+#: criteria/models/criteria_objects.py:15
+msgid "Criterion type"
+msgstr "Typ Kriterium"
+
+#: customer/forms.py:35
 msgid "Password"
 msgstr "Passwort"
 
-#: customer/forms.py:36
+#: customer/forms.py:37
 msgid "Confirm password"
 msgstr "Passwort bestätigen"
 
-#: customer/forms.py:45
+#: customer/forms.py:46
 msgid "The two passwords do not match."
 msgstr "Die beiden Passwörter stimmen nicht überein."
 
-#: customer/forms.py:55
+#: customer/forms.py:56
 msgid "That email address is already in use."
 msgstr "Diese E-Mail Adresse existiert bereits."
 
-#: customer/models.py:25 customer/migrations/0001_initial.py:50
+#: customer/models.py:25
 msgid "Selected shipping method"
 msgstr "Ausgewählte Lieferart"
 
-#: customer/models.py:26 customer/migrations/0001_initial.py:56
+#: customer/models.py:26
 msgid "Selected payment method"
 msgstr "Ausgewählte Bezahlmethode"
 
-#: customer/models.py:27 customer/migrations/0001_initial.py:51
+#: customer/models.py:27
 msgid "Bank account"
 msgstr "Bankkonto"
 
-#: customer/models.py:28 customer/migrations/0001_initial.py:59
+#: customer/models.py:28
 msgid "Credit card"
 msgstr "Kreditkarte"
 
-#: customer/models.py:29 customer/migrations/0001_initial.py:53
+#: customer/models.py:29
 msgid "Selected shipping address"
 msgstr "Ausgewählte Lieferadresse"
 
-#: customer/models.py:30 customer/migrations/0001_initial.py:52
+#: customer/models.py:30
 msgid "Selected invoice address"
 msgstr "Ausgewählte Rechnungsadresse"
 
-#: customer/models.py:31 customer/migrations/0001_initial.py:57
+#: customer/models.py:31
 msgid "Selected country"
 msgstr "Ausgewähltes Land"
 
 #: customer/models.py:66 customer/models.py:85 customer/models.py:98
-#: customer/migrations/0001_initial.py:12
-#: customer/migrations/0001_initial.py:24
-#: customer/migrations/0001_initial.py:35
 #: templates/manage/cart/cart_inline.html:71
 msgid "Customer"
 msgstr "Kunde"
 
-#: customer/models.py:72 customer/migrations/0001_initial.py:44
+#: customer/models.py:72
 msgid "Zip code"
 msgstr "PLZ"
 
-#: customer/models.py:74 customer/migrations/0002_add_address_state.py:11
-#: order/models.py:46 order/migrations/0001_initial.py:45
+#: customer/models.py:74 order/models.py:45
 #: templates/manage/customer/customer_inline.html:133
 #: templates/manage/order/order_inline.html:15
 #: templates/manage/order/order_inline.html:83
 msgid "State"
 msgstr "Status"
 
-#: customer/models.py:87 customer/migrations/0001_initial.py:28
-#: order/models.py:84 order/migrations/0001_initial.py:55
+#: customer/models.py:87 order/models.py:83
 msgid "Account number"
 msgstr "Kontonnummer"
 
-#: customer/models.py:88 customer/migrations/0001_initial.py:26
+#: customer/models.py:88
 msgid "Bank identification code"
 msgstr "Bankleitzahl"
 
-#: customer/models.py:89 customer/migrations/0001_initial.py:25
-#: order/models.py:86 order/migrations/0001_initial.py:50
+#: customer/models.py:89 order/models.py:85
 msgid "Bank name"
 msgstr "Name der Bank"
 
-#: customer/models.py:101 customer/migrations/0001_initial.py:16
+#: customer/models.py:101
 msgid "Owner"
 msgstr "Eigentümer"
 
-#: customer/models.py:102 customer/migrations/0001_initial.py:13
-#: templates/manage/voucher/vouchers_inline.html:64
+#: customer/models.py:102 templates/manage/voucher/vouchers_inline.html:64
 msgid "Number"
 msgstr "Nummer"
 
-#: customer/models.py:103 customer/migrations/0001_initial.py:15
+#: customer/models.py:103
 msgid "Expiration date month"
 msgstr "Ablaufdatum Monat"
 
-#: customer/models.py:104 customer/migrations/0001_initial.py:14
+#: customer/models.py:104
 msgid "Expiration date year"
 msgstr "Ablaufdatum Jahr"
 
 msgstr "Skript"
 
 #: export/models.py:19 templates/manage/product/product.html:81
-#: templates/manage/product/variants.html:84
+#: templates/manage/product/variants.html:85
 msgid "Variants"
 msgstr "Varianten"
 
 #: templates/manage/order/order_inline.html:47
 #: templates/manage/order/order_inline.html:89
 #: templates/manage/order/orders_inline.html:98
-#: templates/manage/product/variants.html:119
+#: templates/manage/product/variants.html:120
 msgid "All"
 msgstr "Alle"
 
 msgid "Welcome to %s"
 msgstr "Welcome to %s"
 
-#: mail/utils.py:90
+#: mail/utils.py:94
 msgid "New review has been added"
 msgstr "Neue Bewertung wurde hinzugefügt."
 
 msgid "Property type has been saved."
 msgstr "Eigenschaftstyp wurden gespeichert."
 
-#: manage/views/properties.py:129
+#: manage/views/properties.py:128
 msgid "Property type has been changed."
 msgstr "Eigenschaftstyp wurden gespeichert."
 
-#: manage/views/properties.py:204
+#: manage/views/properties.py:203
 msgid "Steps have been saved."
 msgstr "Schritte wurden gespeichert."
 
-#: manage/views/properties.py:219
+#: manage/views/properties.py:218
 msgid "Step type has been saved."
 msgstr "Steptyp wurde gespeichert."
 
-#: manage/views/properties.py:235
+#: manage/views/properties.py:234
 msgid "Step has been added."
 msgstr "Schritt wurde hinzugefügt."
 
-#: manage/views/properties.py:247
+#: manage/views/properties.py:246
 msgid "Steps have been updated."
 msgstr "Schritte wurden aktualisiert."
 
-#: manage/views/properties.py:291
+#: manage/views/properties.py:290
 msgid "Property has been added."
 msgstr "Eigenschaft wurde hinzugefügt."
 
-#: manage/views/properties.py:326
+#: manage/views/properties.py:325
 msgid "Option has been added."
 msgstr "Option wurde hinzugefügt."
 
-#: manage/views/properties.py:340
+#: manage/views/properties.py:339
 msgid "Options have been update."