Fix conflicts

datacenterlight/locale/de/LC_MESSAGES/django.po

@@ -8,6 +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"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -75,7 +76,58 @@ 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"
 
@@ -160,16 +212,27 @@ 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
@@ -238,6 +301,88 @@ 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 "
@@ -253,12 +398,17 @@ 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 ""
@@ -291,6 +441,17 @@ msgstr ""
 
 #~ 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"