diff --git a/alplora/locale/de/LC_MESSAGES/django.mo b/alplora/locale/de/LC_MESSAGES/django.mo
index 00859bbb..1b30ec02 100644
Binary files a/alplora/locale/de/LC_MESSAGES/django.mo and b/alplora/locale/de/LC_MESSAGES/django.mo differ
diff --git a/alplora/locale/de/LC_MESSAGES/django.po b/alplora/locale/de/LC_MESSAGES/django.po
index 7d9e3630..69c19026 100644
--- a/alplora/locale/de/LC_MESSAGES/django.po
+++ b/alplora/locale/de/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-11 22:34-0500\n"
+"POT-Creation-Date: 2017-05-26 14:41+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,88 +18,137 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/alplora/index.html:13
+#: alplora/templates/alplora/contact.html:6
+msgid "New message"
+msgstr "Neue Nachricht"
+
+#: alplora/templates/alplora/contact.html:13
+msgid "Name:"
+msgstr "Name:"
+
+#: alplora/templates/alplora/contact.html:15
+msgid "What is your name ?"
+msgstr "Was ist Dein Name?"
+
+#: alplora/templates/alplora/contact.html:19
+msgid "From:"
+msgstr "Von:"
+
+#: alplora/templates/alplora/contact.html:21
+msgid "You email"
+msgstr "Deine Email"
+
+#: alplora/templates/alplora/contact.html:25
+msgid "Message:"
+msgstr "Nachricht:"
+
+#: alplora/templates/alplora/contact.html:27
+msgid "Leave us your message"
+msgstr "Schreibe hier Deine Nachricht"
+
+#: alplora/templates/alplora/contact.html:32
+msgid "Close"
+msgstr "schliessen"
+
+#: alplora/templates/alplora/contact.html:33
+msgid "Send message"
+msgstr "Nachricht senden"
+
+#: alplora/templates/alplora/contact_success.html:6
+msgid "Message Sent"
+msgstr "Nachricht gesendet"
+
+#: alplora/templates/alplora/contact_success.html:9
+msgid "Thank you, we will contact you as soon as possible"
+msgstr "Dankeschön! Wir melden uns sobald wie möglich!"
+
+#: alplora/templates/alplora/index.html:13
msgid "Find your animal anywhere, anytime"
msgstr "Finde deine Tiere"
-#: templates/alplora/index.html:100 templates/alplora/index.html.py:513
+#: alplora/templates/alplora/index.html:99
+#: alplora/templates/alplora/index.html:463
msgid "About"
msgstr "Über"
-#: templates/alplora/index.html:103 templates/alplora/index.html.py:249
-#: templates/alplora/index.html:519
+#: alplora/templates/alplora/index.html:102
+#: alplora/templates/alplora/index.html:248
+#: alplora/templates/alplora/index.html:469
msgid "Why Alplora?"
msgstr "Warum Alplora?"
-#: templates/alplora/index.html:106 templates/alplora/index.html.py:516
+#: alplora/templates/alplora/index.html:105
+#: alplora/templates/alplora/index.html:466
msgid "Usecase"
msgstr ""
-#: templates/alplora/index.html:109 templates/alplora/index.html.py:359
+#: alplora/templates/alplora/index.html:108
+#: alplora/templates/alplora/index.html:358
msgid "Testimonials"
msgstr "Referenzen"
-#: templates/alplora/index.html:112 templates/alplora/index.html.py:422
-#: templates/alplora/index.html:527
+#: alplora/templates/alplora/index.html:111
+#: alplora/templates/alplora/index.html:423
+#: alplora/templates/alplora/index.html:477
msgid "Contact"
msgstr "Kontakt"
-#: templates/alplora/index.html:115
+#: alplora/templates/alplora/index.html:114
msgid "Login"
msgstr "Login"
-#: templates/alplora/index.html:138
+#: alplora/templates/alplora/index.html:137
msgid "Find your herd anytime, anywhere"
msgstr "Finde deine Herde jederzeit und überall"
-#: templates/alplora/index.html:139
+#: alplora/templates/alplora/index.html:138
msgid "Perfect fit for Swiss Alps"
msgstr "Perfekt für die Schweizer Alpen"
-#: templates/alplora/index.html:164
+#: alplora/templates/alplora/index.html:163
msgid "What is Alplora?"
msgstr "Was ist Alplora?"
-#: templates/alplora/index.html:165
+#: alplora/templates/alplora/index.html:164
msgid ""
"Alplora is an animal tracker made for outdoor grazing animals in Swiss Alps."
msgstr ""
"Alplora ist ein Sender, der speziell für Weidetiere in den Schweizer Alpen "
"entwickelt wurde."
-#: templates/alplora/index.html:166
+#: alplora/templates/alplora/index.html:165
msgid "Alplora is just like a cattle bell, but much better."
msgstr "Alplora ist wie eine Kuhglocke, nur viel besser."
-#: templates/alplora/index.html:175
+#: alplora/templates/alplora/index.html:174
msgid "LOST"
msgstr "VERLOREN"
-#: templates/alplora/index.html:177
+#: alplora/templates/alplora/index.html:176
msgid "When an animal gets separated from the herd and is lost."
msgstr "Wenn ein Tier sich von der Herde absondert und verloren geht."
-#: templates/alplora/index.html:185
+#: alplora/templates/alplora/index.html:184
msgid "WOLF"
msgstr "WOLF"
-#: templates/alplora/index.html:187
+#: alplora/templates/alplora/index.html:186
msgid "When a wolf gets close to the herd."
msgstr "Wenn ein Wolf sich der Herde nähert."
-#: templates/alplora/index.html:194
+#: alplora/templates/alplora/index.html:193
msgid "INJURED"
msgstr "VERLETZT"
-#: templates/alplora/index.html:196
+#: alplora/templates/alplora/index.html:195
msgid "When one of the animals is hurt."
msgstr "Wenn eins der Tiere verletzt ist."
-#: templates/alplora/index.html:206
+#: alplora/templates/alplora/index.html:205
msgid "How does Alplora track my animals?"
msgstr "Wie kann Alplora meine Tiere verfolgen und ausfindig machen ?"
-#: templates/alplora/index.html:207
+#: alplora/templates/alplora/index.html:206
msgid ""
"Each animal will be wearing a small tracker,<P></P>and the tracker will be "
"sending a signal every 30 to 60 minutes."
@@ -107,33 +156,33 @@ msgstr ""
"Jedes Tier wird einen kleinen Sender tragen, <P></P> welcher alle 30 bis 60 "
"Minuten ein Signal senden wird."
-#: templates/alplora/index.html:216
+#: alplora/templates/alplora/index.html:215
msgid "Access app"
msgstr "Zugang zur App"
-#: templates/alplora/index.html:218
+#: alplora/templates/alplora/index.html:217
msgid ""
"You can see the animal locations on a map by logging into our Alplora app."
msgstr ""
"Du kannst den Standort deiner Tiere jederzeit auf einer Karte verfolgen, "
"indem du dich in unsere Alplora App einloggst."
-#: templates/alplora/index.html:226
+#: alplora/templates/alplora/index.html:225
msgid "Get an alarm"
msgstr "Erhalte ein Warnsignal"
-#: templates/alplora/index.html:228
+#: alplora/templates/alplora/index.html:227
msgid ""
"When certain signals for danger are detected, Alplora sends an alarm to you."
msgstr ""
"Wenn Anzeichen von Gefahr bestehen, sendet dir die Alplora App einen "
"Warnsignal."
-#: templates/alplora/index.html:236
+#: alplora/templates/alplora/index.html:235
msgid "Find your animal"
msgstr "Finde deine Tiere"
-#: templates/alplora/index.html:239
+#: alplora/templates/alplora/index.html:238
msgid ""
"You can locate the animal in trouble on the realtime map and can take "
"actions for keeping the animal safe."
@@ -141,11 +190,11 @@ msgstr ""
"Du kannst dein Tier in Notsituationen auf einer Echtzeit-Karte lokalisieren "
"und hast die Möglichkeit es in Sicherheit zu bringen."
-#: templates/alplora/index.html:256
+#: alplora/templates/alplora/index.html:255
msgid "Perfect fit for Swiss mountains"
msgstr "Perfekt für die Schweizer Alpen"
-#: templates/alplora/index.html:258
+#: alplora/templates/alplora/index.html:257
msgid ""
"Alplora is made and tested for Swiss Alps. It is a perfect fit for Swiss "
"environment."
@@ -153,11 +202,11 @@ msgstr ""
"Alplora wurde speziell für die Schweizer Alpen entwickelt und vor Ort "
"getestet. Das Produkt passt perfekt in die Schweiz!"
-#: templates/alplora/index.html:264
+#: alplora/templates/alplora/index.html:263
msgid "Energy efficient"
msgstr "Energieeffizient"
-#: templates/alplora/index.html:266
+#: alplora/templates/alplora/index.html:265
msgid ""
"Alplora uses the latest wireless technology, our batteries last the whole "
"alp season."
@@ -165,11 +214,11 @@ msgstr ""
"Alplora arbeitet mit den neuesten Technologien, so dass der Akku die gesamte "
"Alpsaison überdauert."
-#: templates/alplora/index.html:272
+#: alplora/templates/alplora/index.html:271
msgid "Made with love"
msgstr "Mit Liebe gemacht"
-#: templates/alplora/index.html:274
+#: alplora/templates/alplora/index.html:273
msgid ""
"With a lot of love and respect for Swiss agriculture and nature, Alplora is "
"made by a Swiss company."
@@ -177,61 +226,61 @@ msgstr ""
"Alplora wurde mit viel Liebe und Respekt für die Schweizer Natur und "
"Landwirtschaft von einer Schweizer Firma entwickelt."
-#: templates/alplora/index.html:286
+#: alplora/templates/alplora/index.html:285
msgid "Who needs Alplora?"
msgstr "Wer benötigt Alplora?"
-#: templates/alplora/index.html:302
+#: alplora/templates/alplora/index.html:301
msgid " Are your animals..."
msgstr "Sind deine Tiere..."
-#: templates/alplora/index.html:305
+#: alplora/templates/alplora/index.html:304
msgid "sheep, goats, cows or llamas living freely in the Alps?"
msgstr "Schafe, Ziegen, Kühe oder Lamas, die frei in den Alpen leben?"
-#: templates/alplora/index.html:307
+#: alplora/templates/alplora/index.html:306
msgid "wearing bells?"
msgstr "solche, die Glocken tragen?"
-#: templates/alplora/index.html:309
+#: alplora/templates/alplora/index.html:308
msgid ""
"sometimes getting confused and going too far away from where they are "
"supposed to be?"
msgstr ""
"manchmal verwirrt und entfernen sich zu weit von ihrem vorgesehenen Standort?"
-#: templates/alplora/index.html:333
+#: alplora/templates/alplora/index.html:332
msgid "Do you..."
msgstr "Möchtest du..."
-#: templates/alplora/index.html:336
+#: alplora/templates/alplora/index.html:335
msgid "have animals which are staying outdoor during some time of the year?"
msgstr ""
"deine Tiere, die eine längere Zeit im Jahr unbeobachtet Draussen verbringen, "
"schützen und überwachen können?"
-#: templates/alplora/index.html:338
+#: alplora/templates/alplora/index.html:337
msgid "want to get an alarm when your animal is hurt, or in danger?"
msgstr ""
"alarmiert werden, wenn sich eines deiner Tiere verletzt oder in Gefahr "
"befindet ?"
-#: templates/alplora/index.html:340
+#: alplora/templates/alplora/index.html:339
msgid "want to see where your animals are on your cell phone map?"
msgstr ""
"mit deinem Smartphone auf einer Karte sehen können, wo sich deine Tiere "
"befinden? "
-#: templates/alplora/index.html:342
+#: alplora/templates/alplora/index.html:341
msgid "want to make sure 24/7 that your animals are safe?"
msgstr ""
"sicherstellen, dass sich deine Tiere rund um die Uhr in Sicherheit befinden?"
-#: templates/alplora/index.html:360
+#: alplora/templates/alplora/index.html:359
msgid "What our customers say"
msgstr ""
-#: templates/alplora/index.html:380
+#: alplora/templates/alplora/index.html:379
msgid ""
"“Alplora is an innovation in looking after my cows. I can check where my "
"cows have been in the higher mountain all day while doing other works at the "
@@ -243,11 +292,11 @@ msgstr ""
"selben Zeit andereDinge auf dem Hof unten im Dorf erledigen. Dank Alplora "
"kann ich meinen Kühenmehr Sicherheit gewährleisten."
-#: templates/alplora/index.html:383
+#: alplora/templates/alplora/index.html:382
msgid "Farmer in canton Glarus"
msgstr "Bauern im Kanton Glarus"
-#: templates/alplora/index.html:389
+#: alplora/templates/alplora/index.html:388
msgid ""
"\"Alplora is exactly what I was waiting for. I have lost my sheep almost "
"every year. Finally I have a way when I want to locate them.\""
@@ -256,11 +305,11 @@ msgstr ""
"Schafe fastjedes Jahr aus den Augen verloren. Nun habe ich endlich die "
"Möglichkeit, sie zulokalisieren.\""
-#: templates/alplora/index.html:392
+#: alplora/templates/alplora/index.html:391
msgid "Owner of 50 sheep "
msgstr "Besitzerin von 50 Schafen"
-#: templates/alplora/index.html:398
+#: alplora/templates/alplora/index.html:397
msgid ""
"\"I have a farm down all the way down in the village and y goats are always "
"freely grazing in the Alps. There are times that I am worried about them but "
@@ -274,74 +323,30 @@ msgstr ""
"noch um meineanderen Tiere kümmern muss. Mit Alplora kann ich nun ohne "
"Probleme beides tun.\""
-#: templates/alplora/index.html:402
+#: alplora/templates/alplora/index.html:401
msgid "Farmer at Berner Oberland"
msgstr "Bauer aus dem Berner Oberland"
-#: templates/alplora/index.html:419
+#: alplora/templates/alplora/index.html:418
msgid "How do I get Alplora?"
msgstr "Wie kriege ich Zugriff zu Alplora?"
-#: templates/alplora/index.html:420
+#: alplora/templates/alplora/index.html:419
msgid "Click the button below and leave us your contact."
msgstr "Klicke unten auf Kontakt und hinterlasse uns deine Angaben."
-#: templates/alplora/index.html:420
+#: alplora/templates/alplora/index.html:419
msgid "Team Alplora will contact you and visit you with a tracking device."
msgstr "Das Alpora Team wird sich mit Dir schnellstens in Verbindung setzen."
-#: templates/alplora/index.html:437
-msgid "New message"
-msgstr "Neue Nachricht"
-
-#: templates/alplora/index.html:445
-msgid "Name:"
-msgstr "Name:"
-
-#: templates/alplora/index.html:446
-msgid "What is your name ?"
-msgstr "Was ist Dein Name?"
-
-#: templates/alplora/index.html:449
-msgid "From:"
-msgstr "Von:"
-
-#: templates/alplora/index.html:450
-msgid "You email"
-msgstr "Deine Email"
-
-#: templates/alplora/index.html:454
-msgid "Message:"
-msgstr "Nachricht:"
-
-#: templates/alplora/index.html:455
-msgid "Leave us your message"
-msgstr "Schreibe hier Deine Nachricht"
-
-#: templates/alplora/index.html:460
-msgid "Close"
-msgstr "schliessen"
-
-#: templates/alplora/index.html:461
-msgid "Send message"
-msgstr "Nachricht senden"
-
-#: templates/alplora/index.html:474
-msgid "Message Sent"
-msgstr "Nachricht gesendet"
-
-#: templates/alplora/index.html:477
-msgid "Thank you, we will contact you as soon as possible"
-msgstr "Dankeschön! Wir melden uns sobald wie möglich!"
-
-#: templates/alplora/index.html:509
+#: alplora/templates/alplora/index.html:459
msgid "Home"
msgstr "Startseite"
-#: templates/alplora/index.html:522
+#: alplora/templates/alplora/index.html:472
msgid "Testimonials "
msgstr "Referenzen"
-#: views.py:14
+#: alplora/views.py:24
msgid "Message Successfully Sent"
msgstr ""
diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.mo b/datacenterlight/locale/de/LC_MESSAGES/django.mo
index 8f4d30cd..beea2d61 100644
Binary files a/datacenterlight/locale/de/LC_MESSAGES/django.mo and b/datacenterlight/locale/de/LC_MESSAGES/django.mo differ
diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po
index 45629dab..df782513 100644
--- a/datacenterlight/locale/de/LC_MESSAGES/django.po
+++ b/datacenterlight/locale/de/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-23 17:26-0500\n"
+"POT-Creation-Date: 2017-05-26 14:41+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,41 +18,41 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/datacenterlight/beta_access.html:21
+#: datacenterlight/templates/datacenterlight/beta_access.html:21
msgid "Request Beta Access"
msgstr "Beantrage Beta-Zugang"
-#: templates/datacenterlight/beta_success.html:9
+#: datacenterlight/templates/datacenterlight/beta_success.html:9
#, fuzzy
#| msgid "Request Beta Access"
msgid "Request Sent"
msgstr "Anfrage verschickt"
-#: templates/datacenterlight/beta_success.html:12
+#: datacenterlight/templates/datacenterlight/beta_success.html:12
msgid "Thank you, we will contact you as soon as possible"
msgstr "Vielen Dank, wir werden Sie sobald als möglich kontaktieren."
-#: templates/datacenterlight/emails/request_access_confirmation.html:99
-#: templates/datacenterlight/emails/request_access_confirmation.txt:99
+#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.html:99
+#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.txt:99
msgid "Thank you for your request."
msgstr "Vielen Dank für Ihre Anfrage."
-#: templates/datacenterlight/emails/request_access_confirmation.html:104
-#: templates/datacenterlight/emails/request_access_confirmation.txt:104
+#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.html:104
+#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.txt:104
msgid "You are one step away from being our beta tester!"
msgstr ""
"Sie sind nur noch einen Schritt davon entfernt, unser Beta-Tester zu werden!"
-#: templates/datacenterlight/emails/request_access_confirmation.html:105
-#: templates/datacenterlight/emails/request_access_confirmation.txt:105
+#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.html:105
+#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.txt:105
msgid ""
"Currently we are running our tests to make sure everything runs perfectly."
msgstr ""
"Momentan testen wir die Beta-Umgebung um sie für Ihren Gebrauch "
"sicherzustellen."
-#: templates/datacenterlight/emails/request_access_confirmation.html:106
-#: templates/datacenterlight/emails/request_access_confirmation.txt:106
+#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.html:106
+#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.txt:106
msgid ""
"In the meantime, we would like to ask you a little patience<br/> until our "
"team contacts you with beta access."
@@ -60,81 +60,81 @@ msgstr ""
"Wir werden dann sobald als möglich Ihren Beta-Zugang erstellen und Sie "
"daraufhin kontaktieren.Bis dahin bitten wir Sie um etwas Geduld."
-#: templates/datacenterlight/emails/request_access_confirmation.html:107
-#: templates/datacenterlight/emails/request_access_confirmation.txt:107
+#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.html:107
+#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.txt:107
msgid "Thank you!"
msgstr "Vielen Dank!"
-#: templates/datacenterlight/index.html:62
-#: templates/datacenterlight/pricing.html:62
+#: datacenterlight/templates/datacenterlight/index.html:62
+#: datacenterlight/templates/datacenterlight/pricing.html:62
msgid "What is it"
msgstr "Was ist es?"
-#: templates/datacenterlight/index.html:65
-#: templates/datacenterlight/index.html:171
-#: templates/datacenterlight/index.html:331
-#: templates/datacenterlight/pricing.html:65
-#: templates/datacenterlight/pricing.html:188
+#: datacenterlight/templates/datacenterlight/index.html:65
+#: datacenterlight/templates/datacenterlight/index.html:171
+#: datacenterlight/templates/datacenterlight/index.html:331
+#: datacenterlight/templates/datacenterlight/pricing.html:65
+#: datacenterlight/templates/datacenterlight/pricing.html:188
msgid "Scale out"
msgstr "Skalierung"
-#: templates/datacenterlight/index.html:68
-#: templates/datacenterlight/index.html:197
-#: templates/datacenterlight/index.html:334
-#: templates/datacenterlight/pricing.html:68
-#: templates/datacenterlight/pricing.html:191
+#: datacenterlight/templates/datacenterlight/index.html:68
+#: datacenterlight/templates/datacenterlight/index.html:197
+#: datacenterlight/templates/datacenterlight/index.html:334
+#: datacenterlight/templates/datacenterlight/pricing.html:68
+#: datacenterlight/templates/datacenterlight/pricing.html:191
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
+#: datacenterlight/templates/datacenterlight/pricing.html:71
msgid "Buy VM"
msgstr "VM Kaufen"
-#: templates/datacenterlight/index.html:74
-#: templates/datacenterlight/index.html:341
-#: templates/datacenterlight/pricing.html:74
-#: templates/datacenterlight/pricing.html:198
+#: datacenterlight/templates/datacenterlight/index.html:74
+#: datacenterlight/templates/datacenterlight/index.html:341
+#: datacenterlight/templates/datacenterlight/pricing.html:74
+#: datacenterlight/templates/datacenterlight/pricing.html:198
msgid "Contact"
msgstr "Kontakt"
-#: templates/datacenterlight/index.html:109
+#: datacenterlight/templates/datacenterlight/index.html:109
msgid "Finally, an affordable VM hosting in Switzerland!"
msgstr "Endlich: bezahlbares VM Hosting in der Schweiz"
-#: templates/datacenterlight/index.html:113
+#: datacenterlight/templates/datacenterlight/index.html:113
msgid "What is it?"
msgstr "Was ist es?"
-#: templates/datacenterlight/index.html:116
+#: datacenterlight/templates/datacenterlight/index.html:116
msgid "I want it!"
msgstr "Das will ich haben!"
-#: templates/datacenterlight/index.html:142
-#: templates/datacenterlight/index.html:328
-#: templates/datacenterlight/pricing.html:185
+#: datacenterlight/templates/datacenterlight/index.html:142
+#: datacenterlight/templates/datacenterlight/index.html:328
+#: datacenterlight/templates/datacenterlight/pricing.html:185
msgid "How it works"
msgstr "Wie es funktioniert"
-#: templates/datacenterlight/index.html:147
+#: datacenterlight/templates/datacenterlight/index.html:147
msgid "Reuse existing factory halls intead of building an expensive building."
msgstr ""
"Nachhaltigkeit: Wiederverwendung ehemaliger Fabrikhallen an Stelle der "
"Errichtung eines neuen Gebäudes"
-#: templates/datacenterlight/index.html:150
+#: datacenterlight/templates/datacenterlight/index.html:150
msgid "Being creative, using modern and alternative design for a datacenter."
msgstr ""
"Kreativität: Verwendung eines modernen und alternativen Designs für unser "
"Datencenter"
-#: templates/datacenterlight/index.html:152
+#: datacenterlight/templates/datacenterlight/index.html:152
msgid "Being open: Using FOSS exclusively, we can save money for licenses."
msgstr ""
"Offene Verfahrensweise: Die Benutzung eines eigenen Frameworks, FOSS, "
"erspart Lizenzgebühren"
-#: templates/datacenterlight/index.html:174
+#: datacenterlight/templates/datacenterlight/index.html:174
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 "
@@ -144,7 +144,7 @@ msgstr ""
"erschwingliche Systeme. Bei grösserer Auslastung werden mehr Standard "
"komponenten hinzugekauft und skalieren so das Datencenter."
-#: templates/datacenterlight/index.html:200
+#: datacenterlight/templates/datacenterlight/index.html:200
msgid ""
"Our VMs are located in Switzerland, with reliable power supply and fast "
"internet connection. Our VM costs less thanks to our featherlight "
@@ -154,74 +154,74 @@ msgstr ""
"Energieversorgung sowie schneller Internetverbindung ausgestattet. Unser "
"Angebot ist aufgrund unserer leichten Infrastruktur überaus kostengünstig."
-#: templates/datacenterlight/index.html:218
-#: templates/datacenterlight/pricing.html:101
+#: datacenterlight/templates/datacenterlight/index.html:218
+#: datacenterlight/templates/datacenterlight/pricing.html:101
msgid "We are cutting down the costs significantly!"
msgstr "Wir sorgen dafür, dass die Kosten für Sie signifikant abnehmen"
-#: templates/datacenterlight/index.html:219
+#: datacenterlight/templates/datacenterlight/index.html:219
msgid "Affordable VM hosting based in Switzerland"
msgstr "Bezahlbares VM Hosting in der Schweiz"
-#: templates/datacenterlight/index.html:220
+#: datacenterlight/templates/datacenterlight/index.html:220
msgid "More Info"
msgstr "Weitere Informationen"
-#: templates/datacenterlight/index.html:227
-#: templates/datacenterlight/pricing.html:114
+#: datacenterlight/templates/datacenterlight/index.html:227
+#: datacenterlight/templates/datacenterlight/pricing.html:114
msgid "VM hosting"
msgstr ""
-#: templates/datacenterlight/index.html:234
+#: datacenterlight/templates/datacenterlight/index.html:234
msgid "Based in Switzerland"
msgstr "Standort des Datacenters ist in der Schweiz"
-#: templates/datacenterlight/index.html:243
+#: datacenterlight/templates/datacenterlight/index.html:243
msgid "15 GB Storage (SSD)"
msgstr "15 GB Storage (SSD)"
-#: templates/datacenterlight/index.html:246
-#: templates/datacenterlight/pricing.html:156
+#: datacenterlight/templates/datacenterlight/index.html:246
+#: datacenterlight/templates/datacenterlight/pricing.html:156
msgid "Order Now!"
msgstr "Bestelle jetzt!"
-#: templates/datacenterlight/index.html:262
+#: datacenterlight/templates/datacenterlight/index.html:262
msgid "Want to know more? Subscribe to our newsletter!"
msgstr "Willst du mehr wissen? Abonniere unseren Newsletter!"
-#: templates/datacenterlight/index.html:289
+#: datacenterlight/templates/datacenterlight/index.html:289
msgid "Switzerland "
msgstr "Schweiz"
-#: templates/datacenterlight/index.html:306
+#: datacenterlight/templates/datacenterlight/index.html:306
msgid "Questions?"
msgstr "Fragen?"
-#: templates/datacenterlight/index.html:306
+#: datacenterlight/templates/datacenterlight/index.html:306
msgid "Contact us!"
msgstr "Kontaktiere uns!"
-#: templates/datacenterlight/index.html:324
-#: templates/datacenterlight/pricing.html:181
+#: datacenterlight/templates/datacenterlight/index.html:324
+#: datacenterlight/templates/datacenterlight/pricing.html:181
msgid "Home"
msgstr "Home"
-#: templates/datacenterlight/index.html:337
-#: templates/datacenterlight/pricing.html:194
+#: datacenterlight/templates/datacenterlight/index.html:337
+#: datacenterlight/templates/datacenterlight/pricing.html:194
msgid "Pricing"
msgstr "Preise"
-#: templates/datacenterlight/pricing.html:122
+#: datacenterlight/templates/datacenterlight/pricing.html:122
#, fuzzy
#| msgid "Based in Switzerland"
msgid "Hosted in Switzerland"
msgstr "Standort des Datacenters ist in der Schweiz"
-#: templates/datacenterlight/pricing.html:136
+#: datacenterlight/templates/datacenterlight/pricing.html:139
msgid "GB Storage (SSD)"
msgstr "GB Storage (SSD)"
-#: templates/datacenterlight/pricing.html:163
+#: datacenterlight/templates/datacenterlight/pricing.html:163
msgid "Simple and affordable: Try our virtual machine with featherlight price."
msgstr ""
diff --git a/digitalglarus/locale/de/LC_MESSAGES/django.mo b/digitalglarus/locale/de/LC_MESSAGES/django.mo
index 3200410e..12bb9ca5 100644
Binary files a/digitalglarus/locale/de/LC_MESSAGES/django.mo and b/digitalglarus/locale/de/LC_MESSAGES/django.mo differ
diff --git a/digitalglarus/locale/de/LC_MESSAGES/django.po b/digitalglarus/locale/de/LC_MESSAGES/django.po
index 87b79204..fffab1e3 100644
--- a/digitalglarus/locale/de/LC_MESSAGES/django.po
+++ b/digitalglarus/locale/de/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-15 22:24-0500\n"
+"POT-Creation-Date: 2017-05-26 14:41+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,85 +18,1473 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: cms_plugins.py:9
-msgid "Digital Glarus Gallery"
+#: cms_templates/djangocms_blog/post_list.html:11
+#: ungleich/templates/ungleich/djangocms_blog/post_list_ungleich.html:11
+msgid "Articles by"
msgstr ""
-#: cms_plugins.py:21
-msgid "Digital Glarus Supporters"
+#: cms_templates/djangocms_blog/post_list.html:12
+#: ungleich/templates/ungleich/djangocms_blog/post_list_ungleich.html:12
+msgid "Archive"
msgstr ""
-#: templates/glarus_blog/includes/blog_item.html:32
-msgid "read more"
+#: cms_templates/djangocms_blog/post_list.html:13
+#: ungleich/templates/ungleich/djangocms_blog/post_list_ungleich.html:13
+msgid "Tag"
msgstr ""
-#: templates/glarus_blog/includes/blog_meta.html:6
-msgid "by"
+#: cms_templates/djangocms_blog/post_list.html:14
+#: ungleich/templates/ungleich/djangocms_blog/post_list_ungleich.html:14
+msgid "Category"
msgstr ""
-#: templates/glarus_blog/post_list.html:15
+#: 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 ""
-#: templates/glarus_blog/post_list.html:18
+#: 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 ""
-#: templates/glarus_blog/post_list.html:23
+#: cms_templates/djangocms_blog/post_list.html:32
+#: ungleich/templates/ungleich/djangocms_blog/post_list_ungleich.html:33
+msgid "Newer Posts"
+msgstr ""
+
+#: cms_templates/djangocms_blog/post_list.html:39
+#: ungleich/templates/ungleich/djangocms_blog/post_list_ungleich.html:40
+msgid "Older Posts"
+msgstr ""
+
+#: cms_templates/includes/blog_item.html:31
+#: digitalglarus/templates/glarus_blog/includes/blog_item.html:32
+msgid "read more"
+msgstr ""
+
+#: cms_templates/includes/blog_meta.html:6
+#: digitalglarus/templates/glarus_blog/includes/blog_meta.html:6
+msgid "by"
+msgstr ""
+
+#: digitalglarus/cms_plugins.py:9
+msgid "Digital Glarus Gallery"
+msgstr ""
+
+#: digitalglarus/cms_plugins.py:21
+msgid "Digital Glarus Supporters"
+msgstr ""
+
+#: digitalglarus/forms.py:35 digitalglarus/forms.py:70 nosystemd/forms.py:47
+#: utils/forms.py:109
+msgid "Street Address"
+msgstr ""
+
+#: digitalglarus/forms.py:36 digitalglarus/forms.py:71 nosystemd/forms.py:48
+#: utils/forms.py:110 utils/forms.py:124
+msgid "City"
+msgstr ""
+
+#: digitalglarus/forms.py:37 digitalglarus/forms.py:72 nosystemd/forms.py:49
+#: utils/forms.py:111 utils/forms.py:125
+msgid "Postal Code"
+msgstr ""
+
+#: digitalglarus/forms.py:38 digitalglarus/forms.py:73 nosystemd/forms.py:50
+#: utils/forms.py:112 utils/forms.py:126
+msgid "Country"
+msgstr ""
+
+#: 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 ""
+
+#: digitalglarus/templates/glarus_blog/post_list.html:23
+#: nosystemd/templates/nosystemd/donations.html:74
msgid "previous"
msgstr ""
-#: templates/glarus_blog/post_list.html:26
+#: 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 ""
-#: templates/glarus_blog/post_list.html:26
+#: digitalglarus/templates/glarus_blog/post_list.html:26
msgid "of"
msgstr ""
-#: templates/glarus_blog/post_list.html:29
+#: digitalglarus/templates/glarus_blog/post_list.html:29
+#: nosystemd/templates/nosystemd/donations.html:80
msgid "next"
msgstr ""
-#: templates/language_chooser.html:8
+#: digitalglarus/templates/language_chooser.html:8
+#: ungleich/templates/cms/ungleichch/_header_base.html:23
msgid "Change to language:"
msgstr ""
-#: urls.py:8
-msgid "home/?$"
-msgstr "haus/?$"
+#: digitalglarus/templates/new_base_glarus.html:168
+#: digitalglarus/templates/new_base_glarus.html:191
+#: digitalglarus/templates/new_base_glarus_c.html:176
+#: digitalglarus/templates/new_base_glarus_c.html:199
+msgid "Bookings"
+msgstr ""
-#: urls.py:9
-msgid "about/?$"
-msgstr "etwa/?$"
+#: digitalglarus/templates/new_base_glarus.html:172
+#: digitalglarus/templates/new_base_glarus.html:195
+#: digitalglarus/templates/new_base_glarus_c.html:180
+#: digitalglarus/templates/new_base_glarus_c.html:203
+msgid "Membership"
+msgstr ""
-#: urls.py:10
-msgid "contact/?$"
-msgstr "kontakt/?$"
+#: digitalglarus/templates/new_base_glarus.html:178
+#: digitalglarus/templates/new_base_glarus.html:201
+#: digitalglarus/templates/new_base_glarus_c.html:186
+#: digitalglarus/templates/new_base_glarus_c.html:209
+#: nosystemd/templates/nosystemd/base.html:76
+msgid "Logout"
+msgstr ""
-#: urls.py:11
-msgid "supporters/?$"
-msgstr "befurworter/?$"
+#: digitalglarus/urls.py:16
+msgid "booking/payment/edit/?$"
+msgstr ""
-#: urls.py:12
+#: digitalglarus/urls.py:17
+msgid "^$"
+msgstr ""
+
+#: digitalglarus/urls.py:19
msgid "support-us/?$"
msgstr ""
-#: views.py:23
+#: digitalglarus/urls.py:20
+msgid "contact/?$"
+msgstr "kontakt/?$"
+
+#: digitalglarus/urls.py:21
+msgid "login/?$"
+msgstr ""
+
+#: digitalglarus/urls.py:22
+msgid "signup/?$"
+msgstr ""
+
+#: digitalglarus/urls.py:28
+msgid "history/?$"
+msgstr ""
+
+#: digitalglarus/urls.py:29
+msgid "users/billing_address/?$"
+msgstr ""
+
+#: digitalglarus/urls.py:31
+msgid "booking/?$"
+msgstr ""
+
+#: digitalglarus/urls.py:32
+msgid "booking/payment/?$"
+msgstr ""
+
+#: digitalglarus/urls.py:33
+msgid "booking/orders/(?P<pk>\\d+)/?$"
+msgstr ""
+
+#: digitalglarus/urls.py:37
+msgid "booking/orders/?$"
+msgstr ""
+
+#: digitalglarus/urls.py:39
+msgid "membership/payment/?$"
+msgstr ""
+
+#: digitalglarus/urls.py:40
+msgid "membership/activated/?$"
+msgstr ""
+
+#: digitalglarus/urls.py:42
+msgid "membership/deactivate/?$"
+msgstr ""
+
+#: digitalglarus/urls.py:44
+msgid "membership/reactivate/?$"
+msgstr ""
+
+#: digitalglarus/urls.py:46
+msgid "membership/deactivate/success/?$"
+msgstr ""
+
+#: digitalglarus/urls.py:48
+msgid "membership/pricing/?$"
+msgstr ""
+
+#: digitalglarus/urls.py:50
+msgid "membership/orders/(?P<pk>\\d+)/?$"
+msgstr ""
+
+#: digitalglarus/urls.py:52
+#, fuzzy
+#| msgid "supporters/?$"
+msgid "membership/orders/?$"
+msgstr "befurworter/?$"
+
+#: digitalglarus/urls.py:54
+msgid "supporters/?$"
+msgstr "befurworter/?$"
+
+#: digitalglarus/views.py:715
msgid "Message Successfully Sent"
msgstr ""
+#: dynamicweb/settings-test/__init__.py:178
+msgid "US English"
+msgstr ""
+
+#: dynamicweb/settings-test/__init__.py:179
+msgid "German"
+msgstr ""
+
+#: dynamicweb/settings-test/__init__.py:232
+#: dynamicweb/settings-test/__init__.py:241
+#: dynamicweb/settings/__init__old.py:232
+#: dynamicweb/settings/__init__old.py:241 dynamicweb/settings/base.py:270
+#: dynamicweb/settings/base.py:279
+msgid "Content"
+msgstr ""
+
+#: dynamicweb/settings/__init__old.py:178 dynamicweb/settings/base.py:211
+msgid "English"
+msgstr ""
+
+#: dynamicweb/settings/__init__old.py:179 dynamicweb/settings/base.py:212
+msgid "Deutsch"
+msgstr ""
+
+#: dynamicweb/settings/base.py:171
+msgid "default"
+msgstr ""
+
+#: dynamicweb/settings/base.py:172
+msgid "2 Column"
+msgstr ""
+
+#: dynamicweb/settings/base.py:173
+msgid "3 Column"
+msgstr ""
+
+#: dynamicweb/settings/base.py:174 templates/cms/__init__.py:4
+#: templates/cms/digitalglarus/__init__.py:4
+msgid "DG.About"
+msgstr ""
+
+#: dynamicweb/settings/base.py:175 templates/cms/__init__.py:5
+#: templates/cms/digitalglarus/__init__.py:5
+#, fuzzy
+#| msgid "contact/?$"
+msgid "DG.Contact"
+msgstr "kontakt/?$"
+
+#: dynamicweb/settings/base.py:176 templates/cms/__init__.py:6
+#: templates/cms/digitalglarus/__init__.py:6
+msgid "DG.Home"
+msgstr ""
+
+#: dynamicweb/settings/base.py:177 templates/cms/__init__.py:7
+#: templates/cms/digitalglarus/__init__.py:7
+msgid "DG.CoWork"
+msgstr ""
+
+#: dynamicweb/settings/base.py:179
+msgid "DG.OneColumn"
+msgstr ""
+
+#: dynamicweb/settings/base.py:181 templates/cms/__init__.py:9
+#: templates/cms/ungleichch/__init__.py:4
+msgid "Blog"
+msgstr ""
+
+#: membership/forms.py:43 utils/forms.py:142
+msgid "Name"
+msgstr "Name"
+
+#: membership/forms.py:43
+#, fuzzy
+#| msgid "Phone number"
+msgid "Card number"
+msgstr "Telefon"
+
+#: membership/forms.py:43
+msgid "Expiry date"
+msgstr ""
+
+#: membership/forms.py:44
+msgid "CCV"
+msgstr ""
+
+#: membership/models.py:67
+msgid "staff status"
+msgstr ""
+
+#: membership/models.py:69
+msgid "Designates whether the user can log into this admin site."
+msgstr ""
+
+#: membership/models.py:181
+msgid "Use this pattern(MM/YYYY)."
+msgstr ""
+
+#: membership/models.py:182
+#, fuzzy
+#| msgid "Phone number"
+msgid "Wrong CCV number."
+msgstr "Telefon"
+
+#: nosystemd/forms.py:46
+msgid "Amount"
+msgstr ""
+
+#: nosystemd/templates/nosystemd/base.html:70
+msgid "My Donations"
+msgstr ""
+
+#: nosystemd/templates/nosystemd/confirm_reset_password.html:24
+msgid "Set your new password"
+msgstr ""
+
+#: nosystemd/templates/nosystemd/confirm_reset_password.html:33
+#: nosystemd/templates/nosystemd/reset_password.html:25
+msgid "Reset"
+msgstr ""
+
+#: nosystemd/templates/nosystemd/confirm_reset_password.html:37
+#: nosystemd/templates/nosystemd/reset_password.html:29
+#: nosystemd/templates/nosystemd/signup.html:33
+msgid "Already have an account ?"
+msgstr ""
+
+#: nosystemd/templates/nosystemd/confirm_reset_password.html:37
+msgid "Log in"
+msgstr ""
+
+#: nosystemd/templates/nosystemd/donation_detail.html:15
+msgid "Invoice"
+msgstr ""
+
+#: nosystemd/templates/nosystemd/donation_detail.html:15
+msgid "Donation #"
+msgstr ""
+
+#: nosystemd/templates/nosystemd/donation_detail.html:20
+msgid "Billing Address:"
+msgstr ""
+
+#: nosystemd/templates/nosystemd/donation_detail.html:28
+msgid "Date:"
+msgstr ""
+
+#: nosystemd/templates/nosystemd/donation_detail.html:38
+msgid "Payment Method:"
+msgstr ""
+
+#: nosystemd/templates/nosystemd/donation_detail.html:49
+msgid "Donation summary"
+msgstr ""
+
+#: nosystemd/templates/nosystemd/donation_detail.html:52
+#: nosystemd/templates/nosystemd/donations.html:49
+msgid "Donation"
+msgstr ""
+
+#: nosystemd/templates/nosystemd/donation_detail.html:54
+msgid "Total"
+msgstr ""
+
+#: nosystemd/templates/nosystemd/donation_detail.html:60
+msgid "Finish Configuration"
+msgstr ""
+
+#: nosystemd/templates/nosystemd/donation_detail.html:68
+msgid ""
+"Thanks for you donation, you can cancel your monthly donation at any time "
+"going to profile > subscription "
+msgstr ""
+
+#: nosystemd/templates/nosystemd/donation_detail.html:74
+msgid "View Donations"
+msgstr ""
+
+#: nosystemd/templates/nosystemd/donations.html:28
+#: nosystemd/templates/nosystemd/donator_status.html:26
+msgid "Cancel Donation"
+msgstr ""
+
+#: nosystemd/templates/nosystemd/donations.html:35
+msgid "Donate"
+msgstr ""
+
+#: nosystemd/templates/nosystemd/donations.html:44
+msgid "Donations Made"
+msgstr ""
+
+#: nosystemd/templates/nosystemd/donations.html:50
+msgid "Date"
+msgstr ""
+
+#: nosystemd/templates/nosystemd/donations.html:62
+msgid "View Detail"
+msgstr ""
+
+#: nosystemd/templates/nosystemd/donator_status.html:28
+msgid "Reanude Donation"
+msgstr ""
+
+#: nosystemd/templates/nosystemd/emails/password_reset_email.html:2
+#: nosystemd/templates/nosystemd/emails/password_reset_email.txt:2
+#, python-format
+msgid ""
+"You're receiving this email because you requested a password reset for your "
+"user account at %(site_name)s."
+msgstr ""
+
+#: nosystemd/templates/nosystemd/emails/password_reset_email.html:4
+#: nosystemd/templates/nosystemd/emails/password_reset_email.txt:4
+msgid "Please go to the following page and choose a new password:"
+msgstr ""
+
+#: nosystemd/templates/nosystemd/emails/password_reset_email.html:9
+#: nosystemd/templates/nosystemd/emails/password_reset_email.txt:9
+msgid "Thanks for using our site!"
+msgstr ""
+
+#: nosystemd/templates/nosystemd/emails/password_reset_email.html:11
+#: nosystemd/templates/nosystemd/emails/password_reset_email.txt:11
+#, python-format
+msgid "The %(site_name)s team"
+msgstr ""
+
+#: nosystemd/templates/nosystemd/login.html:30
+msgid "Log in "
+msgstr ""
+
+#: nosystemd/templates/nosystemd/login.html:40
+#: nosystemd/templates/nosystemd/reset_password.html:29
+#: nosystemd/templates/nosystemd/signup.html:33
+msgid "Login"
+msgstr ""
+
+#: nosystemd/templates/nosystemd/login.html:44
+msgid "Don't have an account yet ? "
+msgstr ""
+
+#: nosystemd/templates/nosystemd/login.html:44
+#: nosystemd/templates/nosystemd/signup.html:17
+#: nosystemd/templates/nosystemd/signup.html:29
+msgid "Sign up"
+msgstr ""
+
+#: nosystemd/templates/nosystemd/login.html:46
+msgid "Forgot your password ? "
+msgstr ""
+
+#: nosystemd/templates/nosystemd/reset_password.html:16
+msgid "Reset your password"
+msgstr ""
+
+#: templates/cms/__init__.py:8 templates/cms/digitalglarus/__init__.py:8
+msgid "DG.Detail"
+msgstr ""
+
+#: ungleich/cms_toolbar.py:24
+msgid "Page Header"
+msgstr ""
+
+#: ungleich/views.py:78
+#, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr ""
+
+#: utils/fields.py:7
+msgid "Andorra"
+msgstr ""
+
+#: utils/fields.py:8
+msgid "United Arab Emirates"
+msgstr ""
+
+#: utils/fields.py:9
+msgid "Afghanistan"
+msgstr ""
+
+#: utils/fields.py:10
+msgid "Antigua & Barbuda"
+msgstr ""
+
+#: utils/fields.py:11
+msgid "Anguilla"
+msgstr ""
+
+#: utils/fields.py:12
+msgid "Albania"
+msgstr ""
+
+#: utils/fields.py:13
+msgid "Armenia"
+msgstr ""
+
+#: utils/fields.py:14
+msgid "Netherlands Antilles"
+msgstr ""
+
+#: utils/fields.py:15
+msgid "Angola"
+msgstr ""
+
+#: utils/fields.py:16
+msgid "Antarctica"
+msgstr ""
+
+#: utils/fields.py:17
+msgid "Argentina"
+msgstr ""
+
+#: utils/fields.py:18
+msgid "American Samoa"
+msgstr ""
+
+#: utils/fields.py:19
+msgid "Austria"
+msgstr ""
+
+#: utils/fields.py:20
+msgid "Australia"
+msgstr ""
+
+#: utils/fields.py:21
+msgid "Aruba"
+msgstr ""
+
+#: utils/fields.py:22
+msgid "Azerbaijan"
+msgstr ""
+
+#: utils/fields.py:23
+msgid "Bosnia and Herzegovina"
+msgstr ""
+
+#: utils/fields.py:24
+msgid "Barbados"
+msgstr ""
+
+#: utils/fields.py:25
+msgid "Bangladesh"
+msgstr ""
+
+#: utils/fields.py:26
+msgid "Belgium"
+msgstr ""
+
+#: utils/fields.py:27
+msgid "Burkina Faso"
+msgstr ""
+
+#: utils/fields.py:28
+msgid "Bulgaria"
+msgstr ""
+
+#: utils/fields.py:29
+msgid "Bahrain"
+msgstr ""
+
+#: utils/fields.py:30
+msgid "Burundi"
+msgstr ""
+
+#: utils/fields.py:31
+msgid "Benin"
+msgstr ""
+
+#: utils/fields.py:32
+msgid "Bermuda"
+msgstr ""
+
+#: utils/fields.py:33
+msgid "Brunei Darussalam"
+msgstr ""
+
+#: utils/fields.py:34
+msgid "Bolivia"
+msgstr ""
+
+#: utils/fields.py:35
+msgid "Brazil"
+msgstr ""
+
+#: utils/fields.py:36
+msgid "Bahama"
+msgstr ""
+
+#: utils/fields.py:37
+msgid "Bhutan"
+msgstr ""
+
+#: utils/fields.py:38
+msgid "Bouvet Island"
+msgstr ""
+
+#: utils/fields.py:39
+msgid "Botswana"
+msgstr ""
+
+#: utils/fields.py:40
+msgid "Belarus"
+msgstr ""
+
+#: utils/fields.py:41
+msgid "Belize"
+msgstr ""
+
+#: utils/fields.py:42
+msgid "Canada"
+msgstr ""
+
+#: utils/fields.py:43
+msgid "Cocos (Keeling) Islands"
+msgstr ""
+
+#: utils/fields.py:44
+msgid "Central African Republic"
+msgstr ""
+
+#: utils/fields.py:45
+msgid "Congo"
+msgstr ""
+
+#: utils/fields.py:46
+msgid "Switzerland"
+msgstr ""
+
+#: utils/fields.py:47
+msgid "Ivory Coast"
+msgstr ""
+
+#: utils/fields.py:48
+msgid "Cook Iislands"
+msgstr ""
+
+#: utils/fields.py:49
+msgid "Chile"
+msgstr ""
+
+#: utils/fields.py:50
+msgid "Cameroon"
+msgstr ""
+
+#: utils/fields.py:51
+msgid "China"
+msgstr ""
+
+#: utils/fields.py:52
+msgid "Colombia"
+msgstr ""
+
+#: utils/fields.py:53
+msgid "Costa Rica"
+msgstr ""
+
+#: utils/fields.py:54
+msgid "Cuba"
+msgstr ""
+
+#: utils/fields.py:55
+msgid "Cape Verde"
+msgstr ""
+
+#: utils/fields.py:56
+msgid "Christmas Island"
+msgstr ""
+
+#: utils/fields.py:57
+msgid "Cyprus"
+msgstr ""
+
+#: utils/fields.py:58
+msgid "Czech Republic"
+msgstr ""
+
+#: utils/fields.py:59
+msgid "Germany"
+msgstr ""
+
+#: utils/fields.py:60
+msgid "Djibouti"
+msgstr ""
+
+#: utils/fields.py:61
+msgid "Denmark"
+msgstr ""
+
+#: utils/fields.py:62
+msgid "Dominica"
+msgstr ""
+
+#: utils/fields.py:63
+msgid "Dominican Republic"
+msgstr ""
+
+#: utils/fields.py:64
+msgid "Algeria"
+msgstr ""
+
+#: utils/fields.py:65
+msgid "Ecuador"
+msgstr ""
+
+#: utils/fields.py:66
+msgid "Estonia"
+msgstr ""
+
+#: utils/fields.py:67
+msgid "Egypt"
+msgstr ""
+
+#: utils/fields.py:68
+msgid "Western Sahara"
+msgstr ""
+
+#: utils/fields.py:69
+msgid "Eritrea"
+msgstr ""
+
+#: utils/fields.py:70
+msgid "Spain"
+msgstr ""
+
+#: utils/fields.py:71
+msgid "Ethiopia"
+msgstr ""
+
+#: utils/fields.py:72
+msgid "Finland"
+msgstr ""
+
+#: utils/fields.py:73
+msgid "Fiji"
+msgstr ""
+
+#: utils/fields.py:74
+msgid "Falkland Islands (Malvinas)"
+msgstr ""
+
+#: utils/fields.py:75
+msgid "Micronesia"
+msgstr ""
+
+#: utils/fields.py:76
+msgid "Faroe Islands"
+msgstr ""
+
+#: utils/fields.py:77
+msgid "France"
+msgstr ""
+
+#: utils/fields.py:78
+msgid "France, Metropolitan"
+msgstr ""
+
+#: utils/fields.py:79
+msgid "Gabon"
+msgstr ""
+
+#: utils/fields.py:80
+msgid "United Kingdom (Great Britain)"
+msgstr ""
+
+#: utils/fields.py:81
+msgid "Grenada"
+msgstr ""
+
+#: utils/fields.py:82
+msgid "Georgia"
+msgstr ""
+
+#: utils/fields.py:83
+msgid "French Guiana"
+msgstr ""
+
+#: utils/fields.py:84
+msgid "Ghana"
+msgstr ""
+
+#: utils/fields.py:85
+msgid "Gibraltar"
+msgstr ""
+
+#: utils/fields.py:86
+msgid "Greenland"
+msgstr ""
+
+#: utils/fields.py:87
+msgid "Gambia"
+msgstr ""
+
+#: utils/fields.py:88
+msgid "Guinea"
+msgstr ""
+
+#: utils/fields.py:89
+msgid "Guadeloupe"
+msgstr ""
+
+#: utils/fields.py:90
+msgid "Equatorial Guinea"
+msgstr ""
+
+#: utils/fields.py:91
+msgid "Greece"
+msgstr ""
+
+#: utils/fields.py:92
+msgid "South Georgia and the South Sandwich Islands"
+msgstr ""
+
+#: utils/fields.py:93
+msgid "Guatemala"
+msgstr ""
+
+#: utils/fields.py:94
+msgid "Guam"
+msgstr ""
+
+#: utils/fields.py:95
+msgid "Guinea-Bissau"
+msgstr ""
+
+#: utils/fields.py:96
+msgid "Guyana"
+msgstr ""
+
+#: utils/fields.py:97
+msgid "Hong Kong"
+msgstr ""
+
+#: utils/fields.py:98
+msgid "Heard & McDonald Islands"
+msgstr ""
+
+#: utils/fields.py:99
+msgid "Honduras"
+msgstr ""
+
+#: utils/fields.py:100
+msgid "Croatia"
+msgstr ""
+
+#: utils/fields.py:101
+msgid "Haiti"
+msgstr ""
+
+#: utils/fields.py:102
+msgid "Hungary"
+msgstr ""
+
+#: utils/fields.py:103
+msgid "Indonesia"
+msgstr ""
+
+#: utils/fields.py:104
+msgid "Ireland"
+msgstr ""
+
+#: utils/fields.py:105
+msgid "Israel"
+msgstr ""
+
+#: utils/fields.py:106
+msgid "India"
+msgstr ""
+
+#: utils/fields.py:107
+msgid "British Indian Ocean Territory"
+msgstr ""
+
+#: utils/fields.py:108
+msgid "Iraq"
+msgstr ""
+
+#: utils/fields.py:109
+msgid "Islamic Republic of Iran"
+msgstr ""
+
+#: utils/fields.py:110
+msgid "Iceland"
+msgstr ""
+
+#: utils/fields.py:111
+msgid "Italy"
+msgstr ""
+
+#: utils/fields.py:112
+msgid "Jamaica"
+msgstr ""
+
+#: utils/fields.py:113
+msgid "Jordan"
+msgstr ""
+
+#: utils/fields.py:114
+msgid "Japan"
+msgstr ""
+
+#: utils/fields.py:115
+msgid "Kenya"
+msgstr ""
+
+#: utils/fields.py:116
+msgid "Kyrgyzstan"
+msgstr ""
+
+#: utils/fields.py:117
+msgid "Cambodia"
+msgstr ""
+
+#: utils/fields.py:118
+msgid "Kiribati"
+msgstr ""
+
+#: utils/fields.py:119
+msgid "Comoros"
+msgstr ""
+
+#: utils/fields.py:120
+msgid "St. Kitts and Nevis"
+msgstr ""
+
+#: utils/fields.py:121
+msgid "Korea, Democratic People's Republic of"
+msgstr ""
+
+#: utils/fields.py:122
+msgid "Korea, Republic of"
+msgstr ""
+
+#: utils/fields.py:123
+msgid "Kuwait"
+msgstr ""
+
+#: utils/fields.py:124
+msgid "Cayman Islands"
+msgstr ""
+
+#: utils/fields.py:125
+msgid "Kazakhstan"
+msgstr ""
+
+#: utils/fields.py:126
+msgid "Lao People's Democratic Republic"
+msgstr ""
+
+#: utils/fields.py:127
+msgid "Lebanon"
+msgstr ""
+
+#: utils/fields.py:128
+msgid "Saint Lucia"
+msgstr ""
+
+#: utils/fields.py:129
+msgid "Liechtenstein"
+msgstr ""
+
+#: utils/fields.py:130
+msgid "Sri Lanka"
+msgstr ""
+
+#: utils/fields.py:131
+msgid "Liberia"
+msgstr ""
+
+#: utils/fields.py:132
+msgid "Lesotho"
+msgstr ""
+
+#: utils/fields.py:133
+msgid "Lithuania"
+msgstr ""
+
+#: utils/fields.py:134
+msgid "Luxembourg"
+msgstr ""
+
+#: utils/fields.py:135
+msgid "Latvia"
+msgstr ""
+
+#: utils/fields.py:136
+msgid "Libyan Arab Jamahiriya"
+msgstr ""
+
+#: utils/fields.py:137
+msgid "Morocco"
+msgstr ""
+
+#: utils/fields.py:138
+msgid "Monaco"
+msgstr ""
+
+#: utils/fields.py:139
+msgid "Moldova, Republic of"
+msgstr ""
+
+#: utils/fields.py:140
+msgid "Madagascar"
+msgstr ""
+
+#: utils/fields.py:141
+msgid "Marshall Islands"
+msgstr ""
+
+#: utils/fields.py:142
+msgid "Mali"
+msgstr ""
+
+#: utils/fields.py:143
+msgid "Mongolia"
+msgstr ""
+
+#: utils/fields.py:144
+msgid "Myanmar"
+msgstr ""
+
+#: utils/fields.py:145
+msgid "Macau"
+msgstr ""
+
+#: utils/fields.py:146
+msgid "Northern Mariana Islands"
+msgstr ""
+
+#: utils/fields.py:147
+msgid "Martinique"
+msgstr ""
+
+#: utils/fields.py:148
+msgid "Mauritania"
+msgstr ""
+
+#: utils/fields.py:149
+msgid "Monserrat"
+msgstr ""
+
+#: utils/fields.py:150
+msgid "Malta"
+msgstr ""
+
+#: utils/fields.py:151
+msgid "Mauritius"
+msgstr ""
+
+#: utils/fields.py:152
+msgid "Maldives"
+msgstr ""
+
+#: utils/fields.py:153
+msgid "Malawi"
+msgstr ""
+
+#: utils/fields.py:154
+msgid "Mexico"
+msgstr ""
+
+#: utils/fields.py:155
+msgid "Malaysia"
+msgstr ""
+
+#: utils/fields.py:156
+msgid "Mozambique"
+msgstr ""
+
+#: utils/fields.py:157
+msgid "Namibia"
+msgstr ""
+
+#: utils/fields.py:158
+msgid "New Caledonia"
+msgstr ""
+
+#: utils/fields.py:159
+msgid "Niger"
+msgstr ""
+
+#: utils/fields.py:160
+msgid "Norfolk Island"
+msgstr ""
+
+#: utils/fields.py:161
+msgid "Nigeria"
+msgstr ""
+
+#: utils/fields.py:162
+msgid "Nicaragua"
+msgstr ""
+
+#: utils/fields.py:163
+msgid "Netherlands"
+msgstr ""
+
+#: utils/fields.py:164
+msgid "Norway"
+msgstr ""
+
+#: utils/fields.py:165
+msgid "Nepal"
+msgstr ""
+
+#: utils/fields.py:166
+msgid "Nauru"
+msgstr ""
+
+#: utils/fields.py:167
+msgid "Niue"
+msgstr ""
+
+#: utils/fields.py:168
+msgid "New Zealand"
+msgstr ""
+
+#: utils/fields.py:169
+msgid "Oman"
+msgstr ""
+
+#: utils/fields.py:170
+msgid "Panama"
+msgstr ""
+
+#: utils/fields.py:171
+msgid "Peru"
+msgstr ""
+
+#: utils/fields.py:172
+msgid "French Polynesia"
+msgstr ""
+
+#: utils/fields.py:173
+msgid "Papua New Guinea"
+msgstr ""
+
+#: utils/fields.py:174
+msgid "Philippines"
+msgstr ""
+
+#: utils/fields.py:175
+msgid "Pakistan"
+msgstr ""
+
+#: utils/fields.py:176
+msgid "Poland"
+msgstr ""
+
+#: utils/fields.py:177
+msgid "St. Pierre & Miquelon"
+msgstr ""
+
+#: utils/fields.py:178
+msgid "Pitcairn"
+msgstr ""
+
+#: utils/fields.py:179
+msgid "Puerto Rico"
+msgstr ""
+
+#: utils/fields.py:180
+msgid "Portugal"
+msgstr ""
+
+#: utils/fields.py:181
+msgid "Palau"
+msgstr ""
+
+#: utils/fields.py:182
+msgid "Paraguay"
+msgstr ""
+
+#: utils/fields.py:183
+msgid "Qatar"
+msgstr ""
+
+#: utils/fields.py:184
+msgid "Reunion"
+msgstr ""
+
+#: utils/fields.py:185
+msgid "Romania"
+msgstr ""
+
+#: utils/fields.py:186
+msgid "Russian Federation"
+msgstr ""
+
+#: utils/fields.py:187
+msgid "Rwanda"
+msgstr ""
+
+#: utils/fields.py:188
+msgid "Saudi Arabia"
+msgstr ""
+
+#: utils/fields.py:189
+msgid "Solomon Islands"
+msgstr ""
+
+#: utils/fields.py:190
+msgid "Seychelles"
+msgstr ""
+
+#: utils/fields.py:191
+msgid "Sudan"
+msgstr ""
+
+#: utils/fields.py:192
+msgid "Sweden"
+msgstr ""
+
+#: utils/fields.py:193
+msgid "Singapore"
+msgstr ""
+
+#: utils/fields.py:194
+msgid "St. Helena"
+msgstr ""
+
+#: utils/fields.py:195
+msgid "Slovenia"
+msgstr ""
+
+#: utils/fields.py:196
+msgid "Svalbard & Jan Mayen Islands"
+msgstr ""
+
+#: utils/fields.py:197
+msgid "Slovakia"
+msgstr ""
+
+#: utils/fields.py:198
+msgid "Sierra Leone"
+msgstr ""
+
+#: utils/fields.py:199
+msgid "San Marino"
+msgstr ""
+
+#: utils/fields.py:200
+msgid "Senegal"
+msgstr ""
+
+#: utils/fields.py:201
+msgid "Somalia"
+msgstr ""
+
+#: utils/fields.py:202
+msgid "Suriname"
+msgstr ""
+
+#: utils/fields.py:203
+msgid "Sao Tome & Principe"
+msgstr ""
+
+#: utils/fields.py:204
+msgid "El Salvador"
+msgstr ""
+
+#: utils/fields.py:205
+msgid "Syrian Arab Republic"
+msgstr ""
+
+#: utils/fields.py:206
+msgid "Swaziland"
+msgstr ""
+
+#: utils/fields.py:207
+msgid "Turks & Caicos Islands"
+msgstr ""
+
+#: utils/fields.py:208
+msgid "Chad"
+msgstr ""
+
+#: utils/fields.py:209
+msgid "French Southern Territories"
+msgstr ""
+
+#: utils/fields.py:210
+msgid "Togo"
+msgstr ""
+
+#: utils/fields.py:211
+msgid "Thailand"
+msgstr ""
+
+#: utils/fields.py:212
+msgid "Tajikistan"
+msgstr ""
+
+#: utils/fields.py:213
+msgid "Tokelau"
+msgstr ""
+
+#: utils/fields.py:214
+msgid "Turkmenistan"
+msgstr ""
+
+#: utils/fields.py:215
+msgid "Tunisia"
+msgstr ""
+
+#: utils/fields.py:216
+msgid "Tonga"
+msgstr ""
+
+#: utils/fields.py:217
+msgid "East Timor"
+msgstr ""
+
+#: utils/fields.py:218
+msgid "Turkey"
+msgstr ""
+
+#: utils/fields.py:219
+msgid "Trinidad & Tobago"
+msgstr ""
+
+#: utils/fields.py:220
+msgid "Tuvalu"
+msgstr ""
+
+#: utils/fields.py:221
+msgid "Taiwan, Province of China"
+msgstr ""
+
+#: utils/fields.py:222
+msgid "Tanzania, United Republic of"
+msgstr ""
+
+#: utils/fields.py:223
+msgid "Ukraine"
+msgstr ""
+
+#: utils/fields.py:224
+msgid "Uganda"
+msgstr ""
+
+#: utils/fields.py:225
+msgid "United States Minor Outlying Islands"
+msgstr ""
+
+#: utils/fields.py:226
+msgid "United States of America"
+msgstr ""
+
+#: utils/fields.py:227
+msgid "Uruguay"
+msgstr ""
+
+#: utils/fields.py:228
+msgid "Uzbekistan"
+msgstr ""
+
+#: utils/fields.py:229
+msgid "Vatican City State (Holy See)"
+msgstr ""
+
+#: utils/fields.py:230
+msgid "St. Vincent & the Grenadines"
+msgstr ""
+
+#: utils/fields.py:231
+msgid "Venezuela"
+msgstr ""
+
+#: utils/fields.py:232
+msgid "British Virgin Islands"
+msgstr ""
+
+#: utils/fields.py:233
+msgid "United States Virgin Islands"
+msgstr ""
+
+#: utils/fields.py:234
+msgid "Viet Nam"
+msgstr ""
+
+#: utils/fields.py:235
+msgid "Vanuatu"
+msgstr ""
+
+#: utils/fields.py:236
+msgid "Wallis & Futuna Islands"
+msgstr ""
+
+#: utils/fields.py:237
+msgid "Samoa"
+msgstr ""
+
+#: utils/fields.py:238
+msgid "Yemen"
+msgstr ""
+
+#: utils/fields.py:239
+msgid "Mayotte"
+msgstr ""
+
+#: utils/fields.py:240
+msgid "Yugoslavia"
+msgstr ""
+
+#: utils/fields.py:241
+msgid "South Africa"
+msgstr ""
+
+#: utils/fields.py:242
+msgid "Zambia"
+msgstr ""
+
+#: utils/fields.py:243
+msgid "Zaire"
+msgstr ""
+
+#: utils/fields.py:244
+msgid "Zimbabwe"
+msgstr ""
+
+#: utils/fields.py:245
+msgid "Unknown or unspecified country"
+msgstr ""
+
+#: utils/forms.py:123
+msgid "Street Building"
+msgstr ""
+
+#: utils/forms.py:143
+msgid "Email"
+msgstr "Email"
+
+#: utils/forms.py:144
+msgid "Phone number"
+msgstr "Telefon"
+
+#: utils/forms.py:145
+msgid "Message"
+msgstr "Nachricht"
+
+#~ msgid "home/?$"
+#~ msgstr "haus/?$"
+
+#~ msgid "about/?$"
+#~ msgstr "etwa/?$"
+
#~ msgid "index/?$"
#~ msgstr "index/?$"
-
-#~ msgid "Name"
-#~ msgstr "Name"
-
-#~ msgid "Email"
-#~ msgstr "Email"
-
-#~ msgid "Phone number"
-#~ msgstr "Telefon"
-
-#~ msgid "Message"
-#~ msgstr "Nachricht"
diff --git a/hosting/locale/de/LC_MESSAGES/django.mo b/hosting/locale/de/LC_MESSAGES/django.mo
index 11ba904f..23a4bb4f 100644
Binary files a/hosting/locale/de/LC_MESSAGES/django.mo and b/hosting/locale/de/LC_MESSAGES/django.mo differ
diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po
index f599639a..bdc2c038 100644
--- a/hosting/locale/de/LC_MESSAGES/django.po
+++ b/hosting/locale/de/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-17 11:34-0500\n"
+"POT-Creation-Date: 2017-05-26 14:41+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,342 +18,482 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/emails/password_reset_email.html:2
-#: templates/emails/password_reset_email.txt:2
+#: hosting/templates/hosting/base_short.html:67
+msgid "My Virtual Machines"
+msgstr "Meine virtuellen Machinen"
+
+#: hosting/templates/hosting/base_short.html:72
+#: hosting/templates/hosting/orders.html:12
+msgid "My Orders"
+msgstr "Meine Bestellungen"
+
+#: hosting/templates/hosting/base_short.html:77
+msgid "Keys"
+msgstr "Keys"
+
+#: hosting/templates/hosting/base_short.html:82
+msgid "Notifications "
+msgstr "Benachrichtigungen"
+
+#: hosting/templates/hosting/base_short.html:89
+msgid "Logout"
+msgstr "Abmeleden"
+
+#: hosting/templates/hosting/base_short.html:94
+#: hosting/templates/hosting/base_short.html:136
+msgid "How it works"
+msgstr "Wie es funktioniert"
+
+#: hosting/templates/hosting/base_short.html:97
+#: hosting/templates/hosting/base_short.html:139
+msgid "Your infrastructure"
+msgstr "Ihre Infrastruktur"
+
+#: hosting/templates/hosting/base_short.html:100
+#: hosting/templates/hosting/base_short.html:142
+msgid "Our inftrastructure"
+msgstr "Unsere Infrastruktur"
+
+#: hosting/templates/hosting/base_short.html:103
+#: hosting/templates/hosting/base_short.html:145
+msgid "Pricing"
+msgstr "Preise"
+
+#: hosting/templates/hosting/base_short.html:106
+#: hosting/templates/hosting/base_short.html:149
+msgid "Contact"
+msgstr "Kontakt"
+
+#: hosting/templates/hosting/base_short.html:109
+#: hosting/templates/hosting/login.html:29
+#: hosting/templates/hosting/login.html:38
+#: hosting/templates/hosting/reset_password.html:24
+#: hosting/templates/hosting/signup.html:23
+msgid "Login"
+msgstr "Anmelden"
+
+#: hosting/templates/hosting/base_short.html:132
+msgid "Home"
+msgstr "Home"
+
+#: hosting/templates/hosting/bill_detail.html:11
+#: hosting/templates/hosting/order_detail.html:10
+msgid "Invoice"
+msgstr "Rechnung"
+
+#: hosting/templates/hosting/bill_detail.html:11
+#: hosting/templates/hosting/order_detail.html:10
+msgid "Order #"
+msgstr "Rechnung #"
+
+#: hosting/templates/hosting/bill_detail.html:25
+msgid "ungleich GmbH"
+msgstr ""
+
+#: hosting/templates/hosting/bill_detail.html:26
+msgid "buchhaltung@ungleich.ch"
+msgstr ""
+
+#: hosting/templates/hosting/bill_detail.html:27
+msgid "Hauptstrasse 14"
+msgstr ""
+
+#: hosting/templates/hosting/bill_detail.html:28
+msgid "CH-8775 Luchsingen"
+msgstr ""
+
+#: hosting/templates/hosting/bill_detail.html:29
+msgid "Mwst-Nummer: CHE-109.549.333 MWST"
+msgstr ""
+
+#: hosting/templates/hosting/bill_detail.html:60
+msgid "Total:"
+msgstr ""
+
+#: hosting/templates/hosting/bill_detail.html:68
+#, python-format
+msgid "Alles Preise in CHF mit 8%% Mehrwertsteuer."
+msgstr "All prices in CHF including 8%% VAT"
+
+#: hosting/templates/hosting/bill_detail.html:69
+msgid "Betrag zahlbar innerhalb von 30 Tagen ab Rechnungseingang."
+msgstr ""
+
+#: hosting/templates/hosting/bill_detail.html:70
+msgid "Kontoverbindung:"
+msgstr ""
+
+#: hosting/templates/hosting/bill_detail.html:73
+msgid "IBAN:"
+msgstr ""
+
+#: hosting/templates/hosting/bill_detail.html:76
+msgid "BIC:"
+msgstr ""
+
+#: hosting/templates/hosting/bill_detail.html:81
+msgid "CH02 0900 0000 6071 8848 8"
+msgstr ""
+
+#: hosting/templates/hosting/bill_detail.html:84
+msgid "POFICHBEXXX"
+msgstr ""
+
+#: hosting/templates/hosting/bills.html:12
+msgid "Customers"
+msgstr "Kunden"
+
+#: hosting/templates/hosting/bills.html:16
+#: hosting/templates/hosting/virtual_machine_key.html:45
+msgid "Name"
+msgstr ""
+
+#: hosting/templates/hosting/bills.html:17
+msgid "Email"
+msgstr ""
+
+#: hosting/templates/hosting/bills.html:28
+msgid "View Bill"
+msgstr ""
+
+#: hosting/templates/hosting/bills.html:41
+#: hosting/templates/hosting/orders.html:83
+#: hosting/templates/hosting/virtual_machines.html:70
+msgid "previous"
+msgstr "vorherige"
+
+#: hosting/templates/hosting/bills.html:47
+#: hosting/templates/hosting/orders.html:89
+#: hosting/templates/hosting/virtual_machines.html:76
+msgid "next"
+msgstr "nächste"
+
+#: hosting/templates/hosting/confirm_reset_password.html:19
+msgid "Set your new password"
+msgstr "Setzen Ihr neues Passwort"
+
+#: hosting/templates/hosting/confirm_reset_password.html:28
+#: hosting/templates/hosting/reset_password.html:20
+msgid "Reset"
+msgstr "Zurücksetzen"
+
+#: hosting/templates/hosting/confirm_reset_password.html:32
+#: hosting/templates/hosting/reset_password.html:24
+#: hosting/templates/hosting/signup.html:23
+msgid "Already have an account ?"
+msgstr "Besitzen sie bereits ein Bentzerkonto"
+
+#: hosting/templates/hosting/confirm_reset_password.html:32
+msgid "Log in"
+msgstr "Anmelden"
+
+#: hosting/templates/hosting/create_virtual_machine.html:19
+msgid "New Virtual Machine"
+msgstr "Neue virtuelle Maschine"
+
+#: hosting/templates/hosting/create_virtual_machine.html:45
+msgid "Start VM"
+msgstr "Start VM"
+
+#: hosting/templates/hosting/emails/password_reset_email.html:2
+#: hosting/templates/hosting/emails/password_reset_email.txt:2
#, python-format
msgid ""
"You're receiving this email because you requested a password reset for your "
"user account at %(site_name)s."
msgstr ""
-#: templates/emails/password_reset_email.html:4
-#: templates/emails/password_reset_email.txt:4
+#: 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:"
msgstr ""
-#: templates/emails/password_reset_email.html:9
-#: templates/emails/password_reset_email.txt:9
+#: hosting/templates/hosting/emails/password_reset_email.html:9
+#: hosting/templates/hosting/emails/password_reset_email.txt:9
msgid "Thanks for using our site!"
msgstr ""
-#: templates/emails/password_reset_email.html:11
-#: templates/emails/password_reset_email.txt:11
+#: hosting/templates/hosting/emails/password_reset_email.html:11
+#: hosting/templates/hosting/emails/password_reset_email.txt:11
#, python-format
msgid "The %(site_name)s team"
msgstr ""
-#: templates/hosting/base_short.html:67
-msgid "My Virtual Machines"
-msgstr ""
-
-#: templates/hosting/base_short.html:72 templates/hosting/orders.html.py:12
-msgid "My Orders"
-msgstr ""
-
-#: templates/hosting/base_short.html:77
-msgid "Notifications "
-msgstr ""
-
-#: templates/hosting/base_short.html:84
-msgid "Logout"
-msgstr ""
-
-#: templates/hosting/base_short.html:89 templates/hosting/base_short.html:131
-msgid "How it works"
-msgstr ""
-
-#: templates/hosting/base_short.html:92 templates/hosting/base_short.html:134
-msgid "Your infrastructure"
-msgstr ""
-
-#: templates/hosting/base_short.html:95 templates/hosting/base_short.html:137
-msgid "Our inftrastructure"
-msgstr ""
-
-#: templates/hosting/base_short.html:98 templates/hosting/base_short.html:140
-msgid "Pricing"
-msgstr ""
-
-#: templates/hosting/base_short.html:101 templates/hosting/base_short.html:144
-msgid "Contact"
-msgstr ""
-
-#: templates/hosting/base_short.html:104 templates/hosting/login.html.py:29
-#: templates/hosting/login.html:38 templates/hosting/reset_password.html:24
-#: templates/hosting/signup.html:24
-msgid "Login"
-msgstr ""
-
-#: templates/hosting/base_short.html:127
-msgid "Home"
-msgstr ""
-
-#: templates/hosting/confirm_reset_password.html:19
-msgid "Set your new password"
-msgstr ""
-
-#: templates/hosting/confirm_reset_password.html:28
-#: templates/hosting/reset_password.html:20
-msgid "Reset"
-msgstr ""
-
-#: templates/hosting/confirm_reset_password.html:32
-#: templates/hosting/reset_password.html:24 templates/hosting/signup.html:24
-msgid "Already have an account ?"
-msgstr ""
-
-#: templates/hosting/confirm_reset_password.html:32
-msgid "Log in"
-msgstr ""
-
-#: templates/hosting/login.html:22
+#: hosting/templates/hosting/login.html:22
msgid "You haven been logged out"
-msgstr ""
+msgstr "Sie wurden abgmeldet"
-#: templates/hosting/login.html:42
+#: hosting/templates/hosting/login.html:44
msgid "Don't have an account yet ? "
-msgstr ""
+msgstr "Besitzen Sie kein Benutzerkonto?"
-#: templates/hosting/login.html:42 templates/hosting/signup.html.py:11
-#: templates/hosting/signup.html:20
+#: hosting/templates/hosting/login.html:44
+#: hosting/templates/hosting/signup.html:10
+#: hosting/templates/hosting/signup.html:19
msgid "Sign up"
-msgstr ""
+msgstr "Registrieren"
-#: templates/hosting/login.html:44
+#: hosting/templates/hosting/login.html:46
msgid "Forgot your password ? "
-msgstr ""
+msgstr "Passwort vergessen?"
-#: templates/hosting/notifications.html:9
+#: hosting/templates/hosting/notifications.html:9
msgid "Notifications"
-msgstr ""
+msgstr "Benachrichtigungen"
-#: templates/hosting/notifications.html:16
+#: hosting/templates/hosting/notifications.html:16
msgid "Unread"
-msgstr ""
+msgstr "Ungelesen"
-#: templates/hosting/notifications.html:26
+#: hosting/templates/hosting/notifications.html:26
msgid "All"
-msgstr ""
+msgstr "Alle"
-#: templates/hosting/notifications.html:38
+#: hosting/templates/hosting/notifications.html:38
msgid "Unread notifications"
-msgstr ""
+msgstr "Ungelesene Benachrichtigungen"
-#: templates/hosting/notifications.html:48
+#: hosting/templates/hosting/notifications.html:48
msgid "Mark as read"
-msgstr ""
+msgstr "Als gelesen markieren"
-#: templates/hosting/notifications.html:59
+#: hosting/templates/hosting/notifications.html:59
msgid "All notifications"
-msgstr ""
+msgstr "Alle Benachrichtigungen"
-#: templates/hosting/order_detail.html:10
-msgid "Invoice"
-msgstr ""
-
-#: templates/hosting/order_detail.html:10
-msgid "Order #"
-msgstr ""
-
-#: templates/hosting/order_detail.html:16
-#: templates/hosting/order_detail.html:24
+#: hosting/templates/hosting/order_detail.html:16
+#: hosting/templates/hosting/order_detail.html:24
msgid "Billed To:"
msgstr ""
-#: templates/hosting/order_detail.html:26
+#: hosting/templates/hosting/order_detail.html:26
msgid "Status:"
msgstr ""
-#: templates/hosting/order_detail.html:38
+#: hosting/templates/hosting/order_detail.html:38
msgid "Payment Method:"
-msgstr ""
+msgstr "Bezahlmethode"
-#: templates/hosting/order_detail.html:49
+#: hosting/templates/hosting/order_detail.html:49
msgid "Order summary"
-msgstr ""
+msgstr "Bestellungsübersicht"
-#: templates/hosting/order_detail.html:52
-msgid "Type"
-msgstr ""
-
-#: templates/hosting/order_detail.html:54
-#: templates/hosting/virtual_machine_detail.html:96
-msgid "Configuration"
-msgstr ""
-
-#: templates/hosting/order_detail.html:56
-#: templates/hosting/virtual_machine_detail.html:75
+#: 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"
-#: templates/hosting/order_detail.html:58
-#: templates/hosting/virtual_machine_detail.html:81
+#: 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"
-#: templates/hosting/order_detail.html:60
+#: hosting/templates/hosting/order_detail.html:56
+#: hosting/templates/hosting/payment.html:23
msgid "Disk space"
-msgstr ""
+msgstr "Festplattenkapazität"
-#: templates/hosting/order_detail.html:62
+#: hosting/templates/hosting/order_detail.html:58
msgid "Total"
msgstr ""
-#: templates/hosting/order_detail.html:68
+#: hosting/templates/hosting/order_detail.html:64
msgid "Finish Configuration"
-msgstr ""
+msgstr "Konfiguration beenden"
-#: templates/hosting/orders.html:17
-#: templates/hosting/virtual_machine_detail.html:121
+#: hosting/templates/hosting/orders.html:17
msgid "Date"
-msgstr ""
+msgstr "Datum"
-#: templates/hosting/orders.html:18
-#: templates/hosting/virtual_machine_detail.html:122
-#: templates/hosting/virtual_machines.html:15
+#: hosting/templates/hosting/orders.html:18
msgid "Amount"
-msgstr ""
+msgstr "Betrag"
-#: templates/hosting/orders.html:19
-#: templates/hosting/virtual_machine_detail.html:36
-#: templates/hosting/virtual_machine_detail.html:123
-#: templates/hosting/virtual_machines.html:16
+#: hosting/templates/hosting/orders.html:19
+#: hosting/templates/hosting/virtual_machine_detail.html:30
+#: hosting/templates/hosting/virtual_machine_key.html:47
+#: hosting/templates/hosting/virtual_machines.html:31
msgid "Status"
msgstr ""
-#: templates/hosting/orders.html:30
-#: templates/hosting/virtual_machine_detail.html:134
+#: hosting/templates/hosting/orders.html:30
msgid "Approved"
-msgstr ""
+msgstr "Akzeptiert"
-#: templates/hosting/orders.html:32
-#: templates/hosting/virtual_machine_detail.html:136
+#: hosting/templates/hosting/orders.html:32
msgid "Declined"
-msgstr ""
+msgstr "Abgelehnt"
-#: templates/hosting/orders.html:37
-#: templates/hosting/virtual_machine_detail.html:140
-#: templates/hosting/virtual_machines.html:38
+#: hosting/templates/hosting/orders.html:37
+#: hosting/templates/hosting/virtual_machines.html:58
msgid "View Detail"
-msgstr ""
+msgstr "Details anzeigen"
-#: templates/hosting/orders.html:41
+#: hosting/templates/hosting/orders.html:41
msgid "Cancel Order"
-msgstr ""
+msgstr "Bestellung stornieren"
-#: templates/hosting/orders.html:56
+#: hosting/templates/hosting/orders.html:56
msgid "Do You want do delete your order?"
-msgstr ""
+msgstr "Wollen Sie ihre Bestellung löschen?"
-#: templates/hosting/orders.html:64
+#: hosting/templates/hosting/orders.html:64
msgid "Close"
-msgstr ""
+msgstr "Schliessen"
-#: templates/hosting/orders.html:66
+#: hosting/templates/hosting/orders.html:66
msgid "Delete"
-msgstr ""
+msgstr "Löschen"
-#: templates/hosting/orders.html:83 templates/hosting/virtual_machines.html:49
-msgid "previous"
-msgstr ""
+#: hosting/templates/hosting/payment.html:12
+msgid "Billing Amount"
+msgstr "Rechnungsbetrag"
-#: templates/hosting/orders.html:89 templates/hosting/virtual_machines.html:55
-msgid "next"
-msgstr ""
+#: hosting/templates/hosting/payment.html:35
+msgid "Billing Address"
+msgstr "Rechnungsadresse"
-#: templates/hosting/reset_password.html:11
+#: hosting/templates/hosting/payment.html:49
+msgid "Payment Details"
+msgstr "Rechnungsdetails"
+
+#: hosting/templates/hosting/payment.html:68
+msgid "CARD NUMBER"
+msgstr "Kreditkartennummer"
+
+#: hosting/templates/hosting/payment.html:70
+msgid "Valid Card Number"
+msgstr "Gültige Kreditkartennummer"
+
+#: hosting/templates/hosting/payment.html:79
+msgid "EXPIRATION DATE"
+msgstr "Ablaufdatum"
+
+#: hosting/templates/hosting/payment.html:90
+msgid "CV CODE"
+msgstr "CV Code"
+
+#: hosting/templates/hosting/payment.html:98
+msgid "Submit Payment"
+msgstr "Betrag überweisen"
+
+#: hosting/templates/hosting/reset_password.html:11
msgid "Reset your password"
-msgstr ""
+msgstr "Passwort zurücksetzen"
-#: templates/hosting/virtual_machine_detail.html:19
+#: hosting/templates/hosting/virtual_machine_detail.html:19
msgid "Settings"
-msgstr ""
+msgstr "Einstellungen"
-#: templates/hosting/virtual_machine_detail.html:25
+#: hosting/templates/hosting/virtual_machine_detail.html:25
msgid "Billing"
-msgstr ""
+msgstr "Abrechnungen"
-#: templates/hosting/virtual_machine_detail.html:31
-msgid "Orders"
-msgstr ""
-
-#: templates/hosting/virtual_machine_detail.html:60
+#: hosting/templates/hosting/virtual_machine_detail.html:60
msgid "Ip not assigned yet"
-msgstr ""
+msgstr "Ip nicht zugewiesen"
-#: templates/hosting/virtual_machine_detail.html:87
+#: hosting/templates/hosting/virtual_machine_detail.html:87
msgid "Disk"
-msgstr ""
+msgstr "Festplatte"
-#: templates/hosting/virtual_machine_detail.html:106
+#: hosting/templates/hosting/virtual_machine_detail.html:96
+msgid "Configuration"
+msgstr "Konfiguration"
+
+#: hosting/templates/hosting/virtual_machine_detail.html:106
msgid "Current pricing"
-msgstr ""
+msgstr "Aktueller Preis"
-#: templates/hosting/virtual_machine_detail.html:152
+#: hosting/templates/hosting/virtual_machine_detail.html:115
msgid "Current status"
-msgstr ""
+msgstr "Aktuller Status"
-#: templates/hosting/virtual_machine_detail.html:172
-msgid "Cancel Virtual Machine"
-msgstr ""
+#: hosting/templates/hosting/virtual_machine_detail.html:140
+msgid "Terminate Virtual Machine"
+msgstr "Virtuelle Maschine beenden"
-#: templates/hosting/virtual_machine_detail.html:181
-msgid "Cancel your Virtual Machine"
-msgstr ""
+#: hosting/templates/hosting/virtual_machine_detail.html:161
+msgid "Terminate your Virtual Machine"
+msgstr "Ihre virtuelle Maschine beenden"
-#: templates/hosting/virtual_machine_detail.html:184
+#: hosting/templates/hosting/virtual_machine_detail.html:164
msgid "Are you sure do you want to cancel your Virtual Machine "
-msgstr ""
+msgstr "Sind Sie sicher, dass Sie ihre virtuelle Maschine beenden wollen "
-#: templates/hosting/virtual_machine_detail.html:184
-msgid "plan?"
-msgstr ""
-
-#: templates/hosting/virtual_machine_detail.html:187
+#: hosting/templates/hosting/virtual_machine_detail.html:167
msgid "Cancel"
+msgstr "Beenden"
+
+#: hosting/templates/hosting/virtual_machine_key.html:11
+msgid "Access Key"
+msgstr "Zugriffsschlüssel"
+
+#: hosting/templates/hosting/virtual_machine_key.html:22
+msgid "Upload your own key. "
msgstr ""
-#: templates/hosting/virtual_machine_key.html:10
-msgid "SSH Private Key"
+#: hosting/templates/hosting/virtual_machine_key.html:29
+msgid "Upload Key"
msgstr ""
-#: templates/hosting/virtual_machine_key.html:15
-#: templates/hosting/virtual_machine_key.html:29
+#: hosting/templates/hosting/virtual_machine_key.html:33
+msgid "Or generate a new key pair."
+msgstr ""
+
+#: hosting/templates/hosting/virtual_machine_key.html:37
+msgid "Generate Key Pair"
+msgstr ""
+
+#: hosting/templates/hosting/virtual_machine_key.html:46
+msgid "Created at"
+msgstr "Erstellt am"
+
+#: hosting/templates/hosting/virtual_machine_key.html:68
+#: hosting/templates/hosting/virtual_machine_key.html:81
msgid "Warning!"
msgstr ""
-#: templates/hosting/virtual_machine_key.html:15
-msgid ""
-"You can view your SSH private key once. Copy it or if it wasn't downloaded "
-"automatically, just click on Download to start it."
+#: hosting/templates/hosting/virtual_machine_key.html:68
+msgid "You can download your SSH private key once. Don't lost your key"
msgstr ""
-#: templates/hosting/virtual_machine_key.html:24
+#: hosting/templates/hosting/virtual_machine_key.html:76
msgid "Copy to Clipboard"
msgstr ""
-#: templates/hosting/virtual_machine_key.html:25
+#: hosting/templates/hosting/virtual_machine_key.html:77
msgid "Download"
msgstr ""
-#: templates/hosting/virtual_machine_key.html:29
+#: hosting/templates/hosting/virtual_machine_key.html:81
msgid ""
"Your SSH private key was already generated and downloaded, if you lost it, "
"contact us. "
msgstr ""
-#: templates/hosting/virtual_machine_key.html:32
-msgid "Go to my Virtual Machine Dashboard"
+#: hosting/templates/hosting/virtual_machine_key.html:84
+msgid "Generate my key"
msgstr ""
-#: templates/hosting/virtual_machines.html:9
+#: hosting/templates/hosting/virtual_machines.html:9
msgid "Virtual Machines"
msgstr ""
-#: templates/hosting/virtual_machines.html:13
+#: hosting/templates/hosting/virtual_machines.html:22
+msgid "Create VM"
+msgstr ""
+
+#: hosting/templates/hosting/virtual_machines.html:28
msgid "ID"
msgstr ""
-#: templates/hosting/virtual_machines.html:14
-msgid "Location"
+#: hosting/templates/hosting/virtual_machines.html:29
+msgid "Ipv4"
+msgstr ""
+
+#: hosting/templates/hosting/virtual_machines.html:30
+msgid "Ipv6"
msgstr ""
diff --git a/hosting/templates/hosting/payment.html b/hosting/templates/hosting/payment.html
index 33e44afe..3e076743 100644
--- a/hosting/templates/hosting/payment.html
+++ b/hosting/templates/hosting/payment.html
@@ -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>
@@ -65,9 +65,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>
@@ -76,7 +79,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>
@@ -87,14 +90,15 @@
</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>
</div>
<div class="row">
<div class="col-xs-12">
- <button class="btn btn-success btn-lg btn-block" type="submit">Submit Payment</button>
+ <button class="btn btn-success btn-lg
+ btn-block" type="submit">{%trans "Submit Payment"%}</button>
</div>
</div>
<div class="row" style="display:none;">
diff --git a/hosting/templates/hosting/virtual_machine_detail.html b/hosting/templates/hosting/virtual_machine_detail.html
index 04b964a0..794f8ede 100644
--- a/hosting/templates/hosting/virtual_machine_detail.html
+++ b/hosting/templates/hosting/virtual_machine_detail.html
@@ -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>
diff --git a/ungleich_page/locale/de/LC_MESSAGES/django.mo b/ungleich_page/locale/de/LC_MESSAGES/django.mo
index de3e0015..24ce98fb 100644
Binary files a/ungleich_page/locale/de/LC_MESSAGES/django.mo and b/ungleich_page/locale/de/LC_MESSAGES/django.mo differ
diff --git a/ungleich_page/locale/de/LC_MESSAGES/django.po b/ungleich_page/locale/de/LC_MESSAGES/django.po
index 54b0069b..6daecc49 100644
--- a/ungleich_page/locale/de/LC_MESSAGES/django.po
+++ b/ungleich_page/locale/de/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-11 22:04-0500\n"
+"POT-Creation-Date: 2017-05-26 14:41+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,109 +18,110 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: templates/ungleich_page/includes/_about.html:8
+#: ungleich_page/templates/ungleich_page/includes/_about.html:8
msgid "ABOUT"
msgstr "Über ungleich"
-#: templates/ungleich_page/includes/_about.html:9
+#: ungleich_page/templates/ungleich_page/includes/_about.html:9
msgid "The timeline of ungleich"
msgstr "Die Chronik von ungleich"
-#: templates/ungleich_page/includes/_about.html:24
+#: ungleich_page/templates/ungleich_page/includes/_about.html:24
msgid "The first incarnation of ungleich"
msgstr "Die erste Inkarnation von ungleich"
-#: templates/ungleich_page/includes/_about.html:25
+#: ungleich_page/templates/ungleich_page/includes/_about.html:25
msgid "in Germany"
msgstr "in Deutschland"
-#: templates/ungleich_page/includes/_about.html:37
+#: ungleich_page/templates/ungleich_page/includes/_about.html:37
msgid "ungleich founded"
msgstr "ungleich gegründet"
-#: templates/ungleich_page/includes/_about.html:38
+#: ungleich_page/templates/ungleich_page/includes/_about.html:38
msgid "in Switzerland"
msgstr "in der Schweiz"
-#: templates/ungleich_page/includes/_about.html:51
+#: ungleich_page/templates/ungleich_page/includes/_about.html:51
msgid "ungleich present at various conferences"
msgstr "ungleich präsent an mehreren Konferenzen"
-#: templates/ungleich_page/includes/_about.html:65
+#: ungleich_page/templates/ungleich_page/includes/_about.html:65
msgid "ungleich introduces HA-Hosting"
msgstr "ungleich führt HA-Hosting ein"
-#: templates/ungleich_page/includes/_about.html:66
+#: ungleich_page/templates/ungleich_page/includes/_about.html:66
msgid "and introduces affordable 24X7 support."
msgstr "und führt kostengünstigen 24X7 Support ein."
-#: templates/ungleich_page/includes/_about.html:67
+#: ungleich_page/templates/ungleich_page/includes/_about.html:67
msgid "ungleich launches"
msgstr "ungleich lanciert"
-#: templates/ungleich_page/includes/_about.html:68
+#: ungleich_page/templates/ungleich_page/includes/_about.html:68
msgid "Digital Glarus project"
msgstr "Digital Glarus Projekt"
-#: templates/ungleich_page/includes/_about.html:74
+#: ungleich_page/templates/ungleich_page/includes/_about.html:74
msgid "and"
msgstr "und"
-#: templates/ungleich_page/includes/_about.html:74
+#: ungleich_page/templates/ungleich_page/includes/_about.html:74
msgid "the story continues!"
msgstr "Die Geschichte geht weiter!"
-#: templates/ungleich_page/includes/_contact_us.html:15
-#: templates/ungleich_page/includes/_contact_us.html:28 views.py:36
+#: ungleich_page/templates/ungleich_page/includes/_contact_us.html:15
+#: ungleich_page/templates/ungleich_page/includes/_contact_us.html:28
+#: ungleich_page/views.py:36
msgid "Contact Us"
msgstr "Kontaktieren Sie uns"
-#: templates/ungleich_page/includes/_contact_us.html:18
+#: ungleich_page/templates/ungleich_page/includes/_contact_us.html:18
msgid "Join us at"
msgstr "Schliessen Sie sich uns an"
-#: templates/ungleich_page/includes/_contact_us.html:19
+#: ungleich_page/templates/ungleich_page/includes/_contact_us.html:19
msgid "Digital Glarus"
msgstr "Digital Glarus"
-#: templates/ungleich_page/includes/_contact_us.html:20
+#: ungleich_page/templates/ungleich_page/includes/_contact_us.html:20
msgid "a great co-working space in the middle of Alps!"
msgstr "ein wunderschöner Co-Working Space mitten in den Alpen"
-#: templates/ungleich_page/includes/_contact_us.html:21
+#: ungleich_page/templates/ungleich_page/includes/_contact_us.html:21
msgid "You can contact us at"
msgstr "Sie können uns kontaktieren unter"
-#: templates/ungleich_page/includes/_contact_us.html:26
+#: ungleich_page/templates/ungleich_page/includes/_contact_us.html:26
msgid "or"
msgstr "oder"
-#: templates/ungleich_page/includes/_contact_us.html:60
+#: ungleich_page/templates/ungleich_page/includes/_contact_us.html:60
msgid "Submit"
msgstr "Absenden"
-#: templates/ungleich_page/includes/_footer.html:8
+#: ungleich_page/templates/ungleich_page/includes/_footer.html:8
msgid "Copyright © ungleich GmbH "
msgstr "Copyright © ungleich GmbH"
-#: templates/ungleich_page/includes/_footer.html:22
+#: ungleich_page/templates/ungleich_page/includes/_footer.html:22
msgid "ungleich Home"
msgstr "ungleich Home"
-#: templates/ungleich_page/includes/_header.html:11
+#: ungleich_page/templates/ungleich_page/includes/_header.html:11
msgid "We Design, Configure & Maintain <br> Your Linux Infrastructure "
msgstr "Wir designen, erstellen und warten Ihre Linux-Infrastruktur"
-#: templates/ungleich_page/includes/_portfolio.html:8
-#: templates/ungleich_page/includes/_portfolio.html:9
+#: ungleich_page/templates/ungleich_page/includes/_portfolio.html:8
+#: ungleich_page/templates/ungleich_page/includes/_portfolio.html:9
msgid "Hosting Products "
msgstr "Hosting Produkte"
-#: templates/ungleich_page/includes/_portfolio.html:16
+#: ungleich_page/templates/ungleich_page/includes/_portfolio.html:16
msgid "HA Hosting"
msgstr "HA Hosting"
-#: templates/ungleich_page/includes/_portfolio.html:18
+#: ungleich_page/templates/ungleich_page/includes/_portfolio.html:18
msgid ""
"We offer high availablity hosting (HA) in Germany and in Switzerland. Our "
"infrastructure is powered by Free and Open Source Software like OpenNebula, "
@@ -130,22 +131,22 @@ msgstr ""
"Schweiz. Unsere Infrastruktur ist unterstützt durch Free and Open Source "
"Software wie OpenNebula."
-#: templates/ungleich_page/includes/_portfolio.html:24
+#: ungleich_page/templates/ungleich_page/includes/_portfolio.html:24
msgid "Rails Hosting"
msgstr "Rails Hosting"
-#: templates/ungleich_page/includes/_portfolio.html:26
+#: ungleich_page/templates/ungleich_page/includes/_portfolio.html:26
msgid ""
"Ready to go live with your Ruby on Rails application? We offer you ready-to-"
"deploy virtual machines or configure your existing infrastructure for Ruby "
"on Rails."
msgstr "Sind bereit mit ihrem Ruby on Rails Applikation live zu gehen?"
-#: templates/ungleich_page/includes/_portfolio.html:32
+#: ungleich_page/templates/ungleich_page/includes/_portfolio.html:32
msgid " Configuration as a Service"
msgstr "Konfiguration als Service"
-#: templates/ungleich_page/includes/_portfolio.html:34
+#: ungleich_page/templates/ungleich_page/includes/_portfolio.html:34
msgid ""
"You are in need for a configuration?<br>With ungleich you have found an "
"experienced team that configure your systems to provide service like DNS, E-"
@@ -155,27 +156,27 @@ msgstr ""
"gefunden, dass ihnen die Konfiguration von DNS, E-Mail, Datenbanken oder "
"Webservern für ihr System anbietet"
-#: templates/ungleich_page/includes/_services.html:8
+#: ungleich_page/templates/ungleich_page/includes/_services.html:8
msgid "our services"
msgstr "Unsere Dienstleistungen"
-#: templates/ungleich_page/includes/_services.html:10
+#: ungleich_page/templates/ungleich_page/includes/_services.html:10
msgid "We support our clients in all areas of Unix infrastructure."
msgstr ""
"Wir unterstützen unsere Klienten in allen Bereichen der Unix Infrastruktur."
-#: templates/ungleich_page/includes/_services.html:11
+#: ungleich_page/templates/ungleich_page/includes/_services.html:11
msgid ""
"Our top notch configuration management is refreshingly simple and reliable."
msgstr ""
"Unser erstklassiges Konfigurationsmanagement ist erfrischend einfach und "
"zuverlässig."
-#: templates/ungleich_page/includes/_services.html:20
+#: ungleich_page/templates/ungleich_page/includes/_services.html:20
msgid "Hosting"
msgstr "Hosting"
-#: templates/ungleich_page/includes/_services.html:22
+#: ungleich_page/templates/ungleich_page/includes/_services.html:22
msgid ""
"Ruby on Rails. Java hosting, Django hosting, we make it everything run "
"smooth and safe."
@@ -183,11 +184,11 @@ msgstr ""
"Ruby on Rails. Java hosting, Django hosting, wir garantieren einen "
"reibungslosen Ablauf"
-#: templates/ungleich_page/includes/_services.html:30
+#: ungleich_page/templates/ungleich_page/includes/_services.html:30
msgid "Configuration as a Service"
msgstr "Konfiguration als Service"
-#: templates/ungleich_page/includes/_services.html:32
+#: ungleich_page/templates/ungleich_page/includes/_services.html:32
msgid ""
"Ruby on Rails, Django, Java, Webserver, Mailserver, any infrastructure that "
"needs to configured, we provide comprehensive solutions. Amazon, rackspace "
@@ -197,11 +198,11 @@ msgstr ""
"welche eine Konfiguration braucht, wir offerieren umfassende Lösungen, "
"Amazon, Rackspace oder Bare Metal Servers, wir konfigurieren alles."
-#: templates/ungleich_page/includes/_services.html:40
+#: ungleich_page/templates/ungleich_page/includes/_services.html:40
msgid "Linux System Engineering"
msgstr "Linux System Engineering"
-#: templates/ungleich_page/includes/_services.html:43
+#: ungleich_page/templates/ungleich_page/includes/_services.html:43
msgid ""
"Let your developers develop! We take care of your system administration. "
"Gentoo, Archlinux, Debian, Ubuntu, and many more."
@@ -209,15 +210,15 @@ msgstr ""
"Lassen sie ihre Entwickler entwickeln! Wir kümmern uns um ihre "
"Systemadministration. Gentoo, Archlinux, Debian, Ubuntu und viele mehr."
-#: templates/ungleich_page/includes/_team.html:8
+#: ungleich_page/templates/ungleich_page/includes/_team.html:8
msgid "Why ungleich?*"
msgstr "Warum ungleich?"
-#: templates/ungleich_page/includes/_team.html:9
+#: ungleich_page/templates/ungleich_page/includes/_team.html:9
msgid "What our customers say"
msgstr "Was unsere Kunden sagen"
-#: templates/ungleich_page/includes/_team.html:29
+#: ungleich_page/templates/ungleich_page/includes/_team.html:29
msgid ""
"\n"
"\t\t\t \"ungleich helped us getting started with our internal\n"
@@ -233,9 +234,20 @@ msgid ""
"\t\t\t engineers to work more efficiently and comfortable\n"
"\t\t\t than before.\"\n"
"\t\t\t "
-msgstr "\n ungleich half uns mit unserer internen Infrastruktur, gehostet auf physikalischen Servern, in einer gemeinsamen Unterbringung in einem Datenzentrum in Zürich. Von der Planung des Netzwerk-Layouts und der Virtualisierung der Einrichtung, Offertanfragen und Sicherstellung eines sehr guten Angebots von einem Hardwarelieferanten bis hin zur Installisierung von einfachen Dienstleistungen, wie DNS, VPN und Firewalls durch den Gebrauch der Konfigurationsmanagement-Software cdist, wir konnten auf den Support von ungleich zählen. Am Ende haben wir eine hochverfügbare Infrastruktur-Einrichtung erhalten, welche es unseren Technikern ermöglicht effizienter und bequemer zu arbeiten als zuvor."
+msgstr ""
+"\n"
+" ungleich half uns mit unserer internen Infrastruktur, gehostet auf "
+"physikalischen Servern, in einer gemeinsamen Unterbringung in einem "
+"Datenzentrum in Zürich. Von der Planung des Netzwerk-Layouts und der "
+"Virtualisierung der Einrichtung, Offertanfragen und Sicherstellung eines "
+"sehr guten Angebots von einem Hardwarelieferanten bis hin zur "
+"Installisierung von einfachen Dienstleistungen, wie DNS, VPN und Firewalls "
+"durch den Gebrauch der Konfigurationsmanagement-Software cdist, wir konnten "
+"auf den Support von ungleich zählen. Am Ende haben wir eine hochverfügbare "
+"Infrastruktur-Einrichtung erhalten, welche es unseren Technikern ermöglicht "
+"effizienter und bequemer zu arbeiten als zuvor."
-#: templates/ungleich_page/includes/_team.html:51
+#: ungleich_page/templates/ungleich_page/includes/_team.html:51
msgid ""
"\n"
"\t\t\t \"Thanks to ungleich team, who has designed and\n"
@@ -245,9 +257,15 @@ msgid ""
"\t\t\t significantly not only in cost but also in time\n"
"\t\t\t saving, which is crucial for IT companies like ours.\"\n"
"\t\t\t \t"
-msgstr "\n Vielen Dank an das ungleich Team, welches unsere Firmen-Linux-Infrastruktur konfiguriert hat, unsere Systeme sind sehr einfach zu verwalten. Ihr innovatives Konfigurationsmanagement-System cdist half uns signifikant nicht nur in der Kosteneinsparung aber auch zur Zeiteinsparung, was für IT-Firmen sehr wichtig ist."
+msgstr ""
+"\n"
+" Vielen Dank an das ungleich Team, welches unsere Firmen-Linux-Infrastruktur "
+"konfiguriert hat, unsere Systeme sind sehr einfach zu verwalten. Ihr "
+"innovatives Konfigurationsmanagement-System cdist half uns signifikant nicht "
+"nur in der Kosteneinsparung aber auch zur Zeiteinsparung, was für IT-Firmen "
+"sehr wichtig ist."
-#: templates/ungleich_page/includes/_team.html:67
+#: ungleich_page/templates/ungleich_page/includes/_team.html:67
msgid ""
"\n"
"\t\t\t \"ungleich provided an excellent service in designing\n"
@@ -262,9 +280,19 @@ msgid ""
"\t\t\t recommend them to any companies with high demand in\n"
"\t\t\t solid infrastructures.\"\n"
"\t\t\t "
-msgstr "\n ungleich bietete einen exzellenten Service bei der Gestaltung unserer System-Architektur und erstellte sichere und stabile Geräte. Für uns ist es wichtig eine dauerhafte Stabilität in unserem System zu haben und das Konfigurationsmanagement-System cdist ist sehr einfach zu bedienen für die Systemadministration. Wir hatten eine erfolgreiche Kollaboration mit ungleich während einer Zeit mit einer sehr hohen Arbeitsauslastung und ihre Projektführung war hochqualifiziert und sehr zuverlässig. Ich würde sie allen Firmen empfehlen, bei denen eine solide Infrastruktur stark gefragt ist."
+msgstr ""
+"\n"
+" ungleich bietete einen exzellenten Service bei der Gestaltung unserer "
+"System-Architektur und erstellte sichere und stabile Geräte. Für uns ist es "
+"wichtig eine dauerhafte Stabilität in unserem System zu haben und das "
+"Konfigurationsmanagement-System cdist ist sehr einfach zu bedienen für die "
+"Systemadministration. Wir hatten eine erfolgreiche Kollaboration mit "
+"ungleich während einer Zeit mit einer sehr hohen Arbeitsauslastung und ihre "
+"Projektführung war hochqualifiziert und sehr zuverlässig. Ich würde sie "
+"allen Firmen empfehlen, bei denen eine solide Infrastruktur stark gefragt "
+"ist."
-#: templates/ungleich_page/includes/_team.html:82
+#: ungleich_page/templates/ungleich_page/includes/_team.html:82
msgid ""
"\n"
"\t\t\t <strong>- Sebastian Plattner,</strong>\n"
@@ -272,47 +300,47 @@ msgid ""
"\t\t\t "
msgstr ""
-#: templates/ungleich_page/includes/_team.html:95
+#: ungleich_page/templates/ungleich_page/includes/_team.html:95
msgid "*ungleich means not equal to (≠) U+2260."
msgstr "*ungleich bedeutet nicht gleich wie (≠) U+2260."
-#: templates/ungleich_page/landing.html:85
+#: ungleich_page/templates/ungleich_page/landing.html:85
#, fuzzy
#| msgid "our services"
msgid "Services"
msgstr "Unsere Dienstleistungen"
-#: templates/ungleich_page/landing.html:90
+#: ungleich_page/templates/ungleich_page/landing.html:90
msgid "products"
msgstr "PRODUKTE"
-#: templates/ungleich_page/landing.html:93
+#: ungleich_page/templates/ungleich_page/landing.html:93
msgid "About"
msgstr "Über"
-#: templates/ungleich_page/landing.html:96
+#: ungleich_page/templates/ungleich_page/landing.html:96
msgid "WHY UNGLEICH?"
msgstr "WARUM UNGLEICH?"
-#: templates/ungleich_page/landing.html:99
+#: ungleich_page/templates/ungleich_page/landing.html:99
msgid "BLOG"
msgstr "BLOG"
-#: templates/ungleich_page/landing.html:102
+#: ungleich_page/templates/ungleich_page/landing.html:102
msgid "CONTACT"
msgstr "KONTAKT"
-#: urls.py:8
+#: ungleich_page/urls.py:8
#, fuzzy
#| msgid "Contact Us"
msgid "contact/$"
msgstr "Kontaktieren Sie uns"
-#: views.py:26
+#: ungleich_page/views.py:26
msgid "Message Successfully Sent"
msgstr "Nachricht erfolgreich versendet"
-#: views.py:37
+#: ungleich_page/views.py:37
msgid "If you have any question, just send us an email."
msgstr ""
"Wenn Sie irgendwelche Fragen haben, schicken Sie uns einfach eine E-Mail."