Merge branch 'develop' of github.com:ungleich/dynamicweb into develop

This commit is contained in:
Levi 2017-06-04 17:08:09 -05:00
commit 8adcb75b8c
20 changed files with 279 additions and 211 deletions

1
.gitignore vendored
View file

@ -34,3 +34,4 @@ secret-key
.idea/
.env
*.mo

View file

@ -8,7 +8,11 @@
1.0.3: 2017-06-02
* [datacenterlight] Hotfix, remove footer on mobile devices
next
next:
* [datacenterlight] Add German translations
* [datacenterlight] Change beta access to subscriptions
* [hosting] Add German translations
* [blog] Add German translation for header
* [opennebula_api] Improve testing, add ssh key functions
* [opennebula_api] Remove template views
* [datacenterlight] Allow user to have multiple ssh keys

View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-05-26 13:35+0000\n"
"POT-Creation-Date: 2017-05-30 13:47+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

View file

@ -17,7 +17,7 @@
{% render_model post "abstract" "" "" 'truncatewords_html:10' %}
</h2>
<span class="meta">
Posted on {{ post.date_published|date:"DATE_FORMAT" }}
{% trans "Posted on"%} {{ post.date_published|date:"DATE_FORMAT" }}
</span>
</div>
</div>

View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-05-27 10:13-0500\n"
"POT-Creation-Date: 2017-05-30 13:47+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -75,87 +75,72 @@ msgstr ""
msgid "Thank you!"
msgstr "Vielen Dank!"
#: templates/datacenterlight/index.html:62
#: templates/datacenterlight/index.html:142
#: templates/datacenterlight/index.html:328
#: templates/datacenterlight/pricing.html:62
#: templates/datacenterlight/pricing.html:185
#: datacenterlight/templates/datacenterlight/index.html:62
#: datacenterlight/templates/datacenterlight/index.html:160
#: datacenterlight/templates/datacenterlight/index.html:346
#: datacenterlight/templates/datacenterlight/pricing.html:62
#: datacenterlight/templates/datacenterlight/pricing.html:190
msgid "What is it"
msgstr "Was ist es?"
#: datacenterlight/templates/datacenterlight/index.html:65
#: datacenterlight/templates/datacenterlight/index.html:171
#: datacenterlight/templates/datacenterlight/index.html:331
#: datacenterlight/templates/datacenterlight/index.html:189
#: datacenterlight/templates/datacenterlight/index.html:349
#: datacenterlight/templates/datacenterlight/pricing.html:65
#: datacenterlight/templates/datacenterlight/pricing.html:190
#: datacenterlight/templates/datacenterlight/pricing.html:193
msgid "Scale out"
msgstr "Skalierung"
#: datacenterlight/templates/datacenterlight/index.html:68
#: datacenterlight/templates/datacenterlight/index.html:197
#: datacenterlight/templates/datacenterlight/index.html:334
#: datacenterlight/templates/datacenterlight/index.html:215
#: datacenterlight/templates/datacenterlight/index.html:352
#: datacenterlight/templates/datacenterlight/pricing.html:68
#: datacenterlight/templates/datacenterlight/pricing.html:193
#: datacenterlight/templates/datacenterlight/pricing.html:196
msgid "Reliable and light"
msgstr "Zuverlässig und leicht"
#: templates/datacenterlight/index.html:71
#: templates/datacenterlight/pricing.html:71
#: datacenterlight/templates/datacenterlight/index.html:71
msgid "Order VM"
msgstr "VM bestellen"
#: datacenterlight/templates/datacenterlight/index.html:71
#: datacenterlight/templates/datacenterlight/pricing.html:71
msgid "Buy VM"
msgstr "VM Kaufen"
#: datacenterlight/templates/datacenterlight/index.html:74
#: datacenterlight/templates/datacenterlight/index.html:341
#: datacenterlight/templates/datacenterlight/index.html:359
#: datacenterlight/templates/datacenterlight/pricing.html:74
#: datacenterlight/templates/datacenterlight/pricing.html:200
#: datacenterlight/templates/datacenterlight/pricing.html:203
msgid "Contact"
msgstr "Kontakt"
#: datacenterlight/templates/datacenterlight/index.html:109
#: datacenterlight/templates/datacenterlight/index.html:127
msgid "Finally, an affordable VM hosting in Switzerland!"
msgstr "Endlich: bezahlbares VM Hosting in der Schweiz"
#: datacenterlight/templates/datacenterlight/index.html:113
#: datacenterlight/templates/datacenterlight/index.html:131
msgid "What is it?"
msgstr "Was ist es?"
#: datacenterlight/templates/datacenterlight/index.html:116
#: datacenterlight/templates/datacenterlight/index.html:134
msgid "I want it!"
msgstr "Das will ich haben!"
#: templates/datacenterlight/index.html:147
#: datacenterlight/templates/datacenterlight/index.html:142
#: datacenterlight/templates/datacenterlight/index.html:328
#: datacenterlight/templates/datacenterlight/pricing.html:187
msgid "How it works"
msgstr "Wie es funktioniert"
#: datacenterlight/templates/datacenterlight/index.html:147
#: datacenterlight/templates/datacenterlight/index.html:165
msgid "Reuse existing factory halls intead of building an expensive building."
msgstr ""
"Nachhaltigkeit: Wiederverwendung ehemaliger Fabrikhallen an Stelle der "
"Errichtung eines neuen Gebäudes"
#: datacenterlight/templates/datacenterlight/index.html:150
#: datacenterlight/templates/datacenterlight/index.html:168
msgid "Being creative, using modern and alternative design for a datacenter."
msgstr ""
"Kreativität: Verwendung eines modernen und alternativen Designs für unser "
"Datencenter"
#: datacenterlight/templates/datacenterlight/index.html:152
#: datacenterlight/templates/datacenterlight/index.html:170
msgid "Being open: Using FOSS exclusively, we can save money for licenses."
msgstr ""
"Offene Verfahrensweise: Die Benutzung eines eigenen Frameworks, FOSS, "
"erspart Lizenzgebühren"
#: datacenterlight/templates/datacenterlight/index.html:174
#: datacenterlight/templates/datacenterlight/index.html:192
msgid ""
"We don't use special hardware. We use commodity hardware: we buy computers "
"that you buy. Just many more and put them in a cozy home for computers "
@ -165,7 +150,7 @@ msgstr ""
"erschwingliche Systeme. Bei grösserer Auslastung werden mehr Standard "
"komponenten hinzugekauft und skalieren so das Datencenter."
#: datacenterlight/templates/datacenterlight/index.html:200
#: datacenterlight/templates/datacenterlight/index.html:218
msgid ""
"Our VMs are located in Switzerland, with reliable power supply and fast "
"internet connection. Our VM costs less thanks to our featherlight "
@ -175,111 +160,117 @@ msgstr ""
"Energieversorgung sowie schneller Internetverbindung ausgestattet. Unser "
"Angebot ist aufgrund unserer leichten Infrastruktur überaus kostengünstig."
#: datacenterlight/templates/datacenterlight/index.html:218
#: datacenterlight/templates/datacenterlight/pricing.html:101
#: datacenterlight/templates/datacenterlight/index.html:236
#: datacenterlight/templates/datacenterlight/pricing.html:106
msgid "We are cutting down the costs significantly!"
msgstr "Wir sorgen dafür, dass die Kosten für Sie signifikant abnehmen"
#: datacenterlight/templates/datacenterlight/index.html:219
#: datacenterlight/templates/datacenterlight/index.html:237
msgid "Affordable VM hosting based in Switzerland"
msgstr "Bezahlbares VM Hosting in der Schweiz"
#: datacenterlight/templates/datacenterlight/index.html:220
#: datacenterlight/templates/datacenterlight/index.html:238
msgid "More Info"
msgstr "Weitere Informationen"
#: datacenterlight/templates/datacenterlight/index.html:227
#: datacenterlight/templates/datacenterlight/pricing.html:114
#: datacenterlight/templates/datacenterlight/index.html:245
#: datacenterlight/templates/datacenterlight/pricing.html:119
msgid "VM hosting"
msgstr "VM Hosting"
#: datacenterlight/templates/datacenterlight/index.html:234
#: datacenterlight/templates/datacenterlight/index.html:252
msgid "Based in Switzerland"
msgstr "Standort des Datacenters ist in der Schweiz"
#: templates/datacenterlight/index.html:243
#, fuzzy
#| msgid "10 GB Storage (SSD)"
#: datacenterlight/templates/datacenterlight/index.html:261
msgid "10 GB Storage (SSD)"
msgstr "10 GB Storage (SSD)"
#: datacenterlight/templates/datacenterlight/index.html:246
#: datacenterlight/templates/datacenterlight/pricing.html:156
#: datacenterlight/templates/datacenterlight/index.html:264
#: datacenterlight/templates/datacenterlight/pricing.html:161
msgid "Order Now!"
msgstr "Bestelle jetzt!"
#: datacenterlight/templates/datacenterlight/index.html:262
#: datacenterlight/templates/datacenterlight/index.html:280
msgid "Want to know more? Subscribe to our newsletter!"
msgstr "Willst du mehr wissen? Abonniere unseren Newsletter!"
#: datacenterlight/templates/datacenterlight/index.html:289
#: datacenterlight/templates/datacenterlight/index.html:307
msgid "Switzerland "
msgstr "Schweiz"
#: datacenterlight/templates/datacenterlight/index.html:306
#: datacenterlight/templates/datacenterlight/index.html:324
msgid "Questions?"
msgstr "Fragen?"
#: datacenterlight/templates/datacenterlight/index.html:306
#: datacenterlight/templates/datacenterlight/index.html:324
msgid "Contact us!"
msgstr "Kontaktiere uns!"
#: datacenterlight/templates/datacenterlight/index.html:324
#: datacenterlight/templates/datacenterlight/pricing.html:183
#: datacenterlight/templates/datacenterlight/index.html:342
#: datacenterlight/templates/datacenterlight/pricing.html:186
msgid "Home"
msgstr "Home"
#: datacenterlight/templates/datacenterlight/index.html:337
#: datacenterlight/templates/datacenterlight/pricing.html:196
#: datacenterlight/templates/datacenterlight/index.html:355
#: datacenterlight/templates/datacenterlight/pricing.html:199
msgid "Pricing"
msgstr "Preise"
#: datacenterlight/templates/datacenterlight/pricing.html:122
#: datacenterlight/templates/datacenterlight/pricing.html:71
msgid "Buy VM"
msgstr "VM Kaufen"
#: datacenterlight/templates/datacenterlight/pricing.html:127
msgid "Hosted in Switzerland"
msgstr "Standort des Datacenters ist in der Schweiz"
#: templates/datacenterlight/pricing.html:139
#: datacenterlight/templates/datacenterlight/pricing.html:139
#: datacenterlight/templates/datacenterlight/pricing.html:144
msgid "GB Storage (SSD)"
msgstr "GB Storage (SSD)"
#: datacenterlight/templates/datacenterlight/pricing.html:163
#: datacenterlight/templates/datacenterlight/pricing.html:168
msgid "Simple and affordable: Try our virtual machine with featherlight price."
msgstr ""
"Simpel und bezahlbar: Testen Sie unsere virtuelen Machinen mit "
"federleichten Preisen"
#: datacenterlight/templates/datacenterlight/pricing.html:166
msgid "Our VMs are hosted in Glarus, Switzerland."
msgstr "Standort des Datacenters ist in der Schweiz"
#: datacenterlight/templates/datacenterlight/pricing.html:168
msgid ""
" WARNING: We are currently running in BETA mode. We "
"hope you won't encounter any hiccups, but if you do, please let us know at "
"support@datacenterlight.ch"
msgstr ""
" Achtung: Wir befinden uns zurzeit im Beta-Release. Wir hoffen, "
"dass Sie davon nichts mitbekommen, falls doch melden "
"Sie sich bitte via support@datacenterlight.ch"
#~ msgid "Request Beta Access"
#~ msgstr "Beantrage Beta-Zugang"
#~ msgid "Thank you, we will contact you as soon as possible"
#~ msgstr "Vielen Dank, wir werden Sie sobald als möglich kontaktieren."
#: templates/datacenterlight/pricing.html:166
#: datacenterlight/templates/datacenterlight/pricing.html:171
msgid ""
"Our VMs are hosted in Glarus, Switzerland, and our website is currently "
"running in BETA mode. If you want more information that you did not find on "
"our website, or if your order is more detailed, or if you encounter any "
"technical hiccups, please contact us at support@datacenterlight.ch, our team "
"will get in touch with you asap."
msgstr "Unsere VMs werden in der Schweiz im Kanton Glarus gehostet und befinden sich zur Zeit noch in der BETA-Phase. Möchtest du mehr über uns erfahren und hast auf unserer Website nicht genügend Informationen gefunden? Möchtest eine detailliertere Bestellung aufgeben? Bist du auf technische Probleme gestossen, die du uns mitteilen möchtest? Dann zögere nicht und kontaktiere uns unter support@datacenterlight.ch. Unser Team wird sich umgehend um dein Anliegen kümmern!"
msgstr ""
"Unsere VMs werden in der Schweiz im Kanton Glarus gehostet und befinden sich "
"zur Zeit noch in der BETA-Phase. Möchtest du mehr über uns erfahren und hast "
"auf unserer Website nicht genügend Informationen gefunden? Möchtest eine "
"detailliertere Bestellung aufgeben? Bist du auf technische Probleme "
"gestossen, die du uns mitteilen möchtest? Dann zögere nicht und kontaktiere "
"uns unter support@datacenterlight.ch. Unser Team wird sich umgehend um dein "
"Anliegen kümmern!"
#~ msgid "How it works"
#~ msgstr "Wie es funktioniert"
#~ msgid "Our VMs are hosted in Glarus, Switzerland."
#~ msgstr "Standort des Datacenters ist in der Schweiz"
#~ msgid ""
#~ " WARNING: We are currently running in BETA mode. We hope you won't "
#~ "encounter any hiccups, but if you do, please let us know at "
#~ "support@datacenterlight.ch"
#~ msgstr ""
#~ " Achtung: Wir befinden uns zurzeit im Beta-Release. Wir hoffen, dass Sie "
#~ "davon nichts mitbekommen, falls doch melden Sie sich bitte via "
#~ "support@datacenterlight.ch"
#~ msgid "Request Beta Access"
#~ msgstr "Beantrage Beta-Zugang"
#~ msgid "Thank you, we will contact you as soon as possible"
#~ msgstr "Vielen Dank, wir werden Sie sobald als möglich kontaktieren."
#~ msgid "Buy Now!"
#~ msgstr "Kaufe jetzt!"

View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-05-26 13:35+0000\n"
"POT-Creation-Date: 2017-05-30 13:47+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -18,15 +18,21 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: cms_templates/djangocms_blog/_header_post_detail.html:20
#: digitalglarus/templates/digitalglarus/post_detail.html:19
#: ungleich/templates/ungleich/djangocms_blog/includes/blog_item.html:19
msgid "Posted on"
msgstr "Veröffentlicht am"
#: cms_templates/djangocms_blog/post_list.html:11
#: ungleich/templates/ungleich/djangocms_blog/post_list_ungleich.html:11
msgid "Articles by"
msgstr ""
msgstr "Artikel vom"
#: cms_templates/djangocms_blog/post_list.html:12
#: ungleich/templates/ungleich/djangocms_blog/post_list_ungleich.html:12
msgid "Archive"
msgstr ""
msgstr "Archiv"
#: cms_templates/djangocms_blog/post_list.html:13
#: ungleich/templates/ungleich/djangocms_blog/post_list_ungleich.html:13
@ -36,39 +42,39 @@ msgstr ""
#: cms_templates/djangocms_blog/post_list.html:14
#: ungleich/templates/ungleich/djangocms_blog/post_list_ungleich.html:14
msgid "Category"
msgstr ""
msgstr "Kategorie"
#: cms_templates/djangocms_blog/post_list.html:21
#: digitalglarus/templates/glarus_blog/post_list.html:15
#: ungleich/templates/ungleich/djangocms_blog/post_list_ungleich.html:22
msgid "No article found."
msgstr ""
msgstr "Keine Artikel gefunden"
#: cms_templates/djangocms_blog/post_list.html:24
#: digitalglarus/templates/glarus_blog/post_list.html:18
#: ungleich/templates/ungleich/djangocms_blog/post_list_ungleich.html:25
msgid "Back"
msgstr ""
msgstr "Zurück"
#: cms_templates/djangocms_blog/post_list.html:32
#: ungleich/templates/ungleich/djangocms_blog/post_list_ungleich.html:33
msgid "Newer Posts"
msgstr ""
msgstr "Neuere Einträge"
#: cms_templates/djangocms_blog/post_list.html:39
#: ungleich/templates/ungleich/djangocms_blog/post_list_ungleich.html:40
msgid "Older Posts"
msgstr ""
msgstr "Ältere Einträge"
#: cms_templates/includes/blog_item.html:31
#: digitalglarus/templates/glarus_blog/includes/blog_item.html:32
msgid "read more"
msgstr ""
msgstr "weiterlesen"
#: cms_templates/includes/blog_meta.html:6
#: digitalglarus/templates/glarus_blog/includes/blog_meta.html:6
msgid "by"
msgstr ""
msgstr "von"
#: digitalglarus/cms_plugins.py:9
msgid "Digital Glarus Gallery"
@ -81,53 +87,53 @@ msgstr ""
#: digitalglarus/forms.py:35 digitalglarus/forms.py:70 nosystemd/forms.py:47
#: utils/forms.py:109
msgid "Street Address"
msgstr ""
msgstr "Adresse"
#: digitalglarus/forms.py:36 digitalglarus/forms.py:71 nosystemd/forms.py:48
#: utils/forms.py:110 utils/forms.py:124
msgid "City"
msgstr ""
msgstr "Stadt"
#: digitalglarus/forms.py:37 digitalglarus/forms.py:72 nosystemd/forms.py:49
#: utils/forms.py:111 utils/forms.py:125
msgid "Postal Code"
msgstr ""
msgstr "Postleitzahl"
#: digitalglarus/forms.py:38 digitalglarus/forms.py:73 nosystemd/forms.py:50
#: utils/forms.py:112 utils/forms.py:126
msgid "Country"
msgstr ""
msgstr "Land"
#: digitalglarus/templates/digitalglarus/login.html:88
#: digitalglarus/templates/digitalglarus/login_hello.html:32
#: nosystemd/templates/nosystemd/login.html:23
msgid "You haven been logged out"
msgstr ""
msgstr "Sie wurden abgemeldet"
#: digitalglarus/templates/glarus_blog/post_list.html:23
#: nosystemd/templates/nosystemd/donations.html:74
msgid "previous"
msgstr ""
msgstr "vorherige"
#: digitalglarus/templates/glarus_blog/post_list.html:26
#: dynamicweb/settings/base.py:182 templates/cms/__init__.py:10
#: templates/cms/ungleichch/__init__.py:5
msgid "Page"
msgstr ""
msgstr "Seite"
#: digitalglarus/templates/glarus_blog/post_list.html:26
msgid "of"
msgstr ""
msgstr "vom"
#: digitalglarus/templates/glarus_blog/post_list.html:29
#: nosystemd/templates/nosystemd/donations.html:80
msgid "next"
msgstr ""
msgstr "nächste"
#: digitalglarus/templates/language_chooser.html:8
#: ungleich/templates/cms/ungleichch/_header_base.html:23
msgid "Change to language:"
msgstr ""
msgstr "Sprache wechseln zu: "
#: digitalglarus/templates/new_base_glarus.html:168
#: digitalglarus/templates/new_base_glarus.html:191
@ -314,13 +320,12 @@ msgstr "Name"
#: membership/forms.py:43
#, fuzzy
#| msgid "Phone number"
msgid "Card number"
msgstr "Telefon"
msgstr "Kartennummer"
#: membership/forms.py:43
msgid "Expiry date"
msgstr ""
msgstr "Ablaufdatum"
#: membership/forms.py:44
msgid "CCV"
@ -339,14 +344,12 @@ msgid "Use this pattern(MM/YYYY)."
msgstr ""
#: membership/models.py:182
#, fuzzy
#| msgid "Phone number"
msgid "Wrong CCV number."
msgstr "Telefon"
msgstr "Falsche CCV Nummer"
#: nosystemd/forms.py:46
msgid "Amount"
msgstr ""
msgstr "Betrag"
#: nosystemd/templates/nosystemd/base.html:70
msgid "My Donations"
@ -1464,6 +1467,10 @@ msgstr ""
msgid "Unknown or unspecified country"
msgstr ""
#: utils/forms.py:20
msgid "Enter your name or company name"
msgstr "Geben Sie Ihren Namen oder der Ihrer Firma ein"
#: utils/forms.py:123
msgid "Street Building"
msgstr ""

View file

@ -16,7 +16,7 @@
</h2>
</a>
<p class="post-meta" style="font-size:0.9em;">
Posted on {{ post.date_published|date:"DATE_FORMAT" }}
{% trans "Posted on" %}{{ post.date_published|date:"DATE_FORMAT" }}
</p>
<p class="post-subtitle">

View file

@ -25,47 +25,47 @@ msgstr "Fügen Sie Ihren public key ein"
#: hosting/templates/hosting/base_short.html:68
#: hosting/templates/hosting/base_short.html:139
msgid "My Virtual Machines"
msgstr ""
msgstr "Meine virtuellen Maschinen"
#: hosting/templates/hosting/base_short.html:73
#: hosting/templates/hosting/base_short.html:145
#: hosting/templates/hosting/orders.html:12
msgid "My Orders"
msgstr ""
msgstr "Meine Bestellungen"
#: hosting/templates/hosting/base_short.html:78
#: hosting/templates/hosting/base_short.html:152
msgid "Keys"
msgstr ""
msgstr "Schlüssel"
#: hosting/templates/hosting/base_short.html:83
#: hosting/templates/hosting/base_short.html:158
msgid "Notifications "
msgstr ""
msgstr "Benachrichtigungen"
#: hosting/templates/hosting/base_short.html:90
msgid "Logout"
msgstr ""
msgstr "Abmeleden"
#: hosting/templates/hosting/base_short.html:95
msgid "How it works"
msgstr ""
msgstr "Wie es funktioniert"
#: hosting/templates/hosting/base_short.html:98
msgid "Your infrastructure"
msgstr ""
msgstr "Ihre Infrastruktur"
#: hosting/templates/hosting/base_short.html:101
msgid "Our inftrastructure"
msgstr ""
msgstr "Unsere Infrastruktur"
#: hosting/templates/hosting/base_short.html:104
msgid "Pricing"
msgstr ""
msgstr "Preise"
#: hosting/templates/hosting/base_short.html:107
msgid "Contact"
msgstr ""
msgstr "Kontakt"
#: hosting/templates/hosting/base_short.html:110
#: hosting/templates/hosting/login.html:32
@ -73,21 +73,21 @@ msgstr ""
#: hosting/templates/hosting/reset_password.html:31
#: hosting/templates/hosting/signup.html:30
msgid "Login"
msgstr ""
msgstr "Anmelden"
#: hosting/templates/hosting/base_short.html:134
msgid "Home"
msgstr ""
msgstr "Home"
#: hosting/templates/hosting/bill_detail.html:11
#: hosting/templates/hosting/order_detail.html:10
msgid "Invoice"
msgstr ""
msgstr "Rechnung"
#: hosting/templates/hosting/bill_detail.html:11
#: hosting/templates/hosting/order_detail.html:10
msgid "Order #"
msgstr ""
msgstr "Rechnung #"
#: hosting/templates/hosting/bill_detail.html:25
msgid "ungleich GmbH"
@ -116,7 +116,7 @@ msgstr ""
#: hosting/templates/hosting/bill_detail.html:68
#, python-format
msgid "Alles Preise in CHF mit 8%% Mehrwertsteuer."
msgstr ""
msgstr "All prices in CHF including 8%% VAT"
#: hosting/templates/hosting/bill_detail.html:69
msgid "Betrag zahlbar innerhalb von 30 Tagen ab Rechnungseingang."
@ -144,7 +144,7 @@ msgstr ""
#: hosting/templates/hosting/bills.html:12
msgid "Customers"
msgstr ""
msgstr "Kunden"
#: hosting/templates/hosting/bills.html:16
#: hosting/templates/hosting/virtual_machine_key.html:42
@ -157,46 +157,58 @@ msgstr ""
#: hosting/templates/hosting/bills.html:28
msgid "View Bill"
msgstr ""
msgstr "Rechnung anzeigen"
#: hosting/templates/hosting/bills.html:41
#: hosting/templates/hosting/orders.html:83
#: hosting/templates/hosting/virtual_machines.html:70
msgid "previous"
msgstr ""
msgstr "vorherige"
#: hosting/templates/hosting/bills.html:47
#: hosting/templates/hosting/orders.html:89
#: hosting/templates/hosting/virtual_machines.html:76
msgid "next"
msgstr ""
msgstr "nächste"
#: hosting/templates/hosting/confirm_reset_password.html:19
msgid "Set your new password"
msgstr ""
msgstr "Setzen Ihr neues Passwort"
#: hosting/templates/hosting/confirm_reset_password.html:28
#: hosting/templates/hosting/reset_password.html:22
msgid "Reset"
msgstr ""
msgstr "Zurücksetzen"
#: hosting/templates/hosting/confirm_reset_password.html:32
#: hosting/templates/hosting/reset_password.html:28
#: hosting/templates/hosting/signup.html:27
msgid "Already have an account ?"
msgstr ""
msgstr "Besitzen sie bereits ein Bentzerkonto"
#: hosting/templates/hosting/confirm_reset_password.html:32
msgid "Log in"
msgstr ""
msgstr "Anmelden"
#: hosting/templates/hosting/create_virtual_machine.html:19
msgid "New Virtual Machine"
msgstr ""
msgstr "Neue virtuelle Maschine"
#: hosting/templates/hosting/create_virtual_machine.html:24
msgid "Select VM Template:"
msgstr "Wählen Sie eine Vorlage"
#: hosting/templates/hosting/create_virtual_machine.html:32
msgid "Select VM Configuration:"
msgstr "Wählen Sie eine Konfiguration"
#: hosting/templates/hosting/create_virtual_machine.html:39
msgid "CHF/Month"
msgstr "CHF/Monat"
#: hosting/templates/hosting/create_virtual_machine.html:45
msgid "Start VM"
msgstr ""
msgstr "Start VM"
#: hosting/templates/hosting/emails/password_reset_email.html:2
#: hosting/templates/hosting/emails/password_reset_email.txt:2
@ -226,49 +238,49 @@ msgstr ""
#: hosting/templates/hosting/reset_password.html:10
#: hosting/templates/hosting/signup.html:9
msgid "Your VM hosted in Switzerland"
msgstr ""
msgstr "Ihre VM gehostet in der Schweiz"
#: hosting/templates/hosting/login.html:26
msgid "You haven been logged out"
msgstr ""
msgstr "Sie wurden abgmeldet"
#: hosting/templates/hosting/login.html:49
msgid "Don't have an account yet ? "
msgstr ""
msgstr "Besitzen Sie kein Benutzerkonto?"
#: hosting/templates/hosting/login.html:52
#: hosting/templates/hosting/signup.html:13
#: hosting/templates/hosting/signup.html:21
msgid "Sign up"
msgstr ""
msgstr "Registrieren"
#: hosting/templates/hosting/login.html:54
msgid "Forgot your password ? "
msgstr ""
msgstr "Passwort vergessen?"
#: hosting/templates/hosting/notifications.html:9
msgid "Notifications"
msgstr ""
msgstr "Benachrichtigungen"
#: hosting/templates/hosting/notifications.html:16
msgid "Unread"
msgstr ""
msgstr "Ungelesen"
#: hosting/templates/hosting/notifications.html:26
msgid "All"
msgstr ""
msgstr "Alle"
#: hosting/templates/hosting/notifications.html:38
msgid "Unread notifications"
msgstr ""
msgstr "Ungelesene Benachrichtigungen"
#: hosting/templates/hosting/notifications.html:48
msgid "Mark as read"
msgstr ""
msgstr "Als gelesen markieren"
#: hosting/templates/hosting/notifications.html:59
msgid "All notifications"
msgstr ""
msgstr "Alle Benachrichtigungen"
#: hosting/templates/hosting/order_detail.html:16
#: hosting/templates/hosting/order_detail.html:24
@ -281,25 +293,28 @@ msgstr ""
#: hosting/templates/hosting/order_detail.html:38
msgid "Payment Method:"
msgstr ""
msgstr "Bezahlmethode"
#: hosting/templates/hosting/order_detail.html:49
msgid "Order summary"
msgstr ""
msgstr "Bestellungsübersicht"
#: hosting/templates/hosting/order_detail.html:52
#: hosting/templates/hosting/payment.html:17
#: hosting/templates/hosting/virtual_machine_detail.html:75
msgid "Cores"
msgstr ""
msgstr "Prozessorkerne"
#: hosting/templates/hosting/order_detail.html:54
#: hosting/templates/hosting/payment.html:20
#: hosting/templates/hosting/virtual_machine_detail.html:81
msgid "Memory"
msgstr ""
msgstr "Arbeitsspeicher"
#: hosting/templates/hosting/order_detail.html:56
#: hosting/templates/hosting/payment.html:23
msgid "Disk space"
msgstr ""
msgstr "Festplattenkapazität"
#: hosting/templates/hosting/order_detail.html:58
msgid "Total"
@ -307,15 +322,15 @@ msgstr ""
#: hosting/templates/hosting/order_detail.html:64
msgid "Finish Configuration"
msgstr ""
msgstr "Konfiguration beenden"
#: hosting/templates/hosting/orders.html:17
msgid "Date"
msgstr ""
msgstr "Datum"
#: hosting/templates/hosting/orders.html:18
msgid "Amount"
msgstr ""
msgstr "Betrag"
#: hosting/templates/hosting/orders.html:19
#: hosting/templates/hosting/virtual_machine_detail.html:30
@ -326,117 +341,159 @@ msgstr ""
#: hosting/templates/hosting/orders.html:30
msgid "Approved"
msgstr ""
msgstr "Akzeptiert"
#: hosting/templates/hosting/orders.html:32
msgid "Declined"
msgstr ""
msgstr "Abgelehnt"
#: hosting/templates/hosting/orders.html:37
#: hosting/templates/hosting/virtual_machines.html:58
msgid "View Detail"
msgstr ""
msgstr "Details anzeigen"
#: hosting/templates/hosting/orders.html:41
msgid "Cancel Order"
msgstr ""
msgstr "Bestellung stornieren"
#: hosting/templates/hosting/orders.html:56
msgid "Do You want do delete your order?"
msgstr ""
msgstr "Wollen Sie ihre Bestellung löschen?"
#: hosting/templates/hosting/orders.html:64
msgid "Close"
msgstr ""
msgstr "Schliessen"
#: hosting/templates/hosting/orders.html:66
msgid "Delete"
msgstr ""
msgstr "Löschen"
#: hosting/templates/hosting/payment.html:12
msgid "Billing Amount"
msgstr "Rechnungsbetrag"
#: hosting/templates/hosting/payment.html:35
msgid "Billing Address"
msgstr "Rechnungsadresse"
#: hosting/templates/hosting/payment.html:49
msgid "Payment Details"
msgstr "Rechnungsdetails"
#: hosting/templates/hosting/payment.html:61
#: hosting/templates/hosting/payment.html:103
msgid "Submit Payment"
msgstr "Betrag überweisen"
#: hosting/templates/hosting/payment.html:70
msgid "CARD NUMBER"
msgstr "Kreditkartennummer"
#: hosting/templates/hosting/payment.html:75
msgid "Valid Card Number"
msgstr "Gültige Kreditkartennummer"
#: hosting/templates/hosting/payment.html:84
msgid "EXPIRATION DATE"
msgstr "Ablaufdatum"
#: hosting/templates/hosting/payment.html:95
msgid "CV CODE"
msgstr "CV Code"
#: hosting/templates/hosting/reset_password.html:14
msgid "Reset your password"
msgstr ""
msgstr "Passwort zurücksetzen"
#: hosting/templates/hosting/virtual_machine_detail.html:19
msgid "Settings"
msgstr ""
msgstr "Einstellungen"
#: hosting/templates/hosting/virtual_machine_detail.html:25
msgid "Billing"
msgstr ""
msgstr "Abrechnungen"
#: hosting/templates/hosting/virtual_machine_detail.html:60
msgid "Ip not assigned yet"
msgstr ""
msgstr "Ip nicht zugewiesen"
#: hosting/templates/hosting/virtual_machine_detail.html:87
msgid "Disk"
msgstr ""
msgstr "Festplatte"
#: hosting/templates/hosting/virtual_machine_detail.html:96
msgid "Configuration"
msgstr ""
msgstr "Konfiguration"
#: hosting/templates/hosting/virtual_machine_detail.html:106
msgid "Current pricing"
msgstr ""
msgstr "Aktueller Preis"
#: hosting/templates/hosting/virtual_machine_detail.html:115
msgid "Current status"
msgstr ""
msgstr "Aktueller Status"
#: hosting/templates/hosting/virtual_machine_detail.html:140
msgid "Terminate Virtual Machine"
msgstr ""
msgstr "Virtuelle Maschine beenden"
#: hosting/templates/hosting/virtual_machine_detail.html:161
msgid "Terminate your Virtual Machine"
msgstr ""
msgstr "Ihre virtuelle Maschine beenden"
#: hosting/templates/hosting/virtual_machine_detail.html:164
msgid "Are you sure do you want to cancel your Virtual Machine "
msgstr ""
#: hosting/templates/hosting/virtual_machine_detail.html:164
msgid "plan?"
msgstr ""
msgstr "Sind Sie sicher, dass Sie ihre virtuelle Maschine beenden wollen "
#: hosting/templates/hosting/virtual_machine_detail.html:167
msgid "Cancel"
msgstr ""
msgstr "Beenden"
#: hosting/templates/hosting/virtual_machine_key.html:11
msgid "Access Key"
msgstr ""
msgstr "Zugriffsschlüssel"
#: hosting/templates/hosting/virtual_machine_key.html:25
msgid "Upload your own key. "
msgstr ""
msgstr "Laden Sie ihren Schlüssel hoch"
#: hosting/templates/hosting/virtual_machine_key.html:29
msgid "Upload Key"
msgstr "Schlüssel hochladen"
#: hosting/templates/hosting/virtual_machine_key.html:33
msgid "Or generate a new key pair."
msgstr ""
msgstr "Oder erstellen Sie ein neues Schlüsselpaar"
#: hosting/templates/hosting/virtual_machine_key.html:31
msgid "Generate Key Pair"
msgstr "Schlüsselpaar generieren"
#: hosting/templates/hosting/virtual_machine_key.html:40
msgid ""
"Use your created key to access to the machine. If you lost it, contact us."
msgstr ""
"Verwenden Sie Ihren privaten SSH Schlüssel um sich mit Ihren Maschinen zu "
"verbinden. Falls Sie ihn verloren haben kontaktieren Sie uns."
#: hosting/templates/hosting/virtual_machine_key.html:43
msgid "Created at"
msgstr ""
msgstr "Erstellt am"
#: hosting/templates/hosting/virtual_machine_key.html:66
#: hosting/templates/hosting/virtual_machine_key.html:79
msgid "Warning!"
msgstr ""
msgstr "Achtung!"
#: hosting/templates/hosting/virtual_machine_key.html:66
msgid "You can download your SSH private key once. Don't lost your key"
msgstr ""
"Sie können ihren privaten SSH Schlüssel nur einmal herunterladen. Bewaren "
"Sie ihn sicher auf."
#: hosting/templates/hosting/virtual_machine_key.html:74
msgid "Copy to Clipboard"
msgstr ""
msgstr "Kopieren"
#: hosting/templates/hosting/virtual_machine_key.html:75
msgid "Download"
@ -447,18 +504,20 @@ msgid ""
"Your SSH private key was already generated and downloaded, if you lost it, "
"contact us. "
msgstr ""
"Ihr privater SSH Schlüssel wurde bereits generiert und heruntergeladen, "
"falls Sie ihn verloren haben kontaktieren Sie uns."
#: hosting/templates/hosting/virtual_machine_key.html:82
msgid "Generate my key"
msgstr ""
msgstr "Generiere meinen Schlüssel"
#: hosting/templates/hosting/virtual_machines.html:9
msgid "Virtual Machines"
msgstr ""
msgstr "Virtuelle Maschinen"
#: hosting/templates/hosting/virtual_machines.html:22
msgid "Create VM"
msgstr ""
msgstr "Neue VM"
#: hosting/templates/hosting/virtual_machines.html:28
msgid "ID"

View file

@ -21,7 +21,7 @@
<form method="POST" action="">
{% csrf_token %}
<div class="form-group">
Select VM Template:
{% trans "Select VM Template:" %}
<select name="vm_template_id">
{% for template in templates %}
<option value="{{template.id}}">{{template.name}} </option>
@ -29,14 +29,14 @@
</select>
</div>
<div class="form-group">
Select VM Configuration:
{% trans "Select VM Configuration:" %}
<select name="configuration">
{% for config in configuration_options %}
<option value="{{config.id}}">
CORE: {{config.cpu|floatformat}},
RAM: {{config.memory|floatformat}} GiB,
SSD: {{config.disk_size|floatformat}} GiB,
PRICE: {{config.price|floatformat}} CHF/Month
RAM: {{config.memory|floatformat}} GB,
SSD: {{config.disk_size|floatformat}} GB,
PRICE: {{config.price|floatformat}} {% trans "CHF/Month" %}
</option>
{% endfor %}
</select>

View file

@ -9,18 +9,18 @@
<form role="form" novalidate>
<div class="row">
<div class="col-xs-12">
<h3><b>Billing Amount</b></h3>
<h3><b>{%trans "Billing Amount" %}</b></h3>
<hr>
<div class="content">
<!-- <p><b>Type</b> <span class="pull-right">{{request.session.vm_specs.location_code}}</span></p> -->
<!-- <hr> -->
<p><b>Cores</b> <span
<p><b>{%trans "Cores"%}</b> <span
class="pull-right">{{request.session.specs.cpu|floatformat}}</span></p>
<hr>
<p><b>Memory</b> <span
<p><b>{%trans "Memory"%}</b> <span
class="pull-right">{{request.session.specs.memory|floatformat}} GiB</span></p>
<hr>
<p><b>Disk space</b> <span
<p><b>{%trans "Disk space"%}</b> <span
class="pull-right">{{request.session.specs.disk_size|floatformat}} GiB</span></p>
<hr>
<h4>Total<p
@ -32,7 +32,7 @@
</div>
<div class="col-xs-12 col-md-4 billing">
<h3><b>Billing Address</b></h3>
<h3><b>{%trans "Billing Address"%}</b></h3>
<hr>
<form role="form" id="billing-form" method="post" action="" novalidate>
{% for field in form %}
@ -46,7 +46,7 @@
<div class="row">
<div class="col-xs-12 col-md-offset-2 col-md-4 "></div>
<div class="col-xs-12 col-md-4 creditcard-box">
<h3><b>Payment Details</b></h3>
<h3><b>{%trans "Payment Details"%}</b></h3>
<hr>
<div>
<div>
@ -57,7 +57,9 @@
<h5 class="membership-lead">Type: {{credit_card_data.cc_brand}}</h5>
<input type="hidden" name="credit_card_needed" value="false"/>
</form>
<button id="payment_button_with_creditcard" class="btn btn-success btn-lg btn-block" type="submit">Submit Payment</button>
<button id="payment_button_with_creditcard" class="btn btn-success btn-lg btn-block" type="submit">
{% trans "Submit Payment" %}
</button>
{% else %}
@ -74,9 +76,12 @@
<!-- <div class="row">
<div class="col-xs-9 col-md-12">
<div class="form-group">
<label class="control-label" for="cardNumber">CARD NUMBER</label>
<label class="control-label" for="cardNumber">{%trans "CARD NUMBER"%}</label>
<div class="input-group">
<input type="text" class="form-control" name="cardNumber" placeholder="Valid Card Number" required autofocus data-stripe="number" />
<input type="text"
class="form-control"
name="cardNumber"
placeholder="{%trans "Valid Card Number"%}" required autofocus data-stripe="number" />
<span class="input-group-addon"><i class="fa fa-credit-card"></i></span>
</div>
</div>
@ -85,7 +90,7 @@
<div class="row">
<div class="col-xs-6 col-md-7">
<div class="form-group">
<label for="expMonth">EXPIRATION DATE</label><br/>
<label for="expMonth">{%trans "EXPIRATION DATE"%}</label><br/>
<div class="col-xs-6 col-lg-6 col-md-6 pl-ziro">
<input type="text" class="form-control" name="expMonth" placeholder="MM" required data-stripe="exp_month" />
</div>
@ -96,7 +101,7 @@
</div>
<div class="col-xs-4 col-md-5 pull-right">
<div class="form-group">
<label for="cvCode">CV CODE</label>
<label for="cvCode">{%trans "CV CODE"%}</label>
<input type="password" class="form-control" name="cvCode" placeholder="CV" required data-stripe="cvc" />
</div>
</div>

View file

@ -161,7 +161,7 @@
{% trans "Terminate your Virtual Machine"%}
</div>
<div class="modal-body">
{% trans "Are you sure do you want to cancel your Virtual Machine "%} {{virtual_machine.name}} {% trans "plan?"%}
{% trans "Are you sure do you want to cancel your Virtual Machine "%} {{virtual_machine.name}} ?
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">{% trans "Cancel"%}</button>

View file

@ -34,7 +34,8 @@
{% endbuttons %}
<div class="form-group">
</div>
<h5> Use your created key to access to the machine. If you lost it, contact us. </h5>
{% else %}
<h5> {% trans "Use your created key to access to the machine. If you lost it, contact us." %} </h5>
<table class="table borderless table-hover">
<br/>
<thead>

View file

@ -16,7 +16,7 @@
</h2>
</a>
<p class="post-meta" style="font-size:0.9em;">
Posted on {{ post.date_published|date:"DATE_FORMAT" }}
{% trans "Posted on" %}{{ post.date_published|date:"DATE_FORMAT" }}
</p>
<p class="post-subtitle">

View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-05-26 13:35+0000\n"
"POT-Creation-Date: 2017-05-30 13:47+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

View file

@ -17,7 +17,7 @@ class SignupFormMixin(forms.ModelForm):
model = CustomUser
fields = ['name', 'email', 'password']
widgets = {
'name': forms.TextInput(attrs={'placeholder': 'Enter your name or company name'}),
'name': forms.TextInput(attrs={'placeholder': _('Enter your name or company name')}),
}
def clean_confirm_password(self):