Merge branch '20190311-engb2' of tobias/git.friendi.ca into master

This commit is contained in:
Tobias Diekershoff 2019-03-11 18:02:32 +00:00 committed by Gitea
commit 1857e01769

View file

@ -20,6 +20,8 @@
<h2>Zbiór repozytoriów projektu git <a href='https://friendi.ca' target='_new'>Friendica</a>.</h2> <h2>Zbiór repozytoriów projektu git <a href='https://friendi.ca' target='_new'>Friendica</a>.</h2>
{{else if eq .Lang "cs-CZ"}} {{else if eq .Lang "cs-CZ"}}
<h2>Kolekce repozitářů git projektu <a href='https://friendi.ca' target='_new'>Friendica</a>.</h2> <h2>Kolekce repozitářů git projektu <a href='https://friendi.ca' target='_new'>Friendica</a>.</h2>
{{else if eq .Lang "en-GB"}}
<h2>Collection of the git repositories of the <a href='https://friendi.ca' target='_new'>Friendica</a> project.</h2>
{{else}} {{else}}
<h2>Collection of the git repositories of the <a href='https://friendi.ca' target='_new'>Friendica</a> project.</h2> <h2>Collection of the git repositories of the <a href='https://friendi.ca' target='_new'>Friendica</a> project.</h2>
{{end}} {{end}}
@ -218,6 +220,44 @@
</div> </div>
</div> </div>
{{else if eq .Lang "en-GB"}}
<div class="ui stackable middle very relaxed page grid">
<div class="eight wide center column">
<h1 class="hero ui icon header">
<i class="octicon octicon-rocket"></i> Easy to install
</h1>
<p class="large">
All you need is PHP and a MySQL database. Installation can be done via file upload, git or docker.
</p>
</div>
<div class="eight wide center column">
<h1 class="hero ui icon header">
<i class="octicon octicon-code"></i> Free Software
</h1>
<p class="large">
Friendica is Free Software, licensed under the terms of the AGPLv3 (or later). The entire source code is hosted at <a href='https://git.friendi.ca/friendica/friendica'>git.friendi.ca</a>. Join us by contributing to make this project even better. Don't be shy to <a href='https://git.friendi.ca/friendica/friendica/src/branch/develop/doc/Developers-Intro.md'>be a contributor</a>!
</p>
</div>
</div>
<div class="ui stackable middle very relaxed page grid">
<div class="eight wide center column">
<h1 class="hero ui icon header">
<i class="octicon octicon-globe"></i> Decentralisation
</h1>
<p class="large">
Decentralised architecture with no central authority or ownership. Relationships can be made across any compatible system, creating a network of Internet scale made up of smaller sites. Seamless wall-to-wall posts and remote comments, even across different network nodes.
</p>
</div>
<div class="eight wide center column">
<h1 class="hero ui icon header">
<i class="octicon octicon-organization"></i> Interoperability
</h1>
<p class="large">
Friendica has build in support for the OStatus (e.g. GNU social and Mastodon) and diaspora* (e.g. diaspora*, Hubzilla and Socialhome) protocol. With additional addons you can bridge to more networks like pump.io, Twitter and others.
</p>
</div>
</div>
{{else}} {{else}}
<div class="ui stackable middle very relaxed page grid"> <div class="ui stackable middle very relaxed page grid">
<div class="eight wide center column"> <div class="eight wide center column">