Commits

Kai Diefenbach committed b80aa23 Merge

Merge

  • Participants
  • Parent commits 6b17eb1, 89c7d4a

Comments (0)

Files changed (2)

File lfstheme/locale/de/LC_MESSAGES/django.mo

Binary file modified.

File lfstheme/locale/de/LC_MESSAGES/django.po

 msgstr ""
 "Project-Id-Version: LFS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-22 21:14+0100\n"
+"POT-Creation-Date: 2010-06-25 09:33+0200\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: templates/contact_form/contact_form_sent.html:17
 #: templates/lfs/cart/added_to_cart.html:81
-#: templates/lfs/cart/cart_inline.html:230
-#: templates/lfs/cart/cart_inline.html:243
+#: templates/lfs/cart/cart_inline.html:276
+#: templates/lfs/cart/cart_inline.html:289
 #: templates/lfs/checkout/empty_page_checkout.html:21
 msgid "Go on shopping"
 msgstr "Weiter Einkaufen"
 
 #: templates/lfs/base.html:82 templates/lfs/checkout/login.html:6
 #: templates/lfs/checkout/login.html:12 templates/lfs/checkout/login.html:21
-#: templates/lfs/checkout/login.html:54 templates/lfs/customer/login.html:6
+#: templates/lfs/checkout/login.html:53 templates/lfs/customer/login.html:6
 #: templates/lfs/customer/login.html:12 templates/lfs/customer/login.html:21
-#: templates/lfs/customer/login.html:57
+#: templates/lfs/customer/login.html:52
 msgid "Login"
 msgstr "Anmelden"
 
 msgstr "Dieses Produkt wurde zum Warenkorb hinzugefügt."
 
 #: templates/lfs/cart/added_to_cart.html:25
-#: templates/lfs/catalog/products/product_inline.html:150
+#: templates/lfs/catalog/products/product_inline.html:256
 #: templates/lfs/catalog/products/product_inline_topdescription.html:152
 #: templates/lfs/catalog/products/product_inline_topprice.html:152
 msgid "Accessories"
 msgstr "Zubehör"
 
 #: templates/lfs/cart/added_to_cart.html:29
-#: templates/lfs/catalog/products/product_inline.html:80
-#: templates/lfs/catalog/products/product_inline.html:154
+#: templates/lfs/catalog/products/product_inline.html:191
+#: templates/lfs/catalog/products/product_inline.html:260
 #: templates/lfs/catalog/products/product_inline_topdescription.html:82
 #: templates/lfs/catalog/products/product_inline_topdescription.html:156
 #: templates/lfs/catalog/products/product_inline_topprice.html:82
 #: templates/lfs/catalog/products/product_inline_topprice.html:156
 #: templates/lfs/mail/order_received_mail.html:197
+#: templates/lfs/mail/order_sent_mail.html:198
 #: templates/lfs/mail/review_added_mail.html:19
 #: templates/lfs/order/lfs_order_tmpl.html:159
 msgid "Name"
 
 #: templates/lfs/cart/added_to_cart.html:32
 #: templates/lfs/cart/added_to_cart_items.html:9
-#: templates/lfs/catalog/products/product_inline.html:155
+#: templates/lfs/catalog/products/product_inline.html:153
+#: templates/lfs/catalog/products/product_inline.html:261
 #: templates/lfs/catalog/products/product_inline_topdescription.html:157
 #: templates/lfs/catalog/products/product_inline_topprice.html:157
 msgid "Quantity"
 #: templates/lfs/cart/added_to_cart_items.html:12
 #: templates/lfs/cart/cart_inline.html:39
 #: templates/lfs/catalog/filter_navigation.html:54
-#: templates/lfs/catalog/products/product_inline.html:88
-#: templates/lfs/catalog/products/product_inline.html:156
+#: templates/lfs/catalog/products/product_inline.html:199
+#: templates/lfs/catalog/products/product_inline.html:262
 #: templates/lfs/catalog/products/product_inline_topdescription.html:90
 #: templates/lfs/catalog/products/product_inline_topdescription.html:158
 #: templates/lfs/catalog/products/product_inline_topprice.html:90
 #: templates/lfs/checkout/checkout_cart_inline.html:30
 #: templates/lfs/customer/orders.html:31
 #: templates/lfs/mail/order_received_mail.html:203
+#: templates/lfs/mail/order_sent_mail.html:204
 #: templates/lfs/order/lfs_order_tmpl.html:165
 #: templates/lfs/portlets/filter.html:59
 #: templates/lfs/search/search_results.html:50
 
 #: templates/lfs/cart/added_to_cart.html:38
 #: templates/lfs/cart/added_to_cart_items.html:18
-#: templates/lfs/cart/added_to_cart_items.html:54
+#: templates/lfs/cart/added_to_cart_items.html:74
 #: templates/lfs/cart/cart_inline.html:45
-#: templates/lfs/cart/cart_inline.html:192
-#: templates/lfs/catalog/products/product_inline.html:157
+#: templates/lfs/cart/cart_inline.html:238
+#: templates/lfs/catalog/products/product_inline.html:263
 #: templates/lfs/catalog/products/product_inline_topdescription.html:159
 #: templates/lfs/catalog/products/product_inline_topprice.html:159
 #: templates/lfs/checkout/checkout_cart_inline.html:36
-#: templates/lfs/checkout/checkout_cart_inline.html:130
+#: templates/lfs/checkout/checkout_cart_inline.html:175
 #: templates/lfs/mail/order_received_mail.html:80
 #: templates/lfs/mail/order_received_mail.html:206
+#: templates/lfs/mail/order_sent_mail.html:81
+#: templates/lfs/mail/order_sent_mail.html:207
 #: templates/lfs/order/lfs_order_tmpl.html:55
 #: templates/lfs/order/lfs_order_tmpl.html:168
 msgid "Total"
 msgstr "Hinzufügen"
 
 #: templates/lfs/cart/added_to_cart.html:73
-#: templates/lfs/cart/cart_inline.html:226
+#: templates/lfs/cart/cart_inline.html:272
 #: templates/lfs/checkout/empty_page_checkout.html:6
 #: templates/lfs/checkout/empty_page_checkout.html:12
-#: templates/lfs/checkout/login.html:95 templates/lfs/checkout/login.html:105
+#: templates/lfs/checkout/login.html:91 templates/lfs/checkout/login.html:101
 #: templates/lfs/checkout/one_page_checkout.html:5
 #: templates/lfs/checkout/one_page_checkout.html:11
 msgid "Checkout"
 msgstr "Warenkorb"
 
 #: templates/lfs/cart/cart_inline.html:7
-#: templates/lfs/cart/cart_inline.html:100
-#: templates/lfs/checkout/checkout_cart_inline.html:76
-#: templates/lfs/mail/order_received_mail.html:240
+#: templates/lfs/cart/cart_inline.html:146
+#: templates/lfs/checkout/checkout_cart_inline.html:121
+#: templates/lfs/mail/order_received_mail.html:252
+#: templates/lfs/mail/order_sent_mail.html:253
 msgid "Voucher"
 msgstr "Gutschein"
 
 #: templates/lfs/cart/cart_inline.html:36
 #: templates/lfs/checkout/checkout_cart_inline.html:27
 #: templates/lfs/mail/order_received_mail.html:200
+#: templates/lfs/mail/order_sent_mail.html:201
 #: templates/lfs/order/lfs_order_tmpl.html:162
 msgid "Amount"
 msgstr "Menge"
 
-#: templates/lfs/cart/cart_inline.html:90
+#: templates/lfs/cart/cart_inline.html:113
 msgid "Delete item"
 msgstr "Produkt löschen"
 
-#: templates/lfs/cart/cart_inline.html:122
+#: templates/lfs/cart/cart_inline.html:168
 msgid "Country"
 msgstr "Land"
 
-#: templates/lfs/cart/cart_inline.html:141
-#: templates/lfs/checkout/checkout_cart_inline.html:96
+#: templates/lfs/cart/cart_inline.html:187
+#: templates/lfs/checkout/checkout_cart_inline.html:141
 #: templates/lfs/checkout/one_page_checkout.html:279
-#: templates/lfs/mail/order_received_mail.html:257
-#: templates/lfs/order/lfs_order_tmpl.html:200
+#: templates/lfs/mail/order_received_mail.html:269
+#: templates/lfs/mail/order_sent_mail.html:270
+#: templates/lfs/order/lfs_order_tmpl.html:207
 #: templates/lfs/shipping/shipping_portlet.html:6
 msgid "Shipping"
 msgstr "Versandart"
 
-#: templates/lfs/cart/cart_inline.html:166
-#: templates/lfs/checkout/checkout_cart_inline.html:113
+#: templates/lfs/cart/cart_inline.html:212
+#: templates/lfs/checkout/checkout_cart_inline.html:158
 #: templates/lfs/checkout/payment_inline.html:3
-#: templates/lfs/mail/order_received_mail.html:272
-#: templates/lfs/order/lfs_order_tmpl.html:215
+#: templates/lfs/mail/order_received_mail.html:284
+#: templates/lfs/mail/order_sent_mail.html:285
+#: templates/lfs/order/lfs_order_tmpl.html:222
 msgid "Payment"
 msgstr "Zahlungsweise"
 
-#: templates/lfs/cart/cart_inline.html:205
-#: templates/lfs/checkout/checkout_cart_inline.html:137
-#: templates/lfs/mail/order_received_mail.html:293
-#: templates/lfs/order/lfs_order_tmpl.html:236
+#: templates/lfs/cart/cart_inline.html:251
+#: templates/lfs/checkout/checkout_cart_inline.html:182
+#: templates/lfs/mail/order_received_mail.html:305
+#: templates/lfs/mail/order_sent_mail.html:306
+#: templates/lfs/order/lfs_order_tmpl.html:243
 msgid "Inclusive VAT"
 msgstr "Inklusive MwSt."
 
-#: templates/lfs/cart/cart_inline.html:218
+#: templates/lfs/cart/cart_inline.html:264
 msgid "Total delivery time"
 msgstr "Gesamte Lieferzeit"
 
-#: templates/lfs/cart/cart_inline.html:239
+#: templates/lfs/cart/cart_inline.html:285
 msgid "Your Cart is empty"
 msgstr "Ihr Warenkorb ist leer"
 
 msgid "Reset all filters"
 msgstr "Filter zurücksetzen"
 
+#: templates/lfs/catalog/packing_result.html:5
+msgid "Pieces"
+msgstr "Stücke"
+
+#: templates/lfs/catalog/packing_result.html:6
+msgid "and costs"
+msgstr "und kostet"
+
 #: templates/lfs/catalog/product_base.html:37
 msgid "Back to overview"
 msgstr "Zurück zur Übersicht"
 
 #: templates/lfs/catalog/categories/category/default.html:26
 #: templates/lfs/catalog/categories/product/default.html:73
-#: templates/lfs/search/search_results.html:95
+#: templates/lfs/search/search_results.html:93
 msgid "Details"
 msgstr "Details"
 
 msgstr "Nächste Seite"
 
 #: templates/lfs/catalog/categories/product/default.html:68
-#: templates/lfs/catalog/products/product_inline.html:45
-#: templates/lfs/catalog/products/product_inline.html:53
+#: templates/lfs/catalog/products/product_inline.html:66
+#: templates/lfs/catalog/products/product_inline.html:74
 #: templates/lfs/catalog/products/product_inline_topdescription.html:49
 #: templates/lfs/catalog/products/product_inline_topdescription.html:57
 #: templates/lfs/catalog/products/product_inline_topprice.html:17
 #: templates/lfs/catalog/products/product_inline_topprice.html:25
-#: templates/lfs/search/search_results.html:87
+#: templates/lfs/search/search_results.html:85
 msgid "*inc. VAT"
 msgstr "*inkl. MwSt. zzgl. Versand"
 
-#: templates/lfs/catalog/products/product_inline.html:63
+#: templates/lfs/catalog/products/product_inline.html:166
 #: templates/lfs/catalog/products/product_inline_topdescription.html:67
 #: templates/lfs/catalog/products/product_inline_topprice.html:65
 msgid "Add to cart"
 msgstr "In den Warenkorb"
 
-#: templates/lfs/catalog/products/product_inline.html:72
+#: templates/lfs/catalog/products/product_inline.html:182
 #: templates/lfs/catalog/products/product_inline_topdescription.html:74
 #: templates/lfs/catalog/products/product_inline_topprice.html:74
 msgid "Variants"
 msgstr "Varianten"
 
-#: templates/lfs/catalog/products/product_inline.html:140
 #: templates/lfs/catalog/products/product_inline_topdescription.html:142
 #: templates/lfs/catalog/products/product_inline_topprice.html:142
 msgid "Refresh options"
 msgid "Forgot password?"
 msgstr "Passwort vergessen?"
 
-#: templates/lfs/checkout/login.html:62 templates/lfs/checkout/login.html:86
-#: templates/lfs/customer/login.html:65 templates/lfs/customer/login.html:88
+#: templates/lfs/checkout/login.html:60 templates/lfs/checkout/login.html:83
+#: templates/lfs/customer/login.html:59 templates/lfs/customer/login.html:81
 msgid "Register"
 msgstr "Registrieren"
 
-#: templates/lfs/checkout/login.html:65 templates/lfs/customer/login.html:68
+#: templates/lfs/checkout/login.html:63 templates/lfs/customer/login.html:62
 msgid ""
 "If you are not already a customer you can register in order to store your "
 "address data and to follow the state of your orders."
 "Falls Sie noch kein Kunde sind, können Sie sich registrieren um Ihre "
 "Adressdaten zu speichern und den Status Ihrer Bestellungen zu folgen."
 
-#: templates/lfs/checkout/login.html:98
+#: templates/lfs/checkout/login.html:94
 msgid "You can also checkout without login or registration."
 msgstr ""
 "Sie können auch ohne Anmeldung oder Registrierung weiter zur Kasse gehen."
 
 #: templates/lfs/checkout/one_page_checkout.html:32
 #: templates/lfs/mail/order_received_mail.html:94
+#: templates/lfs/mail/order_sent_mail.html:95
 #: templates/lfs/order/lfs_order_tmpl.html:66
 msgid "Invoice address"
 msgstr "Rechnungsadresse"
 
 #: templates/lfs/checkout/one_page_checkout.html:35
 #: templates/lfs/mail/order_received_mail.html:91
+#: templates/lfs/mail/order_sent_mail.html:92
 #: templates/lfs/order/lfs_order_tmpl.html:69
 msgid "Shipping address"
 msgstr "Lieferadresse"
 
 #: templates/lfs/customer/orders.html:28
 #: templates/lfs/mail/order_received_mail.html:52
+#: templates/lfs/mail/order_sent_mail.html:53
 #: templates/lfs/order/lfs_order_tmpl.html:25
 msgid "Date"
 msgstr "Datum"
 
 #: templates/lfs/customer/orders.html:34
 #: templates/lfs/mail/order_received_mail.html:66
+#: templates/lfs/mail/order_sent_mail.html:67
 #: templates/lfs/order/lfs_order_tmpl.html:41
 msgid "State"
 msgstr "Status"
 
 #: templates/lfs/customer/orders.html:41
 #: templates/lfs/mail/order_received_mail.html:55
+#: templates/lfs/mail/order_sent_mail.html:56
 #: templates/lfs/order/lfs_order_tmpl.html:28
 msgid "DATETIME_FORMAT"
 msgstr ""
 msgstr "Willkommen zu"
 
 #: templates/lfs/mail/order_received_mail.html:41
+#: templates/lfs/mail/order_sent_mail.html:42
 #: templates/lfs/order/lfs_order_tmpl.html:14
 msgid "General"
 msgstr "Allgemein"
 
 #: templates/lfs/mail/order_received_mail.html:46
+#: templates/lfs/mail/order_sent_mail.html:47
 #: templates/lfs/order/lfs_order_tmpl.html:19
 msgid "Customer name"
 msgstr "Kundenname"
 
 #: templates/lfs/mail/order_received_mail.html:60
+#: templates/lfs/mail/order_sent_mail.html:61
 #: templates/lfs/order/lfs_order_tmpl.html:33
 msgid "E-mail"
 msgstr "E-Mail"
 
 #: templates/lfs/mail/order_received_mail.html:74
+#: templates/lfs/mail/order_sent_mail.html:75
 #: templates/lfs/order/lfs_order_tmpl.html:49
 msgid "Phone"
 msgstr "Telefon"
 
 #: templates/lfs/mail/order_received_mail.html:97
+#: templates/lfs/mail/order_sent_mail.html:98
 #: templates/lfs/order/lfs_order_tmpl.html:72
 msgid "Shipping method"
 msgstr "Liefermethod"
 
 #: templates/lfs/mail/order_received_mail.html:100
+#: templates/lfs/mail/order_sent_mail.html:101
 #: templates/lfs/order/lfs_order_tmpl.html:75
 msgid "Payment method"
 msgstr "Zahlungsweise"
 
 #: templates/lfs/mail/order_received_mail.html:182
+#: templates/lfs/mail/order_sent_mail.html:183
 msgid "Pay now"
 msgstr "Jetzt bezahlen"
 
 #: templates/lfs/mail/order_received_mail.html:194
+#: templates/lfs/mail/order_sent_mail.html:195
 #: templates/lfs/order/lfs_order_tmpl.html:156
 msgid "SKU"
 msgstr "Artikelnummer"
 
-#: templates/lfs/mail/order_received_mail.html:302
+#: templates/lfs/mail/order_received_mail.html:314
+#: templates/lfs/mail/order_sent_mail.html:315
 msgid "Your message to us"
 msgstr "Ihre Nachricht an uns"
 
+#: templates/lfs/mail/order_sent_mail.html:38
+msgid "Your order has been sent"
+msgstr "Ihre Bestellungen wurde versandt"
+
 #: templates/lfs/mail/review_added_mail.html:24
 #: templates/reviews/reviews_for_instance.html:23
 msgid "Anonymous"
 msgid "Ordernumber"
 msgstr "Bestellnummer:"
 
-#: templates/lfs/order/lfs_order_tmpl.html:245
+#: templates/lfs/order/lfs_order_tmpl.html:252
 msgid "Message from the customer"
 msgstr "Nachricht vom Kunden"
 
 msgid "All topseller"
 msgstr "Alle Topseller"
 
-#: templates/lfs/search/livesearch_results.html:38
+#: templates/lfs/search/livesearch_results.html:36
 msgid "All results"
 msgstr "Alle Ergebnisse"
 
-#: templates/lfs/search/livesearch_results.html:44
+#: templates/lfs/search/livesearch_results.html:42
 msgid "No products found"
 msgstr "Keine Produkte gefunden"