From 11e59c8ea32c5f754846585a8a54c7790f07e7d1 Mon Sep 17 00:00:00 2001
From: Levi <levinoelvm@gmail.com>
Date: Tue, 13 Jun 2017 13:47:55 -0500
Subject: [PATCH] added translations

---
 .../locale/de/LC_MESSAGES/django.mo           | Bin 5879 -> 5867 bytes
 .../locale/de/LC_MESSAGES/django.po           | 219 +++---------------
 .../templates/datacenterlight/home.html       |   4 +-
 3 files changed, 35 insertions(+), 188 deletions(-)

diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.mo b/datacenterlight/locale/de/LC_MESSAGES/django.mo
index a9ce890d574e5c3ebd71565ebcacb3f5768795ed..028dfcbe636433a6b1ec9cb1da5fde536671ad7f 100644
GIT binary patch
delta 628
zcmXZYODIHP6u|LwXUv!}#`~G~tJKWM7)4lEk+2X+Nn}A%Qu4^cM0uo0b0f;55wWnF
zg=E3XO4x|SWMN~$UUvS6soVLT@7()+_k8Eu_vzc(53Y;IlTE~r{dSQA+&~BJVw)in
z#y!@b@gm8%%u7<)M*aQ()9@VA@fs8H5!*3}POK!fVh!s1d8Y)Wo@A9m9^PU%Mo|y0
zCa8@BFSg(*PQ~iEE)gCnC+G#Lah!&SQ5$*SFBSNX9(1_>8?VI_)=lo9NEb;bg$N#D
z5_S{fa2Ts_6m`Q+tbT@i;05ZBUU3b-@EE5V(-`KkNhh|1dgBnj(BKiiv7QYwH*)Fa
z6s9brsH2_0Y@ESN+(aGm3HIP6>SPi#MEWorb>AdT;2aj>2M(g0L$rYr)O}Ofj3o;s
zcO*B+)MO>=-w<}NJ~Xc^d4`zJmNKK%{IL|d3#c-tzk8>d71lbV+#Il$8Tsa-wa7?~
dgsoQ=bI4v3*|mFZ4u7E7A84rcNA6u7*Du~(Nge<I

delta 642
zcmXZYODIHP6u|LwXBacac#LO__n4KTG06-`vm0XLu|OntQnMf%shdZVq~Wecni{cS
zQtDc;Q;G!(8!5`lLMa;y?EF8bZs&KtbMN<k=brbbucr8(9v6}OY>^O7+C*|Ofp$E=
z9!=x~6Rf{-L<(@5m!y(H_5BgL@eGUc2J`S4d+`k&*h+|E7pnJb4$&n{Vo>nl9S-6f
zs)IWT$|%8)19*sfrtWi!@JN8rf}J=+!!cBiJaLN;Kd=!?T>p(nu#k1POBd-U8KGce
z8uM|2kcBa9#yM0Q_A_-8)q&@zE_%gv{KkD;VocN6z$P`ZEmVJ;#77!T;|uE*ow<?A
z6sIs{nL{<&1uVy9EX7?^BR<6;yh1gZiV~4w^rG6gh%sEnYW&0rbaRMmU>4Or9V1w`
zL2^xUi%d;+%KlAaAM0b|!s5}2j0cNXt1^BpHLgmkjOp*c8w{T{q}3baR<GtZmaH|J
mm?`Up#Wpq{3<Sf*s4bXD%}tv>+a74IZE5QWgw0E5qw^PH=1+S7

diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po
index 4daea92f..f97b2a6b 100644
--- a/datacenterlight/locale/de/LC_MESSAGES/django.po
+++ b/datacenterlight/locale/de/LC_MESSAGES/django.po
@@ -8,8 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2017-06-09 16:08-0500\n"
+"POT-Creation-Date: 2017-06-13 13:41-0500\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"
@@ -76,58 +75,7 @@ msgstr ""
 msgid "Thank you!"
 msgstr "Vielen Dank!"
 
-<<<<<<< HEAD
 #: templates/datacenterlight/home.html:15
-=======
-#: templates/datacenterlight/index.html:62
-#: templates/datacenterlight/index.html:160
-#: templates/datacenterlight/index.html:383
-#: templates/datacenterlight/order.html:24
-#: templates/datacenterlight/order.html:165
-#: templates/datacenterlight/pricing.html:62
-#: templates/datacenterlight/pricing.html:190
-#: templates/datacenterlight/success.html:23
-msgid "What is it"
-msgstr "Was ist es?"
-
-#: templates/datacenterlight/index.html:65
-#: templates/datacenterlight/index.html:189
-#: templates/datacenterlight/index.html:386
-#: templates/datacenterlight/order.html:27
-#: templates/datacenterlight/order.html:168
-#: templates/datacenterlight/pricing.html:65
-#: templates/datacenterlight/pricing.html:193
-#: templates/datacenterlight/success.html:26
-msgid "Scale out"
-msgstr "Skalierung"
-
-#: templates/datacenterlight/index.html:68
-#: templates/datacenterlight/index.html:215
-#: templates/datacenterlight/index.html:389
-#: templates/datacenterlight/order.html:30
-#: templates/datacenterlight/order.html:171
-#: templates/datacenterlight/pricing.html:68
-#: templates/datacenterlight/pricing.html:196
-#: templates/datacenterlight/success.html:29
-msgid "Reliable and light"
-msgstr "Zuverlässig und leicht"
-
-#: templates/datacenterlight/index.html:71
-msgid "Order VM"
-msgstr "VM bestellen"
-
-#: templates/datacenterlight/index.html:74
-#: templates/datacenterlight/index.html:396
-#: templates/datacenterlight/order.html:36
-#: templates/datacenterlight/order.html:178
-#: templates/datacenterlight/pricing.html:74
-#: templates/datacenterlight/pricing.html:203
-#: templates/datacenterlight/success.html:35
-msgid "Contact"
-msgstr "Kontakt"
-
-#: templates/datacenterlight/index.html:127
->>>>>>> 05883952264ad1b5650deaf05bb92cc3937c62fa
 msgid "Finally, an affordable VM hosting in Switzerland!"
 msgstr "Endlich: bezahlbares VM Hosting in der Schweiz"
 
@@ -140,7 +88,8 @@ msgid "I want it!"
 msgstr "Das will ich haben!"
 
 #: templates/datacenterlight/home.html:46
-#: templates/datacenterlight/includes/_footer.html:14
+#: templates/datacenterlight/includes/_footer.html:11
+#: templates/datacenterlight/includes/_footer.html:31
 #: templates/datacenterlight/includes/_navbar.html:26
 msgid "What is it"
 msgstr "Was ist es?"
@@ -157,7 +106,7 @@ msgstr ""
 "errichten.
"
 
 #: templates/datacenterlight/home.html:61
-msgid "Only wants you to pay for what you actually need.\\u2028"
+msgid "Only wants you to pay for what you actually need."
 msgstr ""
 "Möchte, dass du nur bezahlst, was du auch wirklich brauchst: Wähle deine "
 "Ressourcen individuell aus!
"
@@ -165,7 +114,7 @@ msgstr ""
 #: templates/datacenterlight/home.html:65
 msgid ""
 "Is creative, using a modern and alternative design for a data center in "
-"order to make it more sustainable and affordable at the same time.\\u2028"
+"order to make it more sustainable and affordable at the same time."
 msgstr ""
 "Ist kreativ, indem es sich ein modernes und alternatives Layout zu Nutze "
 "macht um Nachhaltigkeit zu fördern und somit erschwingliche Preise bieten zu "
@@ -181,7 +130,8 @@ msgstr ""
 "Lizenzgebühren verzichten können.
"
 
 #: templates/datacenterlight/home.html:89
-#: templates/datacenterlight/includes/_footer.html:17
+#: templates/datacenterlight/includes/_footer.html:14
+#: templates/datacenterlight/includes/_footer.html:34
 #: templates/datacenterlight/includes/_navbar.html:29
 msgid "Scale out"
 msgstr "Skalierung"
@@ -197,7 +147,8 @@ msgstr ""
 "komponenten hinzugekauft und skalieren so das Datencenter."
 
 #: templates/datacenterlight/home.html:115
-#: templates/datacenterlight/includes/_footer.html:20
+#: templates/datacenterlight/includes/_footer.html:17
+#: templates/datacenterlight/includes/_footer.html:37
 #: templates/datacenterlight/includes/_navbar.html:32
 msgid "Reliable and light"
 msgstr "Zuverlässig und leicht"
@@ -212,27 +163,16 @@ msgstr ""
 "Energieversorgung sowie schneller Internetverbindung ausgestattet. Unser "
 "Angebot ist aufgrund unserer leichten Infrastruktur überaus kostengünstig."
 
-<<<<<<< HEAD
 #: templates/datacenterlight/home.html:136
 #: templates/datacenterlight/order.html:9
 #: templates/datacenterlight/pricing.html:9
 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:236
-#: templates/datacenterlight/order.html:143
-#: templates/datacenterlight/pricing.html:168
-msgid "Simple and affordable: Try our virtual machine with featherlight price."
-msgstr ""
-"Einfach und bezahlbar: Teste nun unsere virtuellen Maschinen mit "
-"federleichten Preisen."
->>>>>>> 05883952264ad1b5650deaf05bb92cc3937c62fa
 
 #: templates/datacenterlight/home.html:137
 msgid "Affordable VM hosting based in Switzerland"
 msgstr "Bezahlbares VM Hosting in der Schweiz"
 
-<<<<<<< HEAD
 #: templates/datacenterlight/home.html:144
 #: templates/datacenterlight/order.html:22
 #: templates/datacenterlight/pricing.html:22
@@ -265,22 +205,24 @@ msgstr "Fragen?"
 msgid "Contact us!"
 msgstr "Kontaktiere uns!"
 
-#: templates/datacenterlight/includes/_footer.html:10
-msgid "Home"
-msgstr "Home"
+#: templates/datacenterlight/includes/_footer.html:20
+#: templates/datacenterlight/includes/_navbar.html:35
+msgid "Order VM"
+msgstr "VM bestellen"
 
 #: templates/datacenterlight/includes/_footer.html:23
-msgid "Pricing"
-msgstr "Preise"
-
-#: templates/datacenterlight/includes/_footer.html:27
+#: templates/datacenterlight/includes/_footer.html:44
 #: templates/datacenterlight/includes/_navbar.html:38
 msgid "Contact"
 msgstr "Kontakt"
 
-#: templates/datacenterlight/includes/_navbar.html:35
-msgid "Order VM"
-msgstr "VM bestellen"
+#: templates/datacenterlight/includes/_footer.html:27
+msgid "Home"
+msgstr "Home"
+
+#: templates/datacenterlight/includes/_footer.html:40
+msgid "Pricing"
+msgstr "Preise"
 
 #: templates/datacenterlight/order.html:30
 #: templates/datacenterlight/pricing.html:30
@@ -301,88 +243,6 @@ msgstr ""
 
 #: templates/datacenterlight/order.html:87
 #: templates/datacenterlight/pricing.html:86
-=======
-#: templates/datacenterlight/index.html:248
-#: templates/datacenterlight/order.html:81
-#: templates/datacenterlight/pricing.html:119
-msgid "VM hosting"
-msgstr "VM Hosting"
-
-
-#: templates/datacenterlight/index.html:252
-msgid "month"
-msgstr "Monat"
-
-#: templates/datacenterlight/index.html:256
-#: templates/datacenterlight/order.html:89
-#: templates/datacenterlight/pricing.html:127
-msgid "Hosted in Switzerland"
-msgstr "Standort des Datacenters ist in der Schweiz"
-
-#: templates/datacenterlight/index.html:273
-#: templates/datacenterlight/order.html:106
-#: templates/datacenterlight/pricing.html:144
-msgid "GB Storage (SSD)"
-msgstr "GB Storage (SSD)"
-
-#: templates/datacenterlight/index.html:297
-#: templates/datacenterlight/order.html:133
-#: templates/datacenterlight/pricing.html:161
-msgid "Order Now!"
-msgstr "Bestelle jetzt!"
-
-#: templates/datacenterlight/index.html:302
-msgid "Want to know more? Subscribe to our newsletter!"
-msgstr "Willst du mehr wissen? Abonniere unseren Newsletter!"
-
-#: templates/datacenterlight/index.html:364
-#: templates/datacenterlight/index.html:279
-#: templates/datacenterlight/index.html:317
-msgid "I want to have it!"
-msgstr "Das möchte ich haben!"
-
-#: templates/datacenterlight/index.html:344
-msgid "Switzerland "
-msgstr "Schweiz"
-
-#: templates/datacenterlight/index.html:361
-msgid "Questions?"
-msgstr "Fragen?"
-
-#: templates/datacenterlight/index.html:361
-msgid "Contact us!"
-msgstr "Kontaktiere uns!"
-
-#: templates/datacenterlight/index.html:379
-#: templates/datacenterlight/order.html:161
-#: templates/datacenterlight/pricing.html:186
-msgid "Home"
-msgstr "Home"
-
-#: templates/datacenterlight/index.html:377
-#: templates/datacenterlight/index.html:354
-#: templates/datacenterlight/new-order.html:212
-#: templates/datacenterlight/order.html:212
-#: templates/datacenterlight/index.html:392
-#: templates/datacenterlight/order.html:174
-#: templates/datacenterlight/pricing.html:199
-msgid "Pricing"
-msgstr "Preise"
-
-#: templates/datacenterlight/order.html:33
-#: templates/datacenterlight/pricing.html:71
-#: templates/datacenterlight/success.html:32
-msgid "Buy VM"
-msgstr "VM Kaufen"
-
-#: templates/datacenterlight/order.html:68
-#: templates/datacenterlight/pricing.html:106
-msgid "We are cutting down the costs significantly!"
-msgstr "Wir sorgen dafür, dass die Kosten für Sie signifikant abnehmen"
-
-#: templates/datacenterlight/order.html:146
-#: templates/datacenterlight/pricing.html:171
->>>>>>> 05883952264ad1b5650deaf05bb92cc3937c62fa
 msgid ""
 "Our VMs are hosted in Glarus, Switzerland, and our website is currently "
 "running in BETA mode. If you want more information that you did not find on "
@@ -398,21 +258,28 @@ msgstr ""
 "uns unter support@datacenterlight.ch. Unser Team wird sich umgehend um dein "
 "Anliegen kümmern!"
 
-<<<<<<< HEAD
 #: templates/datacenterlight/success.html:8
-=======
-#: templates/datacenterlight/success.html:62
->>>>>>> 05883952264ad1b5650deaf05bb92cc3937c62fa
 msgid "Thank you for order! Our team will contact you via email"
 msgstr ""
 "Vielen Dank für die Bestellung. Unser Team setzt sich sobald wie möglich mit "
 "Ihnen via E-Mail in Verbindung."
 
-<<<<<<< HEAD
 #: templates/datacenterlight/success.html:10
 msgid "as soon as possible!"
 msgstr ""
 
+#~ msgid "month"
+#~ msgstr "Monat"
+
+#~ msgid "Want to know more? Subscribe to our newsletter!"
+#~ msgstr "Willst du mehr wissen? Abonniere unseren Newsletter!"
+
+#~ msgid "I want to have it!"
+#~ msgstr "Das möchte ich haben!"
+
+#~ msgid "Buy VM"
+#~ msgstr "VM Kaufen"
+
 #~ msgid ""
 #~ "Reuse existing factory halls intead of building an expensive building."
 #~ msgstr ""
@@ -433,26 +300,6 @@ msgstr ""
 #~ msgid "More Info"
 #~ msgstr "Weitere Informationen"
 
-#~ msgid "Want to know more? Subscribe to our newsletter!"
-#~ msgstr "Willst du mehr wissen? Abonniere unseren Newsletter!"
-
-#~ msgid "I want to have it!"
-#~ msgstr "Das möchte ich haben!"
-
-#~ msgid "Buy VM"
-#~ msgstr "VM Kaufen"
-=======
-#: templates/datacenterlight/success.html:64
-msgid "as soon as possible!"
-msgstr ""
-
-#~ msgid "Based in Switzerland"
-#~ msgstr "Standort des Datacenters ist in der Schweiz"
-
-#~ msgid "10 GB Storage (SSD)"
-#~ msgstr "10 GB Storage (SSD)"
->>>>>>> 05883952264ad1b5650deaf05bb92cc3937c62fa
-
 #~ msgid "Request Newsletter"
 #~ msgstr "Newsletter abonnieren"
 
diff --git a/datacenterlight/templates/datacenterlight/home.html b/datacenterlight/templates/datacenterlight/home.html
index eb2decd2..84785b05 100755
--- a/datacenterlight/templates/datacenterlight/home.html
+++ b/datacenterlight/templates/datacenterlight/home.html
@@ -58,11 +58,11 @@
                               </li>
                              <li>
                                 <i class="fa-li fa fa-check-square-o fa-lg"></i>
-                                <p class="lead">{% trans "Only wants you to pay for what you actually need.
" %}</p>
+                                <p class="lead">{% trans "Only wants you to pay for what you actually need." %}</p>
                               </li>
                               <li>
                                 <i class="fa-li fa fa-check-square-o fa-lg"></i>
-                                <p class="lead">{% trans "Is creative, using a modern and alternative design for a data center in order to make it more sustainable and affordable at the same time.
" %}</p>
+                                <p class="lead">{% trans "Is creative, using a modern and alternative design for a data center in order to make it more sustainable and affordable at the same time." %}</p>
                               </li> 
                               <li>
                                 <i class="fa-li fa fa-check-square-o fa-lg"></i>