Commits

Anderson Santos committed 95bc284

added translation strings to checkout

Comments (0)

Files changed (9)

satchmo/apps/payment/locale/de/LC_MESSAGES/django.mo

Binary file modified.

satchmo/apps/payment/locale/de/LC_MESSAGES/django.po

 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-06 07:20+0000\n"
+"POT-Creation-Date: 2012-09-05 15:25+0200\n"
 "PO-Revision-Date: 2010-03-01 16:59+0100\n"
 "Last-Translator: Martin Bornhold <mb@bo-tech.de>\n"
 "Language-Team: \n"
 #: config.py:32 modules/authorizenet/config.py:34
 #: modules/autosuccess/config.py:11 modules/cod/config.py:14
 #: modules/cybersource/config.py:28 modules/dummy/config.py:14
-#: modules/giftcertificate/config.py:40 modules/google/config.py:73
-#: modules/paypal/config.py:48 modules/purchaseorder/config.py:11
-#: modules/sagepay/config.py:19 modules/sermepa/config.py:48
-#: modules/trustcommerce/config.py:32
+#: modules/giftcertificate/config.py:41 modules/google/config.py:73
+#: modules/payflowpro/config.py:18 modules/paypal/config.py:48
+#: modules/purchaseorder/config.py:11 modules/sagepay/config.py:19
+#: modules/sermepa/config.py:49 modules/trustcommerce/config.py:32
 msgid "Accept real payments"
 msgstr "Akzeptiere echte Zahlungen"
 
 msgstr ""
 "E-Mail-Adressen, die ebenfalls bei einer Bestellung informiert werden sollen."
 
-#: config.py:58 modules/dummy/config.py:59
+#: config.py:58 modules/dummy/config.py:60
 msgid "Early AUTH"
 msgstr "Frühe Authentifizierung"
 
 msgid "Payment method"
 msgstr "Zahlungsmethode"
 
-#: forms.py:248
+#: forms.py:253
 msgid "This field is required"
 msgstr "Dieses Feld ist erforderlich."
 
-#: forms.py:251
+#: forms.py:256
 msgid "Selected payment method requires this field to be filled"
 msgstr "Dieses Feld muss für die ausgewählte Bezahlmethode ausgefüllt werden"
 
-#: forms.py:273
+#: forms.py:278
 msgid "Invalid discount code."
 msgstr "Ungültiger Rabattcode."
 
-#: forms.py:370
+#: forms.py:376
 msgid "This field is required."
 msgstr "Dieses Feld ist erforderlich."
 
-#: forms.py:505
+#: forms.py:511
 msgid "Your card has expired."
 msgstr "Ihre Karte ist abgelaufen."
 
-#: forms.py:514
+#: forms.py:520
 msgid "Invalid ccv."
 msgstr "Ungültiger Kreditkarte Verifizierungs Code."
 
 msgstr "Start Jahr"
 
 #: models.py:107 modules/authorizenet/config.py:6
-#: modules/cybersource/config.py:6 modules/sagepay/config.py:6
-#: modules/trustcommerce/config.py:5
+#: modules/cybersource/config.py:6 modules/payflowpro/config.py:8
+#: modules/sagepay/config.py:6 modules/trustcommerce/config.py:5
 msgid "Credit Card"
 msgstr "Kreditkarte"
 
-#: models.py:108
+#: models.py:108 modules/authorizenet/config.py:60
+#: modules/cybersource/config.py:48 modules/payflowpro/config.py:49
+#: modules/trustcommerce/config.py:49
 msgid "Credit Cards"
 msgstr "Kreditkarten"
 
+#: utils.py:169
+#, fuzzy
+msgid "Your Gift Certificate"
+msgstr "Geschenkgutschein"
+
 #: modules/base.py:45 modules/base.py:77 modules/base.py:82
 #: modules/base.py:178
 msgid "Not Implemented"
 #: modules/cod/processor.py:26 modules/dummy/processor.py:44
 #: modules/dummy/processor.py:66 modules/dummy/processor.py:79
 #: modules/dummy/processor.py:85 modules/giftcertificate/processor.py:52
-#: modules/purchaseorder/processor.py:31 views/confirm.py:278
+#: modules/purchaseorder/processor.py:31 views/confirm.py:281
 msgid "Success"
 msgstr "Erfolgreich"
 
 msgstr "Fehlgeschlagen"
 
 #: modules/authorizenet/config.py:6 modules/cybersource/config.py:6
-#: modules/sagepay/config.py:6 modules/trustcommerce/config.py:5
+#: modules/payflowpro/config.py:8 modules/sagepay/config.py:6
+#: modules/trustcommerce/config.py:5
 msgid "CreditCard"
 msgstr "Kreditkarte"
 
 #: modules/authorizenet/config.py:46 modules/autosuccess/config.py:17
 #: modules/cod/config.py:21 modules/cybersource/config.py:34
 #: modules/dummy/config.py:20 modules/giftcertificate/config.py:28
-#: modules/google/config.py:79 modules/paypal/config.py:54
-#: modules/purchaseorder/config.py:17 modules/sagepay/config.py:48
-#: modules/sermepa/config.py:22 modules/trustcommerce/config.py:21
+#: modules/google/config.py:79 modules/payflowpro/config.py:28
+#: modules/paypal/config.py:54 modules/purchaseorder/config.py:17
+#: modules/sagepay/config.py:48 modules/sermepa/config.py:22
+#: modules/trustcommerce/config.py:21
 msgid "Implementation module"
 msgstr "Implementierungsmodule"
 
 #: modules/authorizenet/config.py:52 modules/autosuccess/config.py:23
 #: modules/cod/config.py:27 modules/cybersource/config.py:40
 #: modules/dummy/config.py:26 modules/giftcertificate/config.py:16
-#: modules/google/config.py:85 modules/paypal/config.py:60
-#: modules/purchaseorder/config.py:23 modules/sagepay/config.py:54
-#: modules/sermepa/config.py:28 modules/trustcommerce/config.py:15
+#: modules/google/config.py:85 modules/payflowpro/config.py:41
+#: modules/paypal/config.py:60 modules/purchaseorder/config.py:23
+#: modules/sagepay/config.py:54 modules/sermepa/config.py:28
+#: modules/trustcommerce/config.py:15
 msgid "Module key"
 msgstr "Modulschlüssel"
 
 #: modules/authorizenet/config.py:58 modules/autosuccess/config.py:29
 #: modules/cod/config.py:33 modules/cybersource/config.py:46
 #: modules/dummy/config.py:32 modules/giftcertificate/config.py:34
-#: modules/google/config.py:91 modules/paypal/config.py:66
-#: modules/purchaseorder/config.py:29 modules/sagepay/config.py:60
-#: modules/sermepa/config.py:34 modules/trustcommerce/config.py:47
+#: modules/google/config.py:91 modules/payflowpro/config.py:47
+#: modules/paypal/config.py:66 modules/purchaseorder/config.py:29
+#: modules/sagepay/config.py:60 modules/sermepa/config.py:34
+#: modules/trustcommerce/config.py:47
 msgid "English name for this group on the checkout screens"
 msgstr "Englischer Name für diese Gruppe auf den Seiten des Bestellprozesses"
 
-#: modules/authorizenet/config.py:60 modules/autosuccess/config.py:31
-#: modules/cod/config.py:35 modules/cybersource/config.py:48
-#: modules/dummy/config.py:34 modules/giftcertificate/config.py:36
-#: modules/google/config.py:93 modules/paypal/config.py:68
-#: modules/purchaseorder/config.py:31 modules/sagepay/config.py:62
-#: modules/sermepa/config.py:36 modules/trustcommerce/config.py:49
+#: modules/authorizenet/config.py:61 modules/autosuccess/config.py:32
+#: modules/cod/config.py:36 modules/cybersource/config.py:49
+#: modules/dummy/config.py:35 modules/giftcertificate/config.py:37
+#: modules/google/config.py:94 modules/payflowpro/config.py:50
+#: modules/paypal/config.py:69 modules/purchaseorder/config.py:32
+#: modules/sagepay/config.py:63 modules/sermepa/config.py:37
+#: modules/trustcommerce/config.py:50
 msgid "This will be passed to the translation utility"
 msgstr "Dies wird an das Übersetzungswerkzeug weitergereicht"
 
-#: modules/authorizenet/config.py:64 modules/autosuccess/config.py:35
-#: modules/cod/config.py:39 modules/cybersource/config.py:58
-#: modules/dummy/config.py:38 modules/giftcertificate/config.py:46
-#: modules/google/config.py:97 modules/paypal/config.py:72
-#: modules/purchaseorder/config.py:35 modules/sagepay/config.py:100
-#: modules/sermepa/config.py:41 modules/trustcommerce/config.py:53
+#: modules/authorizenet/config.py:65 modules/autosuccess/config.py:36
+#: modules/cod/config.py:40 modules/cybersource/config.py:59
+#: modules/dummy/config.py:39 modules/giftcertificate/config.py:53
+#: modules/google/config.py:98 modules/payflowpro/config.py:54
+#: modules/paypal/config.py:73 modules/purchaseorder/config.py:36
+#: modules/sagepay/config.py:101 modules/sermepa/config.py:42
+#: modules/trustcommerce/config.py:54
 msgid ""
 "The url base used for constructing urlpatterns which will use this module"
 msgstr "Basis für die generierten URL's für dieses Modul"
 
-#: modules/authorizenet/config.py:69 modules/cybersource/config.py:63
-#: modules/dummy/config.py:43 modules/sagepay/config.py:66
-#: modules/trustcommerce/config.py:58
+#: modules/authorizenet/config.py:70 modules/cybersource/config.py:64
+#: modules/dummy/config.py:44 modules/payflowpro/config.py:61
+#: modules/sagepay/config.py:67 modules/trustcommerce/config.py:59
 msgid "Available credit cards"
 msgstr "Verfügbare Kreditkarten"
 
-#: modules/authorizenet/config.py:79
+#: modules/authorizenet/config.py:80
 msgid "Your authorize.net transaction login"
 msgstr "Ihr Authorize.net Transaktions Login"
 
-#: modules/authorizenet/config.py:84
+#: modules/authorizenet/config.py:85
 msgid "Your authorize.net transaction key"
 msgstr "Ihr Authorize.net Transaktions Schlüssel"
 
-#: modules/authorizenet/config.py:89 modules/dummy/config.py:53
+#: modules/authorizenet/config.py:90 modules/dummy/config.py:54
+#: modules/payflowpro/config.py:34
 msgid "Capture Payment immediately?"
 msgstr ""
 
-#: modules/authorizenet/config.py:91 modules/dummy/config.py:55
+#: modules/authorizenet/config.py:92 modules/dummy/config.py:56
+#: modules/payflowpro/config.py:36
 msgid ""
 "IMPORTANT: If false, a capture attempt will be made when the order is marked "
-"as shipped.\""
+"as shipped."
 msgstr ""
 
-#: modules/authorizenet/config.py:95 modules/autosuccess/config.py:40
-#: modules/cod/config.py:44 modules/cybersource/config.py:83
-#: modules/dummy/config.py:65 modules/giftcertificate/config.py:51
-#: modules/google/config.py:102 modules/paypal/config.py:77
-#: modules/sagepay/config.py:105 modules/sermepa/config.py:164
-#: modules/trustcommerce/config.py:78
+#: modules/authorizenet/config.py:96 modules/autosuccess/config.py:41
+#: modules/cod/config.py:45 modules/cybersource/config.py:84
+#: modules/dummy/config.py:66 modules/giftcertificate/config.py:58
+#: modules/google/config.py:103 modules/payflowpro/config.py:106
+#: modules/paypal/config.py:78 modules/sagepay/config.py:106
+#: modules/sermepa/config.py:165 modules/trustcommerce/config.py:79
 msgid "Verbose logs"
 msgstr "Ausführliche Logs"
 
-#: modules/authorizenet/config.py:96 modules/autosuccess/config.py:41
-#: modules/cod/config.py:45 modules/cybersource/config.py:84
-#: modules/dummy/config.py:66 modules/giftcertificate/config.py:52
-#: modules/google/config.py:103 modules/paypal/config.py:78
-#: modules/sagepay/config.py:106 modules/sermepa/config.py:165
-#: modules/trustcommerce/config.py:79
+#: modules/authorizenet/config.py:97 modules/autosuccess/config.py:42
+#: modules/cod/config.py:46 modules/cybersource/config.py:85
+#: modules/dummy/config.py:67 modules/giftcertificate/config.py:59
+#: modules/google/config.py:104 modules/payflowpro/config.py:107
+#: modules/paypal/config.py:79 modules/sagepay/config.py:107
+#: modules/sermepa/config.py:166 modules/trustcommerce/config.py:80
 msgid "Add extensive logs during post."
 msgstr "Extra Logausgaben während des POST aktivieren."
 
-#: modules/authorizenet/config.py:103
+#: modules/authorizenet/config.py:104
 msgid "Enable ARB?"
 msgstr "ARB aktivieren"
 
-#: modules/authorizenet/config.py:105
+#: modules/authorizenet/config.py:106
 msgid ""
 "Enable ARB processing for setting up subscriptions.  You must have this "
 "enabled in your Authorize account for it to work."
 msgstr ""
 
-#: modules/authorizenet/config.py:110
+#: modules/authorizenet/config.py:111
 msgid "Submit to URL (ARB)"
 msgstr ""
 
-#: modules/authorizenet/config.py:111
+#: modules/authorizenet/config.py:112
 msgid "This is the address to submit live transactions for ARB."
 msgstr ""
 
-#: modules/authorizenet/config.py:118
+#: modules/authorizenet/config.py:119
 msgid "Submit to Test URL (ARB)"
 msgstr ""
 
-#: modules/authorizenet/config.py:119
+#: modules/authorizenet/config.py:120
 msgid "This is the address to submit test transactions for ARB."
 msgstr ""
 
 #: modules/authorizenet/processor.py:37 modules/authorizenet/processor.py:87
-#: modules/cybersource/processor.py:109 modules/sagepay/processor.py:138
+#: modules/cybersource/processor.py:109 modules/payflowpro/processor.py:131
+#: modules/payflowpro/processor.py:184 modules/sagepay/processor.py:138
 #: modules/trustcommerce/processor.py:88
 msgid "No charge needed, paid in full."
 msgstr ""
 
-#: modules/authorizenet/processor.py:61
+#: modules/authorizenet/processor.py:61 modules/payflowpro/processor.py:162
 msgid "Already complete"
 msgstr "Bereits vollständig"
 
 
 #: modules/autosuccess/config.py:12 modules/cod/config.py:15
 #: modules/cybersource/config.py:29 modules/dummy/config.py:15
-#: modules/giftcertificate/config.py:41 modules/google/config.py:74
+#: modules/giftcertificate/config.py:42 modules/google/config.py:74
 #: modules/paypal/config.py:49 modules/purchaseorder/config.py:12
-#: modules/sagepay/config.py:20 modules/sermepa/config.py:49
+#: modules/sagepay/config.py:20 modules/sermepa/config.py:50
 #: modules/trustcommerce/config.py:33
 msgid "False if you want to be in test mode"
 msgstr "Deaktivieren um das Modul im Testmodus zu betreiben"
 
+#: modules/autosuccess/config.py:31
+msgid "Pay Now"
+msgstr ""
+
 #: modules/cod/config.py:8
 msgid "COD Payment Module Settings"
 msgstr "Nachnahme Zahlungseinstellungen"
 
+#: modules/cod/config.py:35
+#, fuzzy
+msgid "COD Payment"
+msgstr "Bezahlung"
+
 #: modules/cybersource/config.py:9
 msgid "Cybersource.net Payment Settings"
 msgstr "Cybersource.net Zahlungseinstellungen"
 msgid "Submit to Test WSDL URL"
 msgstr ""
 
-#: modules/cybersource/config.py:52 modules/google/config.py:21
-#: modules/paypal/config.py:12 modules/sagepay/config.py:94
+#: modules/cybersource/config.py:53 modules/google/config.py:21
+#: modules/paypal/config.py:12 modules/sagepay/config.py:95
 msgid "Currency Code"
 msgstr "Währungscode"
 
-#: modules/cybersource/config.py:53
+#: modules/cybersource/config.py:54
 msgid "Currency code for Cybersource transactions."
 msgstr "Währungscode für Cybersource.net Transaktionen"
 
-#: modules/cybersource/config.py:73
+#: modules/cybersource/config.py:74
 msgid "Your Cybersource merchant ID"
 msgstr "Ihre Cybersource.net Merchant ID"
 
-#: modules/cybersource/config.py:78
+#: modules/cybersource/config.py:79
 msgid "Your Cybersource transaction key"
 msgstr "Ihr Cybersource.net Transaktions-Schlüssel"
 
 msgid "Payment Test Module Settings"
 msgstr "Payment Test Modul Zahlungseinstellungen"
 
-#: modules/dummy/config.py:60
+#: modules/dummy/config.py:34
+#, fuzzy
+msgid "Payment test module"
+msgstr "Bezahlungsmethode (Test)"
+
+#: modules/dummy/config.py:61
 msgid ""
 "Authenticate on the card entry page, causes an immediate $.01 AUTH and "
 "release, allowing errors with the card to show on the card entry page."
 "randomly generated character."
 msgstr ""
 
+#: modules/giftcertificate/config.py:36 modules/giftcertificate/models.py:98
+#: modules/giftcertificate/templates/giftcertificate/_order_summary.html:7
+#: modules/giftcertificate/templates/giftcertificate/balance.html:13
+#: modules/giftcertificate/templates/product/detail_giftcertificateproduct.html:9
+msgid "Gift Certificate"
+msgstr "Geschenkgutschein"
+
+#: modules/giftcertificate/config.py:47
+msgid "Send email to recipients"
+msgstr ""
+
+#: modules/giftcertificate/config.py:48
+msgid ""
+"If the purchaser includes an email address, should we send a notification to "
+"them?"
+msgstr ""
+
 #: modules/giftcertificate/forms.py:9
 msgid "Code"
 msgstr "Code"
 msgid "Starting Balance"
 msgstr ""
 
-#: modules/giftcertificate/models.py:98
-#: modules/giftcertificate/templates/giftcertificate/_order_summary.html:7
-#: modules/giftcertificate/templates/giftcertificate/balance.html:13
-#: modules/giftcertificate/templates/product/detail_giftcertificateproduct.html:9
-msgid "Gift Certificate"
-msgstr "Geschenkgutschein"
-
 #: modules/giftcertificate/models.py:99
 #: modules/giftcertificate/templates/giftcertificate/balance.html:6
 msgid "Gift Certificates"
 msgid "Price"
 msgstr "Preis"
 
-#: modules/giftcertificate/templates/product/detail_giftcertificateproduct.html:21
+#: modules/giftcertificate/templates/product/detail_giftcertificateproduct.html:22
 msgid "Quantity (multiply the gift certificate by this amount)"
 msgstr ""
 
-#: modules/giftcertificate/templates/product/detail_giftcertificateproduct.html:24
+#: modules/giftcertificate/templates/product/detail_giftcertificateproduct.html:25
 msgid "Recipient Email (optional):"
 msgstr "Empfänger E-Mail (optional):"
 
-#: modules/giftcertificate/templates/product/detail_giftcertificateproduct.html:25
+#: modules/giftcertificate/templates/product/detail_giftcertificateproduct.html:26
 msgid "Message (optional):"
 msgstr "Nachricht (optional):"
 
-#: modules/giftcertificate/templates/product/detail_giftcertificateproduct.html:30
+#: modules/giftcertificate/templates/product/detail_giftcertificateproduct.html:31
 msgid "Add to cart"
 msgstr "Zum Warenkorb hinzufügen"
 
 
 #: modules/google/config.py:41 modules/google/config.py:47
 #: modules/paypal/config.py:18 modules/paypal/config.py:24
-#: modules/sermepa/config.py:124
+#: modules/sermepa/config.py:125
 msgid "Post URL"
 msgstr "Post URL"
 
 msgid "Merchant Test Key"
 msgstr ""
 
+#: modules/google/config.py:93
+#, fuzzy
+msgid "Google Checkout"
+msgstr "Bestellen"
+
 #: modules/google/notifications.py:48
 msgid "Received through Google Checkout."
 msgstr ""
 
-#: modules/google/notifications.py:69
+#: modules/google/notifications.py:70
 msgid "Paid through Google Checkout."
 msgstr "Ihre Bestellung wurde mit Google Checkout bezahlt."
 
-#: modules/google/notifications.py:80
+#: modules/google/notifications.py:81
 msgid "Shipped through Google Checkout."
 msgstr "Ihre Bestellung wird mit Google Checkout versand."
 
-#: modules/google/views.py:135 modules/paypal/views.py:229
-#: views/checkout.py:15
+#: modules/google/views.py:139 modules/paypal/views.py:224
+#: modules/sermepa/views.py:229 views/checkout.py:16
 msgid "Your order has already been processed."
 msgstr "Ihre Bestellung wurde bereits durchgeführt."
 
+#: modules/payflowpro/config.py:11
+#, fuzzy
+msgid "PayflowPro Payment Settings"
+msgstr "Zahlungseinstellungen"
+
+#: modules/payflowpro/config.py:19
+msgid ""
+"False if you want to submit to the test urls.  NOTE: Look at the PayflowPro "
+"developer's guide (https://cms.paypal.com/us/cgi-bin/?cmd=_render-"
+"content&content_ID=developer/howto_gateway_payflowpro) for the list of valid "
+"credit card numbers."
+msgstr ""
+
+#: modules/payflowpro/config.py:74
+msgid "Your authorized PayPal reseller's id."
+msgstr ""
+
+#: modules/payflowpro/config.py:79
+msgid ""
+"Your merchant login ID that you created when you registered for the account."
+msgstr ""
+
+#: modules/payflowpro/config.py:85
+msgid ""
+"If you set up more additional users on the PayPal account, this value is the "
+"ID of the user authorized to process transactions. If you have not set up "
+"additional users on the account, has the same value as VENDOR."
+msgstr ""
+
+#: modules/payflowpro/config.py:94
+msgid "Your PayflowPro account password"
+msgstr ""
+
 #: modules/paypal/config.py:5
 msgid "Paypal Payment Module Settings"
 msgstr "Paypal Einstellungen"
 "can be a named url and defaults to the standard checkout success."
 msgstr ""
 
-#: modules/paypal/views.py:53 modules/sermepa/views.py:71 views/confirm.py:212
+#: modules/paypal/config.py:68
+msgid "PayPal"
+msgstr ""
+
+#: modules/paypal/views.py:53 modules/sermepa/views.py:72 views/confirm.py:212
 msgid "Your order is no longer valid."
 msgstr "Ihre Bestellung ist nicht länger gültig."
 
 msgid "Purchase Order Module Settings"
 msgstr "Nachnahme Einstellungen"
 
-#: modules/purchaseorder/config.py:40
+#: modules/purchaseorder/config.py:31
+#, fuzzy
+msgid "Purchase Order"
+msgstr "Bestell-Nummer #"
+
+#: modules/purchaseorder/config.py:41
 msgid "Verbose logging?"
 msgstr "Ausführliches Logging?"
 
 msgid "Paid on"
 msgstr "Bezahlt am"
 
-#: modules/sagepay/config.py:6
+#: modules/sagepay/config.py:6 modules/sagepay/config.py:62
 msgid "Sage Pay Secure Payments"
 msgstr ""
 
 "first."
 msgstr ""
 
-#: modules/sagepay/config.py:82
+#: modules/sagepay/config.py:83
 msgid "Your Vendor Name"
 msgstr ""
 
-#: modules/sagepay/config.py:84
+#: modules/sagepay/config.py:85
 msgid ""
 "This is used for Live and Test transactions.  Make sure to add your server "
 "IP address to VSP, or it won't work."
 msgstr ""
 
-#: modules/sagepay/config.py:88
+#: modules/sagepay/config.py:89
 msgid "Simulator Vendor Name"
 msgstr ""
 
-#: modules/sagepay/config.py:90
+#: modules/sagepay/config.py:91
 msgid ""
 "This is used for Live and Test transactions.  Make sure to activate the VSP "
 "Simulator (you have to directly request it) and add your server IP address "
 "to the VSP Simulator, or it won't work."
 msgstr ""
 
-#: modules/sagepay/config.py:95
+#: modules/sagepay/config.py:96
 #, fuzzy
 msgid "Currency code for Sage Pay transactions."
 msgstr "Währungscode für Cybersource.net Transaktionen"
 
 #: modules/sagepay/processor.py:153
 msgid "TESTING MODE"
-msgstr ""
+msgstr "Zahlungsanbieter"
 
 #: modules/sagepay/processor.py:179
 msgid "Invalid response from payment gateway"
 msgid "SERMEPA (ServiRed) Payment Module Settings"
 msgstr "Nachnahme Einstellungen"
 
-#: modules/sermepa/config.py:56
+#: modules/sermepa/config.py:36
+#, fuzzy
+msgid "Credit Card (via SERMEPA)"
+msgstr "Kreditkarte"
+
+#: modules/sermepa/config.py:57
 msgid "Currency"
 msgstr "Währung"
 
-#: modules/sermepa/config.py:59
+#: modules/sermepa/config.py:60
 msgid "EUR (Euro)"
 msgstr "EUR (Euro)"
 
-#: modules/sermepa/config.py:60
+#: modules/sermepa/config.py:61
 msgid "USD (US Dollar)"
 msgstr "USD (US Dollar)"
 
-#: modules/sermepa/config.py:61
+#: modules/sermepa/config.py:62
 msgid "GBP (British Pound)"
 msgstr "GBP (Britische Pfund)"
 
-#: modules/sermepa/config.py:62
+#: modules/sermepa/config.py:63
 msgid "JPY (Japanese Yen)"
 msgstr "JPY (Japanische Yen)"
 
-#: modules/sermepa/config.py:69
+#: modules/sermepa/config.py:70
 msgid "Merchant FUC"
 msgstr ""
 
-#: modules/sermepa/config.py:70
+#: modules/sermepa/config.py:71
 msgid "Your FUC code"
 msgstr ""
 
-#: modules/sermepa/config.py:76
+#: modules/sermepa/config.py:77
 msgid "Merchant title"
 msgstr ""
 
-#: modules/sermepa/config.py:77
+#: modules/sermepa/config.py:78
 msgid ""
 "Description of your shop which will be visible on payment confirmation screen"
 msgstr ""
 
-#: modules/sermepa/config.py:85
+#: modules/sermepa/config.py:86
 msgid "Signature code"
 msgstr ""
 
-#: modules/sermepa/config.py:86
+#: modules/sermepa/config.py:87
 msgid "Your secret code used to sign transaction data"
 msgstr ""
 
-#: modules/sermepa/config.py:92
+#: modules/sermepa/config.py:93
 msgid "Test signature code"
 msgstr ""
 
-#: modules/sermepa/config.py:93
+#: modules/sermepa/config.py:94
 msgid "Your secret code used to sign transaction data in test payments"
 msgstr ""
 
-#: modules/sermepa/config.py:99
+#: modules/sermepa/config.py:100
 msgid "Extended signature calculation"
 msgstr ""
 
-#: modules/sermepa/config.py:100
+#: modules/sermepa/config.py:101
 msgid ""
 "Consult your Sermepa documentation to know the differences between normal "
 "and extended signature calculation, and ask your provider which type of "
 "signature expects you to use. If possible, use extended signature."
 msgstr ""
 
-#: modules/sermepa/config.py:108
+#: modules/sermepa/config.py:109
 msgid "Terminal number"
 msgstr ""
 
-#: modules/sermepa/config.py:115
+#: modules/sermepa/config.py:116
 msgid "Test terminal number"
 msgstr ""
 
-#: modules/sermepa/config.py:117
+#: modules/sermepa/config.py:118
 msgid "Terminal number used for test payments"
 msgstr ""
 
-#: modules/sermepa/config.py:125
+#: modules/sermepa/config.py:126
 msgid "The SERMEPA URL for real transaction posting."
 msgstr ""
 
-#: modules/sermepa/config.py:132
+#: modules/sermepa/config.py:133
 msgid "Test Post URL"
 msgstr ""
 
-#: modules/sermepa/config.py:133
+#: modules/sermepa/config.py:134
 msgid "The SERMEPA URL for test transaction posting."
 msgstr ""
 
-#: modules/sermepa/config.py:141
+#: modules/sermepa/config.py:142
 msgid "Callback URL"
 msgstr ""
 
-#: modules/sermepa/config.py:142
+#: modules/sermepa/config.py:143
 msgid "Callback URL for on-line notifications about payment progress"
 msgstr ""
 
-#: modules/sermepa/config.py:149
+#: modules/sermepa/config.py:150
 msgid "OK URL"
 msgstr ""
 
-#: modules/sermepa/config.py:150
+#: modules/sermepa/config.py:151
 msgid "URL for customer to return after successful payment"
 msgstr ""
 
-#: modules/sermepa/config.py:157
+#: modules/sermepa/config.py:158
 msgid "Failure URL"
 msgstr ""
 
-#: modules/sermepa/config.py:158
+#: modules/sermepa/config.py:159
 msgid "URL for customer to return after payment failure"
 msgstr ""
 
+#: modules/sermepa/views.py:238
+#, python-format
+msgid "The contact is %s"
+msgstr ""
+
+#: modules/sermepa/views.py:241
+#, python-format
+msgid "Processing cart item %s"
+msgstr ""
+
 #: modules/trustcommerce/config.py:8
 msgid "TrustCommerce Payment Settings"
 msgstr "TrustCommerce Einstellungen"
 msgid "Preauth"
 msgstr ""
 
-#: modules/trustcommerce/config.py:68
+#: modules/trustcommerce/config.py:69
 msgid "Your TrustCommerce login"
 msgstr ""
 
-#: modules/trustcommerce/config.py:73
+#: modules/trustcommerce/config.py:74
 msgid "Your TrustCommerce password"
 msgstr "Ihr TrustCommerce Passwort lautet"
 
 msgid "Confirmation"
 msgstr "Bestätigung"
 
-#: templates/shop/checkout/authentication_required.html:29
+#: templates/shop/checkout/authentication_required.html:23
+msgid ""
+"In order to have access to your products and order history, please log in. "
+"After that you may continue to checkout with your current cart."
+msgstr ""
+
+#: templates/shop/checkout/authentication_required.html:26
+#: templates/shop/checkout/form.html:37
+msgid "Username or email"
+msgstr "Benutzername oder E-Mail-Adresse"
+
+#: templates/shop/checkout/authentication_required.html:27
+#: templates/shop/checkout/form.html:38
+msgid "Password"
+msgstr "Passwort"
+
+#: templates/shop/checkout/authentication_required.html:28
 #: templates/shop/checkout/form.html:39
 msgid "Login"
 msgstr "Login"
 
-#: templates/shop/checkout/authentication_required.html:33
+#: templates/shop/checkout/authentication_required.html:32
 msgid "If you do not have an account, please"
 msgstr "Wenn Sie noch kein Benutzerkonto besitzen, bitte"
 
-#: templates/shop/checkout/authentication_required.html:33
+#: templates/shop/checkout/authentication_required.html:32
 msgid "click here"
 msgstr "hier klicken"
 
-#: templates/shop/checkout/authentication_required.html:34
+#: templates/shop/checkout/authentication_required.html:33
 msgid "If you do not remember your password, please"
 msgstr "Wenn Sie ihr Passwort vergessen haben, bitte"
 
-#: templates/shop/checkout/authentication_required.html:34
+#: templates/shop/checkout/authentication_required.html:33
 msgid "click here</a> to have it reset."
 msgstr "hier klicken</a> um es zurückzusetzen."
 
 "Der folgende Fehler trat beim verarbeiten ihrer Karte auf. Bitte korrigieren "
 "Sie ihn und versuchen es erneut."
 
+#: templates/shop/checkout/confirm.html:15
+#: templates/shop/checkout/pay_ship.html:8
+#: templates/shop/checkout/paypal/confirm.html:11
+#: templates/shop/checkout/purchaseorder/pay_ship.html:6
+msgid "PAYMENT TEST MODE"
+msgstr "Zahlungsanbieter"
+
 #: templates/shop/checkout/confirm.html:20
 #: templates/shop/checkout/sagepay/confirm.html:19
 #, python-format
 msgid "This is just a convenience, no account is required!"
 msgstr "Dies ist nur ein Vorschalg, ein Benutzerkonto is nicht erforderlich."
 
-#: templates/shop/checkout/form.html:37
-msgid "Username or email"
-msgstr "Benutzername oder E-Mail-Adresse"
-
-#: templates/shop/checkout/form.html:38
-msgid "Password"
-msgstr "Passwort"
-
 #: templates/shop/checkout/form.html:46
 msgid "You'll need to fill out at least the fields with a *"
 msgstr "Bitte füllen Sie mindestens die Felder mit einem * aus"
 "Bitte drucken Sie sich diese Seite für Ihre Unterlagen aus. Sie werden "
 "ebenfalls eine Bestellbestätigung per E-Mail erhalten."
 
+#: templates/shop/checkout/success.html:17
+msgid ""
+"The recipients of your gift certificates will receive an email notification."
+msgstr ""
+
 #: templates/shop/checkout/cod/confirm.html:17
 #, python-format
 msgid "This order will be COD for %(order_total)s."
 "order."
 msgstr ""
 
-#: views/confirm.py:280
+#: views/confirm.py:283
 msgid "This order does not have a zero balance"
 msgstr ""
 
 #~ msgid "Use SSL for the module checkout pages?"
 #~ msgstr "SSL für die Seiten des Moduls aktivieren?"
 
-#, fuzzy
-#~ msgid "Prot/X Payment Settings"
-#~ msgstr "Zahlungseinstellungen"
-
 #~ msgid "Billing Information"
 #~ msgstr "Rechnungsinformationen"
 
 
 #~ msgid "COD"
 #~ msgstr "Nachnahme"
-
-#~ msgid "Payment Test Module"
-#~ msgstr "Bezahlungsmethode (Test)"

satchmo/apps/payment/templates/shop/checkout/confirm.html

 
 {% block payment_display %}
 <h4>{% trans "Payment" %}</h4>
-{% if not PAYMENT_LIVE %}<b>PAYMENT TEST MODE</b><br/>{% endif %}
+{% if not PAYMENT_LIVE %}<b>{% trans "PAYMENT TEST MODE" %}</b><br/>{% endif %}
 {% with order.credit_card.credit_type as credit_card_type %}
 {% with order.credit_card.display_cc as credit_card_number %}
 {% with order.balance|currency as order_total %}

satchmo/apps/payment/templates/shop/checkout/pay_ship.html

 {% block payment_table %}
     <tr><td><h4>{% trans "Payment Information" %}</h4></td></tr>
     {% if not PAYMENT_LIVE %}
-    <tr><td valign="top"><b>TEST MODE</b></td><td><i>Use Visa 4111111111111111 for CC#<br/>any future date for expiration<br/>any 3 digit CCV</i></td></tr>
+    <tr><td valign="top"><b>{% trans "PAYMENT TEST MODE" %}</b></td><td><i>Use Visa 4111111111111111 for CC#<br/>any future date for expiration<br/>any 3 digit CCV</i></td></tr>
     {% endif %}
 
     <tr><td><label for="id_credit_type">{% trans "Type of credit card" %}</label></td> <td>{{ form.credit_type }}</td></tr>

satchmo/apps/payment/templates/shop/checkout/paypal/confirm.html

 
 {% block payment_display %}
 <h4>{% trans "Payment" %}</h4>
-{% if not PAYMENT_LIVE %}<b>PAYMENT TEST MODE</b><br/>{% endif %}
+{% if not PAYMENT_LIVE %}<b>{% trans "PAYMENT TEST MODE" %}</b><br/>{% endif %}
 {% trans "Your payment will be processed through PayPal." %}
 {% endblock %}
 

satchmo/apps/payment/templates/shop/checkout/purchaseorder/pay_ship.html

 {% block payment_table %}
 <tr><td><h4>Payment Information</h4></td></tr>
 {% if not PAYMENT_LIVE %}
-<tr><td colspan="2"><b>TEST MODE</b></td></tr>
+<tr><td colspan="2"><b>{% trans "PAYMENT TEST MODE" %}</b></td></tr>
 {% endif %}
 
 <tr><td><label for="id_po_number">{% trans "Purchase Order #" %}</label></td> <td>{{ form.po_number }}</td></tr>

satchmo/apps/satchmo_store/shop/locale/de/LC_MESSAGES/django.mo

Binary file modified.

satchmo/apps/satchmo_store/shop/locale/de/LC_MESSAGES/django.po

 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-06 07:20+0000\n"
+"POT-Creation-Date: 2012-09-05 15:26+0200\n"
 "PO-Revision-Date: 2010-03-01 16:59+0100\n"
 "Last-Translator: Martin Bornhold <mb@bo-tech.de>\n"
 "Language-Team: \n"
 msgid "Shipping Countries"
 msgstr "Versandländer"
 
-#: admin.py:73 models.py:671 templates/shop/_order_details.html:37
+#: admin.py:73 models.py:683 templates/shop/_order_details.html:39
 #: templates/shop/_order_tracking_details.html:22
-#: templates/shop/email/_order_detail.txt:29
 msgid "Shipping Method"
 msgstr "Liefermethode"
 
-#: admin.py:74 templates/shop/_order_details.html:30
-#: templates/shop/email/_order_detail.txt:20
+#: admin.py:74 templates/shop/_order_details.html:31
 #: templates/shop/email/_order_detail_table.html:24
-#: templates/shop/email/order_shipped.txt:7 templates/shop/pdf/invoice.rml:25
-#: templates/shop/pdf/packing-slip.rml:25
 msgid "Shipping Address"
 msgstr "Lieferadresse"
 
-#: admin.py:75 templates/shop/pdf/invoice.rml:24
-#: templates/shop/pdf/packing-slip.rml:24
+#: admin.py:75
 msgid "Billing Address"
 msgstr "Rechnungsadresse"
 
 msgid "Totals"
 msgstr "Gesamt"
 
-#: config.py:13
+#: config.py:14
 msgid "Satchmo Shop Settings"
 msgstr "Satchmo Einstellungen"
 
-#: config.py:28
+#: config.py:31
 msgid "URI to the logo for the store"
 msgstr "URI zum Shop Logo"
 
-#: config.py:36
+#: config.py:39
 msgid "State required?"
 msgstr "Bundesland erforderlich?"
 
-#: config.py:37
+#: config.py:40
 msgid ""
 "Require a state during registration/checkout for countries that have states?"
 msgstr ""
 "Bundesland muss während der Registrierung/Bestellung ausgewählt werden wenn "
 "das jeweilige Land Bundesländer besitzt."
 
-#: config.py:43
+#: config.py:46
 msgid "Show Site Field?"
 msgstr "Zeige Feld für die Seite an?"
 
-#: config.py:44
+#: config.py:47
 msgid ""
 "Should the Site field be displayed in the admin lists? A server restart is "
 "required for this to take effect."
 "Soll das Feld für die Seite in den Liaten im Admin Interface angezeigt "
 "werden? Ein Server Neustart ist hierzu erforderlich."
 
-#: config.py:50
+#: config.py:53
 msgid "Cart Quantity Rounding Factor"
 msgstr "Warenkorb Rundungsfaktor"
 
-#: config.py:51
+#: config.py:54
 msgid ""
 "What to round cart adds/deletes by, a '1' here means to round up to a whole "
 "number.  Must be -1 to 1."
 "Rundungsfaktor für die Anzahl von Artikeln im Warenkorb. Eine '1' bedeutet "
 "auf ganze Zahlen zu runden."
 
-#: config.py:58
+#: config.py:61
 msgid "Cart Quantity Decimal Places"
 msgstr "Dezimalstellen für die Anzahl im Warenkorb"
 
-#: config.py:59
+#: config.py:62
 msgid ""
 "How many places to assume for cart quantities, use 0 unless you are selling "
 "products in fractional quantities."
 "sollte auf '0' bleiben falls man nicht Bruchteile von Produkten verkaufen "
 "möchte."
 
-#: config.py:66
+#: config.py:69
 #, fuzzy
 msgid "Persistent Cart: Check for old cart?"
 msgstr "Persistenter Warenkorb?"
 
-#: config.py:67
+#: config.py:70
 #, fuzzy
 msgid "When a user logs in, attempt to retrieve previous cart?"
 msgstr ""
 "Es wird versucht den früheren Inhalt des Warenkorbs wieder herzustellen, "
 "wenn sich ein Benutzer erneut einloggt."
 
-#: config.py:74
+#: config.py:77
 msgid "Persistent Cart: Overrides Current Cart?"
 msgstr ""
 
-#: config.py:75
+#: config.py:78
 msgid ""
 "If you have a persistent cart: Should you merge the carts even if the user "
 "has created a new one?"
 msgstr ""
 
-#: config.py:82
+#: config.py:85
 #, fuzzy
 msgid "Send HTML Email?"
 msgstr "E-Mail senden"
 
-#: config.py:83
+#: config.py:86
 msgid "Should HTML emails be used when sending notifications?"
 msgstr ""
 
-#: config.py:90
+#: config.py:93
 msgid "Use Cart Price Breaks?"
 msgstr ""
 
-#: config.py:91
+#: config.py:94
 msgid ""
 "Use the total number or cart or order items to determine quantities for "
 "discount pricing."
 msgstr ""
 
-#: config.py:98
+#: config.py:101
 msgid "Google Settings"
 msgstr "Google Einstellungen"
 
-#: config.py:103
+#: config.py:106
 msgid "Enable Analytics"
 msgstr "Google Analytics aktivieren"
 
-#: config.py:110
+#: config.py:113
 msgid "Use Urchin?"
 msgstr ""
 
-#: config.py:111
+#: config.py:114
 msgid ""
 "Use the old-style, urchin javascript?.  This is not needed unless your "
 "analytics account hasn't been updated yet."
 msgstr ""
 
-#: config.py:119
+#: config.py:122
 msgid "Analytics Code"
 msgstr "Google Analytics Code"
 
-#: config.py:127
+#: config.py:130
 msgid "Enable Conversion Tracking"
 msgstr "Besuchsaktionsauswertung (Conversion Tracking) aktivieren"
 
-#: config.py:134
+#: config.py:137
 msgid "Adwords ID (ex: UA-abcd-1)"
 msgstr "Google Adwords ID (Bsp.: UA-abcd-1)"
 
 msgid "Test Store"
 msgstr "Test WebShop"
 
-#: models.py:77 models.py:284 models.py:641
+#: models.py:77 models.py:284 models.py:653
 msgid "Site"
 msgstr "Seite"
 
 msgid "Store Name"
 msgstr "WebShop Name"
 
-#: models.py:79 models.py:285 models.py:1381
-#: templates/shop/pdf/invoice.rml:130 templates/shop/pdf/packing-slip.rml:124
+#: models.py:79 models.py:285 models.py:1401
 msgid "Description"
 msgstr "Beschreibung"
 
-#: models.py:80 templates/shop/pdf/invoice.rml:112
-#: templates/shop/pdf/packing-slip.rml:102
+#: models.py:80
 msgid "Email"
 msgstr "E-Mail"
 
-#: models.py:81 models.py:82 models.py:644 models.py:645 models.py:651
-#: models.py:652
+#: models.py:81 models.py:82 models.py:656 models.py:657 models.py:663
+#: models.py:664
 msgid "Street"
 msgstr "Straße"
 
-#: models.py:83 models.py:646 models.py:653
+#: models.py:83 models.py:658 models.py:665
 msgid "City"
 msgstr "Stadt"
 
-#: models.py:84 models.py:647 models.py:654
+#: models.py:84 models.py:659 models.py:666
 msgid "State"
 msgstr "Bundesland"
 
-#: models.py:85 models.py:648 models.py:655
+#: models.py:85 models.py:660 models.py:667
 msgid "Zip Code"
 msgstr "Postleitzahl"
 
-#: models.py:86 models.py:649 models.py:656
+#: models.py:86 models.py:661 models.py:668
 msgid "Country"
 msgstr "Land"
 
 msgid "Customer"
 msgstr "Kunde"
 
-#: models.py:442
+#: models.py:454
 msgid "Shopping Cart"
 msgstr "Warenkorb"
 
-#: models.py:443
+#: models.py:455
 msgid "Shopping Carts"
 msgstr "Warenkörbe"
 
-#: models.py:455 templates/base.html:84 templates/shop/cart.html:12
+#: models.py:467 templates/base.html:84 templates/shop/cart.html:12
 msgid "Cart"
 msgstr "Warenkorb"
 
-#: models.py:456 models.py:1128
+#: models.py:468 models.py:1145
 msgid "Product"
 msgstr "Produkt"
 
-#: models.py:457 models.py:1129 templates/shop/cart.html:33
-#: templates/shop/pdf/invoice.rml:131 templates/shop/pdf/packing-slip.rml:125
+#: models.py:469 models.py:1146 templates/shop/cart.html:33
 msgid "Quantity"
 msgstr "Anzahl"
 
-#: models.py:544
+#: models.py:556
 msgid "Cart Item"
 msgstr "Warenkorbartikel"
 
-#: models.py:545
+#: models.py:557
 msgid "Cart Items"
 msgstr "Warenkorbartikel"
 
-#: models.py:553
+#: models.py:565
 msgid "detail"
 msgstr "Detail"
 
-#: models.py:554
+#: models.py:566
 msgid "name"
 msgstr "Name"
 
-#: models.py:555
+#: models.py:567
 msgid "Item Detail Price Change"
 msgstr "Preisänderung"
 
-#: models.py:557 models.py:1218
+#: models.py:569 models.py:1238
 msgid "Sort Order"
 msgstr "Sortierreihenfolge"
 
-#: models.py:558 models.py:1219
+#: models.py:570 models.py:1239
 msgid "The display order for this group."
 msgstr "Darstellungsreihenfolge für diese Gruppe."
 
-#: models.py:562
+#: models.py:574
 msgid "Cart Item Detail"
 msgstr "Warenkorbdetail"
 
-#: models.py:563
+#: models.py:575
 msgid "Cart Item Details"
 msgstr "Warenkorbdetails"
 
-#: models.py:567
+#: models.py:579
 msgid "Online"
 msgstr "Online"
 
-#: models.py:568
+#: models.py:580
 msgid "In Person"
 msgstr "Persönlich"
 
-#: models.py:569
+#: models.py:581
 msgid "Show"
 msgstr ""
 
-#: models.py:573
+#: models.py:585
 msgid "Temp"
 msgstr "Temporär"
 
-#: models.py:574
+#: models.py:586
 msgid "New"
 msgstr "Neu"
 
-#: models.py:575
+#: models.py:587
 msgid "Blocked"
 msgstr "Blockiert"
 
-#: models.py:576
+#: models.py:588
 msgid "In Process"
 msgstr "In Bearbeitung"
 
-#: models.py:577
+#: models.py:589
 msgid "Billed"
 msgstr "In Rechnung gestellt"
 
-#: models.py:578
+#: models.py:590
 msgid "Shipped"
 msgstr "Geliefert"
 
-#: models.py:579 models.py:1289
+#: models.py:591 models.py:1309
 msgid "Complete"
 msgstr "Abgeschlossen"
 
-#: models.py:580
+#: models.py:592
 msgid "Cancelled"
 msgstr "Storniert"
 
-#: models.py:621
+#: models.py:633
 msgid "key"
 msgstr "Schlüssel"
 
-#: models.py:622
+#: models.py:634
 msgid "value"
 msgstr "Wert"
 
-#: models.py:626
+#: models.py:638
 #, fuzzy
 msgid "Order variable"
 msgstr "Bestellproblem"
 
-#: models.py:627
+#: models.py:639
 #, fuzzy
 msgid "Order variables"
 msgstr "Bestellproblem"
 
-#: models.py:642
+#: models.py:654
 msgid "Contact"
 msgstr "Kontakt"
 
-#: models.py:643 models.py:650
+#: models.py:655 models.py:662
 msgid "Addressee"
 msgstr "Adressat"
 
-#: models.py:657 models.py:1236
+#: models.py:669 models.py:1256
 msgid "Notes"
 msgstr "Notizen"
 
-#: models.py:658 templates/shop/_order_details.html:48
-#: templates/shop/pdf/invoice.rml:154
+#: models.py:670 templates/shop/_order_details.html:50
 msgid "Subtotal"
 msgstr "Zwischensumme"
 
-#: models.py:660 templates/shop/_order_details.html:47
-#: templates/shop/_order_details.html:69
+#: models.py:672 templates/shop/_order_details.html:49
+#: templates/shop/_order_details.html:71
 #: templates/shop/_order_tracking_details.html:28
 #: templates/shop/_order_tracking_details.html:36 templates/shop/cart.html:41
 #: templates/shop/order_history.html:24
-#: templates/shop/email/_order_detail.txt:35
-#: templates/shop/email/_order_detail.txt:40
-#: templates/shop/pdf/invoice.rml:134 templates/shop/pdf/invoice.rml.py:177
 msgid "Total"
 msgstr "Gesamt"
 
-#: models.py:663
+#: models.py:675
 msgid "Discount Code"
 msgstr "Rabattcode"
 
-#: models.py:664
+#: models.py:676
 msgid "Coupon Code"
 msgstr "Gutscheincode"
 
-#: models.py:665
+#: models.py:677
 msgid "Discount amount"
 msgstr "Rabattbetrag"
 
-#: models.py:667
+#: models.py:679
 msgid "Order method"
 msgstr "Bestellmethode"
 
-#: models.py:669
+#: models.py:681
 msgid "Shipping Description"
 msgstr "Versandbeschreibung"
 
-#: models.py:673
+#: models.py:685
 #, fuzzy
 msgid "Shipping Models"
 msgstr "Liefermethode"
 
-#: models.py:675
+#: models.py:687
 msgid "Shipping Cost"
 msgstr "Versandkosten"
 
-#: models.py:677 templates/shop/_order_details.html:58
-#: templates/shop/pdf/invoice.rml:169
+#: models.py:689 templates/shop/_order_details.html:60
 msgid "Shipping Discount"
 msgstr "Versandrabatt"
 
-#: models.py:679 models.py:1382 templates/shop/_order_details.html:67
+#: models.py:691 models.py:1402 templates/shop/_order_details.html:69
 #: templates/shop/_order_tracking_details.html:34
-#: templates/shop/email/_order_detail.txt:39
-#: templates/shop/pdf/invoice.rml:174
 msgid "Tax"
 msgstr "Mehrwertsteuer"
 
-#: models.py:681 models.py:1237
+#: models.py:693 models.py:1257
 #: templates/shop/admin/_orderpayment_list.html:11
 msgid "Timestamp"
 msgstr "Zeitstempel"
 
-#: models.py:682 models.py:1234 templates/shop/_order_tracking_details.html:9
+#: models.py:694 models.py:1254 templates/shop/_order_tracking_details.html:9
 #: templates/shop/order_history.html:21
 msgid "Status"
 msgstr "Status"
 
-#: models.py:683
+#: models.py:695
 msgid "This is set automatically."
 msgstr "Wird automatisch gesetzt."
 
-#: models.py:886 models.py:896 models.py:1014
+#: models.py:898 models.py:908 models.py:1026
 msgid "View"
 msgstr ""
 
-#: models.py:966 templates/shop/_order_details.html:54
+#: models.py:978 templates/shop/_order_details.html:56
 #: templates/shop/_order_tracking_details.html:30
-#: templates/shop/email/_order_detail.txt:37
-#: templates/shop/pdf/invoice.rml:133 templates/shop/pdf/invoice.rml.py:159
 msgid "Discount"
 msgstr "Rabatt"
 
-#: models.py:1120
+#: models.py:1137
 msgid "Product Order"
 msgstr "Produktbestellung"
 
-#: models.py:1121
+#: models.py:1138
 msgid "Product Orders"
 msgstr "Produktbestellungen"
 
-#: models.py:1127 models.py:1233
+#: models.py:1144 models.py:1253
 msgid "Order"
 msgstr "Bestellung"
 
-#: models.py:1130
+#: models.py:1147
 msgid "Unit price"
 msgstr "Stückpreis"
 
-#: models.py:1132
+#: models.py:1149
 msgid "Unit tax"
 msgstr ""
 
-#: models.py:1134
+#: models.py:1151
 msgid "Line item price"
 msgstr "Einzelposten Preis"
 
-#: models.py:1136
+#: models.py:1153
 msgid "Line item tax"
 msgstr "Einzelposten Steuer"
 
-#: models.py:1138
+#: models.py:1155
 msgid "Subscription End"
 msgstr "Abonnement Ende"
 
-#: models.py:1138
+#: models.py:1155
 msgid "Subscription expiration date."
 msgstr "Abonnement Ablaufdatum."
 
-#: models.py:1139
+#: models.py:1156
 msgid "Completed"
 msgstr "Abgeschlossen"
 
-#: models.py:1140
+#: models.py:1157
 msgid "Line item discount"
 msgstr "Einzelposten Rabatt"
 
-#: models.py:1206
+#: models.py:1226
 msgid "Order Line Item"
 msgstr "Bestellungs Einzelposten"
 
-#: models.py:1207
+#: models.py:1227
 msgid "Order Line Items"
 msgstr "Bestellungs Einzelposten"
 
-#: models.py:1214
+#: models.py:1234
 msgid "Order Item"
 msgstr "Einzelposten"
 
-#: models.py:1215 views/contact.py:20
+#: models.py:1235 views/contact.py:20
 msgid "Name"
 msgstr "Name"
 
-#: models.py:1216
+#: models.py:1236
 msgid "Value"
 msgstr "Wert"
 
-#: models.py:1217
+#: models.py:1237
 msgid "Price Change"
 msgstr "Preisänderung"
 
-#: models.py:1225
+#: models.py:1245
 #, fuzzy
 msgid "Order Item Detail"
 msgstr "Warenkorbdetail"
 
-#: models.py:1226
+#: models.py:1246
 #, fuzzy
 msgid "Order Item Details"
 msgstr "Warenkorbdetails"
 
-#: models.py:1249
+#: models.py:1269
 msgid "Order Status"
 msgstr "Bestellungsstatus"
 
-#: models.py:1250
+#: models.py:1270
 msgid "Order Statuses"
 msgstr "Bestellungsstati"
 
-#: models.py:1255
+#: models.py:1275
 msgid "Payment Method"
 msgstr "Zahlungsmethode"
 
-#: models.py:1257
+#: models.py:1277
 msgid "amount"
 msgstr "Betrag"
 
-#: models.py:1259
+#: models.py:1279
 msgid "timestamp"
 msgstr "Zeitstempel"
 
-#: models.py:1260 templates/shop/admin/_orderpayment_list.html:12
+#: models.py:1280 templates/shop/admin/_orderpayment_list.html:12
 msgid "Transaction ID"
 msgstr "Transaktions ID"
 
-#: models.py:1261
+#: models.py:1281
 msgid "Details"
 msgstr "Details"
 
-#: models.py:1262
+#: models.py:1282
 msgid "Reason Code"
 msgstr ""
 
-#: models.py:1321
+#: models.py:1341
 msgid "Order Payment Authorization"
 msgstr "Zahlungs Authorisation"
 
-#: models.py:1322
+#: models.py:1342
 msgid "Order Payment Authorizations"
 msgstr "Zahlungs Authorisationen"
 
-#: models.py:1348
+#: models.py:1368
 msgid "Order Payment"
 msgstr "Bezahlung"
 
-#: models.py:1349 templates/shop/admin/_orderpayment_list.html:3
+#: models.py:1369 templates/shop/admin/_orderpayment_list.html:3
 msgid "Order Payments"
 msgstr "Bezahlungen"
 
-#: models.py:1371
+#: models.py:1391
 msgid "Order Pending Payment"
 msgstr "Ausstehende Bezahlung"
 
-#: models.py:1372
+#: models.py:1392
 msgid "Order Pending Payments"
 msgstr "Ausstehende Bezahlungen"
 
-#: models.py:1380
+#: models.py:1400
 msgid "Model"
 msgstr "Modell"
 
-#: models.py:1392
+#: models.py:1412
 msgid "Order tax detail"
 msgstr "Bestellungs Steuerdetails"
 
-#: models.py:1393
+#: models.py:1413
 msgid "Order tax details"
 msgstr "Bestellungs Steuerdetails"
 
 msgstr "Start"
 
 #: templates/404.html:10 templates/500.html:10 templates/shop/404.html:10
-#: views/cart.py:262 views/cart.py:300
+#: views/cart.py:263 views/cart.py:301
 msgid "Error"
 msgstr "Fehler"
 
 msgid "Powered by <a href=\"http://www.satchmoproject.com\">Satchmo</a>."
 msgstr ""
 
-#: templates/admin/base_site.html:35 templates/admin/base_site.html.py:38
+#: templates/admin/base_site.html:46 templates/admin/base_site.html.py:49
 msgid "Site Administration"
 msgstr "Seiten Verwaltung"
 
-#: templates/admin/index.html:20
+#: templates/admin/index.html:27
 msgid "(show)"
 msgstr "(ausklappen)"
 
-#: templates/admin/index.html:21
+#: templates/admin/index.html:28
 msgid "(hide)"
 msgstr "(einklappen)"
 
-#: templates/admin/index.html:66
+#: templates/admin/index.html:73
 #, python-format
 msgid "Models available in the %(name)s application."
 msgstr "Verfügbare Modelle in der %(name)s Anwendung."
 
-#: templates/admin/index.html:67
+#: templates/admin/index.html:74
 #, python-format
 msgid "%(name)s"
 msgstr ""
 
-#: templates/admin/index.html:77
+#: templates/admin/index.html:84
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: templates/admin/index.html:83
+#: templates/admin/index.html:90
 msgid "Change"
 msgstr "Ändern"
 
-#: templates/admin/index.html:93
+#: templates/admin/index.html:100
 msgid "You don't have permission to edit anything."
 msgstr ""
 
-#: templates/admin/index.html:101
+#: templates/admin/index.html:108
 msgid "Recent Actions"
 msgstr ""
 
-#: templates/admin/index.html:103
+#: templates/admin/index.html:110
 msgid "My Actions"
 msgstr "Meine Aktionen"
 
-#: templates/admin/index.html:107
+#: templates/admin/index.html:114
 msgid "None available"
 msgstr ""
 
-#: templates/admin/index.html:120
+#: templates/admin/index.html:127
 msgid "Admin Tools"
 msgstr "Admin Werkzeuge"
 
-#: templates/admin/index.html:124
+#: templates/admin/index.html:131
 msgid "Edit Site Settings"
 msgstr "Seiteneinstellungen bearbeiten"
 
-#: templates/admin/index.html:127
+#: templates/admin/index.html:134
 msgid "Edit Inventory"
 msgstr "Bestand bearbeiten"
 
-#: templates/admin/index.html:130
+#: templates/admin/index.html:137
 msgid "Export Product Defs"
 msgstr "Produkt Definitionen exportieren"
 
-#: templates/admin/index.html:133
+#: templates/admin/index.html:140
 msgid "Product Variation Manager"
 msgstr "Produktvariationen Manager"
 
-#: templates/admin/index.html:136
+#: templates/admin/index.html:143
 msgid "Cache Status"
 msgstr "Cachestatus"
 
 #: templates/shop/_order_details.html:8
 #: templates/shop/_order_tracking_details.html:16
-#: templates/shop/email/_order_detail.txt:1
 msgid "Items Ordered"
 msgstr "Bestellte Artikel"
 
 #: templates/shop/_order_details.html:17 templates/shop/contact_form.html:10
 #: templates/shop/contact_thanks.html:10
-#: templates/shop/email/_order_detail.txt:5
 #: templates/shop/email/_order_detail_table.html:8
 msgid "Contact Information"
 msgstr "Kontaktinformation"
 
 #: templates/shop/_order_details.html:22
-#: templates/shop/email/_order_detail.txt:11
 #: templates/shop/email/_order_detail_table.html:23
 msgid "Billing Information"
 msgstr "Rechnungsinformationen"
 
-#: templates/shop/_order_details.html:57
+#: templates/shop/_order_details.html:59
 #, fuzzy
 msgid "Base Shipping"
 msgstr "Lieferung"
 
-#: templates/shop/_order_details.html:59
+#: templates/shop/_order_details.html:61
 msgid "Shipping (incl. Tax)"
 msgstr "Versand (inkl. MwSt.)"
 
-#: templates/shop/_order_details.html:61
+#: templates/shop/_order_details.html:63
 #: templates/shop/_order_tracking_details.html:32
-#: templates/shop/email/_order_detail.txt:38
 msgid "Shipping"
 msgstr "Versand"
 
-#: templates/shop/_order_details.html:65
+#: templates/shop/_order_details.html:67
 msgid "Tax included"
 msgstr "inklusive Steuer"
 
 msgid "Featured Items"
 msgstr "Sonderartikel"
 
-#: templates/shop/index.html:32 templates/shop/index.html.py:34
+#: templates/shop/index.html:33 templates/shop/index.html.py:35
 msgid "Previous"
 msgstr "Zurück"
 
-#: templates/shop/index.html:44 templates/shop/index.html.py:46
+#: templates/shop/index.html:45 templates/shop/index.html.py:47
 msgid "Next"
 msgstr "Weiter"
 
 msgid "Qty"
 msgstr ""
 
-#: templates/shop/multiple_product_form.html:52
+#: templates/shop/multiple_product_form.html:55
 msgid "Add to Cart"
 msgstr "Zum Warenkorb hinzufügen"
 
 msgid "Order History"
 msgstr "Frühere Bestellungen"
 
-#: templates/shop/order_history.html:22 templates/shop/pdf/invoice.rml:15
-#: templates/shop/pdf/invoice.rml.py:57 templates/shop/pdf/packing-slip.rml:15
-#: templates/shop/pdf/packing-slip.rml:57
+#: templates/shop/order_history.html:22
 msgid "Date"
 msgstr "Datum"
 
 msgstr "auf"
 
 #: templates/shop/admin/_orderpayment_list.html:8
-#: templates/shop/email/order_complete.txt:13
-#: templates/shop/email/order_placed_notice.txt:9
 msgid "Payment"
 msgstr "Bezahlung"
 
 msgid "Total:"
 msgstr "Gesamt"
 
-#: templates/shop/email/_order_detail_table.html:104
+#: templates/shop/email/_order_detail_table.html:99
 #, fuzzy
-msgid "Payment: "
-msgstr "Bezahlung"
+msgid "Your"
+msgstr "Ihr Warenkorb"
 
-#: templates/shop/email/_order_detail_table.html:108
-#: templates/shop/email/order_placed_notice.txt:12
-#, fuzzy, python-format
-msgid ""
-"%(credit_card_type)s card ending in %(credit_card_number)s will be charged "
-"%(order_total)s."
+#: templates/shop/email/_order_detail_table.html:99
+msgid "ending in"
 msgstr ""
-"Ihre %(credit_card_type)s Kreditkarte, die auf %(credit_card_number)s endet, "
-"wird mit %(order_total)s belastet."
 
-#: templates/shop/email/_order_detail_table.html:120
-#: templates/shop/email/order_placed_notice.txt:15
+#: templates/shop/email/_order_detail_table.html:99
+#: templates/shop/email/_order_detail_table.html:101
+#, fuzzy
+msgid "will be charged"
+msgstr "Vollständig bezahlt"
+
+#: templates/shop/email/_order_detail_table.html:112
 msgid "This is a downloadable product"
 msgstr ""
 
-#: templates/shop/email/contact_us.txt:1
+#: templates/shop/email/gift_certificate_recipient.html:6
 #, python-format
 msgid ""
-"Here's a %(request_type)s from %(name)s ( %(email)s ) sent via the web "