Merge pull request #82 from florolf/wording-fixes

improve wording and fix some Gerglish

7 files changed, 15 insertions, 15 deletions

diff --git a/404.html b/404.html
index 1be5583..94ae2e3 100644
--- a/404.html
+++ b/404.html
@@ -136,7 +136,7 @@
 			<h1><span class="o">400</span> N<span class="o">o</span>t Found</h1>
 
 			<span class="links">
-				Keep Calm and check you URL.
+				Keep calm and check your URL.
 			</span>
 		</div>
 		<footer>
diff --git a/50x.html b/50x.html
index 5883bf4..516b206 100644
--- a/50x.html
+++ b/50x.html
@@ -136,7 +136,7 @@
 			<h1><span class="o">500</span> B<span class="o">o</span>rken</h1>
 
 			<span class="links">
-				Keep Calm and use your Towel.
+				Keep calm and use your towel.
 			</span>
 		</div>
 		<footer>
diff --git a/template/500.phtml b/template/500.phtml
index 7b09ede..d5a0234 100644
--- a/template/500.phtml
+++ b/template/500.phtml
@@ -1,5 +1,5 @@
 <div class="container">
-	<h1>Keep Calm and use your Towel</h1>
+	<h1>Keep calm and use your towel</h1>
 	<h2>And maybe report to <a href="https://twitter.com/c3voc">@C3VOC</a> that you've seen this error:</h2>
 	<div class="well">
 		<pre><?=h($e)?></pre>
diff --git a/template/about-global.phtml b/template/about-global.phtml
index 4d1546d..2a091ae 100644
--- a/template/about-global.phtml
+++ b/template/about-global.phtml
@@ -33,25 +33,25 @@
 	<p>We try to record and stream events (lectures, lightning talks, podiums, etc) of the conferences we are present at. We exclude events where the speaker opts out. We provide the following services to our users.</p>
 
 	<h2>At the conference</h2>
-	<p>At conferences were eventphone <a href="https://eventphone.de">Eventphone</a> is offering their services, we provide audio feeds via the DECT and GSM network. At conferences where live translation is available, these feeds are also provided this way. Have a look at the <a href="https://eventphone.de/guru2/phonebook">GURU</a> to find out which numbers are used.</p>
+	<p>At conferences where <a href="https://eventphone.de">Eventphone</a> is offering their services, we provide audio feeds via the DECT and GSM network. At conferences where live translation is available, these feeds are also provided this way. Have a look at the <a href="https://eventphone.de/guru2/phonebook">GURU</a> to find out which numbers are used.</p>
 
-	<p>During CCC Congress and Camp we try to offer the video feeds via DVB-T. Checkout <a href="https://twitter.com/c3voc">Twitter</a> for announcements.</p>
+	<p>During CCC Congress and Camp we try to offer the video feeds via DVB-T. Check out <a href="https://twitter.com/c3voc">Twitter</a> for announcements.</p>
 
-	<h2>Live Content</h2>
+	<h2>Live content</h2>
 
 	<p>Our streams are available on <a href="//streaming.media.ccc.de">streaming.media.ccc.de</a>. We provide the streams in a number of codecs, containers and resolutions and on some conferences even different translations.</p>
 
-	<p>The web player will choses the hopefully right format depending on your operation system and browser. As web browser and video streaming is still broken in <?=h(date('Y'))?>, we recommend to use the streaming client application of choice to consume the streams. We suggest VLC for desktop usage.</p>
+	<p>The web player will hopefully chose the right format depending on your operation system and browser. As video streaming in web browsers is still broken in <?=h(date('Y'))?>, we recommend to use the streaming client application of choice to consume the streams. We suggest VLC for desktop usage.</p>
 
-	<p>The probably most comfortable way to watch the streams is the <a href="https://github.com/cccc/plugin.video.media-ccc-de">KODI (former XBMC) add-on</a>. This add-on integrates live streams and recordings into a nice media center UI. The add-on is available via the offical kodi add-on repository (<code>Add-ons / Video add-ons / CCC-TV (media.ccc.de)</code>).</p>
+	<p>Probably the most comfortable way to watch the streams is the <a href="https://github.com/cccc/plugin.video.media-ccc-de">KODI (former XBMC) add-on</a>. This add-on integrates live streams and recordings into a nice media center UI. The add-on is available via the offical kodi add-on repository (<code>Add-ons / Video add-ons / CCC-TV (media.ccc.de)</code>).</p>
 
-	<p>On some conferences we also provide streams of the lounges or content provides of other parties additionally to the main conference program.</p>
+	<p>At some conferences we also provide streams of the lounges or content provides of other parties additionally to the main conference program.</p>
 
-	<h2>ReLive Content</h2>
-	<p>As soon as a events has started it is also available via our video-on-demand portal (also located on <a href="//streaming.media.ccc.de">streaming.media.ccc.de</a>). This means that you can jump back to the beginning of the event or pause a live event. ReLive provides the same quality as the our live streams. The streams have a lower bitrate than the final recordings to allow people with slow Internet connection to use the streams. There we remove the ReLive "recordings" as soon as the final recoding is released. This has a much better quality and is free of the watermark. Therefor we ask you to not distribute the ReLive recordings but wait for the final releases. More on this topic can be found in this <a href="https://events.ccc.de/2015/01/03/the-youtube-and-stream-dump-problem/">blog post on events.ccc.de</a></p>
+	<h2>ReLive content</h2>
+	<p>As soon as a events has started it is also available via our video-on-demand portal (also located on <a href="//streaming.media.ccc.de">streaming.media.ccc.de</a>). This means that you can jump back to the beginning of the event or pause a live event. ReLive provides the same quality as our live streams. These streams have a lower bitrate than the final recordings to allow people with a slow internet connection to use the streams. We remove the ReLive "recordings" as soon as the final recoding is released. This has a much better quality and is free of watermarks. Therefore, we ask you to not distribute the ReLive recordings but wait for the final releases. More on this topic can be found in this <a href="https://events.ccc.de/2015/01/03/the-youtube-and-stream-dump-problem/">blog post on events.ccc.de</a></p>
 
 	<h2>Recordings</h2>
-	<p>The recordings can be found at <a href="https://media.ccc.de">media.ccc.de</a> and in our youtube channel <a href="https://www.youtube.com/user/mediacccde">youtube.com/user/mediacccde</a> (in case your preferred device only supports this). Besides our productions you can find content produced by other members of the chaos family on media.ccc.de. Similar to the streamplayer media.ccc.de provides player that tries to play the most suitable format for your OS / browser combination. You can find other formats and links to play in a desktop video player in the "Downloads" tab. Usually also a audio only version is available. All files are also available via an RSS-feed which comes handy with e.g. podcast clients. Our CDN provides metalink which are used by download managers to download in parallel from different CDN servers which can speed up your downloads. Further there is http file listing of the media files on <a href="https://cdn.media.ccc.de">cdn.media.ccc.de</a> which comes handy for binge watching. Also not all content is in the frontend yet but is available via this listing.</p>
+	<p>The recordings can be found at <a href="https://media.ccc.de">media.ccc.de</a> and in our YouTube channel <a href="https://www.youtube.com/user/mediacccde">youtube.com/user/mediacccde</a> (in case your preferred device only supports this). Beyond our own productions, you can find content produced by other members of the chaos family on media.ccc.de. Similar to the streamplayer on this website, media.ccc.de provides a player that tries to play the most suitable format for your OS / browser combination. You can find other formats and links to play in a desktop video player in the "Downloads" tab. Usually also a audio only version is available. All files are also available via an RSS-feed which comes handy with e.g. podcast clients. Our CDN provides metalink files, which are used by download managers to download in parallel from different CDN servers which can speed up your downloads. Furthermore, there is http file listing of the media files on <a href="https://cdn.media.ccc.de">cdn.media.ccc.de</a> which comes in handy for binge watching. Also, not all content is listed in the frontend yet, but is only available via this listing.</p>
 
 	<p>Again we want to point you to the kodi add-on which also lists the recordings. There is also a <a href="https://github.com/cccc/MediaCCC.bundle">plugin for Plex</a> and an <a href="https://github.com/aus-der-Technik/CCC-TV">Apple-TV app</a>.
 </div>
diff --git a/template/allclosed.phtml b/template/allclosed.phtml
index e01aa3b..a7ec690 100644
--- a/template/allclosed.phtml
+++ b/template/allclosed.phtml
@@ -5,7 +5,7 @@
 <? else: ?>
 
 	<p>
-		You can watch most of our Recordings at <a href="https://media.ccc.de/">media.ccc.de</a>.
+		You can watch most of our recordings at <a href="https://media.ccc.de/">media.ccc.de</a>.
 	</p>
 
 <? endif ?>
diff --git a/template/assemblies/switcher/dash.phtml b/template/assemblies/switcher/dash.phtml
index 7c8f617..5aa56b4 100644
--- a/template/assemblies/switcher/dash.phtml
+++ b/template/assemblies/switcher/dash.phtml
@@ -2,7 +2,7 @@
 
 	<div class="notes well">
 		<h3 class="beta">WebM DASH</h3>
-		<p><a href="https://en.wikipedia.org/wiki/Dynamic_Adaptive_Streaming_over_HTTP">DASH</a> is an adaptive-bitrate HTTP-based streaming solution, that is (unlike existing proprietary solutions such as HLS) internationally standardized.</p>
+		<p><a href="https://en.wikipedia.org/wiki/Dynamic_Adaptive_Streaming_over_HTTP">DASH</a> is an adaptive-bitrate HTTP-based streaming solution that is (unlike existing proprietary solutions such as HLS) internationally standardized.</p>
 		<p>Support for DASH in open source software such as ffmpeg is still pretty rough, so consider this a technology-preview, it's not yet a stable solution.</p>
 		<p>Please report your experience to <a href="https://twitter.com/c3voc">@c3voc</a>.</p>
 	</div>
diff --git a/template/relive.phtml b/template/relive.phtml
index 5c337fa..3c3761e 100644
--- a/template/relive.phtml
+++ b/template/relive.phtml
@@ -13,7 +13,7 @@
 				</p>
 
 				<p>
-					Please <b>do not link</b> to the individual Relive recordings, they're going to disappear after the conference.
+					Please <b>do not link</b> to the individual ReLive recordings, they're going to disappear after the conference.
 				</p>
 			</div>
 		</div>