mravi/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix conflicts

Browse source
This commit is contained in:
Henry Bravo 2017-06-05 14:55:41 -05:00
commit c69694274f
26 changed files with 533 additions and 257 deletions
Download patch file Download diff file Expand all files Collapse all files

51
datacenterlight/locale/de/LC_MESSAGES/django.po
View file

@ -75,6 +75,7 @@ msgstr ""
msgid "Thank you!"
msgstr "Vielen Dank!"
<<<<<<< HEAD
#: templates/datacenterlight/index.html:62
#: templates/datacenterlight/index.html:160
#: templates/datacenterlight/index.html:368
@ -158,7 +159,6 @@ msgid ""
"tight factory walls."
msgstr "Verzichtet auf aktive Kühlung, indem es sich die Isolation unserer ehemaligen Fabrikhalle zu Nutze macht."
#: templates/datacenterlight/index.html:214
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 "
@ -169,6 +169,7 @@ msgstr ""
"komponenten hinzugekauft und skalieren so das Datencenter."
#: templates/datacenterlight/index.html:240
#: datacenterlight/templates/datacenterlight/index.html:218
msgid ""
"Our VMs are located in Switzerland, with reliable power supply and fast "
"internet connection. Our VM costs less thanks to our featherlight "
@ -178,84 +179,84 @@ msgstr ""
"Energieversorgung sowie schneller Internetverbindung ausgestattet. Unser "
"Angebot ist aufgrund unserer leichten Infrastruktur überaus kostengünstig."
#: templates/datacenterlight/index.html:258
#: templates/datacenterlight/pricing.html:106
#: datacenterlight/templates/datacenterlight/index.html:236
#: datacenterlight/templates/datacenterlight/pricing.html:106
msgid "We are cutting down the costs significantly!"
msgstr "Wir sorgen dafür, dass die Kosten für Sie signifikant abnehmen"
#: templates/datacenterlight/index.html:259
#: datacenterlight/templates/datacenterlight/index.html:237
msgid "Affordable VM hosting based in Switzerland"
msgstr "Bezahlbares VM Hosting in der Schweiz"
#: templates/datacenterlight/index.html:260
#: datacenterlight/templates/datacenterlight/index.html:238
msgid "More Info"
msgstr "Weitere Informationen"
#: templates/datacenterlight/index.html:267
#: templates/datacenterlight/pricing.html:119
#: datacenterlight/templates/datacenterlight/index.html:245
#: datacenterlight/templates/datacenterlight/pricing.html:119
msgid "VM hosting"
msgstr "VM Hosting"
#: templates/datacenterlight/index.html:274
#: datacenterlight/templates/datacenterlight/index.html:252
msgid "Based in Switzerland"
msgstr "Standort des Datacenters ist in der Schweiz"
#: templates/datacenterlight/index.html:283
#, fuzzy
#| msgid "10 GB Storage (SSD)"
#: datacenterlight/templates/datacenterlight/index.html:261
msgid "10 GB Storage (SSD)"
msgstr "10 GB Storage (SSD)"
#: templates/datacenterlight/index.html:286
#: templates/datacenterlight/pricing.html:161
#: datacenterlight/templates/datacenterlight/index.html:264
#: datacenterlight/templates/datacenterlight/pricing.html:161
msgid "Order Now!"
msgstr "Bestelle jetzt!"
#: templates/datacenterlight/index.html:302
#: datacenterlight/templates/datacenterlight/index.html:280
msgid "Want to know more? Subscribe to our newsletter!"
msgstr "Willst du mehr wissen? Abonniere unseren Newsletter!"
#: templates/datacenterlight/index.html:329
#: datacenterlight/templates/datacenterlight/index.html:307
msgid "Switzerland "
msgstr "Schweiz"
#: templates/datacenterlight/index.html:346
#: datacenterlight/templates/datacenterlight/index.html:324
msgid "Questions?"
msgstr "Fragen?"
#: templates/datacenterlight/index.html:346
#: datacenterlight/templates/datacenterlight/index.html:324
msgid "Contact us!"
msgstr "Kontaktiere uns!"
#: templates/datacenterlight/index.html:364
#: templates/datacenterlight/pricing.html:186
#: datacenterlight/templates/datacenterlight/index.html:342
#: datacenterlight/templates/datacenterlight/pricing.html:186
msgid "Home"
msgstr "Home"
#: templates/datacenterlight/index.html:377
#: templates/datacenterlight/pricing.html:199
#: datacenterlight/templates/datacenterlight/index.html:355
#: datacenterlight/templates/datacenterlight/pricing.html:199
msgid "Pricing"
msgstr "Preise"
#: templates/datacenterlight/pricing.html:71
#: datacenterlight/templates/datacenterlight/pricing.html:71
msgid "Buy VM"
msgstr "VM Kaufen"
#: templates/datacenterlight/pricing.html:127
#: datacenterlight/templates/datacenterlight/pricing.html:127
msgid "Hosted in Switzerland"
msgstr "Standort des Datacenters ist in der Schweiz"
#: templates/datacenterlight/pricing.html:144
#: datacenterlight/templates/datacenterlight/pricing.html:144
msgid "GB Storage (SSD)"
msgstr "GB Storage (SSD)"
#: templates/datacenterlight/pricing.html:168
#: datacenterlight/templates/datacenterlight/pricing.html:168
msgid "Simple and affordable: Try our virtual machine with featherlight price."
msgstr ""
"Einfach und bezahlbar: Testen Sie unsere virtuelen Machinen mit "
"federleichten Preisen"
#: templates/datacenterlight/pricing.html:171
#: datacenterlight/templates/datacenterlight/pricing.html:171
msgid ""
"Our VMs are hosted in Glarus, Switzerland, and our website is currently "
"running in BETA mode. If you want more information that you did not find on "