Merge branch 'develop' into hosting_i18n
This commit is contained in:
		
				commit
				
					
						40fe3f4d29
					
				
			
		
					 7 changed files with 61 additions and 21 deletions
				
			
		
							
								
								
									
										1
									
								
								.gitignore
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.gitignore
									
										
									
									
										vendored
									
									
								
							| 
						 | 
				
			
			@ -34,3 +34,4 @@ secret-key
 | 
			
		|||
.idea/
 | 
			
		||||
 | 
			
		||||
.env
 | 
			
		||||
.mo
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -18,19 +18,29 @@ msgstr ""
 | 
			
		|||
"Content-Transfer-Encoding: 8bit\n"
 | 
			
		||||
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 | 
			
		||||
 | 
			
		||||
#: datacenterlight/templates/datacenterlight/beta_access.html:13
 | 
			
		||||
msgid "Enter name"
 | 
			
		||||
msgstr "Name"
 | 
			
		||||
 | 
			
		||||
#: datacenterlight/templates/datacenterlight/beta_access.html:17
 | 
			
		||||
msgid "Enter email"
 | 
			
		||||
msgstr "E-Mail-Adresse"
 | 
			
		||||
 | 
			
		||||
#: datacenterlight/templates/datacenterlight/beta_access.html:21
 | 
			
		||||
msgid "Request Beta Access"
 | 
			
		||||
msgstr "Beantrage Beta-Zugang"
 | 
			
		||||
msgid "Request Newsletter"
 | 
			
		||||
msgstr "Newsletter abonnieren"
 | 
			
		||||
 | 
			
		||||
#: datacenterlight/templates/datacenterlight/beta_success.html:9
 | 
			
		||||
#, fuzzy
 | 
			
		||||
#| msgid "Request Beta Access"
 | 
			
		||||
msgid "Request Sent"
 | 
			
		||||
msgstr "Anfrage verschickt"
 | 
			
		||||
 | 
			
		||||
#: 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."
 | 
			
		||||
msgid ""
 | 
			
		||||
"Thank you for your subscription! You will receive a confirmation mail from "
 | 
			
		||||
"our team"
 | 
			
		||||
msgstr ""
 | 
			
		||||
"Vielen dank für Ihre Anmeldung. Sie erhalten in kürze eine Bestätigungsmail "
 | 
			
		||||
"von unserem Team"
 | 
			
		||||
 | 
			
		||||
#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.html:99
 | 
			
		||||
#: datacenterlight/templates/datacenterlight/emails/request_access_confirmation.txt:99
 | 
			
		||||
| 
						 | 
				
			
			@ -74,7 +84,7 @@ msgstr "Was ist es?"
 | 
			
		|||
#: datacenterlight/templates/datacenterlight/index.html:171
 | 
			
		||||
#: datacenterlight/templates/datacenterlight/index.html:331
 | 
			
		||||
#: datacenterlight/templates/datacenterlight/pricing.html:65
 | 
			
		||||
#: datacenterlight/templates/datacenterlight/pricing.html:188
 | 
			
		||||
#: datacenterlight/templates/datacenterlight/pricing.html:190
 | 
			
		||||
msgid "Scale out"
 | 
			
		||||
msgstr "Skalierung"
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -82,7 +92,7 @@ msgstr "Skalierung"
 | 
			
		|||
#: datacenterlight/templates/datacenterlight/index.html:197
 | 
			
		||||
#: datacenterlight/templates/datacenterlight/index.html:334
 | 
			
		||||
#: datacenterlight/templates/datacenterlight/pricing.html:68
 | 
			
		||||
#: datacenterlight/templates/datacenterlight/pricing.html:191
 | 
			
		||||
#: datacenterlight/templates/datacenterlight/pricing.html:193
 | 
			
		||||
msgid "Reliable and light"
 | 
			
		||||
msgstr "Zuverlässig und leicht"
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -94,7 +104,7 @@ msgstr "VM Kaufen"
 | 
			
		|||
#: datacenterlight/templates/datacenterlight/index.html:74
 | 
			
		||||
#: datacenterlight/templates/datacenterlight/index.html:341
 | 
			
		||||
#: datacenterlight/templates/datacenterlight/pricing.html:74
 | 
			
		||||
#: datacenterlight/templates/datacenterlight/pricing.html:198
 | 
			
		||||
#: datacenterlight/templates/datacenterlight/pricing.html:200
 | 
			
		||||
msgid "Contact"
 | 
			
		||||
msgstr "Kontakt"
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -112,7 +122,7 @@ msgstr "Das will ich haben!"
 | 
			
		|||
 | 
			
		||||
#: datacenterlight/templates/datacenterlight/index.html:142
 | 
			
		||||
#: datacenterlight/templates/datacenterlight/index.html:328
 | 
			
		||||
#: datacenterlight/templates/datacenterlight/pricing.html:185
 | 
			
		||||
#: datacenterlight/templates/datacenterlight/pricing.html:187
 | 
			
		||||
msgid "How it works"
 | 
			
		||||
msgstr "Wie es funktioniert"
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -170,7 +180,7 @@ msgstr "Weitere Informationen"
 | 
			
		|||
#: datacenterlight/templates/datacenterlight/index.html:227
 | 
			
		||||
#: datacenterlight/templates/datacenterlight/pricing.html:114
 | 
			
		||||
msgid "VM hosting"
 | 
			
		||||
msgstr ""
 | 
			
		||||
msgstr "VM Hosting"
 | 
			
		||||
 | 
			
		||||
#: datacenterlight/templates/datacenterlight/index.html:234
 | 
			
		||||
msgid "Based in Switzerland"
 | 
			
		||||
| 
						 | 
				
			
			@ -202,18 +212,16 @@ msgid "Contact us!"
 | 
			
		|||
msgstr "Kontaktiere uns!"
 | 
			
		||||
 | 
			
		||||
#: datacenterlight/templates/datacenterlight/index.html:324
 | 
			
		||||
#: datacenterlight/templates/datacenterlight/pricing.html:181
 | 
			
		||||
#: datacenterlight/templates/datacenterlight/pricing.html:183
 | 
			
		||||
msgid "Home"
 | 
			
		||||
msgstr "Home"
 | 
			
		||||
 | 
			
		||||
#: datacenterlight/templates/datacenterlight/index.html:337
 | 
			
		||||
#: datacenterlight/templates/datacenterlight/pricing.html:194
 | 
			
		||||
#: datacenterlight/templates/datacenterlight/pricing.html:196
 | 
			
		||||
msgid "Pricing"
 | 
			
		||||
msgstr "Preise"
 | 
			
		||||
 | 
			
		||||
#: datacenterlight/templates/datacenterlight/pricing.html:122
 | 
			
		||||
#, fuzzy
 | 
			
		||||
#| msgid "Based in Switzerland"
 | 
			
		||||
msgid "Hosted in Switzerland"
 | 
			
		||||
msgstr "Standort des Datacenters ist in der Schweiz"
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -224,6 +232,29 @@ msgstr "GB Storage (SSD)"
 | 
			
		|||
#: datacenterlight/templates/datacenterlight/pricing.html:163
 | 
			
		||||
msgid "Simple and affordable: Try our virtual machine with featherlight price."
 | 
			
		||||
msgstr ""
 | 
			
		||||
"Simpel und bezahlbar: Testen Sie unsere virtuelen Machinen mit  "
 | 
			
		||||
"federleichten Preisen"
 | 
			
		||||
 | 
			
		||||
#: datacenterlight/templates/datacenterlight/pricing.html:166
 | 
			
		||||
msgid "Our VMs are hosted in Glarus, Switzerland."
 | 
			
		||||
msgstr "Standort des Datacenters ist in der Schweiz"
 | 
			
		||||
 | 
			
		||||
#: datacenterlight/templates/datacenterlight/pricing.html:168
 | 
			
		||||
msgid ""
 | 
			
		||||
" WARNING: We are currently running in BETA mode. We "
 | 
			
		||||
"hope you won't encounter any hiccups, but if you do, please let us know at "
 | 
			
		||||
"support@datacenterlight.ch"
 | 
			
		||||
msgstr ""
 | 
			
		||||
" Achtung: Wir befinden uns zurzeit im Beta-Release. Wir hoffen, "
 | 
			
		||||
"dass Sie davon nichts mitbekommen, falls doch melden "
 | 
			
		||||
"Sie sich bitte via support@datacenterlight.ch"
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
#~ msgid "Request Beta Access"
 | 
			
		||||
#~ msgstr "Beantrage Beta-Zugang"
 | 
			
		||||
 | 
			
		||||
#~ msgid "Thank you, we will contact you as soon as possible"
 | 
			
		||||
#~ msgstr "Vielen Dank, wir werden Sie sobald als möglich kontaktieren."
 | 
			
		||||
 | 
			
		||||
#~ msgid "Buy Now!"
 | 
			
		||||
#~ msgstr "Kaufe jetzt!"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -10,15 +10,15 @@
 | 
			
		|||
  </div>
 | 
			
		||||
 <div class="inputs">
 | 
			
		||||
	 <div class="form-group">
 | 
			
		||||
		<input type="text" name="name" class="form-control" id="name" placeholder="Enter name">
 | 
			
		||||
		<input type="text" name="name" class="form-control" id="name" placeholder="{% trans 'Enter name' %}">
 | 
			
		||||
		<span style="color: white">{{ form.name.errors|striptags}}</span>
 | 
			
		||||
	  </div>
 | 
			
		||||
	  <div class="form-group">
 | 
			
		||||
		<input type="email" name="email" class="form-control" id="email" placeholder="Enter email">
 | 
			
		||||
		<input type="email" name="email" class="form-control" id="email" placeholder="{% trans 'Enter email' %}">
 | 
			
		||||
		<span style="color: white">{{ form.email.errors|striptags}}</span>
 | 
			
		||||
	  </div>
 | 
			
		||||
 </div>
 | 
			
		||||
  <button type="submit" class="btn btn-default btn-transparent btn-lg">{% trans "Request Beta Access" %}</button>
 | 
			
		||||
  <button type="submit" class="btn btn-default btn-transparent btn-lg">{% trans "Request Newsletter" %}</button>
 | 
			
		||||
</form>
 | 
			
		||||
<script>
 | 
			
		||||
	$('#beta_access').ajaxForm({
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -9,7 +9,7 @@
 | 
			
		|||
				<h4 class="modal-title">{% trans "Request Sent" %}</h4>
 | 
			
		||||
			  </div>
 | 
			
		||||
			  <div class="modal-body">
 | 
			
		||||
				<p>{% trans "Thank you, we will contact you as soon as possible" %}</p>
 | 
			
		||||
				<p>{% trans "Thank you for your subscription! You will receive a confirmation mail from our team" %}</p>
 | 
			
		||||
			  </div>
 | 
			
		||||
			</div><!-- /.modal-content -->
 | 
			
		||||
		</div>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -163,7 +163,9 @@
 | 
			
		|||
			<h2 class="section-heading">{% trans "Simple and affordable: Try our virtual machine with featherlight price." %}</h2>
 | 
			
		||||
 | 
			
		||||
			<div class="description">
 | 
			
		||||
				<p>Our VMs are hosted in Glarus, Switzerland. WARNING: We are currently running in BETA mode, especially our website We hope you will not encounter any hiccups, but if you, please let us know at support@datacenterlight.ch</p>
 | 
			
		||||
					<p>{% trans "Our VMs are hosted in Glarus, Switzerland." %}</p>
 | 
			
		||||
					
 | 
			
		||||
					{% trans " WARNING: We are currently running in BETA mode. We hope you won't encounter any hiccups, but if you do, please let us know at support@datacenterlight.ch"  %}
 | 
			
		||||
			</div>
 | 
			
		||||
		</div>
 | 
			
		||||
	</div>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -8,7 +8,7 @@ msgid ""
 | 
			
		|||
msgstr ""
 | 
			
		||||
"Project-Id-Version: PACKAGE VERSION\n"
 | 
			
		||||
"Report-Msgid-Bugs-To: \n"
 | 
			
		||||
"POT-Creation-Date: 2017-05-29 12:29+0000\n"
 | 
			
		||||
"POT-Creation-Date: 2017-05-26 13:35+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"
 | 
			
		||||
| 
						 | 
				
			
			@ -342,6 +342,7 @@ msgstr "Betrag"
 | 
			
		|||
#: hosting/templates/hosting/orders.html:19
 | 
			
		||||
#: hosting/templates/hosting/virtual_machine_detail.html:30
 | 
			
		||||
#: hosting/templates/hosting/virtual_machine_key.html:49
 | 
			
		||||
#: hosting/templates/hosting/virtual_machine_key.html:47
 | 
			
		||||
#: hosting/templates/hosting/virtual_machines.html:31
 | 
			
		||||
msgid "Status"
 | 
			
		||||
msgstr ""
 | 
			
		||||
| 
						 | 
				
			
			@ -430,6 +431,7 @@ msgstr "Festplatte"
 | 
			
		|||
#: hosting/templates/hosting/virtual_machine_detail.html:96
 | 
			
		||||
msgid "Configuration"
 | 
			
		||||
msgstr "Konfiguration"
 | 
			
		||||
>>>>>>> develop
 | 
			
		||||
 | 
			
		||||
#: hosting/templates/hosting/virtual_machine_detail.html:106
 | 
			
		||||
msgid "Current pricing"
 | 
			
		||||
| 
						 | 
				
			
			@ -451,6 +453,10 @@ msgstr "Ihre virtuelle Maschine beenden"
 | 
			
		|||
msgid "Are you sure do you want to cancel your Virtual Machine "
 | 
			
		||||
msgstr "Sind Sie sicher, dass Sie ihre virtuelle Maschine beenden wollen "
 | 
			
		||||
 | 
			
		||||
#: hosting/templates/hosting/virtual_machine_detail.html:164
 | 
			
		||||
msgid "plan?"
 | 
			
		||||
msgstr ""
 | 
			
		||||
 | 
			
		||||
#: hosting/templates/hosting/virtual_machine_detail.html:167
 | 
			
		||||
msgid "Cancel"
 | 
			
		||||
msgstr "Beenden"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
										
											Binary file not shown.
										
									
								
							
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue