merge conflict resolved

This commit is contained in:
Arvind Tiwari 2017-08-31 23:47:42 +05:30
commit d0e770d0df
4 changed files with 15 additions and 216 deletions

View file

@ -73,12 +73,14 @@
<br/> <br/>
<form method="post"> <form method="post">
{% csrf_token %} {% csrf_token %}
<div class="col-md-8 col-xs-7 pull-left tbl-no-padding"> <div class="row">
<div class="col-sm-8">
<p class="dcl-place-order-text">{% blocktrans with vm_price=request.session.specs.price %}By clicking "Place order" this plan will charge your credit card account with the fee of {{ vm_price }}CHF/month{% endblocktrans %}.</p> <p class="dcl-place-order-text">{% blocktrans with vm_price=request.session.specs.price %}By clicking "Place order" this plan will charge your credit card account with the fee of {{ vm_price }}CHF/month{% endblocktrans %}.</p>
</div> </div>
<div class="col-md-4 col-xs-5 content tbl-no-padding"> <div class="col-sm-4 content">
<a href="{{next_url}}" ><button class="btn btn-info pull-right">{% trans "Place order"%}</button></a> <a href="{{next_url}}" ><button class="btn btn-info pull-right">{% trans "Place order"%}</button></a>
</div> </div>
</div>
</form> </form>
</div> </div>
</div> </div>

View file

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-08-31 18:00+0530\n" "POT-Creation-Date: 2017-08-31 23:46+0530\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -18,436 +18,290 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: .\hosting\forms.py:29
msgid "Your username and/or password were incorrect." msgid "Your username and/or password were incorrect."
msgstr "Dein Benutzername und/oder Dein Passwort ist falsch." msgstr "Dein Benutzername und/oder Dein Passwort ist falsch."
#: .\hosting\forms.py:32
msgid "Your account is not activated yet." msgid "Your account is not activated yet."
msgstr "Dein Account wurde noch nicht aktiviert." msgstr "Dein Account wurde noch nicht aktiviert."
#: .\hosting\forms.py:68
msgid "Paste here your public key" msgid "Paste here your public key"
msgstr "Füge deinen Public Key ein" msgstr "Füge deinen Public Key ein"
#: .\hosting\forms.py:74
msgid "Give a name to your key" msgid "Give a name to your key"
msgstr "Gebe deinem SSH-Key einen Name" msgstr "Gebe deinem SSH-Key einen Name"
#: .\hosting\forms.py:79
msgid "Key name" msgid "Key name"
msgstr "Key-Name" msgstr "Key-Name"
#: .\hosting\templates\hosting\base_short.html:75
msgid "My Virtual Machines" msgid "My Virtual Machines"
msgstr "Meine virtuellen Maschinen" msgstr "Meine virtuellen Maschinen"
#: .\hosting\templates\hosting\base_short.html:80
#: .\hosting\templates\hosting\orders.html:8
msgid "My Orders" msgid "My Orders"
msgstr "Meine Bestellungen" msgstr "Meine Bestellungen"
#: .\hosting\templates\hosting\base_short.html:89
msgid "SSH Keys" msgid "SSH Keys"
msgstr "SSH Key" msgstr "SSH Key"
#: .\hosting\templates\hosting\base_short.html:94
msgid "Notifications " msgid "Notifications "
msgstr "Benachrichtigungen" msgstr "Benachrichtigungen"
#: .\hosting\templates\hosting\base_short.html:97
msgid "Logout" msgid "Logout"
msgstr "Abmelden" msgstr "Abmelden"
#: .\hosting\templates\hosting\base_short.html:119
#: .\hosting\templates\hosting\includes\_footer.html:29
msgid "All Rights Reserved" msgid "All Rights Reserved"
msgstr "Alle Rechte vorbehalten" msgstr "Alle Rechte vorbehalten"
#: .\hosting\templates\hosting\bill_detail.html:11 .\hosting\views.py:687
msgid "Invoice" msgid "Invoice"
msgstr "Rechnung" msgstr "Rechnung"
#: .\hosting\templates\hosting\bill_detail.html:11
#: .\hosting\templates\hosting\order_detail.html:23
msgid "Order #" msgid "Order #"
msgstr "Bestellung #" msgstr "Bestellung #"
#: .\hosting\templates\hosting\bill_detail.html:25
msgid "ungleich GmbH" msgid "ungleich GmbH"
msgstr "" msgstr ""
#: .\hosting\templates\hosting\bill_detail.html:26
msgid "buchhaltung@ungleich.ch" msgid "buchhaltung@ungleich.ch"
msgstr "" msgstr ""
#: .\hosting\templates\hosting\bill_detail.html:27
msgid "Hauptstrasse 14" msgid "Hauptstrasse 14"
msgstr "" msgstr ""
#: .\hosting\templates\hosting\bill_detail.html:28
msgid "CH-8775 Luchsingen" msgid "CH-8775 Luchsingen"
msgstr "" msgstr ""
#: .\hosting\templates\hosting\bill_detail.html:29
msgid "Mwst-Nummer: CHE-109.549.333 MWST" msgid "Mwst-Nummer: CHE-109.549.333 MWST"
msgstr "" msgstr ""
#: .\hosting\templates\hosting\bill_detail.html:60
msgid "Total:" msgid "Total:"
msgstr "" msgstr ""
#: .\hosting\templates\hosting\bill_detail.html:68
#, python-format #, python-format
msgid "Alles Preise in CHF mit 8%% Mehrwertsteuer." msgid "Alles Preise in CHF mit 8%% Mehrwertsteuer."
msgstr "All prices in CHF including 8%% VAT" msgstr "All prices in CHF including 8%% VAT"
#: .\hosting\templates\hosting\bill_detail.html:69
msgid "Betrag zahlbar innerhalb von 30 Tagen ab Rechnungseingang." msgid "Betrag zahlbar innerhalb von 30 Tagen ab Rechnungseingang."
msgstr "" msgstr ""
#: .\hosting\templates\hosting\bill_detail.html:70
msgid "Kontoverbindung:" msgid "Kontoverbindung:"
msgstr "" msgstr ""
#: .\hosting\templates\hosting\bill_detail.html:73
msgid "IBAN:" msgid "IBAN:"
msgstr "" msgstr ""
#: .\hosting\templates\hosting\bill_detail.html:76
msgid "BIC:" msgid "BIC:"
msgstr "" msgstr ""
#: .\hosting\templates\hosting\bill_detail.html:81
msgid "CH02 0900 0000 6071 8848 8" msgid "CH02 0900 0000 6071 8848 8"
msgstr "" msgstr ""
#: .\hosting\templates\hosting\bill_detail.html:84
msgid "POFICHBEXXX" msgid "POFICHBEXXX"
msgstr "" msgstr ""
#: .\hosting\templates\hosting\bills.html:12
msgid "Customers" msgid "Customers"
msgstr "Kunden" msgstr "Kunden"
#: .\hosting\templates\hosting\bills.html:16
#: .\hosting\templates\hosting\user_keys.html:25
msgid "Name" msgid "Name"
msgstr "" msgstr ""
#: .\hosting\templates\hosting\bills.html:17
msgid "Email" msgid "Email"
msgstr "" msgstr ""
#: .\hosting\templates\hosting\bills.html:28
msgid "View Bill" msgid "View Bill"
msgstr "Rechnung anzeigen" msgstr "Rechnung anzeigen"
#: .\hosting\templates\hosting\bills.html:41
#: .\hosting\templates\hosting\orders.html:54
#: .\hosting\templates\hosting\virtual_machines.html:65
msgid "previous" msgid "previous"
msgstr "vorherige" msgstr "vorherige"
#: .\hosting\templates\hosting\bills.html:47
#: .\hosting\templates\hosting\orders.html:60
#: .\hosting\templates\hosting\virtual_machines.html:71
msgid "next" msgid "next"
msgstr "nächste" msgstr "nächste"
#: .\hosting\templates\hosting\choice_ssh_keys.html:8
msgid "SSH Key" msgid "SSH Key"
msgstr "SSH Key" msgstr "SSH Key"
#: .\hosting\templates\hosting\choice_ssh_keys.html:9
msgid "Choose a key option in order to access your VM" msgid "Choose a key option in order to access your VM"
msgstr "Wähle eine Option um Zugriff auf deine VM zu erhalten" msgstr "Wähle eine Option um Zugriff auf deine VM zu erhalten"
#: .\hosting\templates\hosting\choice_ssh_keys.html:20
msgid "Generating a new key pair" msgid "Generating a new key pair"
msgstr "Neuen SSH-Key erstellen" msgstr "Neuen SSH-Key erstellen"
#: .\hosting\templates\hosting\choice_ssh_keys.html:21
msgid "I want to generate a new key pair" msgid "I want to generate a new key pair"
msgstr "Ich möchte einen neuen SSH-Key erstellen" msgstr "Ich möchte einen neuen SSH-Key erstellen"
#: .\hosting\templates\hosting\choice_ssh_keys.html:25
#: .\hosting\templates\hosting\user_key.html:36
msgid "Generate" msgid "Generate"
msgstr "Generieren" msgstr "Generieren"
#: .\hosting\templates\hosting\choice_ssh_keys.html:31
msgid "Using existing key" msgid "Using existing key"
msgstr "Nutzung eines existierenden SSH-Keys" msgstr "Nutzung eines existierenden SSH-Keys"
#: .\hosting\templates\hosting\choice_ssh_keys.html:32
msgid "I want to use my existing public key" msgid "I want to use my existing public key"
msgstr "Ich möchte einen existierenden SSH-Key nutzen" msgstr "Ich möchte einen existierenden SSH-Key nutzen"
#: .\hosting\templates\hosting\choice_ssh_keys.html:35
msgid "Upload" msgid "Upload"
msgstr "Hochladen" msgstr "Hochladen"
#: .\hosting\templates\hosting\confirm_reset_password.html:14
#: .\hosting\templates\hosting\login.html:14
#: .\hosting\templates\hosting\reset_password.html:15
#: .\hosting\templates\hosting\signup.html:13
#: .\hosting\templates\hosting\signup_validate.html:9
msgid "Your VM hosted in Switzerland" msgid "Your VM hosted in Switzerland"
msgstr "deine VM in der Schweiz" msgstr "deine VM in der Schweiz"
#: .\hosting\templates\hosting\confirm_reset_password.html:18
msgid "Set your new password" msgid "Set your new password"
msgstr "Setze dein neues Passwort" msgstr "Setze dein neues Passwort"
#: .\hosting\templates\hosting\confirm_reset_password.html:33
#: .\hosting\templates\hosting\reset_password.html:27
msgid "Reset" msgid "Reset"
msgstr "Zurücksetzen" msgstr "Zurücksetzen"
#: .\hosting\templates\hosting\confirm_reset_password.html:39
#: .\hosting\templates\hosting\reset_password.html:33
#: .\hosting\templates\hosting\signup.html:31
msgid "Already have an account ?" msgid "Already have an account ?"
msgstr "Hast Du bereits ein Benutzerkonto?" msgstr "Hast Du bereits ein Benutzerkonto?"
#: .\hosting\templates\hosting\confirm_reset_password.html:42
#: .\hosting\templates\hosting\login.html:18
#: .\hosting\templates\hosting\login.html:34
#: .\hosting\templates\hosting\reset_password.html:36
#: .\hosting\templates\hosting\signup.html:34
msgid "Login" msgid "Login"
msgstr "Anmelden" msgstr "Anmelden"
#: .\hosting\templates\hosting\create_virtual_machine.html:20
msgid "New Virtual Machine" msgid "New Virtual Machine"
msgstr "Neue virtuelle Maschine" msgstr "Neue virtuelle Maschine"
#: .\hosting\templates\hosting\create_virtual_machine.html:28
msgid "Step 1. Select VM Template:" msgid "Step 1. Select VM Template:"
msgstr "Wähle eine Vorlage" msgstr "Wähle eine Vorlage"
#: .\hosting\templates\hosting\create_virtual_machine.html:42
msgid "Step2. Select VM Configuration" msgid "Step2. Select VM Configuration"
msgstr "Wähle eine Konfiguration" msgstr "Wähle eine Konfiguration"
#: .\hosting\templates\hosting\create_virtual_machine.html:59
msgid "Price " msgid "Price "
msgstr "Preis" msgstr "Preis"
#: .\hosting\templates\hosting\create_virtual_machine.html:59
msgid "CHF/Month" msgid "CHF/Month"
msgstr "CHF/Monat" msgstr "CHF/Monat"
#: .\hosting\templates\hosting\create_virtual_machine.html:61
msgid "Start VM" msgid "Start VM"
msgstr "VM jetzt starten" msgstr "VM jetzt starten"
#: .\hosting\templates\hosting\dashboard.html:8
msgid "My Dashboard" msgid "My Dashboard"
msgstr "Mein Dashboard" msgstr "Mein Dashboard"
#: .\hosting\templates\hosting\dashboard.html:12
msgid "Create VM" msgid "Create VM"
msgstr "VM erstellen" msgstr "VM erstellen"
#: .\hosting\templates\hosting\dashboard.html:18
msgid "My VMs" msgid "My VMs"
msgstr "Meine VMs" msgstr "Meine VMs"
#: .\hosting\templates\hosting\dashboard.html:24
#: .\hosting\templates\hosting\user_keys.html:6
msgid "My SSH Keys" msgid "My SSH Keys"
msgstr "Meine SSH Keys" msgstr "Meine SSH Keys"
#: .\hosting\templates\hosting\dashboard.html:30
msgid "My Bills" msgid "My Bills"
msgstr "Meine Rechnungen" msgstr "Meine Rechnungen"
#: .\hosting\templates\hosting\dashboard.html:36
msgid "My Settings" msgid "My Settings"
msgstr "Meine Einstellungen" msgstr "Meine Einstellungen"
#: .\hosting\templates\hosting\dashboard.html:42
#: .\hosting\templates\hosting\virtual_machine_detail.html:74
msgid "Support / Contact" msgid "Support / Contact"
msgstr "Support / Kontakt" msgstr "Support / Kontakt"
#: .\hosting\templates\hosting\emails\password_reset_email.html:2
#: .\hosting\templates\hosting\emails\password_reset_email.txt:2
#, python-format #, python-format
msgid "" msgid ""
"You're receiving this email because you requested a password reset for your " "You're receiving this email because you requested a password reset for your "
"user account at %(site_name)s." "user account at %(site_name)s."
msgstr "" msgstr ""
#: .\hosting\templates\hosting\emails\password_reset_email.html:4
#: .\hosting\templates\hosting\emails\password_reset_email.txt:4
msgid "Please go to the following page and choose a new password:" msgid "Please go to the following page and choose a new password:"
msgstr "" msgstr ""
#: .\hosting\templates\hosting\emails\password_reset_email.html:9
#: .\hosting\templates\hosting\emails\password_reset_email.txt:9
msgid "Thanks for using our site!" msgid "Thanks for using our site!"
msgstr "" msgstr ""
#: .\hosting\templates\hosting\emails\password_reset_email.html:11
#: .\hosting\templates\hosting\emails\password_reset_email.txt:11
#, python-format #, python-format
msgid "The %(site_name)s team" msgid "The %(site_name)s team"
msgstr "" msgstr ""
#: .\hosting\templates\hosting\login.html:41
msgid "Don't have an account yet ? " msgid "Don't have an account yet ? "
msgstr "Besitzt du kein Benutzerkonto?" msgstr "Besitzt du kein Benutzerkonto?"
#: .\hosting\templates\hosting\login.html:44
#: .\hosting\templates\hosting\signup.html:17
#: .\hosting\templates\hosting\signup.html:25 .\hosting\views.py:238
msgid "Sign up" msgid "Sign up"
msgstr "Registrieren" msgstr "Registrieren"
#: .\hosting\templates\hosting\login.html:46
msgid "Forgot your password ? " msgid "Forgot your password ? "
msgstr "Passwort vergessen?" msgstr "Passwort vergessen?"
#: .\hosting\templates\hosting\notifications.html:9
msgid "Notifications" msgid "Notifications"
msgstr "Benachrichtigungen" msgstr "Benachrichtigungen"
#: .\hosting\templates\hosting\notifications.html:16
msgid "Unread" msgid "Unread"
msgstr "Ungelesen" msgstr "Ungelesen"
#: .\hosting\templates\hosting\notifications.html:26
msgid "All" msgid "All"
msgstr "Alle" msgstr "Alle"
#: .\hosting\templates\hosting\notifications.html:38
msgid "Unread notifications" msgid "Unread notifications"
msgstr "Ungelesene Benachrichtigungen" msgstr "Ungelesene Benachrichtigungen"
#: .\hosting\templates\hosting\notifications.html:48
msgid "Mark as read" msgid "Mark as read"
msgstr "Als gelesen markieren" msgstr "Als gelesen markieren"
#: .\hosting\templates\hosting\notifications.html:59
msgid "All notifications" msgid "All notifications"
msgstr "Alle Benachrichtigungen" msgstr "Alle Benachrichtigungen"
#: .\hosting\templates\hosting\order_detail.html:29
#: .\hosting\templates\hosting\orders.html:23
#: .\hosting\templates\hosting\orders.html:33
msgid "Date" msgid "Date"
msgstr "Datum" msgstr "Datum"
#: .\hosting\templates\hosting\order_detail.html:31
msgid "Status:" msgid "Status:"
msgstr "" msgstr ""
#: .\hosting\templates\hosting\order_detail.html:41
msgid "Billed To:" msgid "Billed To:"
msgstr "Rechnungsadresse" msgstr "Rechnungsadresse"
#: .\hosting\templates\hosting\order_detail.html:52
msgid "Payment Method:" msgid "Payment Method:"
msgstr "Bezahlmethode" msgstr "Bezahlmethode"
#: .\hosting\templates\hosting\order_detail.html:63
msgid "Order summary" msgid "Order summary"
msgstr "Bestellungsübersicht" msgstr "Bestellungsübersicht"
#: .\hosting\templates\hosting\order_detail.html:66
#: .\hosting\templates\hosting\payment.html:13
#: .\hosting\templates\hosting\virtual_machine_detail.html:38
msgid "Cores" msgid "Cores"
msgstr "Prozessorkerne" msgstr "Prozessorkerne"
#: .\hosting\templates\hosting\order_detail.html:68
#: .\hosting\templates\hosting\payment.html:16
#: .\hosting\templates\hosting\virtual_machine_detail.html:39
msgid "Memory" msgid "Memory"
msgstr "Arbeitsspeicher" msgstr "Arbeitsspeicher"
#: .\hosting\templates\hosting\order_detail.html:70
#: .\hosting\templates\hosting\payment.html:19
msgid "Disk space" msgid "Disk space"
msgstr "Festplattenkapazität" msgstr "Festplattenkapazität"
#: .\hosting\templates\hosting\order_detail.html:72
#: .\hosting\templates\hosting\payment.html:41
msgid "Total" msgid "Total"
msgstr "Gesamt" msgstr "Gesamt"
#: .\hosting\templates\hosting\order_detail.html:78
msgid "Finish Configuration" msgid "Finish Configuration"
msgstr "Konfiguration beenden" msgstr "Konfiguration beenden"
#: .\hosting\templates\hosting\orders.html:22
#: .\hosting\templates\hosting\orders.html:32
msgid "Order Nr." msgid "Order Nr."
msgstr "Bestellung Nr." msgstr "Bestellung Nr."
#: .\hosting\templates\hosting\orders.html:24
#: .\hosting\templates\hosting\orders.html:34
msgid "Amount" msgid "Amount"
msgstr "Betrag" msgstr "Betrag"
#: .\hosting\templates\hosting\orders.html:25
#: .\hosting\templates\hosting\orders.html:35
#: .\hosting\templates\hosting\virtual_machine_detail.html:53
#: .\hosting\templates\hosting\virtual_machines.html:31
#: .\hosting\templates\hosting\virtual_machines.html:43
msgid "Status" msgid "Status"
msgstr "" msgstr ""
#: .\hosting\templates\hosting\orders.html:43
#: .\hosting\templates\hosting\virtual_machine_detail.html:49
msgid "See Invoice" msgid "See Invoice"
msgstr "Rechnung" msgstr "Rechnung"
#: .\hosting\templates\hosting\orders.html:43
#: .\hosting\templates\hosting\virtual_machines.html:53
msgid "View Detail"
msgstr "Details anzeigen"
#: .\hosting\templates\hosting\orders.html:57
#: .\hosting\templates\hosting\virtual_machines.html:68
msgid "Page" msgid "Page"
msgstr "" msgstr ""
#: .\hosting\templates\hosting\orders.html:57
#: .\hosting\templates\hosting\virtual_machines.html:68
msgid "of" msgid "of"
msgstr "" msgstr ""
#: .\hosting\templates\hosting\payment.html:10
msgid "Your Order" msgid "Your Order"
msgstr "Deine Bestellung" msgstr "Deine Bestellung"
#: .\hosting\templates\hosting\payment.html:22
#: .\hosting\templates\hosting\virtual_machine_detail.html:41
msgid "Configuration" msgid "Configuration"
msgstr "Konfiguration" msgstr "Konfiguration"
#: .\hosting\templates\hosting\payment.html:41
msgid "including VAT" msgid "including VAT"
msgstr "inkl. Mehrwertsteuer" msgstr "inkl. Mehrwertsteuer"
#: .\hosting\templates\hosting\payment.html:46
#: .\hosting\templates\hosting\virtual_machine_detail.html:48
msgid "Month" msgid "Month"
msgstr "Monat" msgstr "Monat"
#: .\hosting\templates\hosting\payment.html:55
msgid "Billing Address" msgid "Billing Address"
msgstr "Rechnungsadresse" msgstr "Rechnungsadresse"
#: .\hosting\templates\hosting\payment.html:65
msgid "Credit Card" msgid "Credit Card"
msgstr "Kreditkarte" msgstr "Kreditkarte"
#: .\hosting\templates\hosting\payment.html:70
msgid "" msgid ""
"\n" "\n"
" Please fill in your credit card information " " Please fill in your credit card information "
@ -462,8 +316,6 @@ msgstr ""
"\"https://stripe.com\" target=\"_blank\">Stripe</a> für die Bezahlung und " "\"https://stripe.com\" target=\"_blank\">Stripe</a> für die Bezahlung und "
"speichern keine Informationen in unserer Datenbank." "speichern keine Informationen in unserer Datenbank."
#: .\hosting\templates\hosting\payment.html:90
#: .\hosting\templates\hosting\payment.html:147
msgid "" msgid ""
"You are not making any payment yet. After submitting your card information, " "You are not making any payment yet. After submitting your card information, "
"you will be taken to the Confirm Order Page." "you will be taken to the Confirm Order Page."
@ -471,200 +323,152 @@ msgstr ""
"Es wird noch keine Bezahlung vorgenommen. Die Bezahlung wird erst ausgelöst, " "Es wird noch keine Bezahlung vorgenommen. Die Bezahlung wird erst ausgelöst, "
"nachdem Du die Bestellung auf der nächsten Seite bestätigt hast." "nachdem Du die Bestellung auf der nächsten Seite bestätigt hast."
#: .\hosting\templates\hosting\payment.html:112
#: .\hosting\templates\hosting\payment.html:168
msgid "Submit" msgid "Submit"
msgstr "Absenden" msgstr "Absenden"
#: .\hosting\templates\hosting\payment.html:124
msgid "Card Number" msgid "Card Number"
msgstr "Kreditkartennummer" msgstr "Kreditkartennummer"
#: .\hosting\templates\hosting\payment.html:128
msgid "Expiry Date" msgid "Expiry Date"
msgstr "Ablaufdatum" msgstr "Ablaufdatum"
#: .\hosting\templates\hosting\payment.html:133
msgid "CVC" msgid "CVC"
msgstr "" msgstr ""
#: .\hosting\templates\hosting\payment.html:137
msgid "Card Type" msgid "Card Type"
msgstr "Kartentyp" msgstr "Kartentyp"
#: .\hosting\templates\hosting\payment.html:194
msgid "Processing" msgid "Processing"
msgstr "Weiter" msgstr "Weiter"
#: .\hosting\templates\hosting\payment.html:195
msgid "Enter your credit card number" msgid "Enter your credit card number"
msgstr "Deine Kreditkartennummer" msgstr "Deine Kreditkartennummer"
#: .\hosting\templates\hosting\reset_password.html:19
msgid "Reset your password" msgid "Reset your password"
msgstr "Passwort zurücksetzen" msgstr "Passwort zurücksetzen"
#: .\hosting\templates\hosting\user_key.html:11
msgid "Add your public SSH key" msgid "Add your public SSH key"
msgstr "Füge deinen öffentlichen SSH-Key hinzu" msgstr "Füge deinen öffentlichen SSH-Key hinzu"
#: .\hosting\templates\hosting\user_key.html:25
msgid "Use your created key to access to the VM" msgid "Use your created key to access to the VM"
msgstr "Benutze deinen erstellten SSH-Key um auf deine VM zugreifen zu können" msgstr "Benutze deinen erstellten SSH-Key um auf deine VM zugreifen zu können"
#: .\hosting\templates\hosting\user_key.html:28
#: .\hosting\templates\hosting\user_keys.html:17
msgid "Add SSH Key" msgid "Add SSH Key"
msgstr "Hinzufügen" msgstr "Hinzufügen"
#: .\hosting\templates\hosting\user_key.html:33
msgid "Or you can generate a new key pair" msgid "Or you can generate a new key pair"
msgstr "Erstelle dein neues Keypaar" msgstr "Erstelle dein neues Keypaar"
#: .\hosting\templates\hosting\user_key.html:45
msgid "Warning!" msgid "Warning!"
msgstr "Achtung!" msgstr "Achtung!"
#: .\hosting\templates\hosting\user_key.html:45
msgid "You can download your SSH private key once. Don't loose your key" msgid "You can download your SSH private key once. Don't loose your key"
msgstr "" msgstr ""
"Du kannst deinen privaten SSH Schlüssel nur einmal herunterladen. Beware ihn " "Du kannst deinen privaten SSH Schlüssel nur einmal herunterladen. Beware ihn "
"sicher auf." "sicher auf."
#: .\hosting\templates\hosting\user_keys.html:15
msgid "" msgid ""
"To generate a new key pair or to upload your existing key, click 'Add Key'" "To generate a new key pair or to upload your existing key, click 'Add Key'"
msgstr "" msgstr ""
"Um einen neuen SSH-Key zu erstellen oder um einen vorhandenen SSH-Key " "Um einen neuen SSH-Key zu erstellen oder um einen vorhandenen SSH-Key "
"hinzuzufügen, klicke auf 'Hinzufügen'" "hinzuzufügen, klicke auf 'Hinzufügen'"
#: .\hosting\templates\hosting\user_keys.html:26
msgid "Delete Key" msgid "Delete Key"
msgstr "Löschen" msgstr "Löschen"
#: .\hosting\templates\hosting\user_keys.html:27
msgid "Public Key" msgid "Public Key"
msgstr "" msgstr ""
#: .\hosting\templates\hosting\user_keys.html:28
msgid "Private Key" msgid "Private Key"
msgstr "" msgstr ""
#: .\hosting\templates\hosting\user_keys.html:38
#: .\hosting\templates\hosting\user_keys.html:57
msgid "Delete" msgid "Delete"
msgstr "Löschen" msgstr "Löschen"
#: .\hosting\templates\hosting\user_keys.html:52
msgid "Delete SSH Key" msgid "Delete SSH Key"
msgstr "SSH Key löschen" msgstr "SSH Key löschen"
#: .\hosting\templates\hosting\user_keys.html:53
msgid "Do you want to delete this key?" msgid "Do you want to delete this key?"
msgstr "Möchtest Du den Schlüssel löschen?" msgstr "Möchtest Du den Schlüssel löschen?"
#: .\hosting\templates\hosting\user_keys.html:68
msgid "Show" msgid "Show"
msgstr "Anzeigen" msgstr "Anzeigen"
#: .\hosting\templates\hosting\user_keys.html:80
msgid "Public SSH Key" msgid "Public SSH Key"
msgstr "Public SSH Key" msgstr "Public SSH Key"
#: .\hosting\templates\hosting\user_keys.html:95
msgid "Download" msgid "Download"
msgstr "" msgstr ""
#: .\hosting\templates\hosting\virtual_machine_detail.html:14
msgid "Your Virtual Machine Detail" msgid "Your Virtual Machine Detail"
msgstr "Virtuelle Maschinen Detail" msgstr "Virtuelle Maschinen Detail"
#: .\hosting\templates\hosting\virtual_machine_detail.html:17
msgid "VM Settings" msgid "VM Settings"
msgstr "VM Einstellungen" msgstr "VM Einstellungen"
#: .\hosting\templates\hosting\virtual_machine_detail.html:24
#: .\hosting\templates\hosting\virtual_machine_detail.html:31
msgid "Copied" msgid "Copied"
msgstr "Kopiert" msgstr "Kopiert"
#: .\hosting\templates\hosting\virtual_machine_detail.html:40
msgid "Disk" msgid "Disk"
msgstr "Festplatte" msgstr "Festplatte"
#: .\hosting\templates\hosting\virtual_machine_detail.html:45
msgid "Billing" msgid "Billing"
msgstr "Abrechnungen" msgstr "Abrechnungen"
#: .\hosting\templates\hosting\virtual_machine_detail.html:47
msgid "Current Pricing" msgid "Current Pricing"
msgstr "Aktueller Preis" msgstr "Aktueller Preis"
#: .\hosting\templates\hosting\virtual_machine_detail.html:55
msgid "Your VM is" msgid "Your VM is"
msgstr "Deine VM ist" msgstr "Deine VM ist"
#: .\hosting\templates\hosting\virtual_machine_detail.html:57
msgid "Pending" msgid "Pending"
msgstr "In Vorbereitung" msgstr "In Vorbereitung"
#: .\hosting\templates\hosting\virtual_machine_detail.html:59
msgid "Online" msgid "Online"
msgstr "" msgstr ""
#: .\hosting\templates\hosting\virtual_machine_detail.html:61
msgid "Failed" msgid "Failed"
msgstr "Fehlgeschlagen" msgstr "Fehlgeschlagen"
#: .\hosting\templates\hosting\virtual_machine_detail.html:67
msgid "Terminate VM" msgid "Terminate VM"
msgstr "VM Beenden" msgstr "VM Beenden"
#: .\hosting\templates\hosting\virtual_machine_detail.html:79
msgid "Something doesn't work?" msgid "Something doesn't work?"
msgstr "Etwas funktioniert nicht?" msgstr "Etwas funktioniert nicht?"
#: .\hosting\templates\hosting\virtual_machine_detail.html:79
msgid "We are here to help you!" msgid "We are here to help you!"
msgstr "Wir sind hier, um Dir zu helfen!" msgstr "Wir sind hier, um Dir zu helfen!"
#: .\hosting\templates\hosting\virtual_machine_detail.html:83
msgid "CONTACT" msgid "CONTACT"
msgstr "KONTACT" msgstr "KONTACT"
#: .\hosting\templates\hosting\virtual_machine_detail.html:87
msgid "BACK TO LIST" msgid "BACK TO LIST"
msgstr "ZURÜCK ZUR LISTE" msgstr "ZURÜCK ZUR LISTE"
#: .\hosting\templates\hosting\virtual_machine_detail.html:99
msgid "Terminate your Virtual Machine" msgid "Terminate your Virtual Machine"
msgstr "Deine Virtuelle Maschine beenden" msgstr "Deine Virtuelle Maschine beenden"
#: .\hosting\templates\hosting\virtual_machine_detail.html:101
msgid "Do you want to cancel your Virtual Machine" msgid "Do you want to cancel your Virtual Machine"
msgstr "Bist Du sicher, dass Du Deine virtuelle Maschine beenden willst" msgstr "Bist Du sicher, dass Du Deine virtuelle Maschine beenden willst"
#: .\hosting\templates\hosting\virtual_machine_detail.html:106
msgid "OK" msgid "OK"
msgstr "" msgstr ""
#: .\hosting\templates\hosting\virtual_machines.html:6
msgid "Virtual Machines" msgid "Virtual Machines"
msgstr "Virtuelle Maschinen" msgstr "Virtuelle Maschinen"
#: .\hosting\templates\hosting\virtual_machines.html:16
msgid "To create a new virtual machine, click \"Create VM\"" msgid "To create a new virtual machine, click \"Create VM\""
msgstr "" msgstr ""
#: .\hosting\templates\hosting\virtual_machines.html:18
msgid "CREATE VM" msgid "CREATE VM"
msgstr "NEUE VM" msgstr "NEUE VM"
#: .\hosting\views.py:225 .\hosting\views.py:249 msgid "View Detail"
msgstr "Details anzeigen"
msgid "login" msgid "login"
msgstr "Einloggen" msgstr "Einloggen"
#: .\hosting\views.py:231
msgid "" msgid ""
"Thank you for signing up. We have sent an email to you. Please follow the " "Thank you for signing up. We have sent an email to you. Please follow the "
"instructions in it to activate your account. Once activated, you can login " "instructions in it to activate your account. Once activated, you can login "
@ -674,35 +478,27 @@ msgstr ""
"den Anweisungen um deinen Account zu aktivieren. Danach kannst du dich über " "den Anweisungen um deinen Account zu aktivieren. Danach kannst du dich über "
"diesen" "diesen"
#: .\hosting\views.py:233 .\hosting\views.py:263
msgid "Go back to" msgid "Go back to"
msgstr "Zurück" msgstr "Zurück"
#: .\hosting\views.py:250
msgid "Account activation" msgid "Account activation"
msgstr "Accountaktivierung" msgstr "Accountaktivierung"
#: .\hosting\views.py:254
msgid "Your account has been activated." msgid "Your account has been activated."
msgstr "Dein Account wurde aktiviert." msgstr "Dein Account wurde aktiviert."
#: .\hosting\views.py:255
msgid "You can now" msgid "You can now"
msgstr "Du kannst dich nun" msgstr "Du kannst dich nun"
#: .\hosting\views.py:262
msgid "Sorry. Your request is invalid." msgid "Sorry. Your request is invalid."
msgstr "Entschuldigung, deine Anfrage ist ungültig." msgstr "Entschuldigung, deine Anfrage ist ungültig."
#: .\hosting\views.py:572
msgid "Invalid credit card" msgid "Invalid credit card"
msgstr "Ungültige Kreditkarte" msgstr "Ungültige Kreditkarte"
#: .\hosting\views.py:685
msgid "Confirm Order" msgid "Confirm Order"
msgstr "Bestellung Bestätigen" msgstr "Bestellung Bestätigen"
#: .\hosting\views.py:823
msgid "" msgid ""
"We could not find the requested VM. Please " "We could not find the requested VM. Please "
"contact Data Center Light Support." "contact Data Center Light Support."

View file

@ -536,6 +536,7 @@ a.unlink:hover {
.dcl-place-order-text{ .dcl-place-order-text{
font-size: 13px; font-size: 13px;
color: #808080; color: #808080;
margin-bottom: 15px;
} }
.dcl-order-table-total .tbl-total { .dcl-order-table-total .tbl-total {

View file

@ -40,7 +40,7 @@
{% endif %} {% endif %}
</td> </td>
<td class="text-right last-td"> <td class="text-right last-td">
<a class="btn btn-order-detail alt-text" href="{% url 'hosting:orders' order.pk %}" data-alt="{% trans 'See Invoice' %}">{% trans "View Detail" %}</a> <a class="btn btn-order-detail" href="{% url 'hosting:orders' order.pk %}">{% trans 'See Invoice' %}</a>
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}