From b2c93eace6851ea01db6431e1f958b243fc82ca7 Mon Sep 17 00:00:00 2001
From: Paul <paul.lesur@etu.utc.fr>
Date: Thu, 29 Nov 2018 15:14:20 +0100
Subject: [PATCH 1/2] [Translation] Strings translated to french

---
 app/src/main/res/values-fr/strings.xml | 58 ++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 app/src/main/res/values-fr/strings.xml

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
new file mode 100644
index 0000000..75d7cde
--- /dev/null
+++ b/app/src/main/res/values-fr/strings.xml
@@ -0,0 +1,58 @@
+<resources>
+    <string name="app_name">PeerTube</string>
+
+    <string name="title_activity_video_play">VideoPlayActivity</string>
+    <string name="title_activity_settings">Paramètres</string>
+    <string name="title_activity_login">Connexion</string>
+
+    <!-- Strings related to login -->
+    <string name="prompt_server">Serveur</string>
+    <string name="prompt_email">Email</string>
+    <string name="prompt_password">Mot de passe (optionnel)</string>
+    <string name="action_sign_in">Connexion</string>
+    <string name="action_sign_in_short">Connexion</string>
+    <string name="error_invalid_email">Cette adresse mail n\'est pas valide</string>
+    <string name="error_invalid_password">Ce mot de passe est trop court</string>
+    <string name="error_incorrect_password">Ce mot de passe est incorrect</string>
+    <string name="error_field_required">Ce champs est requis</string>
+    <string name="permission_rationale">"L\'autorisation sur les contacts est requise pour la complétion des adresses email."
+    </string>
+
+    <!-- Action bar -->
+    <string name="action_bar_title_search">Rechercher</string>
+    <string name="action_bar_title_settings">Paramètres</string>
+
+    <!-- Bottom navigation bar -->
+    <string name="bottom_nav_title_home">Accueil</string>
+    <string name="bottom_nav_title_trending">Tendances</string>
+    <string name="bottom_nav_title_subscriptions">Abonnements</string>
+    <string name="bottom_nav_title_account">Compte</string>
+
+    <!-- Strings related to Settings -->
+    <string name="peertube_required_server_version">1.0.0-alpha.7</string>
+
+    <string name="pref_default_api_base_url" formatted="false">https://troll.tv</string>
+    <string name="pref_title_peertube_server">PeerTube Server</string>
+
+
+    <!-- Strings related to Video meta data -->
+    <string name="meta_data_seperator">\u0020-\u0020</string>
+    <string name="meta_data_views">\u0020Views</string>
+    <string name="meta_data_owner_seperator">\@</string>
+
+
+    <string name="video_row_video_thumbnail">Miniature vidéo</string>
+    <string name="video_row_account_avatar">Avatar compte</string>
+
+    <string name="pref_title_show_nsfw">Afficher le contenu adulte</string>
+    <string name="pref_description_show_nsfw">Le contenu adulte sera affiché si activé</string>
+    <string name="title_activity_url_video_play">UrlVideoPlayActivity</string>
+    <string name="pref_title_torrent_player">Lecteur Vidéo Torrent</string>
+    <string name="pref_description_torrent_player">Lecture de vidéo via un flux torrent</string>
+    <string name="pref_title_license">Licence</string>
+    <string name="pref_description_license">\n<b>GNU Affero General Public License v3.0</b>\n\nPermissions of this strongest copyleft license are conditioned on making available complete source code of licensed works and modifications, which include larger works using a licensed work, under the same license. Copyright and license notices must be preserved. Contributors provide an express grant of patent rights. When a modified version is used to provide a service over a network, the complete source code of the modified version must be made available.</string>
+    <string name="pref_title_version">Version</string>
+    <string name="search_hint">Rechercher sur PeerTube</string>
+    <string name="title_activity_search">Rechercher</string>
+
+</resources>

From deb4e7b5264a2eff0244dd5bb60e28ca7268edf6 Mon Sep 17 00:00:00 2001
From: Paul <paul.lesur@etu.utc.fr>
Date: Fri, 30 Nov 2018 11:25:42 +0100
Subject: [PATCH 2/2] [Bugfix] Screen doesn't turn off when playing a video

---
 app/src/main/res/layout/activity_video_play.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/layout/activity_video_play.xml b/app/src/main/res/layout/activity_video_play.xml
index 491dd50..0e736ec 100644
--- a/app/src/main/res/layout/activity_video_play.xml
+++ b/app/src/main/res/layout/activity_video_play.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:keepScreenOn="true"
     tools:context="net.schueller.peertube.activity.VideoPlayActivity">
 
     <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"