Verified Commit 73fa5845 authored by Luc Didry's avatar Luc Didry
Browse files

Update en and fr to and from Zanata

parent 59930ef3
Pipeline #57397 failed with stages
in 12 seconds
......@@ -45,4 +45,4 @@ name = "Hall of fame"
identifier = "hof"
weight = 7
title = "Hall of fame"
url = "/en/hall-of-fame/"
url = "/en/hall-of-fame/"
\ No newline at end of file
......@@ -45,4 +45,4 @@ name = "Tableau d’honneur"
identifier = "hof"
weight = 7
title = "Tableau d’honneur"
url = "/fr/hall-of-fame/"
url = "/fr/hall-of-fame/"
\ No newline at end of file
......@@ -378,7 +378,7 @@ For those who wants to watch videos, PeerTube has the benefit of…
<div class="panel-body">
<p>
One of the advantages is that <strong>you become a part of the broadcasting of the videos you are watching</strong>.
One of the benefits is that <strong>you become a part of the broadcasting of the videos you are watching</strong>.
If other people are watching a PeerTube video at the same time as you, as long as your tab remains open, your browser shares bits of that video and you participate in a healthier use of the Internet.
......@@ -596,12 +596,12 @@ There are none, not at the moment : PeerTube is a tool that we wanted neutral in
</p>
<p>
For now, the only solution proposed to people who upload videos is to put a text and a link that will appear in the support button ("<i>Support</i>") under the video.
For now, the solution proposed to people who upload videos is to put a text and a link that will appear in the support button ("<i lang="en">Support</i>") under the video. For example, it's possible to put a patreon, Tipeee, Paypal, Leberapy (or another solution) button. Other example: put an adress for a postcard thanks, put a logo, a link to support an GNO&hellip;
</p>
<p>
We did not go any further because to favour a technical solution would be to impose, in the code, a political vision of cultural sharing and its financing.
Favouring a technical solution would impose, in the code, a political vision of cultural sharing and its financing. Every financial solutions are therefore possible in PeerTube.
</p>
<p>
......@@ -707,7 +707,7 @@ We recommend not to install PeerTube on a weak hardware or behind a weak connect
</p>
<p>
Don't bother the developer to help you install your instance: our <a href="https://framacolibri.org/c/qualite/peertube">support forum</a> is there for that.
Don't bother the developer to help you install your instance: our <a href="https://framacolibri.org/c/peertube">support forum</a> is there for that.
</p>
</div>
......@@ -743,7 +743,7 @@ You can <a href="https://github.com/Chocobozzz/PeerTube/issues">create an issue<
</p>
<p>
If you want to provide another type of help, or if you want a feature that is not available, come discuss it on our <a href="https://framacolibri.org/c/qualite/peertube">contribution forum</a>.
If you want to provide another type of help, or if you want a feature that is not available, come discuss it on our <a href="https://framacolibri.org/c/peertube">contribution forum</a>.
</p>
</div>
......
......@@ -595,7 +595,8 @@ PeerTube est un outil que nous avons voulu neutre au niveau de la rémunération
</p>
<p>
Actuellement, la solution proposée est d'utiliser le bouton «&nbsp;Soutenir&nbsp;» («&nbsp;<i lang="en">Support</i>&nbsp;»). Ce bouton permet d'afficher un cadre dans lequel les personnes qui mettent en ligne des vidéos peuvent afficher des textes, images, et liens librement. Par exemple, il est possible d'afficher un bouton Patreon, Tipeee, Paypal, Liberapay (ou toute autre solution, puisque le champ de saisie est libre). Autres exemples possibles : indiquer une adresse pour un remerciement par carte postale, négocier avec un sponsor l'affichage du logo de son entreprise, mettre en avant un lien pour soutenir une ONG, etc.
Actuellement, la solution proposée est d'utiliser le bouton «&nbsp;Soutenir&nbsp;» («&nbsp;<i lang="en">Support</i>&nbsp;»). Ce bouton permet d'afficher un cadre dans lequel les personnes qui mettent en ligne des vidéos peuvent afficher des textes, images, et liens librement. Par exemple, il est possible d'afficher un bouton Patreon, Tipeee, Paypal, Liberapay (ou toute autre solution, puisque le champ de saisie est libre). Autres exemples possibles&nbsp;: indiquer une adresse pour un remerciement par carte postale, négocier avec un sponsor l'affichage du logo de son entreprise, mettre en avant un lien pour soutenir une ONG, etc.
</p>
<p>
......
......@@ -73,6 +73,7 @@ type = "page"
</a>
</div>
</div>
<p class="text-center"><a class="button" href="https://www.kisskissbankbank.com/en/projects/peertube-a-free-and-federated-video-platform">Become a sponsor</a></p>
<h3>Financial Contributors</h3>
......@@ -99,9 +100,11 @@ type = "page"
<li>Winter Matsunaga</li>
<li>Carola Mcelravy</li>
</ul>-->
<p><a class="button" href="https://www.kisskissbankbank.com/en/projects/peertube-a-free-and-federated-video-platform">Add your name here</a></p>
<h3>Contributors</h3>
<ul>
<li>Chocobozzz</li>
<li>gegeweb</li>
......@@ -134,6 +137,7 @@ type = "page"
<li>Nautigsam</li>
<li>ewft</li>
</ul>
<p><a class="button" href="https://github.com/Chocobozzz/PeerTube/">Contribute to the code</a></p>
{{< /grid >}}
......
......@@ -73,6 +73,7 @@ type = "page"
</a>
</div>
</div>
<p class="text-center"><a class="button" href="https://www.kisskissbankbank.com/fr/projects/peertube-a-free-and-federated-video-platform">Devenir sponsor</a></p>
<h3>Donateurs</h3>
......@@ -99,6 +100,7 @@ type = "page"
<li>Winter Matsunaga</li>
<li>Carola Mcelravy</li>
</ul>-->
<p><a class="button" href="https://www.kisskissbankbank.com/fr/projects/peertube-a-free-and-federated-video-platform">Ajouter votre nom ici</a></p>
<h3>Contributeurs</h3>
......@@ -135,6 +137,7 @@ type = "page"
<li>Nautigsam</li>
<li>ewft</li>
</ul>
<p><a class="button" href="https://github.com/Chocobozzz/PeerTube/">Contribuer au code</a></p>
{{< /grid >}}
......
......@@ -12,23 +12,33 @@ type = "page"
{{% grid class="container" %}}
{{% grid class="col-sm-12 text-center" %}}
# Take back the control of your videos
# Take back control of your videos
## A decentralized video hosting network, based on free/libre software
<div class="col-md-6 well col-md-push-6">
<div class="embed-responsive embed-responsive-16by9">
<iframe class="embed-responsive-item" allowfullscreen
src="https://framatube.org/videos/embed/217eefeb-883d-45be-b7fc-a788ad8507d3"></iframe>
</div>
<p class="text-left">Help us improve PeerTube to its v1!<br>
Only <b><span id="kkbbDays">45</span> days</b> left to contribute to our crowdfunding!</p>
<p><a class="button" href="https://www.kisskissbankbank.com/en/projects/peertube-a-free-and-federated-video-platform">Support PeerTube</a></p>
<p class="text-left">
Help us improve PeerTube to its v1!
<br>
Only <b><span id="kkbbDays">45</span> days</b> left to contribute to our crowdfunding!
</p>
<p><a class="button" href="https://www.kisskissbankbank.com/en/projects/peertube-a-free-and-federated-video-platform">Support PeerTube</a></p>
</div>
<div class="col-md-6 col-md-pull-6">
<img src="/notebook.jpg" class="img-responsive" alt="" />
<p><a href="#getting-started">Get started</a> <a href="#how-it-works">How it works</a></p>
<p><a href="#getting-started">Get started</a> <a href="#how-it-works">How it works</a></p>
</div>
{{% /grid %}}
......@@ -56,7 +66,7 @@ type = "page"
{{% grid class="container" %}}
{{% grid class="col-sm-8" %}}
### Take back the power and the responsibilities!
### Take back the power&hellip; and the responsibilities!
PeerTube isn't a single video hosting platform with a single group of rules:
it's a network of dozens of interconnected hosting providers, and each provider is composed
......@@ -88,7 +98,8 @@ Tweaking the **Support** button will allow you to show your audience how you wan
### Putting the users first
You're a person, not a product. PeerTube is a free/libre software
You're a person, not a product.
PeerTube is a free/libre software
financed by a French non-profit organization: [Framasoft](https://soutenir.framasoft.org/association).
All instances are created, animated, moderated and maintained independently.
PeerTube isn't submitted by any company monopole, doesn't depend on ads and doesn't track you.
......@@ -178,9 +189,7 @@ the administrator chooses to follow in order to suggest them to its users.
Every account has a globally unique identifier (e.g. @chocobozzz@framatube.org) consisting of the local username (@chocobozzz) and the domain name of the server it is on (framatube.org).
The administrators of a PeerTube instance can follow each other.
When your PeerTube instance follows another PeerTube instance, you receive
the videos preview informations from this instance. This way, you can display
the videos available on your instance and on the instances you decided to follow.
When your PeerTube instance follows another PeerTube instance, you receive the videos preview informations from this instance. This way, you can display the videos available on your instance and on the instances you decided to follow.
So you keep control of the videos displayed on your PeerTube instance!
[Questions?](/en/faq)
......
......@@ -20,13 +20,25 @@ type = "page"
<iframe class="embed-responsive-item" allowfullscreen
src="https://framatube.org/videos/embed/9db9f3f1-9b54-44ed-9e91-461d262d2205"></iframe>
</div>
<p class="text-left">Aidez-nous à réaliser la v1 de PeerTube !<br>
Plus que <b><span id="kkbbDays">45</span> jours</b> pour participer à notre financement participatif !</p>
<p class="text-left">
Aidez-nous à réaliser la v1 de PeerTube !
<br>
Plus que <b><span id="kkbbDays">45</span> jours</b> pour participer à notre financement participatif !
</p>
<p><a class="button" href="https://www.kisskissbankbank.com/fr/projects/peertube-a-free-and-federated-video-platform">Soutenir PeerTube</a></p>
</div>
<div class="col-md-6 col-md-pull-6">
<img src="/notebook.jpg" class="img-responsive" alt="" />
<p><a href="#getting-started">Pour commencer</a> <a href="#how-it-works">Comment ça fonctionne</a></p>
</div>
{{% /grid %}}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment