fix some orthographic issues

10 files changed, 24 insertions, 24 deletions

diff --git a/template/about.phtml b/template/about.phtml
index b38f049..68aa2fb 100644
--- a/template/about.phtml
+++ b/template/about.phtml
@@ -16,20 +16,20 @@
 		The video stream is licensed under <a href="https://creativecommons.org/licenses/by/3.0/de/">CC Attribution 3.0 Germany (CC BY 3.0 DE)</a>. This may not hold true for the slides or the actual performance. If in doubt please contact the speaker directly.
 	</p>
 	<p>
-		Although the licence permits it, we would like to ask you to don't distribute stream dumps. We try to release finished cuts of recordings as quickly as possible
+		Although the licence permits it, we would like to ask you not to distribute stream dumps. We try to release finished cuts of recordings as quickly as possible
 		<? if($conference->hasReleases()): ?>
 			on <a href="<?=h($conference->getReleasesUrl())?>"><?=h($conference->getReleasesUrl())?></a>
 		<? endif ?>.
-		Early releases of incomplete stream dumps without audio translation, subtitles, intros, <a href="https://auphonic.com/">unprocessed audio</a> and missing meta data is not what we have in mind when we spend three month of preparation in our spare time.
+		Early releases of incomplete stream dumps without audio translation, subtitles, intros, <a href="https://auphonic.com/">unprocessed audio</a> and missing meta data is not what we had in mind when we spent months of our spare time with preparations.
 	</p>
 
 	<h2>Privacy Policy</h2>
 	<p>
-		During the Conference, we'll log all accesses to this website
+		During the conference, we'll log all accesses to this website
 		and the servers providing the video and audio
-		streams. We do this to get an idea how the users are distributed though
+		streams. We do this to get an idea how the users are distributed throughout
 		the internet, what streaming formats are popular and which players are
-		used. We'll use this information for debugging during the Conference and to
+		used. We'll use this information for debugging during the conference and to
 		optimize our streaming CDN configuration in the future.
 	</p>
 
@@ -45,7 +45,7 @@
 
 	<p>
 		Only statistical data which cannot be used to identify a person will be
-		retained after the Conference. We'll destroy the original log files to the
+		retained after the conference. We'll destroy the original log files to the
 		best of our knowledge and ability.
 	</p>
 	<p>
diff --git a/template/assemblies/desktop-player.phtml b/template/assemblies/desktop-player.phtml
index f4320b6..208e4e8 100644
--- a/template/assemblies/desktop-player.phtml
+++ b/template/assemblies/desktop-player.phtml
@@ -1,4 +1,4 @@
 <div class="desktop-player-hint">
-	<h3>Use a Desktop-Player!</h3>
-	<p>Browsers and Video doesn't go together well, even in <?=h(date('Y'))?> and especially when it's live. So for your best viewing-experience please use a Desktop-Player like VLC or mplayer.</p>
+	<h3>Use a desktop player!</h3>
+	<p>Browsers and video doesn't go together well, even in <?=h(date('Y'))?> and especially when it's live. So for your best viewing experience please use a desktop player like VLC or mplayer.</p>
 </div>
diff --git a/template/assemblies/embed-form.phtml b/template/assemblies/embed-form.phtml
index 617f477..424d63a 100644
--- a/template/assemblies/embed-form.phtml
+++ b/template/assemblies/embed-form.phtml
@@ -6,7 +6,7 @@
 	<div class="col-sm-3 embed-form">
 
 		<div class="form-group">
-			<label for="size">Select Size</label>
+			<label for="size">Select size</label>
 			<select id="size" class="form-control">
 				<option value="512,288">512×288</option>
 				<option value="800,450">800×450</option>
@@ -29,7 +29,7 @@
 	<div class="col-sm-9 embed-form">
 
 		<div class="form-group">
-			<label for="embed-code">Embed Code</label>
+			<label for="embed-code">Embed code</label>
 			<input type="text" id="embed-code" class="form-control" readonly value="<?=h(trim('
 				<iframe src="'.h($stream->getEmbedUrl()).'" width="1024" height="576" frameborder="none" allowfullscreen="allowfullscreen" seamless="seamless" scrolling="no"></iframe>
 			'))?>">
diff --git a/template/assemblies/feedback.phtml b/template/assemblies/feedback.phtml
index 97075d9..a33cc31 100644
--- a/template/assemblies/feedback.phtml
+++ b/template/assemblies/feedback.phtml
@@ -12,8 +12,8 @@
 				<option>DSL &gt;6000</option>
 				<option>VDSL</option>
 				<option>Public Hotspot</option>
-				<option>WLAN Inside the CCH</option>
-				<option>Ethernet Inside the CCH</option>
+				<option>WiFi inside the CCH</option>
+				<option>Ethernet inside the CCH</option>
 				<option>Something else</option>
 			</select>
 		</div>
@@ -73,7 +73,7 @@
 
 	<div class="col-sm-4 col">
 		<div class="form-group">
-			<label>IP-Connectivity</label>
+			<label>IP connectivity</label>
 			<div class="checkbox">
 				<label>
 					<input type="checkbox" value="v4" name="ipproto[]" /> IPv4
@@ -99,7 +99,7 @@
 
 	<div class="col-sm-4 col">
 		<div class="form-group">
-			<label>Did you have Issues?</label>
+			<label>Did you have issues?</label>
 			<div class="checkbox">
 				<label>
 					<input type="checkbox" name="issues[]" value="Dropouts" /> Dropouts
@@ -117,12 +117,12 @@
 			</div>
 			<div class="checkbox">
 				<label>
-					<input type="checkbox" name="issues[]" value="No Image" /> No Image
+					<input type="checkbox" name="issues[]" value="No image" /> No image
 				</label>
 			</div>
 			<div class="checkbox">
 				<label>
-					<input type="checkbox" name="issues[]" value="No Audio" /> No Audio
+					<input type="checkbox" name="issues[]" value="No audio" /> No audio
 				</label>
 			</div>
 			<div class="checkbox">
@@ -144,5 +144,5 @@
 </form>
 
 <h3 class="feedback-thankyou">Thank you!</h3>
-<h3 class="feedback-error">The Feedback seems to be also broken…</h3>
+<h3 class="feedback-error">The feedback also seems to be broken…</h3>
 <iframe name="feedback-target" style="display: none;"></iframe>
diff --git a/template/assemblies/switcher/audio.phtml b/template/assemblies/switcher/audio.phtml
index ede7a0e..6bb36d9 100644
--- a/template/assemblies/switcher/audio.phtml
+++ b/template/assemblies/switcher/audio.phtml
@@ -28,7 +28,7 @@
 	<div class="directlinks">
 
 		<? foreach(Stream::getAudioProtos() as $proto => $display): ?>
-			<h3>Directlinks (<?=h($display)?>)</h3>
+			<h3>Direct links (<?=h($display)?>)</h3>
 			<div class="row">
 				<? $switcherstream = $room->createStreamObject('music') ?>
 				<div class="col-lg-3 col-md-4 col-lg-5 col-xs-12">
diff --git a/template/assemblies/switcher/music.phtml b/template/assemblies/switcher/music.phtml
index c349aec..2767fe8 100644
--- a/template/assemblies/switcher/music.phtml
+++ b/template/assemblies/switcher/music.phtml
@@ -1,5 +1,5 @@
 <div class="container-fluid">
-	<h3>Directlinks</h3>
+	<h3>Direct links</h3>
 	<div class="directlinks">
 		<div class="row">
 			<? foreach(Stream::getMusicProtos() as $proto => $display): ?>
diff --git a/template/assemblies/switcher/slides.phtml b/template/assemblies/switcher/slides.phtml
index a401729..978e966 100644
--- a/template/assemblies/switcher/slides.phtml
+++ b/template/assemblies/switcher/slides.phtml
@@ -28,7 +28,7 @@
 	<div class="directlinks">
 
 		<? foreach(Stream::getSlidesProtos() as $proto => $display): ?>
-			<h3>Directlinks (<?=h($display)?>)</h3>
+			<h3>Direct links (<?=h($display)?>)</h3>
 			<div class="row">
 				<? $switcherstream = $room->createStreamObject('slides') ?>
 				<div class="col-lg-3 col-md-4 col-lg-5 col-xs-12">
@@ -59,4 +59,4 @@
 		<? endforeach ?>
 
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/template/assemblies/switcher/video.phtml b/template/assemblies/switcher/video.phtml
index 2d31532..2a5b0d7 100644
--- a/template/assemblies/switcher/video.phtml
+++ b/template/assemblies/switcher/video.phtml
@@ -39,7 +39,7 @@
 
 	<div class="directlinks">
 		<? foreach(Stream::getVideoProtos() as $proto => $display): ?>
-			<h3>Directlinks (<?=h($display)?>)</h3>
+			<h3>Direct links (<?=h($display)?>)</h3>
 			<div class="row">
 				<? foreach($room->getVideoResolutions() as $res): ?>
 					<? $selection = $room->createSelectionObject($res) ?>
diff --git a/template/closed.phtml b/template/closed.phtml
index 577016e..2347c37 100644
--- a/template/closed.phtml
+++ b/template/closed.phtml
@@ -9,7 +9,7 @@
 	<? endif ?>
 
 	<p>
-		Lecture recording and streaming at <strong><?=h($conference->getTitle())?></strong> was organized and performed by the <a href="http://c3voc.de">Chaos Computer Club Video Operation Center</a>. The next Events we'll attend will be
+		Lecture recording and streaming at <strong><?=h($conference->getTitle())?></strong> was organized and performed by the <a href="http://c3voc.de">Chaos Computer Club Video Operation Center</a>. The next events we'll attend will be
 	</p>
 
 	<br><br><br>
diff --git a/template/relive-player.phtml b/template/relive-player.phtml
index aa33cb9..1982186 100644
--- a/template/relive-player.phtml
+++ b/template/relive-player.phtml
@@ -21,7 +21,7 @@
 			<div class="col-xs-12">
 				<div class="alert alert-success">
 					<h3>Download</h3>
-					<p>Click here to <a href="<?=h($talk['mp4'])?>">Download</a> this Relive-Recording. Beware! This is an unprocessed Streamdump – a final Release will follow soon.</p>
+					<p>Click here to <a href="<?=h($talk['mp4'])?>">Download</a> this Relive recording. Beware! This is an unprocessed streamdump – a final release will follow soon.</p>
 				</div>
 			</div>
 		</div>