From 73fa58457678f56175790e81ca0790d1c9ac86e5 Mon Sep 17 00:00:00 2001
From: Luc Didry
Date: Wed, 13 Jun 2018 16:00:49 +0200
Subject: [PATCH] Update en and fr to and from Zanata
---
config/en.toml | 2 +-
config/fr.toml | 2 +-
content/faq.en.md | 10 +++++-----
content/faq.fr.md | 3 ++-
content/hall-of-fame.en.md | 4 ++++
content/hall-of-fame.fr.md | 3 +++
content/home.en.md | 33 +++++++++++++++++++++------------
content/home.fr.md | 16 ++++++++++++++--
8 files changed, 51 insertions(+), 22 deletions(-)
diff --git a/config/en.toml b/config/en.toml
index f657209..1447af3 100644
--- a/config/en.toml
+++ b/config/en.toml
@@ -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
diff --git a/config/fr.toml b/config/fr.toml
index 571f3a6..a4d9f0e 100644
--- a/config/fr.toml
+++ b/config/fr.toml
@@ -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
diff --git a/content/faq.en.md b/content/faq.en.md
index 7e8f9be..88c9204 100644
--- a/content/faq.en.md
+++ b/content/faq.en.md
@@ -378,7 +378,7 @@ For those who wants to watch videos, PeerTube has the benefit of…
-One of the advantages is that you become a part of the broadcasting of the videos you are watching.
+One of the benefits is that you become a part of the broadcasting of the videos you are watching.
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
-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 ("Support") 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 ("Support") 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…
-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.
@@ -707,7 +707,7 @@ We recommend not to install PeerTube on a weak hardware or behind a weak connect
-Don't bother the developer to help you install your instance: our support forum is there for that.
+Don't bother the developer to help you install your instance: our support forum is there for that.
@@ -743,7 +743,7 @@ You can create an issue<
-If you want to provide another type of help, or if you want a feature that is not available, come discuss it on our contribution forum.
+If you want to provide another type of help, or if you want a feature that is not available, come discuss it on our contribution forum.
diff --git a/content/faq.fr.md b/content/faq.fr.md
index 872c149..b422c0d 100644
--- a/content/faq.fr.md
+++ b/content/faq.fr.md
@@ -595,7 +595,8 @@ PeerTube est un outil que nous avons voulu neutre au niveau de la rémunération
-Actuellement, la solution proposée est d'utiliser le bouton « Soutenir » (« Support »). 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 « Soutenir » (« Support »). 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.
diff --git a/content/hall-of-fame.en.md b/content/hall-of-fame.en.md
index 1143003..64477d0 100644
--- a/content/hall-of-fame.en.md
+++ b/content/hall-of-fame.en.md
@@ -73,6 +73,7 @@ type = "page"
+
Become a sponsor
Financial Contributors
@@ -99,9 +100,11 @@ type = "page"
Winter Matsunaga
Carola Mcelravy
-->
+
Add your name here
Contributors
+
- Chocobozzz
- gegeweb
@@ -134,6 +137,7 @@ type = "page"
- Nautigsam
- ewft
+
Contribute to the code
{{< /grid >}}
diff --git a/content/hall-of-fame.fr.md b/content/hall-of-fame.fr.md
index 8e8dd55..7a8ff71 100644
--- a/content/hall-of-fame.fr.md
+++ b/content/hall-of-fame.fr.md
@@ -73,6 +73,7 @@ type = "page"
+
Devenir sponsor
Donateurs
@@ -99,6 +100,7 @@ type = "page"
Winter Matsunaga
Carola Mcelravy
-->
+
Ajouter votre nom ici
Contributeurs
@@ -135,6 +137,7 @@ type = "page"
Nautigsam
ewft
+
Contribuer au code
{{< /grid >}}
diff --git a/content/home.en.md b/content/home.en.md
index 754bcb0..ee11b1b 100644
--- a/content/home.en.md
+++ b/content/home.en.md
@@ -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
-
-
-
Help us improve PeerTube to its v1!
- Only 45 days left to contribute to our crowdfunding!
-
Support PeerTube
+
+
+
+Help us improve PeerTube to its v1!
+
+
+
+Only 45 days left to contribute to our crowdfunding!
+
+
+
+
Support PeerTube
+
{{% /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… 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)
diff --git a/content/home.fr.md b/content/home.fr.md
index a5c64a6..a267c08 100644
--- a/content/home.fr.md
+++ b/content/home.fr.md
@@ -20,13 +20,25 @@ type = "page"
- Aidez-nous à réaliser la v1 de PeerTube !
- Plus que 45 jours pour participer à notre financement participatif !
+
+
+
+ Aidez-nous à réaliser la v1 de PeerTube !
+
+
+
+ Plus que 45 jours pour participer à notre financement participatif !
+
+
+
Soutenir PeerTube
+
{{% /grid %}}
--
GitLab