From 1089632a19bec3ab1e2d515e7035a490abada18a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Sch=C3=BCller?= <sschueller@techdroid.com>
Date: Sat, 26 Sep 2020 18:56:58 +0200
Subject: [PATCH 1/5] Translated using Weblate (Italian)

Currently translated at 99.1% (340 of 343 strings)

Translation: PeerTube/Android
Translate-URL: https://hosted.weblate.org/projects/peertube/android/it/
---
 CHANGELOG.md                                  |  12 +
 DEPLOYMENT.md                                 |  15 +
 Gemfile.lock                                  |  44 +--
 README.md                                     |  11 +-
 .../peertube/activity/AccountActivity.java    |  14 +-
 .../peertube/activity/MeActivity.java         |   2 +
 .../activity/SearchServerActivity.java        |  38 +-
 .../peertube/activity/VideoListActivity.java  |   9 +-
 .../peertube/activity/VideoPlayActivity.java  |  34 +-
 .../fragment/VideoMetaDataFragment.java       |  23 +-
 .../fragment/VideoPlayerFragment.java         |  39 +-
 .../peertube/helper/ErrorHelper.java          |  26 ++
 .../schueller/peertube/intents/Intents.java   |  33 +-
 .../network/GetServerListDataService.java     |   3 +-
 .../peertube/service/VideoPlayerService.java  |  65 ++--
 .../res/layout/activity_search_server.xml     |  17 +-
 .../main/res/layout/fragment_video_meta.xml   |   1 +
 app/src/main/res/values-fr/strings.xml        |   2 +
 app/src/main/res/values-it/strings.xml        |  29 ++
 app/src/main/res/values-pt/strings.xml        | 348 +++++++++++++++++-
 app/src/main/res/values-zh-rCN/strings.xml    |   2 +-
 app/src/main/res/values/strings.xml           |   2 +
 .../android/en-US/changelogs/1048.txt         |   1 +
 .../android/en-US/changelogs/1049.txt         |   7 +
 .../metadata/android/fr/changelogs/1047.txt   |   1 +
 .../metadata/android/fr/short_description.txt |   1 +
 fastlane/metadata/android/fr/video.txt        |   1 +
 .../android/nb_NO/changelogs/1047.txt         |   1 +
 .../android/nb_NO/short_description.txt       |   1 +
 fastlane/metadata/android/nb_NO/title.txt     |   1 +
 .../metadata/android/ru/changelogs/1047.txt   |   1 +
 .../metadata/android/ru/full_description.txt  |  33 ++
 .../metadata/android/ru/short_description.txt |   1 +
 fastlane/metadata/android/ru/title.txt        |   1 +
 fastlane/metadata/android/ru/video.txt        |   1 +
 .../metadata/android/tr/changelogs/1047.txt   |   1 +
 .../metadata/android/tr/full_description.txt  |  33 ++
 .../metadata/android/tr/short_description.txt |   1 +
 fastlane/metadata/android/tr/title.txt        |   1 +
 fastlane/metadata/android/tr/video.txt        |   1 +
 40 files changed, 752 insertions(+), 105 deletions(-)
 create mode 100644 DEPLOYMENT.md
 create mode 100644 app/src/main/java/net/schueller/peertube/helper/ErrorHelper.java
 create mode 100644 fastlane/metadata/android/en-US/changelogs/1048.txt
 create mode 100644 fastlane/metadata/android/en-US/changelogs/1049.txt
 create mode 100644 fastlane/metadata/android/fr/changelogs/1047.txt
 create mode 100644 fastlane/metadata/android/fr/short_description.txt
 create mode 100644 fastlane/metadata/android/fr/video.txt
 create mode 100644 fastlane/metadata/android/nb_NO/changelogs/1047.txt
 create mode 100644 fastlane/metadata/android/nb_NO/short_description.txt
 create mode 100644 fastlane/metadata/android/nb_NO/title.txt
 create mode 100644 fastlane/metadata/android/ru/changelogs/1047.txt
 create mode 100644 fastlane/metadata/android/ru/full_description.txt
 create mode 100644 fastlane/metadata/android/ru/short_description.txt
 create mode 100644 fastlane/metadata/android/ru/title.txt
 create mode 100644 fastlane/metadata/android/ru/video.txt
 create mode 100644 fastlane/metadata/android/tr/changelogs/1047.txt
 create mode 100644 fastlane/metadata/android/tr/full_description.txt
 create mode 100644 fastlane/metadata/android/tr/short_description.txt
 create mode 100644 fastlane/metadata/android/tr/title.txt
 create mode 100644 fastlane/metadata/android/tr/video.txt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b9fd25..29f4b77 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+### Version 1.0.49 Tag: v1.0.49 (2020-09-26)
+ - add support of hypertext redirection in description (@freeboub)
+ - various crash fixes (@freeboub)
+ - avoid going to pip when leaving the app due to share button (@freeboub)
+ - Add ability to filter server list (@freeboub)
+ - Refactor Toast error management to split network error (@freeboub)
+ - keep video aspect ratio for pip (@freeboub)
+ - navigation bar was not restored when leaving landscape mode (@freeboub)
+
+### Version 1.0.48 Tag: v1.0.48 (2020-09-26)
+ - f-droid release to fix auto deployment
+
 ### Version 1.0.47 Tag: v1.0.47 (2020-07-10)
  * Authentication refresh
 
diff --git a/DEPLOYMENT.md b/DEPLOYMENT.md
new file mode 100644
index 0000000..3876b58
--- /dev/null
+++ b/DEPLOYMENT.md
@@ -0,0 +1,15 @@
+## Internal deployment notes
+
+  1. merge pull-requests on github into develop
+  2. Locally switch to develop
+  3. Pull github develop
+  4. Pull weblate develop
+  5. Add change logs (fastlane/metadata/android/en-US/changelogs/XXX.txt)
+  6. Push to gitlab and github
+  7. Merge request into master and merge
+  8. Add Release Tag on master branch
+  9. Release to play store
+  10. Wait for gitlab -> github sync
+  11. Run publishGithub
+
+
diff --git a/Gemfile.lock b/Gemfile.lock
index 6f4436d..6e7ebae 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,8 +6,8 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     atomos (0.1.3)
     aws-eventstream (1.1.0)
-    aws-partitions (1.341.0)
-    aws-sdk-core (3.103.0)
+    aws-partitions (1.353.0)
+    aws-sdk-core (3.104.3)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
@@ -15,8 +15,8 @@ GEM
     aws-sdk-kms (1.36.0)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.74.0)
-      aws-sdk-core (~> 3, >= 3.102.1)
+    aws-sdk-s3 (1.76.0)
+      aws-sdk-core (~> 3, >= 3.104.1)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.2.1)
@@ -33,9 +33,9 @@ GEM
       rake (~> 13.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.7.5)
+    dotenv (2.7.6)
     emoji_regex (3.0.0)
-    excon (0.75.0)
+    excon (0.76.0)
     faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
     faraday-cookie_jar (0.0.6)
@@ -43,8 +43,8 @@ GEM
       http-cookie (~> 1.0.0)
     faraday_middleware (1.0.0)
       faraday (~> 1.0)
-    fastimage (2.1.7)
-    fastlane (2.151.2)
+    fastimage (2.2.0)
+    fastlane (2.155.3)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.3, < 3.0.0)
       aws-sdk-s3 (~> 1.0)
@@ -55,9 +55,9 @@ GEM
       dotenv (>= 2.1.1, < 3.0.0)
       emoji_regex (>= 0.1, < 4.0)
       excon (>= 0.71.0, < 1.0.0)
-      faraday (>= 0.17, < 2.0)
+      faraday (~> 1.0)
       faraday-cookie_jar (~> 0.0.6)
-      faraday_middleware (>= 0.13.1, < 2.0)
+      faraday_middleware (~> 1.0)
       fastimage (>= 2.1.0, < 3.0.0)
       gh_inspector (>= 1.1.2, < 2.0.0)
       google-api-client (>= 0.37.0, < 0.39.0)
@@ -92,17 +92,17 @@ GEM
     google-cloud-core (1.5.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (1.3.2)
+    google-cloud-env (1.3.3)
       faraday (>= 0.17.3, < 2.0)
     google-cloud-errors (1.0.1)
-    google-cloud-storage (1.26.2)
+    google-cloud-storage (1.27.0)
       addressable (~> 2.5)
       digest-crc (~> 0.4)
       google-api-client (~> 0.33)
       google-cloud-core (~> 1.2)
       googleauth (~> 0.9)
       mini_mime (~> 1.0)
-    googleauth (0.13.0)
+    googleauth (0.13.1)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
@@ -119,13 +119,13 @@ GEM
     memoist (0.16.2)
     mini_magick (4.10.1)
     mini_mime (1.0.2)
-    multi_json (1.14.1)
+    multi_json (1.15.0)
     multipart-post (2.0.0)
-    nanaimo (0.2.6)
+    nanaimo (0.3.0)
     naturally (2.2.0)
-    os (1.1.0)
+    os (1.1.1)
     plist (3.5.0)
-    public_suffix (4.0.1)
+    public_suffix (4.0.5)
     rake (13.0.1)
     representable (3.0.4)
       declarative (< 0.1.0)
@@ -147,22 +147,22 @@ GEM
     terminal-notifier (2.0.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
-    tty-cursor (0.7.0)
-    tty-screen (0.7.0)
+    tty-cursor (0.7.1)
+    tty-screen (0.8.1)
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
     uber (0.1.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.7)
-    unicode-display_width (1.6.0)
+    unicode-display_width (1.7.0)
     word_wrap (1.0.0)
-    xcodeproj (1.17.0)
+    xcodeproj (1.17.1)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.2.6)
+      nanaimo (~> 0.3.0)
     xcpretty (0.3.0)
       rouge (~> 2.0.7)
     xcpretty-travis-formatter (1.0.0)
diff --git a/README.md b/README.md
index df66918..4b2d85b 100644
--- a/README.md
+++ b/README.md
@@ -28,6 +28,13 @@ Please note this is app is in beta and is still missing a lot of features.
 * Beta Test on Google Play: https://play.google.com/store/apps/details?id=net.schueller.peertube
 * F-Droid: https://f-droid.org/packages/net.schueller.peertube/
 
+## Releases
+Release Tags are automatically built and deployed to the play store but not released to production right away. 
+To use the latest tagged release download it from github or fdroid (~1 day delay).
+
+## Reproducible Builds
+Reproducible builds currently does not work.
+
 ## Help Translate
 * https://hosted.weblate.org/projects/peertube/
 
@@ -48,11 +55,11 @@ Please note this is app is in beta and is still missing a lot of features.
 * Video speed selection
 * Video quality selection
 * Server selection
+* Video overlay play and draggable video window
 
 ## Coming soon
 
 * Video Playback via WebRTC
-* Video overlay play and draggable video window
 * Comment videos
 * Report Videos
 * User / Channel Overview Page
@@ -66,4 +73,4 @@ Whether you have ideas, translations, design changes, code cleaning, or real hea
 
 <noscript><a href="https://liberapay.com/sschueller/donate"><img alt="Donate using Liberapay" src="https://liberapay.com/assets/widgets/donate.svg"></a></noscript>
 
-Bitcoin: 1LoTXo728HzYTtyfbkaf5ewSRvu8ABTDPm 
+Bitcoin: 1LoTXo728HzYTtyfbkaf5ewSRvu8ABTDPm
diff --git a/app/src/main/java/net/schueller/peertube/activity/AccountActivity.java b/app/src/main/java/net/schueller/peertube/activity/AccountActivity.java
index d80b58c..7daf17b 100644
--- a/app/src/main/java/net/schueller/peertube/activity/AccountActivity.java
+++ b/app/src/main/java/net/schueller/peertube/activity/AccountActivity.java
@@ -37,6 +37,7 @@ import net.schueller.peertube.R;
 import net.schueller.peertube.adapter.ChannelAdapter;
 import net.schueller.peertube.adapter.VideoAdapter;
 import net.schueller.peertube.helper.APIUrlHelper;
+import net.schueller.peertube.helper.ErrorHelper;
 import net.schueller.peertube.helper.MetaDataHelper;
 import net.schueller.peertube.model.Account;
 import net.schueller.peertube.model.Avatar;
@@ -206,7 +207,7 @@ public class AccountActivity extends CommonActivity {
                     }
 
                 } else {
-                    Toast.makeText(AccountActivity.this, getString(R.string.api_error), Toast.LENGTH_SHORT).show();
+                    ErrorHelper.showToastFromCommunicationError( AccountActivity.this, null );
                 }
 
 
@@ -215,7 +216,7 @@ public class AccountActivity extends CommonActivity {
             @Override
             public void onFailure(@NonNull Call<Account> call, @NonNull Throwable t) {
                 Log.wtf(TAG, t.fillInStackTrace());
-                Toast.makeText(AccountActivity.this, getString(R.string.api_error), Toast.LENGTH_SHORT).show();
+                ErrorHelper.showToastFromCommunicationError( AccountActivity.this, t );
             }
         });
 
@@ -247,8 +248,7 @@ public class AccountActivity extends CommonActivity {
                     }
 
                 } else{
-                    Toast.makeText(AccountActivity.this, getString(R.string.api_error), Toast.LENGTH_SHORT).show();
-
+                    ErrorHelper.showToastFromCommunicationError( AccountActivity.this, null );
                 }
 
                 isLoadingVideos = false;
@@ -258,7 +258,7 @@ public class AccountActivity extends CommonActivity {
             @Override
             public void onFailure(@NonNull Call<VideoList> call, @NonNull Throwable t) {
                 Log.wtf("err", t.fillInStackTrace());
-                Toast.makeText(AccountActivity.this, getString(R.string.api_error), Toast.LENGTH_SHORT).show();
+                ErrorHelper.showToastFromCommunicationError( AccountActivity.this, t );
                 isLoadingVideos = false;
                 swipeRefreshLayoutVideos.setRefreshing(false);
             }
@@ -281,7 +281,7 @@ public class AccountActivity extends CommonActivity {
 
 
                 } else {
-                    Toast.makeText(AccountActivity.this, getString(R.string.api_error), Toast.LENGTH_SHORT).show();
+                    ErrorHelper.showToastFromCommunicationError( AccountActivity.this, null );
                 }
 
 
@@ -290,7 +290,7 @@ public class AccountActivity extends CommonActivity {
             @Override
             public void onFailure(@NonNull Call<ChannelList> call, @NonNull Throwable t) {
                 Log.wtf(TAG, t.fillInStackTrace());
-                Toast.makeText(AccountActivity.this, getString(R.string.api_error), Toast.LENGTH_SHORT).show();
+                ErrorHelper.showToastFromCommunicationError( AccountActivity.this, t );
             }
         });
     }
diff --git a/app/src/main/java/net/schueller/peertube/activity/MeActivity.java b/app/src/main/java/net/schueller/peertube/activity/MeActivity.java
index 9e0c6da..7a62427 100644
--- a/app/src/main/java/net/schueller/peertube/activity/MeActivity.java
+++ b/app/src/main/java/net/schueller/peertube/activity/MeActivity.java
@@ -31,6 +31,7 @@ import android.widget.TextView;
 
 import net.schueller.peertube.R;
 import net.schueller.peertube.helper.APIUrlHelper;
+import net.schueller.peertube.helper.ErrorHelper;
 import net.schueller.peertube.model.Avatar;
 import net.schueller.peertube.model.Me;
 import net.schueller.peertube.network.GetUserService;
@@ -162,6 +163,7 @@ public class MeActivity extends CommonActivity {
 
             @Override
             public void onFailure(@NonNull Call<Me> call, @NonNull Throwable t) {
+                ErrorHelper.showToastFromCommunicationError( MeActivity.this, t );
                 account.setVisibility(View.GONE);
             }
         });
diff --git a/app/src/main/java/net/schueller/peertube/activity/SearchServerActivity.java b/app/src/main/java/net/schueller/peertube/activity/SearchServerActivity.java
index 6c57cf7..b263f39 100644
--- a/app/src/main/java/net/schueller/peertube/activity/SearchServerActivity.java
+++ b/app/src/main/java/net/schueller/peertube/activity/SearchServerActivity.java
@@ -28,13 +28,17 @@ import retrofit2.Response;
 
 import android.os.Bundle;
 import android.util.Log;
+import android.view.KeyEvent;
 import android.view.View;
+import android.view.inputmethod.EditorInfo;
+import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import net.schueller.peertube.R;
 import net.schueller.peertube.adapter.ServerSearchAdapter;
 import net.schueller.peertube.helper.APIUrlHelper;
+import net.schueller.peertube.helper.ErrorHelper;
 import net.schueller.peertube.model.ServerList;
 import net.schueller.peertube.network.GetServerListDataService;
 import net.schueller.peertube.network.RetrofitInstance;
@@ -46,9 +50,13 @@ public class SearchServerActivity extends CommonActivity {
 
     private ServerSearchAdapter serverAdapter;
     private SwipeRefreshLayout swipeRefreshLayout;
+    private EditText searchTextView;
+
+    private final static String TAG = "SearchServerActivity";
 
     private int currentStart = 0;
-    private int count = 12;
+    private final int count = 12;
+    private String lastSearchtext = "";
 
     private TextView emptyView;
     private RecyclerView recyclerView;
@@ -77,11 +85,20 @@ public class SearchServerActivity extends CommonActivity {
 
     }
 
+    TextView.OnEditorActionListener onSearchTextValidated = ( textView, i, keyEvent ) -> {
+        if ( keyEvent != null && keyEvent.getKeyCode() == KeyEvent.KEYCODE_ENTER
+                || i == EditorInfo.IME_ACTION_GO ) {
+            loadServers(currentStart, count, textView.getText().toString());
+        }
+        return false;
+    };
 
     private void loadList() {
 
         recyclerView = findViewById(R.id.serverRecyclerView);
         swipeRefreshLayout = findViewById(R.id.serversSwipeRefreshLayout);
+        searchTextView = findViewById(R.id.search_server_input_field );
+        searchTextView.setOnEditorActionListener( onSearchTextValidated );
 
         emptyView = findViewById(R.id.empty_server_selection_view);
 
@@ -91,7 +108,7 @@ public class SearchServerActivity extends CommonActivity {
         serverAdapter = new ServerSearchAdapter(new ArrayList<>(), this);
         recyclerView.setAdapter(serverAdapter);
 
-        loadServers(currentStart, count);
+        loadServers(currentStart, count, searchTextView.getText().toString() );
 
         recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
             @Override
@@ -107,7 +124,7 @@ public class SearchServerActivity extends CommonActivity {
                     if (!recyclerView.canScrollVertically(RecyclerView.FOCUS_DOWN)) {
                         if (!isLoading) {
                             currentStart = currentStart + count;
-                            loadServers(currentStart, count);
+                            loadServers(currentStart, count, searchTextView.getText().toString());
                         }
                     }
                 }
@@ -119,26 +136,29 @@ public class SearchServerActivity extends CommonActivity {
             // Refresh items
             if (!isLoading) {
                 currentStart = 0;
-                loadServers(currentStart, count);
+                loadServers(currentStart, count, searchTextView.getText().toString());
             }
         });
 
 
     }
 
-
-
-    private void loadServers(int start, int count) {
+    private void loadServers(int start, int count, String searchtext) {
         isLoading = true;
 
         GetServerListDataService service = RetrofitInstance.getRetrofitInstance(
                 APIUrlHelper.getServerIndexUrl(SearchServerActivity.this)
         ).create(GetServerListDataService.class);
 
+        if ( !searchtext.equals( lastSearchtext ) )
+        {
+            currentStart = 0;
+            lastSearchtext = searchtext;
+        }
 
         Call<ServerList> call;
 
-        call = service.getInstancesData(start, count);
+        call = service.getInstancesData(start, count, searchtext);
 
         Log.d("URL Called", call.request().url() + "");
 
@@ -171,7 +191,7 @@ public class SearchServerActivity extends CommonActivity {
             @Override
             public void onFailure(@NonNull Call<ServerList> call, @NonNull Throwable t) {
                 Log.wtf("err", t.fillInStackTrace());
-                Toast.makeText(SearchServerActivity.this, getString(R.string.api_error), Toast.LENGTH_SHORT).show();
+                ErrorHelper.showToastFromCommunicationError( SearchServerActivity.this, t );
                 isLoading = false;
                 swipeRefreshLayout.setRefreshing(false);
             }
diff --git a/app/src/main/java/net/schueller/peertube/activity/VideoListActivity.java b/app/src/main/java/net/schueller/peertube/activity/VideoListActivity.java
index b00bfa5..ae7b650 100644
--- a/app/src/main/java/net/schueller/peertube/activity/VideoListActivity.java
+++ b/app/src/main/java/net/schueller/peertube/activity/VideoListActivity.java
@@ -59,6 +59,8 @@ import com.mikepenz.iconics.IconicsDrawable;
 import net.schueller.peertube.R;
 import net.schueller.peertube.adapter.VideoAdapter;
 import net.schueller.peertube.helper.APIUrlHelper;
+import net.schueller.peertube.helper.ErrorHelper;
+import net.schueller.peertube.model.Video;
 import net.schueller.peertube.model.VideoList;
 import net.schueller.peertube.network.GetUserService;
 import net.schueller.peertube.network.GetVideoDataService;
@@ -348,7 +350,10 @@ public class VideoListActivity extends CommonActivity {
                 }
 
                 if (response.body() != null) {
-                    videoAdapter.setData(response.body().getVideoArrayList());
+                    ArrayList<Video> videoList = response.body().getVideoArrayList();
+                    if (videoList != null) {
+                        videoAdapter.setData(response.body().getVideoArrayList());
+                    }
                 }
 
                 // no results show no results message
@@ -368,7 +373,7 @@ public class VideoListActivity extends CommonActivity {
             @Override
             public void onFailure(@NonNull Call<VideoList> call, @NonNull Throwable t) {
                 Log.wtf("err", t.fillInStackTrace());
-                Toast.makeText(VideoListActivity.this, getString(R.string.api_error), Toast.LENGTH_SHORT).show();
+                ErrorHelper.showToastFromCommunicationError( VideoListActivity.this, t );
                 isLoading = false;
                 swipeRefreshLayout.setRefreshing(false);
             }
diff --git a/app/src/main/java/net/schueller/peertube/activity/VideoPlayActivity.java b/app/src/main/java/net/schueller/peertube/activity/VideoPlayActivity.java
index 398312f..0118817 100644
--- a/app/src/main/java/net/schueller/peertube/activity/VideoPlayActivity.java
+++ b/app/src/main/java/net/schueller/peertube/activity/VideoPlayActivity.java
@@ -295,7 +295,11 @@ public class VideoPlayActivity extends AppCompatActivity {
 
         videoPlayerFragment.setIsFullscreen(isLandscape);
 
-        getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
+        if ( isLandscape ) {
+            getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
+        } else {
+            getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
+        }
     }
 
     @Override
@@ -351,11 +355,17 @@ public class VideoPlayActivity extends AppCompatActivity {
         SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this);
         FragmentManager fragmentManager = getSupportFragmentManager();
         VideoPlayerFragment videoPlayerFragment = (VideoPlayerFragment) fragmentManager.findFragmentById(R.id.video_player_fragment);
+        VideoMetaDataFragment videoMetaDataFragment = (VideoMetaDataFragment) fragmentManager.findFragmentById(R.id.video_meta_data_fragment);
 
         String backgroundBehavior = sharedPref.getString(getString(R.string.pref_background_behavior_key), getString(R.string.pref_background_stop_key));
 
         assert videoPlayerFragment != null;
         assert backgroundBehavior != null;
+        if ( videoMetaDataFragment.isLeaveAppExpected() )
+        {
+            super.onUserLeaveHint();
+            return;
+        }
 
         if (backgroundBehavior.equals(getString(R.string.pref_background_stop_key))) {
             Log.v(TAG, "stop the video");
@@ -451,15 +461,21 @@ public class VideoPlayActivity extends AppCompatActivity {
 
     @RequiresApi(api = Build.VERSION_CODES.O)
     public void enterPipMode() {
-        Rational rational = new Rational(239, 100);
-        Log.v(TAG, rational.toString());
-        PictureInPictureParams mParams =
-                new PictureInPictureParams.Builder()
-                        .setAspectRatio(rational)
-//                        .setSourceRectHint(new Rect(0,500,400,600))
-                        .build();
+        final FragmentManager fragmentManager = getSupportFragmentManager();
+        final VideoPlayerFragment videoPlayerFragment = (VideoPlayerFragment) fragmentManager.findFragmentById( R.id.video_player_fragment );
 
-        enterPictureInPictureMode(mParams);
+        if ( videoPlayerFragment.getVideoAspectRatio() == 0 ) {
+            Log.i( TAG, "impossible to switch to pip" );
+        } else {
+            Rational rational = new Rational( (int) ( videoPlayerFragment.getVideoAspectRatio() * 100 ), 100 );
+            PictureInPictureParams mParams =
+                    new PictureInPictureParams.Builder()
+                            .setAspectRatio( rational )
+//                          .setSourceRectHint(new Rect(0,500,400,600))
+                            .build();
+
+            enterPictureInPictureMode( mParams );
+        }
     }
 
     @Override
diff --git a/app/src/main/java/net/schueller/peertube/fragment/VideoMetaDataFragment.java b/app/src/main/java/net/schueller/peertube/fragment/VideoMetaDataFragment.java
index 1d370e0..b07634a 100644
--- a/app/src/main/java/net/schueller/peertube/fragment/VideoMetaDataFragment.java
+++ b/app/src/main/java/net/schueller/peertube/fragment/VideoMetaDataFragment.java
@@ -39,6 +39,7 @@ import com.squareup.picasso.Picasso;
 
 import net.schueller.peertube.R;
 import net.schueller.peertube.helper.APIUrlHelper;
+import net.schueller.peertube.helper.ErrorHelper;
 import net.schueller.peertube.helper.MetaDataHelper;
 import net.schueller.peertube.intents.Intents;
 import net.schueller.peertube.model.Account;
@@ -72,6 +73,8 @@ public class VideoMetaDataFragment extends Fragment {
     private Rating videoRating;
     private ColorStateList defaultTextColor;
 
+    private boolean leaveAppExpected = false;
+
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
@@ -80,6 +83,18 @@ public class VideoMetaDataFragment extends Fragment {
         return inflater.inflate(R.layout.fragment_video_meta, container, false);
     }
 
+    @Override
+    public void onPause()
+    {
+        leaveAppExpected = false;
+        super.onPause();
+    }
+
+    public boolean isLeaveAppExpected()
+    {
+        return leaveAppExpected;
+    }
+
     public void updateVideoMeta(Video video, VideoPlayerService mService) {
         Context context = getContext();
         Activity activity = getActivity();
@@ -122,6 +137,7 @@ public class VideoMetaDataFragment extends Fragment {
 
                 @Override
                 public void onFailure(Call<Rating> call, Throwable t) {
+                    ErrorHelper.showToastFromCommunicationError( getActivity(), t );
                     // Do nothing.
                 }
             });
@@ -131,7 +147,11 @@ public class VideoMetaDataFragment extends Fragment {
         Button videoShareButton = activity.findViewById(R.id.video_share);
         videoShareButton.setText(R.string.video_share_icon);
         new Iconics.IconicsBuilder().ctx(context).on(videoShareButton).build();
-        videoShareButton.setOnClickListener(v -> Intents.Share(context, video));
+        videoShareButton.setOnClickListener(v ->
+                                            {
+                                                leaveAppExpected = true;
+                                                Intents.Share( context, video );
+                                            } );
 
         // Download
         Button videoDownloadButton = activity.findViewById(R.id.video_download);
@@ -140,6 +160,7 @@ public class VideoMetaDataFragment extends Fragment {
         videoDownloadButton.setOnClickListener(v -> {
             // get permission to store file
             if (ActivityCompat.checkSelfPermission(context, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
+                leaveAppExpected = true;
                 ActivityCompat.requestPermissions(activity, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, 0);
                 if (ActivityCompat.checkSelfPermission(context, Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) {
                     Intents.Download(context, video);
diff --git a/app/src/main/java/net/schueller/peertube/fragment/VideoPlayerFragment.java b/app/src/main/java/net/schueller/peertube/fragment/VideoPlayerFragment.java
index 3ac32ba..397913c 100644
--- a/app/src/main/java/net/schueller/peertube/fragment/VideoPlayerFragment.java
+++ b/app/src/main/java/net/schueller/peertube/fragment/VideoPlayerFragment.java
@@ -59,6 +59,7 @@ import com.mikepenz.iconics.Iconics;
 import net.schueller.peertube.R;
 
 import net.schueller.peertube.helper.APIUrlHelper;
+import net.schueller.peertube.helper.ErrorHelper;
 import net.schueller.peertube.model.File;
 import net.schueller.peertube.model.Video;
 import net.schueller.peertube.network.GetVideoDataService;
@@ -86,6 +87,7 @@ public class VideoPlayerFragment extends Fragment implements VideoRendererEventL
     private VideoPlayerService mService;
     private TorrentStream torrentStream;
     private LinearLayout torrentStatus;
+    private float aspectRatio;
 
     private static final String TAG = "VideoPlayerFragment";
     private GestureDetector mDetector;
@@ -112,6 +114,14 @@ public class VideoPlayerFragment extends Fragment implements VideoRendererEventL
             mBound = false;
         }
     };
+    private AspectRatioFrameLayout.AspectRatioListener aspectRatioListerner = new AspectRatioFrameLayout.AspectRatioListener()
+    {
+        @Override
+        public void onAspectRatioUpdated( float targetAspectRatio, float naturalAspectRatio, boolean aspectRatioMismatch )
+        {
+            aspectRatio = targetAspectRatio;
+        }
+    };
 
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
@@ -144,6 +154,8 @@ public class VideoPlayerFragment extends Fragment implements VideoRendererEventL
         mDetector = new GestureDetector(context, new MyGestureListener());
         simpleExoPlayerView.setOnTouchListener(touchListener);
 
+        simpleExoPlayerView.setAspectRatioListener( aspectRatioListerner );
+
         torrentStatus = activity.findViewById(R.id.exo_torrent_status);
 
         // Full screen Icon
@@ -196,7 +208,7 @@ public class VideoPlayerFragment extends Fragment implements VideoRendererEventL
             @Override
             public void onFailure(@NonNull Call<Video> call, @NonNull Throwable t) {
                 Log.wtf(TAG, t.fillInStackTrace());
-                Toast.makeText(context, "Something went wrong: " + t.getLocalizedMessage(), Toast.LENGTH_LONG).show();
+                ErrorHelper.showToastFromCommunicationError( getActivity(), t );
             }
         });
     }
@@ -231,17 +243,22 @@ public class VideoPlayerFragment extends Fragment implements VideoRendererEventL
             Integer videoQuality = sharedPref.getInt(getString(R.string.pref_quality_key), 0);
 
             //get video qualities
-            String urlToPlay = video.getFiles().get(0).getFileUrl();
-            for (File file : video.getFiles()) {
-                // Set quality if it matches
-                if (file.getResolution().getId().equals(videoQuality)) {
-                    urlToPlay = file.getFileUrl();
+            /// #
+            if (video.getFiles().size() > 0) {
+                String urlToPlay = video.getFiles().get( 0 ).getFileUrl();
+                for ( File file : video.getFiles() ) {
+                    // Set quality if it matches
+                    if ( file.getResolution().getId().equals( videoQuality ) ) {
+                        urlToPlay = file.getFileUrl();
+                    }
                 }
+                mService.setCurrentStreamUrl( urlToPlay );
+                torrentStatus.setVisibility(View.GONE);
+                startPlayer();
+            } else {
+                stopVideo();
+                Toast.makeText(context, R.string.api_error, Toast.LENGTH_LONG).show();
             }
-            mService.setCurrentStreamUrl(urlToPlay);
-
-            torrentStatus.setVisibility(View.GONE);
-            startPlayer();
         }
         Log.v(TAG, "end of load Video");
 
@@ -278,6 +295,8 @@ public class VideoPlayerFragment extends Fragment implements VideoRendererEventL
         }
     }
 
+    public float getVideoAspectRatio() { return aspectRatio; }
+
     public boolean isPaused() {
         return !mService.player.getPlayWhenReady();
     }
diff --git a/app/src/main/java/net/schueller/peertube/helper/ErrorHelper.java b/app/src/main/java/net/schueller/peertube/helper/ErrorHelper.java
new file mode 100644
index 0000000..96bbc7f
--- /dev/null
+++ b/app/src/main/java/net/schueller/peertube/helper/ErrorHelper.java
@@ -0,0 +1,26 @@
+package net.schueller.peertube.helper;
+
+import android.content.Context;
+import android.widget.Toast;
+
+import net.schueller.peertube.R;
+
+import java.io.IOException;
+
+import retrofit2.HttpException;
+
+public class ErrorHelper {
+
+    public static void showToastFromCommunicationError( Context context, Throwable throwable ) {
+        if (throwable instanceof IOException ) {
+            //handle network error
+            Toast.makeText( context, context.getString( R.string.network_error), Toast.LENGTH_SHORT).show();
+        } else if (throwable instanceof HttpException ) {
+            //handle HTTP error response code
+            Toast.makeText(context, context.getString(R.string.api_error), Toast.LENGTH_SHORT).show();
+        } else {
+            //handle other exceptions
+            Toast.makeText(context, context.getString(R.string.api_error), Toast.LENGTH_SHORT).show();
+        }
+    }
+}
diff --git a/app/src/main/java/net/schueller/peertube/intents/Intents.java b/app/src/main/java/net/schueller/peertube/intents/Intents.java
index 6b2dfe3..c8eb87e 100644
--- a/app/src/main/java/net/schueller/peertube/intents/Intents.java
+++ b/app/src/main/java/net/schueller/peertube/intents/Intents.java
@@ -27,6 +27,7 @@ import android.os.Build;
 import android.os.Environment;
 import android.webkit.MimeTypeMap;
 import android.webkit.URLUtil;
+import android.widget.Toast;
 
 
 import com.github.se_bastiaan.torrentstream.TorrentOptions;
@@ -40,6 +41,7 @@ import androidx.core.app.ActivityCompat;
 
 public class Intents {
 
+    private static final String TAG = "Intents";
 
     /**
      * https://troll.tv/videos/watch/6edbd9d1-e3c5-4a6c-8491-646e2020469c
@@ -68,20 +70,25 @@ public class Intents {
     // TODO, offer which version to download
     public static void Download(Context context, Video video) {
 
-        String url = video.getFiles().get(0).getFileDownloadUrl();
-        // make sure it is a valid filename
-        String destFilename = video.getName().replaceAll("[^a-zA-Z0-9]", "_") + "." + MimeTypeMap.getFileExtensionFromUrl(URLUtil.guessFileName(url,null,null));
+        if (video.getFiles().size() > 0)
+        {
+            String url = video.getFiles().get( 0 ).getFileDownloadUrl();
+            // make sure it is a valid filename
+            String destFilename = video.getName().replaceAll( "[^a-zA-Z0-9]", "_" ) + "." + MimeTypeMap.getFileExtensionFromUrl( URLUtil.guessFileName( url, null, null ) );
 
-        //Toast.makeText(context, destFilename, Toast.LENGTH_LONG).show();
-        DownloadManager.Request request = new DownloadManager.Request(Uri.parse(url));
-        request.setDescription(video.getDescription());
-        request.setTitle(video.getName());
-        request.allowScanningByMediaScanner();
-        request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
-        request.setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, destFilename);
+            //Toast.makeText(context, destFilename, Toast.LENGTH_LONG).show();
+            DownloadManager.Request request = new DownloadManager.Request( Uri.parse( url ) );
+            request.setDescription( video.getDescription() );
+            request.setTitle( video.getName() );
+            request.allowScanningByMediaScanner();
+            request.setNotificationVisibility( DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED );
+            request.setDestinationInExternalPublicDir( Environment.DIRECTORY_DOWNLOADS, destFilename );
 
-        // get download service and enqueue file
-        DownloadManager manager = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
-        manager.enqueue(request);
+            // get download service and enqueue file
+            DownloadManager manager = (DownloadManager) context.getSystemService( Context.DOWNLOAD_SERVICE );
+            manager.enqueue( request );
+        } else {
+            Toast.makeText( context, R.string.api_error, Toast.LENGTH_LONG ).show();
+        }
     }
 }
diff --git a/app/src/main/java/net/schueller/peertube/network/GetServerListDataService.java b/app/src/main/java/net/schueller/peertube/network/GetServerListDataService.java
index bdb8a26..eb2d431 100644
--- a/app/src/main/java/net/schueller/peertube/network/GetServerListDataService.java
+++ b/app/src/main/java/net/schueller/peertube/network/GetServerListDataService.java
@@ -27,7 +27,8 @@ public interface GetServerListDataService {
     @GET("instances/")
     Call<ServerList> getInstancesData(
             @Query("start") int start,
-            @Query("count") int count
+            @Query("count") int count,
+            @Query("search") String text
     );
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/service/VideoPlayerService.java b/app/src/main/java/net/schueller/peertube/service/VideoPlayerService.java
index b01ab4d..94414d7 100644
--- a/app/src/main/java/net/schueller/peertube/service/VideoPlayerService.java
+++ b/app/src/main/java/net/schueller/peertube/service/VideoPlayerService.java
@@ -33,6 +33,7 @@ import android.os.Binder;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
+import android.webkit.URLUtil;
 import androidx.annotation.Nullable;
 
 import android.support.v4.media.MediaDescriptionCompat;
@@ -70,21 +71,25 @@ import static net.schueller.peertube.activity.VideoListActivity.EXTRA_VIDEOID;
 public class VideoPlayerService extends Service {
 
     private static final String TAG = "VideoPlayerService";
+
     private static final String MEDIA_SESSION_TAG = "peertube_player";
 
     private final IBinder mBinder = new LocalBinder();
 
     private static final String PLAYBACK_CHANNEL_ID = "playback_channel";
+
     private static final Integer PLAYBACK_NOTIFICATION_ID = 1;
 
     public SimpleExoPlayer player;
 
     private Video currentVideo;
+
     private String currentStreamUrl;
 
     private PlayerNotificationManager playerNotificationManager;
 
     private IntentFilter becomeNoisyIntentFilter = new IntentFilter(AudioManager.ACTION_AUDIO_BECOMING_NOISY);
+
     private BecomingNoisyReceiver myNoisyAudioStreamReceiver = new BecomingNoisyReceiver();
 
     @Override
@@ -105,13 +110,13 @@ public class VideoPlayerService extends Service {
                     registerReceiver(myNoisyAudioStreamReceiver, becomeNoisyIntentFilter);
                 }
 
-                if (playbackState == ACTION_PLAY) { // this means that play is available, hence the audio is paused or stopped
+                if (playbackState
+                        == ACTION_PLAY) { // this means that play is available, hence the audio is paused or stopped
                     Log.v(TAG, "ACTION_PAUSE: " + playbackState);
-                    unregisterReceiver(myNoisyAudioStreamReceiver);
-                    myNoisyAudioStreamReceiver=null;
+                    safeUnregisterReceiver();
                 }
             }
-        } );
+        });
 
     }
 
@@ -131,14 +136,9 @@ public class VideoPlayerService extends Service {
         if (playerNotificationManager != null) {
             playerNotificationManager.setPlayer(null);
         }
-        //Was seeing an error when exiting the program about about not unregistering the receiver.
-        try {
-            if (null!=myNoisyAudioStreamReceiver) {
-                this.unregisterReceiver(myNoisyAudioStreamReceiver);
-            }
-        } catch (Exception e) {
-            Log.e("VideoPlayerService", "attempted to unregister a nonregistered service");
-        }
+        //Was seeing an error when exiting the program about not unregistering the receiver.
+        safeUnregisterReceiver();
+
         if (player != null) {
             player.release();
             player = null;
@@ -146,6 +146,15 @@ public class VideoPlayerService extends Service {
         super.onDestroy();
     }
 
+    private void safeUnregisterReceiver()
+    {
+        try {
+            unregisterReceiver(myNoisyAudioStreamReceiver);
+        } catch (Exception e) {
+            Log.e("VideoPlayerService", "attempted to unregister a nonregistered service");
+        }
+    }
+
     @Nullable
     @Override
     public IBinder onBind(Intent intent) {
@@ -156,22 +165,23 @@ public class VideoPlayerService extends Service {
     public int onStartCommand(Intent intent, int flags, int startId) {
         Context context = this;
         Log.v(TAG, "onStartCommand...");
-        if(currentStreamUrl == null){
-            Toast.makeText(context, "currentStreamUrl must not null", Toast.LENGTH_SHORT).show();
+
+        if (!URLUtil.isValidUrl(currentStreamUrl)) {
+            Toast.makeText(context, "Invalid URL provided. Unable to play video.", Toast.LENGTH_SHORT).show();
+            return START_NOT_STICKY;
+        } else {
+            playVideo();
+            return START_STICKY;
         }
-        playVideo();
-        return START_STICKY;
     }
 
 
-    public void setCurrentVideo(Video video)
-    {
+    public void setCurrentVideo(Video video) {
         Log.v(TAG, "setCurrentVideo...");
         currentVideo = video;
     }
 
-    public void setCurrentStreamUrl(String streamUrl)
-    {
+    public void setCurrentStreamUrl(String streamUrl) {
         Log.v(TAG, "setCurrentStreamUrl..." + streamUrl);
         currentStreamUrl = streamUrl;
     }
@@ -184,6 +194,7 @@ public class VideoPlayerService extends Service {
 
     /**
      * Returns the current playback speed of the player.
+     *
      * @return the current playback speed of the player.
      */
     public float getPlayBackSpeed() {
@@ -193,6 +204,8 @@ public class VideoPlayerService extends Service {
     public void playVideo() {
         Context context = this;
 
+        // We need a valid URL
+
         Log.v(TAG, "playVideo...");
 
         // Produces DataSource instances through which media data is loaded.
@@ -242,7 +255,8 @@ public class VideoPlayerService extends Service {
 
                     @Nullable
                     @Override
-                    public Bitmap getCurrentLargeIcon(Player player, PlayerNotificationManager.BitmapCallback callback) {
+                    public Bitmap getCurrentLargeIcon(Player player,
+                            PlayerNotificationManager.BitmapCallback callback) {
                         return null;
                     }
                 }
@@ -297,15 +311,16 @@ public class VideoPlayerService extends Service {
 
         // Audio Focus
         AudioAttributes audioAttributes = new AudioAttributes.Builder()
-            .setUsage(C.USAGE_MEDIA)
-            .setContentType(C.CONTENT_TYPE_MOVIE)
-            .build();
-        player.setAudioAttributes(audioAttributes,true);
+                .setUsage(C.USAGE_MEDIA)
+                .setContentType(C.CONTENT_TYPE_MOVIE)
+                .build();
+        player.setAudioAttributes(audioAttributes, true);
 
     }
 
     // pause playback on audio output change
     private class BecomingNoisyReceiver extends BroadcastReceiver {
+
         @Override
         public void onReceive(Context context, Intent intent) {
             if (AudioManager.ACTION_AUDIO_BECOMING_NOISY.equals(intent.getAction())) {
diff --git a/app/src/main/res/layout/activity_search_server.xml b/app/src/main/res/layout/activity_search_server.xml
index 1860129..991e091 100644
--- a/app/src/main/res/layout/activity_search_server.xml
+++ b/app/src/main/res/layout/activity_search_server.xml
@@ -6,6 +6,11 @@
     android:layout_height="match_parent"
     tools:context=".activity.SearchServerActivity">
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar_server_selection"
         android:layout_width="match_parent"
@@ -29,11 +34,19 @@
         android:text="@string/no_data_available"
         android:visibility="gone" />
 
+
+    <EditText
+        android:id="@+id/search_server_input_field"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="@string/server_selection_filter_hint"
+        android:singleLine="true"
+        android:imeOptions="actionGo"/>
+
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/serversSwipeRefreshLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_below="@+id/appbar_server_selection"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <androidx.recyclerview.widget.RecyclerView
@@ -45,5 +58,5 @@
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
-
+    </LinearLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_video_meta.xml b/app/src/main/res/layout/fragment_video_meta.xml
index f734fe4..229eeaa 100644
--- a/app/src/main/res/layout/fragment_video_meta.xml
+++ b/app/src/main/res/layout/fragment_video_meta.xml
@@ -194,6 +194,7 @@
         android:layout_marginStart="18dp"
         android:layout_marginTop="12dp"
         android:layout_marginEnd="12dp"
+        android:autoLink="web"
         android:textAppearance="@style/Base.TextAppearance.AppCompat.Body1" />
 
     <LinearLayout
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index c19c6ff..bcb0d58 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -86,6 +86,7 @@
     <string name="server_selection_set_server">Serveur réglé sur : %s</string>
     <string name="server_selection_select_a_server">Sélectionnez un serveur de la liste ci-dessous ou entrez-le directement.</string>
     <string name="server_selection_peertube_server_url">URL du serveur PeerTube</string>
+    <string name="server_selection_filter_hint">Filtrer la liste</string>
     <string name="title_activity_account">Compte</string>
     <string name="menu_video_more_report">Signaler</string>
     <string name="menu_video_more_blacklist">Liste noire</string>
@@ -109,6 +110,7 @@
     <string name="account_about_description">Description :</string>
     <string name="account_about_joined">Inscrit·e le :</string>
     <string name="api_error">Quelque chose s’est mal passé, veuillez essayer plus tard !</string>
+    <string name="network_error">Problème réseau, veuillez vérifier votre connection</string>
     <string name="action_bar_title_server_selection">Sélectionnez un serveur</string>
     <string name="ab">abkhaze</string>
     <string name="aa">afar</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index ae96838..2150f0c 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -316,4 +316,33 @@
     <string name="clear_search_history">Cancella la cronologia delle ricerche</string>
     <string name="pref_description_language_app">Seleziona la lingua per l\'interfaccia dell\'applicazione. Riavvia l\'app per rendere effettive le modifiche.</string>
     <string name="pref_language_app">Lingua dell\'applicazione</string>
+    <string name="pref_background_behavior_summary">Come la riproduzione video risponde quando va in sottofondo</string>
+    <string name="authentication_token_refresh_success">Token aggiornato</string>
+    <string name="authentication_token_refresh_failed">Impossibile aggiornare il token</string>
+    <string name="pref_title_buildtime">Tempo di costruzione</string>
+    <string name="menu_video_options_quality_automated">Automatico</string>
+    <string name="server_selection_video_totals">Videos: %s, Video locali: %s</string>
+    <string name="server_selection_nsfw_instance">Instanza NSFW</string>
+    <string name="settings_activity_look_and_feel_category_title">Aspetto</string>
+    <string name="settings_activity_about_category_title">Info</string>
+    <string name="settings_activity_video_playback_category_title">Riproduzione video</string>
+    <string name="settings_activity_video_list_category_title">Lista dei video</string>
+    <string name="title_activity_settings2">ImpostazioniAttività2</string>
+    <string name="title_activity_me">Account</string>
+    <string name="title_activity_select_server">Cerca server</string>
+    <string name="server_book_del_alert_msg">Sicuro di voler rimuovere questo server dalla rubrica\?</string>
+    <string name="server_book_del_alert_title">Server remoto</string>
+    <string name="title_activity_server_address_book">Rubrica</string>
+    <string name="server_book_add_label">Etichetta</string>
+    <string name="server_book_label_is_required">L\'etichetta del server è obbligatoria</string>
+    <string name="hello_blank_fragment">Ciao frammento vuoto</string>
+    <string name="bn_rBD">Bengalese (Bangladesh)</string>
+    <string name="settings_permissions_error_float">Il permesso della modalità Picture-in-Picture è disattivata per questa app nelle impostazioni Android</string>
+    <string name="settings_api_error_float">Questa versione di Android non supporta la lettura fluttuante del video</string>
+    <string name="pref_background_behavior">Configurazione della lettura in sottfondo</string>
+    <string name="pref_background_float">Continua riproduzione in una finestra fluttuante</string>
+    <string name="pref_background_stop">Ferma la lettura video</string>
+    <string name="pref_background_audio">Continua come flusso sonoro in sottofondo</string>
+    <string name="pref_description_back_pause">Metti la riproduzione di sottofondo in pausa quando premi il tasto indietro durante la lettura del video.</string>
+    <string name="pref_title_back_pause">Pausa sul tasto backspace</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index a6b3dae..4ac7419 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -1,2 +1,348 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources>
+    <string name="pref_background_stop">Parar toda a reprodução</string>
+    <string name="ak">Akan</string>
+    <string name="sfs">Língua de sinais sul-africana</string>
+    <string name="nb">Bokmål norueguês</string>
+    <string name="ve">Venda</string>
+    <string name="title_activity_search">Busca</string>
+    <string name="prompt_email">Email / Nome de utilizador</string>
+    <string name="search_hint">Busca no PeerTube</string>
+    <string name="be">Belarusian</string>
+    <string name="error_field_required">Este campo é obrigatório</string>
+    <string name="uz">Uzbeque</string>
+    <string name="title_activity_select_server">Busca servidor</string>
+    <string name="ty">Taitiano</string>
+    <string name="invalid_url">URL inválido.</string>
+    <string name="zh">Chinês</string>
+    <string name="pref_title_dark_mode">Tema Oscuro</string>
+    <string name="server_book_add_label">Nome Identificador</string>
+    <string name="ca">Catalan</string>
+    <string name="tg">Tajik</string>
+    <string name="fi">Finnish</string>
+    <string name="to">Tonga (Ilhas Tonga)</string>
+    <string name="bottom_nav_title_subscriptions">Subscrições</string>
+    <string name="error_invalid_password">Esta palavra-passe é muito curta</string>
+    <string name="bottom_nav_title_account">Conta</string>
+    <string name="ru">Russo</string>
+    <string name="fy">Frisiano Ocidental</string>
+    <string name="server_book_add_username">Nome do utilizador</string>
+    <string name="me_logout_button">Sair</string>
+    <string name="settings_activity_video_list_category_title">Lista de vídeos</string>
+    <string name="kw">Cornish</string>
+    <string name="bo">Tibetano</string>
+    <string name="indigo">Índigo</string>
+    <string name="video_download_permission_error">Não é possível fazer o download do vídeo sem permissão de gravação</string>
+    <string name="video_speed_20">2x</string>
+    <string name="as">Assamese</string>
+    <string name="pref_title_peertube_server">Servidor de PeerTube</string>
+    <string name="authentication_login_failed">Login Falhou!</string>
+    <string name="fa">Persa</string>
+    <string name="video_speed_05">0.5x</string>
+    <string name="bottom_nav_title_local">Local</string>
+    <string name="eo">Esperanto</string>
+    <string name="li">Limburgan</string>
+    <string name="video_rating_failed">Classificação falhou</string>
+    <string name="pref_title_background_play">Reprodução no fundo</string>
+    <string name="cse">Língua de sinais tcheca</string>
+    <string name="ny">Nyanja</string>
+    <string name="ar">Arabic</string>
+    <string name="ks">Kashmiri</string>
+    <string name="csl">Língua chinesa de sinais</string>
+    <string name="kr">Kanuri</string>
+    <string name="uk">Ucraniano</string>
+    <string name="fo">Faroese</string>
+    <string name="video_row_video_thumbnail">Miniatura do vídeo</string>
+    <string name="settings_permissions_error_float">A permissão Picture-in-Picture está desativada para este aplicação nas Configurações do Android</string>
+    <string name="pl">Polonês</string>
+    <string name="menu_video_options_quality" formatted="true">Qualidade (%1$s)</string>
+    <string name="ba">Bashkir</string>
+    <string name="lo">Lao</string>
+    <string name="my">Burmese</string>
+    <string name="kj">Kuanyama</string>
+    <string name="ki">Kikuyu</string>
+    <string name="pref_description_dark_mode">Reinicie o aplicação para que o Tema Escuro tenha efeito.</string>
+    <string name="tlh">Klingon</string>
+    <string name="id">Indonésio</string>
+    <string name="jsl">Língua japonesa de sinais</string>
+    <string name="en">Inglês</string>
+    <string name="server_book_del_alert_msg">Tem certeza que quer remover este servidor da lista de contatos\?</string>
+    <string name="vi">Vietnamita</string>
+    <string name="amber">Âmbar</string>
+    <string name="account_about_subscribers">Assinantes:</string>
+    <string name="action_bar_title_settings">Configurações</string>
+    <string name="om">Oromo</string>
+    <string name="an">Aragonese</string>
+    <string name="wa">Walloon</string>
+    <string name="gd">Gaélico escocês</string>
+    <string name="login_current_server_hint">Servidor atual</string>
+    <string name="pref_description_torrent_player">Reprodução de torrent vídeo. Isto requer permissões de armazenamento. (Alfa, não estável!)</string>
+    <string name="br">Breton</string>
+    <string name="ch">Chamorro</string>
+    <string name="menu_share">Compartilhar</string>
+    <string name="ff">Fulah</string>
+    <string name="pref_language_app">Idioma do aplicação</string>
+    <string name="no">Norueguês</string>
+    <string name="pks">Língua de sinais do Paquistão</string>
+    <string name="server_selection_nsfw_instance">Servidor NSFW</string>
+    <string name="deeppurple">Púrpura profunda</string>
+    <string name="nn">Norueguês Nynorsk</string>
+    <string name="ml">Malayalam</string>
+    <string name="fr">Francês</string>
+    <string name="os">Ossetian</string>
+    <string name="video_speed_075">0.75x</string>
+    <string name="video_meta_button_privacy">Privacidade</string>
+    <string name="mg">Malagasy</string>
+    <string name="sm">Samoan</string>
+    <string name="account_about_description">Descrição:</string>
+    <string name="sdl">Língua de sinais da Arábia Saudita</string>
+    <string name="prompt_server">Servidor</string>
+    <string name="mt">Maltês</string>
+    <string name="blue">Azul</string>
+    <string name="hello_blank_fragment">Olá secção em branco</string>
+    <string name="action_bar_title_account">Conta</string>
+    <string name="ta">Tamil</string>
+    <string name="kl">Kalaallisut</string>
+    <string name="km">Khmer</string>
+    <string name="video_row_account_avatar">Avatar da conta</string>
+    <string name="nr">Ndebele do Sul</string>
+    <string name="pref_description_language">Selecione um idioma de vídeo, em vez de mostrar todos os vídeos em todos os idiomas.</string>
+    <string name="server_book_no_servers_found">O Servidor de Reservas está vazio</string>
+    <string name="purple">Púrpura</string>
+    <string name="settings_api_error_float">A versão de Android não suporta vídeo flutuante</string>
+    <string name="se">Sami do Norte</string>
+    <string name="title_activity_login">Entrar</string>
+    <string name="video_meta_button_category">Categoria</string>
+    <string name="pref_description_background_play">Se ativado, continua a reprodução de vídeo no fundo.</string>
+    <string name="cv">Chuvash</string>
+    <string name="hz">Herero</string>
+    <string name="server_book_del_alert_title">Remover servidor</string>
+    <string name="pref_title_license">Licença</string>
+    <string name="settings_activity_video_playback_category_title">Reprodução de vídeo</string>
+    <string name="bzs">Língua Brasileira de Sinais</string>
+    <string name="am">Amharic</string>
+    <string name="hr">Croatian</string>
+    <string name="mh">Marshallese</string>
+    <string name="kv">Komi</string>
+    <string name="gsg">Língua Alemã de Sinais</string>
+    <string name="meta_data_views">" Visualizações"</string>
+    <string name="bluegray">Bluegray</string>
+    <string name="na">Nauru</string>
+    <string name="ee">Ewe</string>
+    <string name="sv">Sueco</string>
+    <string name="title_activity_server_address_book">Lista de contactos</string>
+    <string name="ku">Curdo</string>
+    <string name="yellow">Amarelo</string>
+    <string name="title_activity_url_video_play">UrlVideoPlayActivity</string>
+    <string name="server_selection_signup_allowed_yes">Sim</string>
+    <string name="server_selection_set_server">Servidor configurado para: %s</string>
+    <string name="ky">Kirghiz</string>
+    <string name="gray">Cinza</string>
+    <string name="pref_background_behavior_summary">Como um vídeo em reprodução responde quando vai para o fundo</string>
+    <string name="title_activity_account">Conta</string>
+    <string name="action_set_url">Selecione o servidor</string>
+    <string name="server_selection_peertube_server_url">URL do servidor de PeerTube</string>
+    <string name="video_meta_button_share">Compartilhar</string>
+    <string name="ps">Pushto</string>
+    <string name="hy">Armenian</string>
+    <string name="sg">Sango</string>
+    <string name="oc">Occitan</string>
+    <string name="clear_search_history_prompt">Quer apagar permanentemente o histórico de busca\?</string>
+    <string name="dsl">Língua de sinais dinamarquesa</string>
+    <string name="prompt_password">Palavra-passe</string>
+    <string name="su">Sundanese</string>
+    <string name="bn">Bengali</string>
+    <string name="video_speed_125">1.25x</string>
+    <string name="ms">Malay (macrolanguage)</string>
+    <string name="gu">Gujarati</string>
+    <string name="aa">Afar</string>
+    <string name="avk">Kotava</string>
+    <string name="bottom_nav_title_discover">Descobrir</string>
+    <string name="account_bottom_menu_channels">Canais</string>
+    <string name="pref_description_app_theme">Reinicie a aplicação para que o tema tenha efeito.</string>
+    <string name="sr">Sérvio</string>
+    <string name="ts">Tsonga</string>
+    <string name="pref_background_behavior">Configuração da reprodução no fundo</string>
+    <string name="ht">Haitiano</string>
+    <string name="server_book_valid_url_is_required">URL válido é requerido</string>
+    <string name="account_bottom_menu_about">Sobre</string>
+    <string name="error_invalid_email">Este e-mail é inválido</string>
+    <string name="th">Tailandês</string>
+    <string name="rn">Rundi</string>
+    <string name="cs">Czech</string>
+    <string name="nv">Navajo</string>
+    <string name="gn">Guarani</string>
+    <string name="pa">Panjabi</string>
+    <string name="server_book_label_is_required">Categoria do servidor é requerido</string>
+    <string name="lb">Luxemburguês</string>
+    <string name="sc">Sardo</string>
+    <string name="deeporange">Laranja Profunda</string>
+    <string name="pref_background_audio">Continuar como um Stream de áudio no fundo</string>
+    <string name="descr_overflow_button">Mais</string>
+    <string name="menu_video_more_blacklist">Lista negra</string>
+    <string name="pref_description_language_app">Selecione o idioma para a interface da aplicação. Reinicie a aplicação para que a alteração tenha efeito.</string>
+    <string name="pref_description_show_nsfw">Mostrar conteúdo NSFW</string>
+    <string name="da">Danish</string>
+    <string name="lightgreen">Verde claro</string>
+    <string name="ig">Igbo</string>
+    <string name="ab">Abkhazian</string>
+    <string name="pt">Português</string>
+    <string name="title_activity_settings2">SettingsActivity2</string>
+    <string name="tn">Tswana</string>
+    <string name="rsl">Língua de sinais russa</string>
+    <string name="ay">Aymara</string>
+    <string name="action_bar_title_logout">Sair</string>
+    <string name="action_sign_in_short">Entrar</string>
+    <string name="sd">Sindhi</string>
+    <string name="authentication_token_refresh_success">Token atualizado</string>
+    <string name="bg">Bulgarian</string>
+    <string name="pref_title_app_theme">Tema do App</string>
+    <string name="hi">Hindi</string>
+    <string name="authentication_login_success">Logado</string>
+    <string name="cy">Galês</string>
+    <string name="bs">Bosnian</string>
+    <string name="action_bar_title_server_selection">Selecione o servidor</string>
+    <string name="za">Zhuang</string>
+    <string name="qu">Quechua</string>
+    <string name="pref_title_back_pause">Pausa no clicar botão voltar</string>
+    <string name="sh">Servo-Croata</string>
+    <string name="video_speed_15">1.5x</string>
+    <string name="bfi">Língua de sinais britânica</string>
+    <string name="ase">Linguagem dos sinais americana</string>
+    <string name="clear_search_history">Limpiar todo histórico de busca</string>
+    <string name="menu_video_more_report">Relatar</string>
+    <string name="bi">Bislama</string>
+    <string name="ro">Romeno</string>
+    <string name="rw">Kinyarwanda</string>
+    <string name="permission_rationale">Conceda permissão de contato para preenchimento de e-mail.</string>
+    <string name="ka">Georgian</string>
+    <string name="no_data_available">Sem resultados</string>
+    <string name="is">Islandês</string>
+    <string name="zu">Zulu</string>
+    <string name="ho">Hiri Motu</string>
+    <string name="cr">Cree</string>
+    <string name="sk">Eslovaco</string>
+    <string name="title_activity_settings">Configurações</string>
+    <string name="jv">Javanese</string>
+    <string name="server_book_add_server_url">URL do servidor</string>
+    <string name="dv">Dhivehi</string>
+    <string name="menu_video_options_quality_automated">Automático</string>
+    <string name="video_login_required_for_service">Deve fazer o login para usar este serviço</string>
+    <string name="ne">Nepalês (macrolinguagem)</string>
+    <string name="tt">Tatar</string>
+    <string name="pref_language">Filtro de idiomas</string>
+    <string name="hu">Húngaro</string>
+    <string name="af">Afrikaans</string>
+    <string name="account_bottom_menu_videos">Vídeos</string>
+    <string name="ha">Hausa</string>
+    <string name="pref_title_torrent_player">Reprodutor de Torrent Vídeos</string>
+    <string name="swl">Língua Sueca de Sinais</string>
+    <string name="settings_activity_look_and_feel_category_title">Visual e Funcionalidade</string>
+    <string name="ik">Inupiaq</string>
+    <string name="yi">Yiddish</string>
+    <string name="av">Avaric</string>
+    <string name="rm">Romanche</string>
+    <string name="es">Espanhol</string>
+    <string name="title_activity_me">Conta</string>
+    <string name="ln">Lingala</string>
+    <string name="video_meta_button_license">Licença</string>
+    <string name="it">Italiano</string>
+    <string name="teal">Teal</string>
+    <string name="mr">Marathi</string>
+    <string name="ur">Urdu</string>
+    <string name="pref_description_license">"
+\n&lt;b&gt;GNU Affero Licença Pública Geral v3.0&lt;/b&gt;
+\n
+\nAs permissões desta licença mais forte de copyleft estão condicionadas a disponibilizar o código fonte completo de obras licenciadas e modificações, que incluem obras maiores usando uma obra licenciada, sob a mesma licença. Os avisos de direitos autorais e de licença devem ser preservados. Os contribuidores fornecem uma concessão expressa de direitos de patente. Quando uma versão modificada é usada para fornecer um serviço através de uma rede, o código-fonte completo da versão modificada deve ser disponibilizado."<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="si">Sinhala</string>
+    <string name="video_speed_10">Normal</string>
+    <string name="pref_title_version">Versão</string>
+    <string name="nd">Ndebele do Norte</string>
+    <string name="kg">Kongo</string>
+    <string name="he">Hebraico</string>
+    <string name="et">Estonian</string>
+    <string name="so">Somali</string>
+    <string name="te">Telugu</string>
+    <string name="server_book_list_has_login">Tem login</string>
+    <string name="lu">Luba-Katanga</string>
+    <string name="mn">Mongol</string>
+    <string name="error_incorrect_password">Esta palavra-passe está incorreta</string>
+    <string name="pref_title_show_nsfw">Conteúdo NSFW</string>
+    <string name="bn_rBD">Bengali (Bangladesh)</string>
+    <string name="tr">Turco</string>
+    <string name="dz">Dzongkha</string>
+    <string name="account_about_account">Conta:</string>
+    <string name="jbo">Lojban</string>
+    <string name="settings_activity_about_category_title">Sobre</string>
+    <string name="pref_background_float">Continuar reproduzindo vídeo na janela flutuante</string>
+    <string name="bm">Bambara</string>
+    <string name="action_bar_title_search">Busca</string>
+    <string name="ss">Swati</string>
+    <string name="tl">Tagalog</string>
+    <string name="server_book_add_pick_server_button">Busca</string>
+    <string name="red">Vermelho</string>
+    <string name="wo">Wolof</string>
+    <string name="bottom_nav_title_trending">Tendências</string>
+    <string name="server_selection_signup_allowed">Inscrição permitida: %s</string>
+    <string name="az">Azerbaijani</string>
+    <string name="lightblue">Azul claro</string>
+    <string name="cyan">Ciano</string>
+    <string name="gl">Galician</string>
+    <string name="server_book_add_add_button">Adicionar</string>
+    <string name="oj">Ojibwa</string>
+    <string name="ko">Coreano</string>
+    <string name="st">Sotho do Sul</string>
+    <string name="lime">Lime</string>
+    <string name="xh">Xhosa</string>
+    <string name="mk">Macedônio</string>
+    <string name="me_help_and_feedback_button">Ajuda e Opiniões</string>
+    <string name="yo">Yoruba</string>
+    <string name="co">Corsican</string>
+    <string name="sq">Albanian</string>
+    <string name="de">Alemão</string>
+    <string name="iu">Inuktitut</string>
+    <string name="video_meta_button_tags">Categorias</string>
+    <string name="ja">Japonês</string>
+    <string name="ce">Chechen</string>
+    <string name="kn">Kannada</string>
+    <string name="eu">Basque</string>
+    <string name="action_sign_in">Entrar</string>
+    <string name="sl">Esloveno</string>
+    <string name="pref_title_buildtime">Build Time</string>
+    <string name="ti">Tigrinya</string>
+    <string name="nl">Dutch</string>
+    <string name="mi">Maori</string>
+    <string name="authentication_token_refresh_failed">Não foi possível atualizar o token</string>
+    <string name="account_about_joined">Membro desde:</string>
+    <string name="video_meta_button_language">Idioma</string>
+    <string name="green">Verde</string>
+    <string name="lt">Lituano</string>
+    <string name="orange">Laranja</string>
+    <string name="lv">Letão</string>
+    <string name="fsl">Língua de sinais francesa</string>
+    <string name="video_meta_button_download">Descarregar</string>
+    <string name="server_selection_signup_allowed_no">Não</string>
+    <string name="server_book_add_password">Palavra-passe</string>
+    <string name="ga">Irlandês</string>
+    <string name="bottom_nav_title_recent">Recente</string>
+    <string name="sw">Swahili (macrolinguagem)</string>
+    <string name="menu_video_options_playback_speed" formatted="true">Velocidade de reprodução (%1$s)</string>
+    <string name="tk">Turcomeno</string>
+    <string name="ug">Uighur</string>
+    <string name="api_error">Algo deu errado, por favor tente mais tarde!</string>
+    <string name="tw">Twi</string>
+    <string name="fj">Fijian</string>
+    <string name="brown">Marrom</string>
+    <string name="server_selection_video_totals">Vídeos: %s, Vídeos locais: %s</string>
+    <string name="sn">Shona</string>
+    <string name="kk">Kazakh</string>
+    <string name="pref_description_back_pause">Pausar a reprodução no fundo ao pressionar botão voltar durante a reprodução do vídeo.</string>
+    <string name="ii">Sichuan Yi</string>
+    <string name="pink">Cor-de-rosa</string>
+    <string name="or">Oriya (macrolanguage)</string>
+    <string name="gv">Manx</string>
+    <string name="ng">Ndonga</string>
+    <string name="el">Grego moderno (1453-)</string>
+    <string name="server_selection_select_a_server">Selecione um servidor da lista abaixo ou digite-o diretamente.</string>
+    <string name="lg">Ganda</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 2da25c3..7fdeaea 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -87,7 +87,7 @@
     <string name="lo">老挝语</string>
     <string name="el">现代希腊语（1453年—）</string>
     <string name="mn">蒙古语</string>
-    <string name="or">奥里亚语</string>
+    <string name="or">奥里亚语 (巨集语言)</string>
     <string name="ru">俄语</string>
     <string name="si">僧伽罗字母</string>
     <string name="es">西班牙语</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4636d89..d961bc3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -292,6 +292,7 @@
     <string name="server_selection_set_server">Server set to: %s</string>
     <string name="server_selection_select_a_server">Select a server from the list below or enter it directly.</string>
     <string name="server_selection_peertube_server_url">PeerTube Server URL</string>
+    <string name="server_selection_filter_hint">Filter list</string>
     <string name="title_activity_account">Account</string>
     <string name="menu_video_more_report">Report</string>
     <string name="menu_video_more_blacklist">Blacklist</string>
@@ -315,6 +316,7 @@
     <string name="account_about_description">Description:</string>
     <string name="account_about_joined">Joined:</string>
     <string name="api_error">Something went wrong, please try later!</string>
+    <string name="network_error">Network access error, please check your connectivity</string>
     <string name="action_bar_title_server_selection">Select Server</string>
     <string name="hello_blank_fragment">Hello blank fragment</string>
     <string name="action_bar_title_address_book"/>
diff --git a/fastlane/metadata/android/en-US/changelogs/1048.txt b/fastlane/metadata/android/en-US/changelogs/1048.txt
new file mode 100644
index 0000000..b297db6
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/1048.txt
@@ -0,0 +1 @@
+ - f-droid release to fix auto deployment
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/1049.txt b/fastlane/metadata/android/en-US/changelogs/1049.txt
new file mode 100644
index 0000000..542db4b
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/1049.txt
@@ -0,0 +1,7 @@
+ - add support of hypertext redirection in description (@freeboub)
+ - various crash fixes (@freeboub)
+ - avoid going to pip when leaving the app due to share button (@freeboub)
+ - Add ability to filter server list (@freeboub)
+ - Refactor Toast error management to split network error (@freeboub)
+ - keep video aspect ratio for pip (@freeboub)
+ - navigation bar was not restored when leaving landscape mode (@freeboub)
\ No newline at end of file
diff --git a/fastlane/metadata/android/fr/changelogs/1047.txt b/fastlane/metadata/android/fr/changelogs/1047.txt
new file mode 100644
index 0000000..6c7752d
--- /dev/null
+++ b/fastlane/metadata/android/fr/changelogs/1047.txt
@@ -0,0 +1 @@
+- Rafraîchissement de l'authentification
diff --git a/fastlane/metadata/android/fr/short_description.txt b/fastlane/metadata/android/fr/short_description.txt
new file mode 100644
index 0000000..baf2ce7
--- /dev/null
+++ b/fastlane/metadata/android/fr/short_description.txt
@@ -0,0 +1 @@
+Thorium est un lecteur non-officiel de PeerTube
diff --git a/fastlane/metadata/android/fr/video.txt b/fastlane/metadata/android/fr/video.txt
new file mode 100644
index 0000000..5824a09
--- /dev/null
+++ b/fastlane/metadata/android/fr/video.txt
@@ -0,0 +1 @@
+https://www.youtube.com/watch?v=PJIsiuSdpq8
diff --git a/fastlane/metadata/android/nb_NO/changelogs/1047.txt b/fastlane/metadata/android/nb_NO/changelogs/1047.txt
new file mode 100644
index 0000000..da6d7a2
--- /dev/null
+++ b/fastlane/metadata/android/nb_NO/changelogs/1047.txt
@@ -0,0 +1 @@
+- Gjenoppfrisking av identitetsbekreftelse
diff --git a/fastlane/metadata/android/nb_NO/short_description.txt b/fastlane/metadata/android/nb_NO/short_description.txt
new file mode 100644
index 0000000..fb1d0e5
--- /dev/null
+++ b/fastlane/metadata/android/nb_NO/short_description.txt
@@ -0,0 +1 @@
+Uoffisiell PeerTube-klient
diff --git a/fastlane/metadata/android/nb_NO/title.txt b/fastlane/metadata/android/nb_NO/title.txt
new file mode 100644
index 0000000..d639724
--- /dev/null
+++ b/fastlane/metadata/android/nb_NO/title.txt
@@ -0,0 +1 @@
+Thorium
diff --git a/fastlane/metadata/android/ru/changelogs/1047.txt b/fastlane/metadata/android/ru/changelogs/1047.txt
new file mode 100644
index 0000000..850da59
--- /dev/null
+++ b/fastlane/metadata/android/ru/changelogs/1047.txt
@@ -0,0 +1 @@
+- Обновление аутентификации
diff --git a/fastlane/metadata/android/ru/full_description.txt b/fastlane/metadata/android/ru/full_description.txt
new file mode 100644
index 0000000..440bf70
--- /dev/null
+++ b/fastlane/metadata/android/ru/full_description.txt
@@ -0,0 +1,33 @@
+Thorium - это клиент PeerTube, который может подключаться к любому серверу Peertube с версией v1.1.0-alpha.2 или выше.
+
+PeerTube - это федеративная (ActivityPub) платформа потокового видео, использующая P2P (BitTorrent) непосредственно в веб-браузере. Для получения дополнительной информации посетите https://joinpeertube.org/, чтобы получить дополнительную информацию и список серверов.
+
+Этот клиент поставляется с предварительно сконфигурированным одним сервером PeerTube, управляемым создателем приложения, а не самим проектом PeerTube, подробности которого перечислены на http://instances.joinpeertube.org/, чтобы вы могли почувствовать, на что способен клиент. Выберите свой сервер, чтобы настроить свой опыт!
+
+Текущие возможности:
+- Подключиться к любому серверу PeerTube
+- Торрент-видео или прямое воспроизведение
+- Поиск в PeerTube
+- Скачать / поделиться видео
+- Темы / Темный режим
+- Фоновое воспроизведение
+- Полноэкранное воспроизведение в альбомной ориентации
+- Скорость воспроизведения
+- Фильтр содержимого NSFW
+- Аутентификация / Вход
+- Лайк / дизлайк видео
+
+Скоро:
+- Комментировать видео
+- Регистр
+- Страница обзора пользователя / канала
+- Пожаловаться на видео
+
+Разрешения:
+- Доступ к хранилищу, необходимый для скачивания через торрент или видео.
+
+Под лицензией GNU Affero General Public License v3.0
+
+Разрешения этой сильнейшей лицензии с авторским левом обусловлены предоставлением полного исходного кода лицензионных произведений и модификаций, которые включают более крупные произведения с использованием лицензионных произведений, по той же лицензии. Уведомления об авторских правах и лицензии должны быть сохранены. Соавторы предоставляют явное предоставление патентных прав. Когда измененная версия используется для предоставления услуги по сети, полный исходный код измененной версии должен быть доступен.
+
+Исходный код: https://github.com/sschueller/peertube-android/
diff --git a/fastlane/metadata/android/ru/short_description.txt b/fastlane/metadata/android/ru/short_description.txt
new file mode 100644
index 0000000..246a544
--- /dev/null
+++ b/fastlane/metadata/android/ru/short_description.txt
@@ -0,0 +1 @@
+Thorium - неофициальный плеер PeerTube
diff --git a/fastlane/metadata/android/ru/title.txt b/fastlane/metadata/android/ru/title.txt
new file mode 100644
index 0000000..cdb92da
--- /dev/null
+++ b/fastlane/metadata/android/ru/title.txt
@@ -0,0 +1 @@
+Thorium-неоф. клиент PeerTube
diff --git a/fastlane/metadata/android/ru/video.txt b/fastlane/metadata/android/ru/video.txt
new file mode 100644
index 0000000..5824a09
--- /dev/null
+++ b/fastlane/metadata/android/ru/video.txt
@@ -0,0 +1 @@
+https://www.youtube.com/watch?v=PJIsiuSdpq8
diff --git a/fastlane/metadata/android/tr/changelogs/1047.txt b/fastlane/metadata/android/tr/changelogs/1047.txt
new file mode 100644
index 0000000..a3413f0
--- /dev/null
+++ b/fastlane/metadata/android/tr/changelogs/1047.txt
@@ -0,0 +1 @@
+- Kimlik doğrulaması yenileme
diff --git a/fastlane/metadata/android/tr/full_description.txt b/fastlane/metadata/android/tr/full_description.txt
new file mode 100644
index 0000000..c1d19d0
--- /dev/null
+++ b/fastlane/metadata/android/tr/full_description.txt
@@ -0,0 +1,33 @@
+Thorium, sürüm v1.1.0-alpha.2 veya daha üstünü çalıştıran herhangi bir PeerTube sunucusuna bağlanabilen bir PeerTube istemcisidir. 
+
+PeerTube, doğrudan web tarayıcısında P2P (BitTorrent) kullanan bir federe (ActivityPub) video yayınlama platformudur. Daha fazla bilgi ve sunucu listesi için lütfen https://joinpeertube.org/ adresini ziyaret edin.
+
+Bu istemci, uygulamanın yaratıcısı tarafından - PeerTube projesinin kendisi değil, http://instances.joinpeertube.org/ adresinde daha fazlasını listelemektedir - yönetilen bir PeerTube sunucusuyla önceden yapılandırılmış olarak gelir, böylece istemcinin neler yapabileceğini görebilirsiniz. Deneyiminizi kendinize göre ayarlamak için sunucunuzu seçin!
+
+Mevcut Özellikler:
+- Herhangi bir PeerTube sunucusuna bağlanın
+- Videoyu torrent ile paylaşma veya doğrudan oynatma
+- PeerTube'de arayın
+- Video indirin / paylaşın
+- Temalar / Karanlık mod
+- Arka planda oynatma
+- Yatay modda tam ekran oynatma
+- Oynatma hızı
+- Uygunsuz (NSFW) içeriği filtreleyin
+- Kimlik doğrulama / Oturum açma
+- Video beğenin / beğenmeyin
+
+Yakında Gelecekler:
+- Videolara yorum yapma
+- Kaydolma
+- Kullanıcı / Kanal genel görünüm sayfası
+- Videoları şikayet etme
+
+İzinler:
+- Depolama erişimi, torrent veya video indirme için gerekli. 
+
+GNU Affero Genel Kamu Lisansı v3.0 altında lisanslanmıştır.
+
+Bu en güçlü copyleft lisansının izinleri, lisanslı bir çalışmayı içeren daha büyük çalışmalar dahil, lisanslı çalışmanın ve değişikliklerinin tüm kaynak kodlarının aynı lisans altında açık olarak sunulmasını gerektirmektedir. Telif hakkı ve lisans uyarıları korunmalıdır. Katkıda bulunanlar, açık bir patent hakları verirler. Değiştirilmiş bir sürüm ağ üzerinden bir hizmet sağlamak için kullanıldığında, değiştirilmiş sürümün tam kaynak kodu açık olarak sunulmalıdır.
+
+Kaynak kodları: https://github.com/sschueller/peertube-android/
diff --git a/fastlane/metadata/android/tr/short_description.txt b/fastlane/metadata/android/tr/short_description.txt
new file mode 100644
index 0000000..d90c153
--- /dev/null
+++ b/fastlane/metadata/android/tr/short_description.txt
@@ -0,0 +1 @@
+Thorium resmi olmayan bir PeerTube oynatıcısıdır
diff --git a/fastlane/metadata/android/tr/title.txt b/fastlane/metadata/android/tr/title.txt
new file mode 100644
index 0000000..d91340b
--- /dev/null
+++ b/fastlane/metadata/android/tr/title.txt
@@ -0,0 +1 @@
+Thorium: PeerTube istemcisi
diff --git a/fastlane/metadata/android/tr/video.txt b/fastlane/metadata/android/tr/video.txt
new file mode 100644
index 0000000..5824a09
--- /dev/null
+++ b/fastlane/metadata/android/tr/video.txt
@@ -0,0 +1 @@
+https://www.youtube.com/watch?v=PJIsiuSdpq8

From 86cfac15d59da4c784a6ad35212c0e1586b23e8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Sch=C3=BCller?= <sschueller@techdroid.com>
Date: Sun, 22 Nov 2020 13:54:54 +0100
Subject: [PATCH 2/5] Allow insecure connections

---
 app/build.gradle                              |  1 +
 .../peertube/activity/AccountActivity.java    |  4 +-
 .../peertube/activity/MeActivity.java         |  2 +-
 .../activity/SearchServerActivity.java        |  2 +-
 .../peertube/activity/SettingsActivity.java   | 43 +++++++++++-
 .../peertube/activity/VideoListActivity.java  |  4 +-
 .../fragment/VideoMetaDataFragment.java       |  4 +-
 .../fragment/VideoPlayerFragment.java         |  2 +-
 .../peertube/helper/APIUrlHelper.java         |  5 ++
 .../peertube/network/RetrofitInstance.java    | 15 +++-
 .../peertube/network/UnsafeOkHttpClient.java  | 68 +++++++++++++++++++
 .../peertube/service/LoginService.java        |  4 +-
 .../peertube/service/VideoPlayerService.java  | 19 +++++-
 app/src/main/res/values/constants.xml         |  2 +
 app/src/main/res/values/strings.xml           |  7 ++
 app/src/main/res/xml/root_preferences.xml     | 11 +++
 build.gradle                                  |  2 +-
 gradle/wrapper/gradle-wrapper.properties      |  4 +-
 18 files changed, 180 insertions(+), 19 deletions(-)
 create mode 100644 app/src/main/java/net/schueller/peertube/network/UnsafeOkHttpClient.java

diff --git a/app/build.gradle b/app/build.gradle
index fe3e6df..ff59927 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -93,6 +93,7 @@ android {
             implementation "com.google.android.exoplayer:exoplayer-hls:$libVersions.exoplayer"
             implementation "com.google.android.exoplayer:exoplayer-smoothstreaming:$libVersions.exoplayer"
             implementation "com.google.android.exoplayer:extension-mediasession:$libVersions.exoplayer"
+            implementation "com.google.android.exoplayer:extension-okhttp:$libVersions.exoplayer"
 
             // date formatter
             implementation 'org.ocpsoft.prettytime:prettytime:4.0.4.Final'
diff --git a/app/src/main/java/net/schueller/peertube/activity/AccountActivity.java b/app/src/main/java/net/schueller/peertube/activity/AccountActivity.java
index 7daf17b..a26d6b3 100644
--- a/app/src/main/java/net/schueller/peertube/activity/AccountActivity.java
+++ b/app/src/main/java/net/schueller/peertube/activity/AccountActivity.java
@@ -97,7 +97,7 @@ public class AccountActivity extends CommonActivity {
 
         apiBaseURL = APIUrlHelper.getUrlWithVersion(this);
 
-        userService = RetrofitInstance.getRetrofitInstance(apiBaseURL).create(GetUserService.class);
+        userService = RetrofitInstance.getRetrofitInstance(apiBaseURL, APIUrlHelper.useInsecureConnection(this)).create(GetUserService.class);
 
         recyclerViewVideos = findViewById(R.id.account_video_recyclerView);
         recyclerViewChannels = findViewById(R.id.account_channel_recyclerView);
@@ -227,7 +227,7 @@ public class AccountActivity extends CommonActivity {
 
         isLoadingVideos = false;
 
-        GetVideoDataService service = RetrofitInstance.getRetrofitInstance(apiBaseURL).create(GetVideoDataService.class);
+        GetVideoDataService service = RetrofitInstance.getRetrofitInstance(apiBaseURL, APIUrlHelper.useInsecureConnection(this)).create(GetVideoDataService.class);
         Call<VideoList> call;
 
         call = service.getAccountVideosData(displayNameAndHost, videosStart, videosCount, videosSort);
diff --git a/app/src/main/java/net/schueller/peertube/activity/MeActivity.java b/app/src/main/java/net/schueller/peertube/activity/MeActivity.java
index 7a62427..cda962f 100644
--- a/app/src/main/java/net/schueller/peertube/activity/MeActivity.java
+++ b/app/src/main/java/net/schueller/peertube/activity/MeActivity.java
@@ -119,7 +119,7 @@ public class MeActivity extends CommonActivity {
         String apiBaseURL = APIUrlHelper.getUrlWithVersion(this);
         String baseURL = APIUrlHelper.getUrl(this);
 
-        GetUserService service = RetrofitInstance.getRetrofitInstance(apiBaseURL).create(GetUserService.class);
+        GetUserService service = RetrofitInstance.getRetrofitInstance(apiBaseURL, APIUrlHelper.useInsecureConnection(this)).create(GetUserService.class);
 
         Call<Me> call = service.getMe();
 
diff --git a/app/src/main/java/net/schueller/peertube/activity/SearchServerActivity.java b/app/src/main/java/net/schueller/peertube/activity/SearchServerActivity.java
index b263f39..41f9613 100644
--- a/app/src/main/java/net/schueller/peertube/activity/SearchServerActivity.java
+++ b/app/src/main/java/net/schueller/peertube/activity/SearchServerActivity.java
@@ -148,7 +148,7 @@ public class SearchServerActivity extends CommonActivity {
 
         GetServerListDataService service = RetrofitInstance.getRetrofitInstance(
                 APIUrlHelper.getServerIndexUrl(SearchServerActivity.this)
-        ).create(GetServerListDataService.class);
+                , APIUrlHelper.useInsecureConnection(this)).create(GetServerListDataService.class);
 
         if ( !searchtext.equals( lastSearchtext ) )
         {
diff --git a/app/src/main/java/net/schueller/peertube/activity/SettingsActivity.java b/app/src/main/java/net/schueller/peertube/activity/SettingsActivity.java
index c2e0083..d0a9623 100644
--- a/app/src/main/java/net/schueller/peertube/activity/SettingsActivity.java
+++ b/app/src/main/java/net/schueller/peertube/activity/SettingsActivity.java
@@ -17,14 +17,18 @@
  */
 package net.schueller.peertube.activity;
 
+import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.view.View;
+import android.preference.PreferenceManager;
 
+import android.util.Log;
 import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AlertDialog.Builder;
 import androidx.appcompat.widget.Toolbar;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
 
+import androidx.preference.SwitchPreference;
 import net.schueller.peertube.BuildConfig;
 import net.schueller.peertube.R;
 
@@ -68,6 +72,43 @@ public class SettingsActivity extends CommonActivity {
             assert pref != null;
             pref.setSummary(Long.toString(BuildConfig.BUILD_TIME));
 
+            // double check disabling SSL
+            final SwitchPreference insecure = (SwitchPreference) findPreference("pref_accept_insecure");
+            if (insecure != null) {
+                insecure.setOnPreferenceChangeListener((preference, newValue) -> {
+
+                    SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(getContext());
+                    SharedPreferences.Editor editor = sharedPref.edit();
+
+                    boolean currentValue = sharedPref.getBoolean("pref_accept_insecure", false);
+
+                    if (newValue instanceof Boolean && ((Boolean) newValue) != currentValue) {
+                        final boolean enable = (Boolean) newValue;
+
+                        Log.v("pref", "enable: " + enable);
+                        Log.v("pref", "currentValue: " + currentValue);
+
+                        if (enable) {
+                            new Builder(preference.getContext())
+                                    .setTitle(R.string.pref_insecure_confirm_title)
+                                    .setMessage(R.string.pref_insecure_confirm_message)
+                                    .setIcon(R.drawable.ic_info_black_24dp)
+                                    .setNegativeButton(R.string.pref_insecure_confirm_no, (dialog, whichButton) -> {
+                                        // do nothing
+                                    })
+                                    .setPositiveButton(R.string.pref_insecure_confirm_yes, (dialog, whichButton) -> {
+                                        // OK has been pressed => force the new value and update the checkbox display
+                                        editor.putBoolean("pref_accept_insecure", true);
+                                        editor.apply();
+                                        insecure.setChecked(true);
+                                    }).create().show();
+                            // by default ignore the pref change, which can only be validated when OK is pressed
+                            return false;
+                        }
+                    }
+                    return true;
+                });
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/activity/VideoListActivity.java b/app/src/main/java/net/schueller/peertube/activity/VideoListActivity.java
index ae7b650..adcc3c9 100644
--- a/app/src/main/java/net/schueller/peertube/activity/VideoListActivity.java
+++ b/app/src/main/java/net/schueller/peertube/activity/VideoListActivity.java
@@ -325,13 +325,13 @@ public class VideoListActivity extends CommonActivity {
         Set<String> languages = sharedPref.getStringSet(getString(R.string.pref_video_language_key), null);
         String apiBaseURL = APIUrlHelper.getUrlWithVersion(this);
 
-        GetVideoDataService service = RetrofitInstance.getRetrofitInstance(apiBaseURL).create(GetVideoDataService.class);
+        GetVideoDataService service = RetrofitInstance.getRetrofitInstance(apiBaseURL, APIUrlHelper.useInsecureConnection(this)).create(GetVideoDataService.class);
 
         Call<VideoList> call;
         if (!searchQuery.equals("")) {
             call = service.searchVideosData(start, count, sort, nsfw, searchQuery, filter, languages);
         } else if (subscriptions) {
-            GetUserService userService = RetrofitInstance.getRetrofitInstance(apiBaseURL).create(GetUserService.class);
+            GetUserService userService = RetrofitInstance.getRetrofitInstance(apiBaseURL, APIUrlHelper.useInsecureConnection(this)).create(GetUserService.class);
             call = userService.getVideosSubscripions(start, count, sort);
         } else {
             call = service.getVideosData(start, count, sort, nsfw, filter, languages);
diff --git a/app/src/main/java/net/schueller/peertube/fragment/VideoMetaDataFragment.java b/app/src/main/java/net/schueller/peertube/fragment/VideoMetaDataFragment.java
index b07634a..5291054 100644
--- a/app/src/main/java/net/schueller/peertube/fragment/VideoMetaDataFragment.java
+++ b/app/src/main/java/net/schueller/peertube/fragment/VideoMetaDataFragment.java
@@ -100,7 +100,7 @@ public class VideoMetaDataFragment extends Fragment {
         Activity activity = getActivity();
 
         String apiBaseURL = APIUrlHelper.getUrlWithVersion(context);
-        GetVideoDataService videoDataService = RetrofitInstance.getRetrofitInstance(apiBaseURL).create(GetVideoDataService.class);
+        GetVideoDataService videoDataService = RetrofitInstance.getRetrofitInstance(apiBaseURL, APIUrlHelper.useInsecureConnection(context)).create(GetVideoDataService.class);
 
         // Thumbs up
         Button thumbsUpButton = activity.findViewById(R.id.video_thumbs_up);
@@ -326,7 +326,7 @@ public class VideoMetaDataFragment extends Fragment {
             RequestBody body = RequestBody.create(okhttp3.MediaType.parse("application/json"), "{\"rating\":\"" + ratePayload + "\"}");
 
             String apiBaseURL = APIUrlHelper.getUrlWithVersion(getContext());
-            GetVideoDataService videoDataService = RetrofitInstance.getRetrofitInstance(apiBaseURL).create(GetVideoDataService.class);
+            GetVideoDataService videoDataService = RetrofitInstance.getRetrofitInstance(apiBaseURL, APIUrlHelper.useInsecureConnection(getContext())).create(GetVideoDataService.class);
 
             Call<ResponseBody> call = videoDataService.rateVideo(video.getId(), body);
 
diff --git a/app/src/main/java/net/schueller/peertube/fragment/VideoPlayerFragment.java b/app/src/main/java/net/schueller/peertube/fragment/VideoPlayerFragment.java
index 397913c..245eaaf 100644
--- a/app/src/main/java/net/schueller/peertube/fragment/VideoPlayerFragment.java
+++ b/app/src/main/java/net/schueller/peertube/fragment/VideoPlayerFragment.java
@@ -184,7 +184,7 @@ public class VideoPlayerFragment extends Fragment implements VideoRendererEventL
 
         // get video details from api
         String apiBaseURL = APIUrlHelper.getUrlWithVersion(context);
-        GetVideoDataService service = RetrofitInstance.getRetrofitInstance(apiBaseURL).create(GetVideoDataService.class);
+        GetVideoDataService service = RetrofitInstance.getRetrofitInstance(apiBaseURL, APIUrlHelper.useInsecureConnection(context)).create(GetVideoDataService.class);
 
         Call<Video> call = service.getVideoData(mVideoUuid);
 
diff --git a/app/src/main/java/net/schueller/peertube/helper/APIUrlHelper.java b/app/src/main/java/net/schueller/peertube/helper/APIUrlHelper.java
index 2a436af..f138dd8 100644
--- a/app/src/main/java/net/schueller/peertube/helper/APIUrlHelper.java
+++ b/app/src/main/java/net/schueller/peertube/helper/APIUrlHelper.java
@@ -43,6 +43,11 @@ public class APIUrlHelper{
         return APIUrlHelper.getUrl(context) + "/api/v1/";
     }
 
+    public static Boolean useInsecureConnection(Context context) {
+        SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(context);
+        return sharedPref.getBoolean(context.getString(R.string.pref_accept_insecure), false);
+    }
+
     public static String getShareUrl(Context context, String videoUuid) {
         return APIUrlHelper.getUrl(context) + "/videos/watch/" + videoUuid;
     }
diff --git a/app/src/main/java/net/schueller/peertube/network/RetrofitInstance.java b/app/src/main/java/net/schueller/peertube/network/RetrofitInstance.java
index 740f0ae..00a7a62 100644
--- a/app/src/main/java/net/schueller/peertube/network/RetrofitInstance.java
+++ b/app/src/main/java/net/schueller/peertube/network/RetrofitInstance.java
@@ -17,6 +17,11 @@
  */
 package net.schueller.peertube.network;
 
+import static net.schueller.peertube.network.UnsafeOkHttpClient.getUnsafeOkHttpClientBuilder;
+
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+import net.schueller.peertube.R;
 import okhttp3.OkHttpClient;
 import retrofit2.Retrofit;
 import retrofit2.converter.gson.GsonConverterFactory;
@@ -26,11 +31,17 @@ public class RetrofitInstance {
     private static Retrofit retrofit;
     private static String baseUrl;
 
-    public static Retrofit getRetrofitInstance(String newBaseUrl) {
+    public static Retrofit getRetrofitInstance(String newBaseUrl, boolean insecure) {
         if (retrofit == null || !newBaseUrl.equals(baseUrl)) {
             baseUrl = newBaseUrl;
 
-            OkHttpClient.Builder okhttpClientBuilder = new OkHttpClient.Builder();
+            OkHttpClient.Builder okhttpClientBuilder;
+
+            if (!insecure) {
+                okhttpClientBuilder = new OkHttpClient.Builder();
+            } else {
+                okhttpClientBuilder = getUnsafeOkHttpClientBuilder();
+            }
 
             okhttpClientBuilder.addInterceptor(new AuthorizationInterceptor());
             okhttpClientBuilder.authenticator(new AccessTokenAuthenticator());
diff --git a/app/src/main/java/net/schueller/peertube/network/UnsafeOkHttpClient.java b/app/src/main/java/net/schueller/peertube/network/UnsafeOkHttpClient.java
new file mode 100644
index 0000000..8935872
--- /dev/null
+++ b/app/src/main/java/net/schueller/peertube/network/UnsafeOkHttpClient.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2018 Stefan Schüller <sschueller@techdroid.com>
+ *
+ * License: GPL-3.0+
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package net.schueller.peertube.network;
+
+import android.annotation.SuppressLint;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+import okhttp3.OkHttpClient;
+import okhttp3.OkHttpClient.Builder;
+
+// Take from https://stackoverflow.com/questions/25509296/trusting-all-certificates-with-okhttp/25992879#25992879
+public class UnsafeOkHttpClient {
+    public static Builder getUnsafeOkHttpClientBuilder() {
+        try {
+            // Create a trust manager that does not validate certificate chains
+            final TrustManager[] trustAllCerts = new TrustManager[] {
+                    new X509TrustManager() {
+                        @SuppressLint("TrustAllX509TrustManager")
+                        @Override
+                        public void checkClientTrusted(java.security.cert.X509Certificate[] chain, String authType) {
+                        }
+
+                        @SuppressLint("TrustAllX509TrustManager")
+                        @Override
+                        public void checkServerTrusted(java.security.cert.X509Certificate[] chain, String authType) {
+                        }
+
+                        @Override
+                        public java.security.cert.X509Certificate[] getAcceptedIssuers() {
+                            return new java.security.cert.X509Certificate[]{};
+                        }
+                    }
+            };
+
+            // Install the all-trusting trust manager
+            final SSLContext sslContext = SSLContext.getInstance("SSL");
+            sslContext.init(null, trustAllCerts, new java.security.SecureRandom());
+
+            // Create an ssl socket factory with our all-trusting manager
+            final SSLSocketFactory sslSocketFactory = sslContext.getSocketFactory();
+
+            OkHttpClient.Builder builder = new OkHttpClient.Builder();
+            builder.sslSocketFactory(sslSocketFactory, (X509TrustManager)trustAllCerts[0]);
+            builder.hostnameVerifier((hostname, session) -> true);
+
+            return builder;
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/net/schueller/peertube/service/LoginService.java b/app/src/main/java/net/schueller/peertube/service/LoginService.java
index fbc3a31..b192f46 100644
--- a/app/src/main/java/net/schueller/peertube/service/LoginService.java
+++ b/app/src/main/java/net/schueller/peertube/service/LoginService.java
@@ -50,7 +50,7 @@ public class LoginService {
 
         SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(context);
 
-        AuthenticationService service = RetrofitInstance.getRetrofitInstance(apiBaseURL).create(AuthenticationService.class);
+        AuthenticationService service = RetrofitInstance.getRetrofitInstance(apiBaseURL, APIUrlHelper.useInsecureConnection(context)).create(AuthenticationService.class);
 
         Call<OauthClient> call = service.getOauthClientLocal();
 
@@ -134,7 +134,7 @@ public class LoginService {
 
         String apiBaseURL = APIUrlHelper.getUrlWithVersion(context);
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
-        AuthenticationService service = RetrofitInstance.getRetrofitInstance(apiBaseURL).create(AuthenticationService.class);
+        AuthenticationService service = RetrofitInstance.getRetrofitInstance(apiBaseURL, APIUrlHelper.useInsecureConnection(context)).create(AuthenticationService.class);
 
         String refreshToken = sharedPreferences.getString(AppApplication.getContext().getString(R.string.pref_token_refresh), null);
         String userName = sharedPreferences.getString(AppApplication.getContext().getString(R.string.pref_auth_username), null);
diff --git a/app/src/main/java/net/schueller/peertube/service/VideoPlayerService.java b/app/src/main/java/net/schueller/peertube/service/VideoPlayerService.java
index 94414d7..04ed053 100644
--- a/app/src/main/java/net/schueller/peertube/service/VideoPlayerService.java
+++ b/app/src/main/java/net/schueller/peertube/service/VideoPlayerService.java
@@ -51,6 +51,8 @@ import com.google.android.exoplayer2.SimpleExoPlayer;
 import com.google.android.exoplayer2.audio.AudioAttributes;
 import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector;
 import com.google.android.exoplayer2.ext.mediasession.TimelineQueueNavigator;
+import com.google.android.exoplayer2.ext.okhttp.OkHttpDataSource;
+import com.google.android.exoplayer2.ext.okhttp.OkHttpDataSourceFactory;
 import com.google.android.exoplayer2.source.ExtractorMediaSource;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.ui.PlayerNotificationManager;
@@ -60,13 +62,16 @@ import com.google.android.exoplayer2.util.Util;
 
 import net.schueller.peertube.R;
 import net.schueller.peertube.activity.VideoPlayActivity;
+import net.schueller.peertube.helper.APIUrlHelper;
 import net.schueller.peertube.helper.MetaDataHelper;
 import net.schueller.peertube.model.Video;
+import okhttp3.OkHttpClient;
 
 import static android.media.session.PlaybackState.ACTION_PAUSE;
 import static android.media.session.PlaybackState.ACTION_PLAY;
 import static com.google.android.exoplayer2.ui.PlayerNotificationManager.ACTION_STOP;
 import static net.schueller.peertube.activity.VideoListActivity.EXTRA_VIDEOID;
+import static net.schueller.peertube.network.UnsafeOkHttpClient.getUnsafeOkHttpClientBuilder;
 
 public class VideoPlayerService extends Service {
 
@@ -209,8 +214,18 @@ public class VideoPlayerService extends Service {
         Log.v(TAG, "playVideo...");
 
         // Produces DataSource instances through which media data is loaded.
-        DataSource.Factory dataSourceFactory = new DefaultDataSourceFactory(getApplicationContext(),
-                Util.getUserAgent(getApplicationContext(), "PeerTube"), null);
+//        DataSource.Factory dataSourceFactory = new DefaultDataSourceFactory(getApplicationContext(),
+//                Util.getUserAgent(getApplicationContext(), "PeerTube"), null);
+
+        OkHttpClient.Builder okhttpClientBuilder;
+
+        if (!APIUrlHelper.useInsecureConnection(this)) {
+            okhttpClientBuilder = new OkHttpClient.Builder();
+        } else {
+            okhttpClientBuilder = getUnsafeOkHttpClientBuilder();
+        }
+
+        DataSource.Factory dataSourceFactory =  new OkHttpDataSourceFactory(okhttpClientBuilder.build(), Util.getUserAgent(getApplicationContext(), "PeerTube"));
 
         // This is the MediaSource representing the media to be played.
         ExtractorMediaSource videoSource = new ExtractorMediaSource.Factory(dataSourceFactory)
diff --git a/app/src/main/res/values/constants.xml b/app/src/main/res/values/constants.xml
index 7c0916c..6b29bef 100644
--- a/app/src/main/res/values/constants.xml
+++ b/app/src/main/res/values/constants.xml
@@ -15,6 +15,8 @@
     <string name="pref_background_behavior_key" translatable="false">pref_background_behavior</string>
     <string name="pref_torrent_player_key" translatable="false">pref_torrent_player</string>
 
+    <string name="pref_accept_insecure" translatable="false">pref_accept_insecure</string>
+
     <!-- defaults -->
     <string name="pref_default_api_base_url" formatted="false" translatable="false">https://troll.tv</string>
     <string name="app_default_theme" translatable="false">AppTheme.BLUE</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d961bc3..7c73b7e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -67,6 +67,8 @@
     <string name="pref_background_behavior_summary">How a playing video responds when going to background</string>
     <string name="clear_search_history">Clear Search History</string>
     <string name="clear_search_history_prompt">Do you want to permanently delete the search history?</string>
+    <string name="pref_description_accept_insecure">Ignore insecure connections. Use this only if you know the server you are connecting to. Requires App Restart.</string>
+    <string name="pref_title_accept_insecure">Disable SSL Certificate Check</string>
     <!-- languages -->
     <string name="ab">Abkhazian</string>
     <string name="aa">Afar</string>
@@ -353,4 +355,9 @@
     <string name="pref_title_buildtime">Build Time</string>
     <string name="authentication_token_refresh_failed">Could not refresh token</string>
     <string name="authentication_token_refresh_success">Token refreshed</string>
+    <string name="settings_activity_advanced_category_title">Advanced</string>
+    <string name="pref_insecure_confirm_title">Warning!</string>
+    <string name="pref_insecure_confirm_no">No</string>
+    <string name="pref_insecure_confirm_yes">Yes</string>
+    <string name="pref_insecure_confirm_message">You are about the disable all SSL Certification validation in Thorium. Disabling this can be very dangerous if the peertube server is not under your control, because a man-in-the-middle attack could direct traffic to another server without your knowledge. An attacker could record passwords and other personal data.</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml
index 795ebb8..e96fdd9 100644
--- a/app/src/main/res/xml/root_preferences.xml
+++ b/app/src/main/res/xml/root_preferences.xml
@@ -77,6 +77,17 @@
 
     </PreferenceCategory>
 
+    <PreferenceCategory app:title="@string/settings_activity_advanced_category_title" app:iconSpaceReserved="false">
+
+        <SwitchPreference
+            app:defaultValue="false"
+            app:key="@string/pref_accept_insecure"
+            app:summary="@string/pref_description_accept_insecure"
+            app:title="@string/pref_title_accept_insecure"
+            app:iconSpaceReserved="false"/>
+
+    </PreferenceCategory>
+
     <PreferenceCategory app:title="@string/settings_activity_about_category_title" app:iconSpaceReserved="false">
 
         <Preference
diff --git a/build.gradle b/build.gradle
index f81d2d2..5111a5c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.1'
         
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e023b24..f777cde 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Jun 12 19:07:10 CEST 2020
+#Sun Nov 22 12:39:32 CET 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip

From 4f335d87615073ca725f048362e6a8892bf2e11e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Sch=C3=BCller?= <sschueller@techdroid.com>
Date: Sun, 22 Nov 2020 14:07:39 +0100
Subject: [PATCH 3/5] Translated using Weblate (Bengali)

Currently translated at 100.0% (345 of 345 strings)

Translation: PeerTube/Android
Translate-URL: https://hosted.weblate.org/projects/peertube/android/bn/
---
 CHANGELOG.md                                  |   4 +
 app/src/main/res/values-ar/strings.xml        |   9 +
 app/src/main/res/values-bn-rBD/strings.xml    | 281 +++++++++++++-
 app/src/main/res/values-bn/strings.xml        |   2 +
 app/src/main/res/values-de/strings.xml        |  25 +-
 app/src/main/res/values-es/strings.xml        |   3 +-
 app/src/main/res/values-fi/strings.xml        |   4 +-
 app/src/main/res/values-fr/strings.xml        |  10 +-
 app/src/main/res/values-it/strings.xml        |  12 +-
 app/src/main/res/values-ks/strings.xml        |   2 +
 app/src/main/res/values-nb-rNO/strings.xml    |  41 ++
 app/src/main/res/values-pt-rBR/strings.xml    |   6 +-
 app/src/main/res/values-pt/strings.xml        |  14 +-
 app/src/main/res/values-ru/strings.xml        |   2 +
 app/src/main/res/values-tr/strings.xml        |   8 +-
 app/src/main/res/values-uk/strings.xml        | 350 ++++++++++++++++++
 app/src/main/res/values-zh-rCN/strings.xml    |   2 +-
 app/src/main/res/values-zh-rTW/strings.xml    |   2 +
 .../metadata/android/ar/full_description.txt  |   1 +
 .../metadata/android/ar/short_description.txt |   1 +
 fastlane/metadata/android/ar/title.txt        |   1 +
 fastlane/metadata/android/ar/video.txt        |   1 +
 .../metadata/android/de/changelogs/1047.txt   |   1 +
 .../metadata/android/de/full_description.txt  |  33 ++
 .../metadata/android/de/short_description.txt |   1 +
 fastlane/metadata/android/de/title.txt        |   1 +
 fastlane/metadata/android/de/video.txt        |   1 +
 .../android/en-US/changelogs/1050.txt         |   2 +
 .../android/fr-FR/changelogs/1048.txt         |   1 +
 .../android/fr-FR/full_description.txt        |  34 +-
 .../android/fr-FR/short_description.txt       |   2 +-
 fastlane/metadata/android/fr-FR/title.txt     |   2 +-
 .../metadata/android/it/changelogs/1047.txt   |   1 +
 .../metadata/android/it/changelogs/1048.txt   |   1 +
 .../metadata/android/it/changelogs/1049.txt   |   7 +
 .../metadata/android/it/full_description.txt  |  33 ++
 .../metadata/android/it/short_description.txt |   1 +
 fastlane/metadata/android/it/title.txt        |   1 +
 fastlane/metadata/android/it/video.txt        |   1 +
 fastlane/metadata/android/no-NO/video.txt     |   1 +
 .../android/ru-RU/changelogs/1048.txt         |   1 +
 .../android/ru-RU/changelogs/1049.txt         |   7 +
 .../android/tr-TR/changelogs/1048.txt         |   1 +
 .../android/tr-TR/changelogs/1049.txt         |   7 +
 .../metadata/android/uk/changelogs/1047.txt   |   1 +
 .../metadata/android/uk/changelogs/1048.txt   |   1 +
 .../metadata/android/uk/changelogs/1049.txt   |   7 +
 .../metadata/android/uk/full_description.txt  |  33 ++
 .../metadata/android/uk/short_description.txt |   1 +
 fastlane/metadata/android/uk/title.txt        |   1 +
 fastlane/metadata/android/uk/video.txt        |   1 +
 51 files changed, 930 insertions(+), 36 deletions(-)
 create mode 100644 app/src/main/res/values-ks/strings.xml
 create mode 100644 app/src/main/res/values-uk/strings.xml
 create mode 100644 fastlane/metadata/android/ar/full_description.txt
 create mode 100644 fastlane/metadata/android/ar/short_description.txt
 create mode 100644 fastlane/metadata/android/ar/title.txt
 create mode 100644 fastlane/metadata/android/ar/video.txt
 create mode 100644 fastlane/metadata/android/de/changelogs/1047.txt
 create mode 100644 fastlane/metadata/android/de/full_description.txt
 create mode 100644 fastlane/metadata/android/de/short_description.txt
 create mode 100644 fastlane/metadata/android/de/title.txt
 create mode 100644 fastlane/metadata/android/de/video.txt
 create mode 100644 fastlane/metadata/android/en-US/changelogs/1050.txt
 create mode 100644 fastlane/metadata/android/fr-FR/changelogs/1048.txt
 create mode 100644 fastlane/metadata/android/it/changelogs/1047.txt
 create mode 100644 fastlane/metadata/android/it/changelogs/1048.txt
 create mode 100644 fastlane/metadata/android/it/changelogs/1049.txt
 create mode 100644 fastlane/metadata/android/it/full_description.txt
 create mode 100644 fastlane/metadata/android/it/short_description.txt
 create mode 100644 fastlane/metadata/android/it/title.txt
 create mode 100644 fastlane/metadata/android/it/video.txt
 create mode 100644 fastlane/metadata/android/no-NO/video.txt
 create mode 100644 fastlane/metadata/android/ru-RU/changelogs/1048.txt
 create mode 100644 fastlane/metadata/android/ru-RU/changelogs/1049.txt
 create mode 100644 fastlane/metadata/android/tr-TR/changelogs/1048.txt
 create mode 100644 fastlane/metadata/android/tr-TR/changelogs/1049.txt
 create mode 100644 fastlane/metadata/android/uk/changelogs/1047.txt
 create mode 100644 fastlane/metadata/android/uk/changelogs/1048.txt
 create mode 100644 fastlane/metadata/android/uk/changelogs/1049.txt
 create mode 100644 fastlane/metadata/android/uk/full_description.txt
 create mode 100644 fastlane/metadata/android/uk/short_description.txt
 create mode 100644 fastlane/metadata/android/uk/title.txt
 create mode 100644 fastlane/metadata/android/uk/video.txt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 29f4b77..fcf8645 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### Version 1.0.50 Tag: v1.0.50 (2020-11-22)
+ - add support for disabling SSL
+ - translations
+
 ### Version 1.0.49 Tag: v1.0.49 (2020-09-26)
  - add support of hypertext redirection in description (@freeboub)
  - various crash fixes (@freeboub)
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index b2efff6..583ee72 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -343,4 +343,13 @@
     <string name="pref_language_app">لغة التطبيق</string>
     <string name="pref_description_back_pause">أوقف التشغيل في الخلفية مؤقتًا عند الضغط على رجوع أثناء تشغيل الفيديو.</string>
     <string name="pref_title_back_pause">ايقاف عند الضغط على زر العودة</string>
+    <string name="pref_title_buildtime">تاريخ ووقت البناء</string>
+    <string name="network_error">خطأ في الوصول للشبكة، تحقق من اتصالك</string>
+    <string name="server_selection_filter_hint">فلترة القائمة</string>
+    <string name="pref_background_behavior">إعدادات التشغيل في الخلفية</string>
+    <string name="pref_background_stop">إيقاف تشغيل الكل</string>
+    <string name="pref_background_audio">تابع تشغيل الصوت في الخلفية</string>
+    <string name="authentication_token_refresh_success">تم تحديث الرمز</string>
+    <string name="authentication_token_refresh_failed">تعذر تحديث الرمز المميز</string>
+    <string name="server_book_no_servers_found">كتب الخادم فارغة</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-bn-rBD/strings.xml b/app/src/main/res/values-bn-rBD/strings.xml
index a8b8e54..8891644 100644
--- a/app/src/main/res/values-bn-rBD/strings.xml
+++ b/app/src/main/res/values-bn-rBD/strings.xml
@@ -30,10 +30,10 @@
     <string name="pref_description_show_nsfw">নিষিদ্ধ কন্টেন্ট দেখাও</string>
     <string name="pref_title_show_nsfw">নিষিদ্ধ কন্টেন্ট</string>
     <string name="pref_title_version">সংস্করণ</string>
-    <string name="pref_description_license">"
-\n&lt;b&gt;গাহ্নু অফেরও সাধারণ গণ অনুমতিপত্র সং.৩.০&lt;/b&gt;
+    <string name="pref_description_license">
+\n<b>গাহ্নু অফেরও সাধারণ গণ অনুমতিপত্র সং.৩.০</b>
 \n
-\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>
+\nএই শক্তিশালী কপিলেফট লাইসেন্সের অনুমতি এই চুক্তির উপর নির্ভরশীল যে অনুমতিপত্রের দ্বারা আবদ্ধ সকল কাজ ও পরিবর্তনের সোর্স কোড উপলব্ধ করার মাধ্যমে, যার আওতায় পড়ে অনুমতিপত্রের দ্বারা আবদ্ধ কাজের বৃহত্তর অংশ একই অনুমতিপত্রের আওতায় আনার মাধ্যমে। কপিরাইট এবং লাইসেন্স নোটিশ সংরক্ষণ করা আবশ্যক। অবদানকারীগণ তাদের পেটেন্টর অধিকার অবশ্যই দেয়, যখন একটি পরিমার্জিত সংস্করণ ব্যবহার করে একটি পরিসেবা একটি নেটওয়ার্ক দিয়ে দেয়া হয়, সম্পূর্ণ সোর্স কোড এর পরিমার্জিত সংস্করণ উপলব্ধ তৈরি করা আবশ্যক।</string>
     <string name="pref_description_torrent_player">একটি টরেন্ট স্ট্রিমের মাধ্যমে ভিডিও প্লেব্যাক করুন। এর জন্য স্টোরেজ অনুমতির প্রয়োজন । (আলফা, স্থিতিশীল নয়!)</string>
     <string name="pref_title_torrent_player">টরেন্ট ভিডিও প্লেয়ার</string>
     <string name="pref_description_app_theme">থিমটি কার্যকর হওয়ার জন্য অ্যাপ্লিকেশন পুনরায় চালু করো।</string>
@@ -72,4 +72,279 @@
     <string name="prompt_server">সার্ভার</string>
     <string name="title_activity_login">সাইন ইন</string>
     <string name="title_activity_settings">সেটিংস</string>
+    <string name="authentication_token_refresh_success">টোকেন রিফ্রেশ হয়েছে</string>
+    <string name="authentication_token_refresh_failed">টোকেন রিফ্রেশ করা যায় নি</string>
+    <string name="pref_title_buildtime">বিল্ড এর সময়</string>
+    <string name="menu_video_options_quality_automated">স্বয়ংক্রিয়</string>
+    <string name="server_selection_video_totals">ভিডিওঃ %s, স্থানীয় ভিডিওঃ %s</string>
+    <string name="server_selection_nsfw_instance">NSFW ইন্সটান্স</string>
+    <string name="settings_activity_look_and_feel_category_title">লুক এবং ফিল</string>
+    <string name="settings_activity_about_category_title">সম্পর্কিত</string>
+    <string name="settings_activity_video_playback_category_title">ভিডিও প্লেব্যাক</string>
+    <string name="settings_activity_video_list_category_title">ভিডিও এর লিস্ট</string>
+    <string name="title_activity_settings2">সেটিংস কার্যকলাপ ২</string>
+    <string name="title_activity_me">আকাউন্ট</string>
+    <string name="title_activity_select_server">সার্ভার অনুসন্ধান করুন</string>
+    <string name="server_book_del_alert_msg">আপনি কি এই সার্ভার রিমুভ করতে চান সার্ভার বই থেকে\?</string>
+    <string name="server_book_del_alert_title">সার্ভার রিমুভ করুন</string>
+    <string name="video_speed_125">1.25x</string>
+    <string name="video_speed_075">0.75x</string>
+    <string name="title_activity_server_address_book">এড্রেস বই</string>
+    <string name="login_current_server_hint">বর্তমান সার্ভার</string>
+    <string name="server_book_list_has_login">লগইন আছে</string>
+    <string name="server_book_add_add_button">যোগ</string>
+    <string name="server_book_add_password">পাসওয়ার্ড</string>
+    <string name="server_book_add_username">ইউজারনেম</string>
+    <string name="server_book_add_pick_server_button">সার্চ</string>
+    <string name="server_book_add_server_url">সার্ভার ইউআরএল</string>
+    <string name="server_book_add_label">লেবেল</string>
+    <string name="me_help_and_feedback_button">সাহায্য ও মতামত</string>
+    <string name="me_logout_button">লগ আউট</string>
+    <string name="server_book_valid_url_is_required">সঠিক ইউ আর এল দরকার</string>
+    <string name="server_book_label_is_required">সার্ভার লেবেল দরকার</string>
+    <string name="server_book_no_servers_found">সার্ভার বই খালি আছে</string>
+    <string name="authentication_login_failed">লগইন সফল হয় নি!</string>
+    <string name="authentication_login_success">লগইন হয়েছে</string>
+    <string name="hello_blank_fragment">হ্যালো ফাঁকা টুকরা</string>
+    <string name="action_bar_title_server_selection">সার্ভার নির্বাচন করুন</string>
+    <string name="network_error">নেটওয়ার্ক ত্রটি, দয়া করে সংযোগ দেখো</string>
+    <string name="api_error">কিছু সমস্যা হয়েছে, অনুগ্রহ করে পরে চেষ্টা করুন!</string>
+    <string name="account_about_joined">যুক্ত হয়েছেন:</string>
+    <string name="account_about_description">বিবরণ:</string>
+    <string name="account_about_subscribers">গ্রাহক সমূহ:</string>
+    <string name="account_about_account">একাউন্ট:</string>
+    <string name="account_bottom_menu_about">সম্পর্কিত</string>
+    <string name="account_bottom_menu_channels">চ্যানেলগুলি</string>
+    <string name="account_bottom_menu_videos">ভিডিও</string>
+    <string name="menu_video_options_quality" formatted="true">কোয়ালিটি (%1$s)</string>
+    <string name="menu_video_options_playback_speed" formatted="true">প্লেব্যাক এর গতি (%1$s)</string>
+    <string name="video_meta_button_tags">Tags</string>
+    <string name="video_meta_button_language">ভাষা</string>
+    <string name="video_meta_button_license">অনুমতিপত্র</string>
+    <string name="video_meta_button_category">বিভাগ</string>
+    <string name="video_meta_button_privacy">Privacy</string>
+    <string name="video_meta_button_download">ডাউনলোড</string>
+    <string name="video_meta_button_share">শেয়ার</string>
+    <string name="video_login_required_for_service">এই সেবা ব্যবহারের জন্য লগ ইন করুন</string>
+    <string name="video_rating_failed">রেটিং ব্যর্থ</string>
+    <string name="video_download_permission_error">লেখার অনুমতি ছাড়া ভিডিও ডাউনলোড করা যাবে না</string>
+    <string name="menu_video_more_blacklist">নিষিদ্ধ তালিকা</string>
+    <string name="menu_video_more_report">রিপোর্ট</string>
+    <string name="title_activity_account">একাউন্ট</string>
+    <string name="server_selection_filter_hint">ফিল্টার তালিকা</string>
+    <string name="server_selection_peertube_server_url">পিয়ারটিউব সার্ভার URL</string>
+    <string name="server_selection_select_a_server">নিচের তালিকা থেকে একটি সার্ভার নিন অথবা সরাসরি একটি সার্ভার দিন।</string>
+    <string name="server_selection_set_server">সেট করা সার্ভার: %s</string>
+    <string name="server_selection_signup_allowed_no">না</string>
+    <string name="server_selection_signup_allowed_yes">হ্যা</string>
+    <string name="server_selection_signup_allowed">সাইন আপ করা যাবে: %s</string>
+    <string name="action_set_url">সার্ভার পছন্দ করুন</string>
+    <string name="video_speed_20">2x</string>
+    <string name="video_speed_15">১.৫x</string>
+    <string name="video_speed_10">Normal</string>
+    <string name="video_speed_05">০.৫x</string>
+    <string name="bluegray">নীলচে ধূসর</string>
+    <string name="gray">ধুসর</string>
+    <string name="brown">বাদামী</string>
+    <string name="deeporange">গাড় কমলা</string>
+    <string name="orange">কমলা</string>
+    <string name="amber">কমলা-হলুদ</string>
+    <string name="yellow">হলুদ</string>
+    <string name="lime">হালকা সবুজ</string>
+    <string name="lightgreen">হালকা সবুজ</string>
+    <string name="green">সবুজ</string>
+    <string name="teal">সবজে নীল</string>
+    <string name="cyan">হালকা সবজে নীল</string>
+    <string name="lightblue">হালকা নীল</string>
+    <string name="blue">নীল</string>
+    <string name="indigo">Indigo</string>
+    <string name="deeppurple">গাঢ় বেগুনি</string>
+    <string name="purple">বেগুনি</string>
+    <string name="pink">গোলাপি</string>
+    <string name="red">লাল</string>
+    <string name="zu">Zulu</string>
+    <string name="za">Zhuang</string>
+    <string name="yo">Yoruba</string>
+    <string name="yi">Yiddish</string>
+    <string name="xh">Xhosa</string>
+    <string name="wo">Wolof</string>
+    <string name="fy">পশ্চিম ফ্রিসিয়ান</string>
+    <string name="cy">Welsh</string>
+    <string name="wa">Walloon</string>
+    <string name="vi">Vietnamese</string>
+    <string name="ve">Venda</string>
+    <string name="uz">Uzbek</string>
+    <string name="ur">Urdu</string>
+    <string name="uk">Ukrainian</string>
+    <string name="ug">Uighur</string>
+    <string name="tw">Twi</string>
+    <string name="tk">Turkmen</string>
+    <string name="tr">Turkish</string>
+    <string name="tn">Tswana</string>
+    <string name="ts">Tsonga</string>
+    <string name="to">Tonga (Tonga Islands)</string>
+    <string name="ti">Tigrinya</string>
+    <string name="bo">Tibetan</string>
+    <string name="th">Thai</string>
+    <string name="te">Telugu</string>
+    <string name="tt">Tatar</string>
+    <string name="ta">Tamil</string>
+    <string name="tg">Tajik</string>
+    <string name="ty">Tahitian</string>
+    <string name="tl">Tagalog</string>
+    <string name="swl">সুইডিশ সাংকেতিক ভাষা</string>
+    <string name="sv">Swedish</string>
+    <string name="ss">Swati</string>
+    <string name="sw">Swahili (macrolanguage)</string>
+    <string name="su">Sundanese</string>
+    <string name="es">Spanish</string>
+    <string name="st">দক্ষিণ সোথো</string>
+    <string name="nr">দক্ষিণ ডেবেলে</string>
+    <string name="sfs">দক্ষিণ আফ্রিকান সাংকেতিক ভাষা</string>
+    <string name="so">Somali</string>
+    <string name="sl">Slovenian</string>
+    <string name="sk">Slovak</string>
+    <string name="si">Sinhala</string>
+    <string name="sd">Sindhi</string>
+    <string name="ii">Sichuan Yi</string>
+    <string name="sn">Shona</string>
+    <string name="sh">Serbo-Croatian</string>
+    <string name="sr">Serbian</string>
+    <string name="gd">Scottish Gaelic</string>
+    <string name="sdl">সৌদি আরবীয় সাংকেতিক ভাষা</string>
+    <string name="sc">Sardinian</string>
+    <string name="sg">Sango</string>
+    <string name="sm">Samoan</string>
+    <string name="rsl">রাশিয়ান সাংকেতিক ভাষা</string>
+    <string name="ru">Russian</string>
+    <string name="rn">Rundi</string>
+    <string name="rm">Romansh</string>
+    <string name="ro">Romanian</string>
+    <string name="qu">Quechua</string>
+    <string name="ps">Pushto</string>
+    <string name="pt">Portuguese</string>
+    <string name="pl">Polish</string>
+    <string name="fa">Persian</string>
+    <string name="pa">Panjabi</string>
+    <string name="pks">পাকিস্তানি সাংকেতিক ভাষা</string>
+    <string name="os">Ossetian</string>
+    <string name="om">Oromo</string>
+    <string name="or">Oriya (macrolanguage)</string>
+    <string name="oj">Ojibwa</string>
+    <string name="oc">Occitan</string>
+    <string name="ny">Nyanja</string>
+    <string name="nn">Norwegian Nynorsk</string>
+    <string name="nb">Norwegian Bokmål</string>
+    <string name="no">Norwegian</string>
+    <string name="se">উত্তর সামি</string>
+    <string name="nd">উত্তর ডেবেলে</string>
+    <string name="ne">Nepali (macrolanguage)</string>
+    <string name="ng">Ndonga</string>
+    <string name="nv">Navajo</string>
+    <string name="na">Nauru</string>
+    <string name="mn">Mongolian</string>
+    <string name="el">Modern Greek (1453-)</string>
+    <string name="mh">Marshallese</string>
+    <string name="mr">Marathi</string>
+    <string name="mi">মাওরি</string>
+    <string name="gv">মান্ক্স</string>
+    <string name="mt">মাল্টিজ</string>
+    <string name="ml">মালায়ালাম</string>
+    <string name="ms">মালয় (বড়ভাষা)</string>
+    <string name="mg">মালাগাসি</string>
+    <string name="mk">ম্যাসিডোনিয়</string>
+    <string name="lb">লাক্সেমবোর্গীয়</string>
+    <string name="lu">লুবা-কাতাঙ্গা</string>
+    <string name="jbo">লোজবান</string>
+    <string name="lt">লিথুনীয়</string>
+    <string name="ln">লিনগালা</string>
+    <string name="li">লিমবুরগান</string>
+    <string name="lv">লাটভীয়</string>
+    <string name="lo">লাও</string>
+    <string name="ku">কুর্ডিশ</string>
+    <string name="kj">কুয়ানইয়ামা</string>
+    <string name="avk">কোটাভা</string>
+    <string name="ko">কোরিয়ান</string>
+    <string name="kg">কঙ্গো</string>
+    <string name="kv">কোমি</string>
+    <string name="tlh">ক্লিন্টোন</string>
+    <string name="ky">কিরঘিয</string>
+    <string name="rw">কিনয়ারওয়ান্ডা</string>
+    <string name="ki">কিকুয়ু</string>
+    <string name="km">খমার</string>
+    <string name="kk">কাযাখ</string>
+    <string name="ks">কাশমিরি</string>
+    <string name="kr">কানুরি</string>
+    <string name="kn">কান্নাডা</string>
+    <string name="kl">কালাল্লিসুট</string>
+    <string name="jv">জাভানিজ</string>
+    <string name="jsl">জাপানি সাইন ভাষা</string>
+    <string name="ja">জাপানিজ</string>
+    <string name="it">ইতালিয়</string>
+    <string name="ga">আইরিশ</string>
+    <string name="ik">ইনুপিয়াক</string>
+    <string name="iu">ইনুক্টিটুট</string>
+    <string name="id">ইন্দোনেশীয়</string>
+    <string name="ig">ইগবো</string>
+    <string name="is">আইসল্যান্ডিক</string>
+    <string name="hu">হানগেরীয়</string>
+    <string name="ho">হিরি মোটু</string>
+    <string name="hi">হিন্দি</string>
+    <string name="hz">হেরেরো</string>
+    <string name="he">হিব্রু</string>
+    <string name="ha">হাওসা</string>
+    <string name="ht">হাইতান</string>
+    <string name="gu">গুজরাটি</string>
+    <string name="gn">গুরানি</string>
+    <string name="gsg">জার্মান সাংকেতিক ভাষা</string>
+    <string name="de">জার্মান</string>
+    <string name="ka">জর্জিয়</string>
+    <string name="lg">গানডা</string>
+    <string name="gl">গালিসীয়</string>
+    <string name="ff">ফুলাহ</string>
+    <string name="fsl">ফরাসি সাংকেতিক ভাষা</string>
+    <string name="fr">ফরাসি</string>
+    <string name="fi">ফিনিশ</string>
+    <string name="fj">ফিজান</string>
+    <string name="fo">ফারোয়েস</string>
+    <string name="ee">ইওয়ি</string>
+    <string name="et">এসটোনীয়</string>
+    <string name="eo">এসপেরানটা</string>
+    <string name="en">ইংরেজি</string>
+    <string name="dz">জংখ্যা</string>
+    <string name="nl">ডাচ</string>
+    <string name="dv">ধিভেহি</string>
+    <string name="dsl">ড্যানিশ সাংকেতিক ভাষা</string>
+    <string name="da">ড্যানিশ</string>
+    <string name="cse">চেক সাইন ভাষা</string>
+    <string name="cs">চেক</string>
+    <string name="hr">ক্রোয়েশীয়</string>
+    <string name="cr">ক্রি</string>
+    <string name="co">কোর্সিকান</string>
+    <string name="kw">কর্ণিশ</string>
+    <string name="cv">চুভাশ</string>
+    <string name="csl">চীনা সাইন ভাষা</string>
+    <string name="zh">চাইনিজ</string>
+    <string name="ce">চেচেন</string>
+    <string name="ch">চামোরো</string>
+    <string name="ca">কাটালান</string>
+    <string name="my">বার্মিজ</string>
+    <string name="bg">বুলগারিয়ানে</string>
+    <string name="bfi">ব্রিটিশ সাইন ভাষা</string>
+    <string name="bn_rBD">বাংলা (বাংলাদেশ)</string>
+    <string name="clear_search_history_prompt">আপনি কি পুরোপুরি সার্চ ইতিহাস মুছে ফেলতে চান\?</string>
+    <string name="clear_search_history">সার্চ ইতিহাস মুছে ফেলুন</string>
+    <string name="pref_background_behavior_summary">চালু ভিডিও কি করবে যখন পেছনে যাবে</string>
+    <string name="settings_permissions_error_float">অ্যান্ড্রয়েড সেটিং এ পিকচার ইন পিকচার পারমিশন বন্ধ আছে এই আয়াপ এ</string>
+    <string name="settings_api_error_float">অ্যান্ড্রয়েড ভার্সন ভাসমান ভিডিও সাপোর্ট করে</string>
+    <string name="pref_background_behavior">ব্যাকগ্রউন্ড প্লে এর কনফিগারেশন</string>
+    <string name="pref_background_float">ভাসমান উইন্ডো তে ভিডিও চালু রাখুন</string>
+    <string name="pref_background_stop">সব প্লেব্যাক বন্ধ করুন</string>
+    <string name="pref_background_audio">পেছনে অডিও স্ট্রিম হিসেবে চালু রাখুন</string>
+    <string name="pref_description_language_app">ভাষা পছন্দ করুন অ্যাপ্লিকেশান এর জন্য। রিস্টার্ট করুন পরিবর্তন দেখার জন্য।</string>
+    <string name="pref_language_app">অ্যাপ্লিকেশান এর ভাষা</string>
+    <string name="pref_description_back_pause">ভিডিও চলার সময় ব্যাকগ্রাউন্ড প্লে পজ হবে ব্যাক বাটন প্রেস করলে।</string>
+    <string name="pref_title_back_pause">ব্যাক বাটন এ পজ</string>
+    <string name="pref_title_peertube_server">পিয়ারটিউব সার্ভার</string>
+    <string name="pref_title_license">অনুমতিপত্র</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
index 80c4546..ec25df3 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -351,4 +351,6 @@
     <string name="menu_video_options_quality_automated">স্বয়ংক্রিয়</string>
     <string name="authentication_token_refresh_success">টোকেন রিফ্রেশ হয়েছে</string>
     <string name="authentication_token_refresh_failed">টোকেন রিফ্রেশ করা যায় নি</string>
+    <string name="network_error">নেটওয়ার্ক ত্রটি, দয়া করে সংযোগ দেখো</string>
+    <string name="server_selection_filter_hint">ফিল্টার তালিকা</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 07ecbb5..c05bea4 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -20,7 +20,7 @@
     <string name="error_incorrect_password">Dieses Passwort ist falsch</string>
     <string name="action_bar_title_settings">Einstellungen</string>
     <string name="bottom_nav_title_recent">Aktuell</string>
-    <string name="meta_data_views">Aufrufe</string>
+    <string name="meta_data_views">" Aufrufe"</string>
     <string name="video_row_video_thumbnail">Video-Vorschaubild</string>
     <string name="video_row_account_avatar">Konto-Avatar</string>
     <string name="pref_title_show_nsfw">NSFW-Inhalt</string>
@@ -36,7 +36,7 @@
     <string name="invalid_url">Ungültige URL.</string>
     <string name="pref_title_dark_mode">Dunkler Modus</string>
     <string name="pref_title_app_theme">Farbschema</string>
-    <string name="error_field_required">Dieses Feld ist erforderlich</string>
+    <string name="error_field_required">Dieses Feld wird benötigt</string>
     <string name="bottom_nav_title_trending">Trends</string>
     <string name="pref_description_dark_mode">Ein Neustart ist erforderlich, um diese Änderung durchzuführen.</string>
     <string name="pref_description_app_theme">Ein Neustart ist erforderlich, um diese Änderung durchzuführen.</string>
@@ -287,7 +287,7 @@
     <string name="account_about_joined">Mitglied seit:</string>
     <string name="api_error">Etwas ist schiefgelaufen, bitte versuche es später noch einmal!</string>
     <string name="action_bar_title_server_selection">Server auswählen</string>
-    <string name="permission_rationale">Erlaube Kontaktzugriff für E-Mail-Vervollständigung.</string>
+    <string name="permission_rationale">Berechtigung zum Auslesen der Kontakte für die E-Mail-Vervollständigung erteilen.</string>
     <string name="pref_description_language">Eine Videosprache auswählen, statt alle Videos in allen Sprachen anzuzeigen.</string>
     <string name="pref_description_background_play">Falls aktiviert, werden Videos im Hintergrund weiter abgespielt.</string>
     <string name="server_selection_select_a_server">Wählen Sie einen Server aus der Liste oder geben Sie ihn direkt ein.</string>
@@ -297,7 +297,7 @@
 \n<b>GNU Affero General Public License v3.0</b> 
 \n 
 \nBerechtigungen dieser stärksten Copyleft-Lizenz bedingen, sämtlichen Quellcode von lizenzierten Werken und Modifikationen, einschließlich größere Werke, die ein lizenziertes Werk verwenden, unter derselben Lizenz bereitzustellen. Urheberrechts- und Lizenzhinweise müssen erhalten bleiben. Mitarbeitende gewähren eine ausdrückliche Genehmigung der Verwertungsrechte. Wenn eine modifizierte Version verwendet wird, um einen Dienst über ein Netzwerk anzubieten, muss der vollständige Quellcode der modifizierten Version verfügbar gemacht werden.</string>
-    <string name="pref_description_torrent_player">Videowiedergabe über einen Torrentstream. Dies erfordert Speicherberechtigungen. (Alphastadium, nicht stabil!)</string>
+    <string name="pref_description_torrent_player">Videowiedergabe via Torrent-Stream. Dies benötigt Speicherberechtigungen. (Alpha, nicht stabil!)</string>
     <string name="video_speed_125">1,25×</string>
     <string name="video_speed_075">0,75×</string>
     <string name="server_book_add_add_button">Hinzufügen</string>
@@ -327,11 +327,24 @@
     <string name="server_book_del_alert_msg">Sind Sie sicher, dass Sie diesen Server aus ihrem Adressbuch entfernen möchten\?</string>
     <string name="server_book_del_alert_title">Server entfernen</string>
     <string name="title_activity_server_address_book">Adressbuch</string>
-    <string name="settings_permissions_error_float">Die \"Picture in Picture\" Berechtigung wurde für diese App in den Android Einstellungen nicht erteilt</string>
-    <string name="pref_background_behavior">Im Hintergrund abspielen Konfiguration</string>
+    <string name="settings_permissions_error_float">Die Bild-in-Bild-Berechtigung ist für diese Anwendung in den Android-Einstellungen deaktiviert</string>
+    <string name="pref_background_behavior">Konfiguration für Hintergrundwiedergabe</string>
     <string name="pref_background_audio">Im Hintergrund als Audiostream weiterhören</string>
     <string name="title_activity_me">Konto</string>
     <string name="bn_rBD">Bengalisch (Bangladesch)</string>
     <string name="pref_description_back_pause">Unterbrechen der Hintergrundwiedergabe, wenn Sie während der Videowiedergabe zurück drücken.</string>
     <string name="pref_title_back_pause">Pause bei Zurück-Taste</string>
+    <string name="title_activity_settings2">Aktivitätseinstellungen2</string>
+    <string name="network_error">Netzwerkfehler, bitte kontrollieren sie ihre Verbindung</string>
+    <string name="pref_background_behavior_summary">Was geschehen soll, wenn ein abspielendes Video in den Hintergrund verschoben wird</string>
+    <string name="settings_api_error_float">Diese Android Version unterstützt keine Wiedergabe im schwebendem Fenster</string>
+    <string name="pref_background_float">In schwebendem Fenster weiterspielen</string>
+    <string name="pref_title_buildtime">Erstellungszeit</string>
+    <string name="server_selection_nsfw_instance">NSWF-Instanz</string>
+    <string name="server_book_list_has_login">Hat Anmeldungsdaten</string>
+    <string name="server_book_add_label">Bezeichnung</string>
+    <string name="server_book_label_is_required">Serverbezeichnung wird benötigt</string>
+    <string name="server_book_no_servers_found">Das Serververzeichnis ist leer</string>
+    <string name="hello_blank_fragment">Hallo leeres Fragment</string>
+    <string name="server_selection_filter_hint">Liste filtern</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index b086528..dc4dfb9 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -3,7 +3,7 @@
     <string name="title_activity_settings">Ajustes</string>
     <string name="title_activity_login">Iniciar sesión</string>
     <string name="prompt_server">Servidor</string>
-    <string name="prompt_email">Correo / Usuario</string>
+    <string name="prompt_email">Correo / Nombre de usuario</string>
     <string name="prompt_password">Contraseña</string>
     <string name="action_sign_in">Iniciar sesión</string>
     <string name="action_sign_in_short">Iniciar sesión</string>
@@ -113,4 +113,5 @@
 \nLos permisos de esta fuerte licencia copyleft están condicionados a hacer disponible el código fuente completo de los trabajos licenciados y las modificaciones, que incluyen trabajos más grandes usando un trabajo licenciado, bajo la misma licencia. Los derechos de autor y los avisos de licencia deben ser preservados. Los colaboradores proporcionan una concesión expresa de los derechos de patente. Cuando se utiliza una versión modificada para proporcionar un servicio a través de una red, el código fuente completo de la versión modificada debe estar disponible.</string>
     <string name="video_speed_125">1,25×</string>
     <string name="video_speed_075">0,75×</string>
+    <string name="pref_language_app">Idioma de la aplicación</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index b7a1730..29f9719 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -103,7 +103,7 @@
     <string name="mi">maori</string>
     <string name="or">oriya (makrokieli)</string>
     <string name="bi">bislama</string>
-    <string name="menu_video_options_quality" formatted="true">Laatu (%s)</string>
+    <string name="menu_video_options_quality" formatted="true">Laatu (%1$s)</string>
     <string name="api_error">Jotain meni pieleen, yritä myöhemmin!</string>
     <string name="bg">bulgaria</string>
     <string name="uz">uzbekki</string>
@@ -300,4 +300,6 @@
     <string name="tk">turkmeeni</string>
     <string name="video_speed_125">1,25×</string>
     <string name="video_speed_075">0,75×</string>
+    <string name="pref_description_language_app">Valitse kieli sovelluksen käyttöliittymälle. Käynnistä sovellus uudelleen, jotta muutos tulee voimaan.</string>
+    <string name="pref_language_app">Sovelluksen kieli</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index bcb0d58..5aab696 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -8,7 +8,7 @@
     <string name="prompt_password">Mot de passe</string>
     <string name="action_sign_in">Se connecter</string>
     <string name="action_sign_in_short">Se connecter</string>
-    <string name="error_invalid_email">Cette adresse de courriel n\'est pas valide</string>
+    <string name="error_invalid_email">Cette adresse courriel est invalide</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 champ est requis</string>
@@ -110,7 +110,7 @@
     <string name="account_about_description">Description :</string>
     <string name="account_about_joined">Inscrit·e le :</string>
     <string name="api_error">Quelque chose s’est mal passé, veuillez essayer plus tard !</string>
-    <string name="network_error">Problème réseau, veuillez vérifier votre connection</string>
+    <string name="network_error">Problème réseau, veuillez vérifier votre connexion</string>
     <string name="action_bar_title_server_selection">Sélectionnez un serveur</string>
     <string name="ab">abkhaze</string>
     <string name="aa">afar</string>
@@ -189,7 +189,7 @@
     <string name="ja">japonais</string>
     <string name="jsl">langue des signes japonaise</string>
     <string name="jv">javanais</string>
-    <string name="kl">kalaallisut</string>
+    <string name="kl">groenlandais</string>
     <string name="kn">kannada</string>
     <string name="kr">kanuri</string>
     <string name="ks">cachemiri</string>
@@ -317,8 +317,8 @@
     <string name="server_book_add_pick_server_button">Rechercher</string>
     <string name="server_book_add_server_url">URL du serveur</string>
     <string name="server_book_add_label">Étiquette</string>
-    <string name="me_help_and_feedback_button">Aide et commentaire</string>
-    <string name="me_logout_button">Déconnecté</string>
+    <string name="me_help_and_feedback_button">Aide et remarques</string>
+    <string name="me_logout_button">Se déconnecter</string>
     <string name="server_book_valid_url_is_required">Une URL valide est requise</string>
     <string name="server_book_label_is_required">L\'étiquette du serveur est obligatoire</string>
     <string name="server_book_no_servers_found">Le livre des serveurs est vide</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 2150f0c..f0ed19f 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -3,11 +3,11 @@
     <string name="title_activity_settings">Impostazioni</string>
     <string name="title_activity_login">Accedi</string>
     <string name="prompt_server">Server</string>
-    <string name="prompt_email">Email / Nome utente</string>
+    <string name="prompt_email">E-mail / Nome utente</string>
     <string name="prompt_password">Password</string>
     <string name="action_sign_in">Accedi</string>
     <string name="action_sign_in_short">Accedi</string>
-    <string name="error_invalid_email">Questo indirizzo email non è valido</string>
+    <string name="error_invalid_email">Questo indirizzo e-mail non è valido</string>
     <string name="error_invalid_password">La password è troppo corta</string>
     <string name="error_incorrect_password">Questa password non è corretta</string>
     <string name="error_field_required">Questo campo è obbligatorio</string>
@@ -32,10 +32,10 @@
     <string name="descr_overflow_button">Altro</string>
     <string name="menu_share">Condividi</string>
     <string name="invalid_url">URL non valido.</string>
-    <string name="pref_description_dark_mode">Riavviare l\'applicazione affinché la modalità Dark Mode abbia effetto.</string>
+    <string name="pref_description_dark_mode">Riavvia l\'applicazione affinché la modalità scura abbia effetto.</string>
     <string name="pref_title_app_theme">Tema dell\'app</string>
     <string name="pref_description_app_theme">Riavviare l\'applicazione affinché il tema abbia effetto.</string>
-    <string name="pref_title_torrent_player">Lettore Video Torrent</string>
+    <string name="pref_title_torrent_player">Lettore video Torrent</string>
     <string name="pref_description_torrent_player">Riproduzione di Video tramite torrent stream. Questo richiede i permessi di archiviazione. (Alfa, non stabile!)</string>
     <string name="pref_title_license">Licenza</string>
     <string name="pref_title_version">Versione</string>
@@ -46,7 +46,7 @@
     <string name="pref_title_peertube_server">Server PeerTube</string>
     <string name="pref_title_background_play">Riproduzione in sottofondo</string>
     <string name="pref_description_background_play">Se abilitata, continua a riprodurre il video in sottofondo.</string>
-    <string name="pref_title_dark_mode">Modo scuro</string>
+    <string name="pref_title_dark_mode">Modalità scura</string>
     <string name="pref_description_license">
 \n<b>GNU Affero General Public License v3.0</b>
 \n
@@ -345,4 +345,6 @@
     <string name="pref_background_audio">Continua come flusso sonoro in sottofondo</string>
     <string name="pref_description_back_pause">Metti la riproduzione di sottofondo in pausa quando premi il tasto indietro durante la lettura del video.</string>
     <string name="pref_title_back_pause">Pausa sul tasto backspace</string>
+    <string name="network_error">Errore di accesso alla rete, controlla la tua connettività</string>
+    <string name="server_selection_filter_hint">Elenco dei filtri</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ks/strings.xml b/app/src/main/res/values-ks/strings.xml
new file mode 100644
index 0000000..a6b3dae
--- /dev/null
+++ b/app/src/main/res/values-ks/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index 81e63d1..fbdfb61 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -145,4 +145,45 @@
     <string name="title_activity_server_address_book">Adressebok</string>
     <string name="server_book_del_alert_title">Fjern tjener</string>
     <string name="settings_activity_about_category_title">Om</string>
+    <string name="server_book_no_servers_found">Tjeneradressebok tom</string>
+    <string name="title_activity_settings2">SettingsActivity2</string>
+    <string name="authentication_token_refresh_success">Symbol gjenoppfrisket</string>
+    <string name="authentication_token_refresh_failed">Kunne ikke gjenoppfriske symbol</string>
+    <string name="pref_title_buildtime">Byggtid</string>
+    <string name="menu_video_options_quality_automated">Automatisert</string>
+    <string name="server_selection_video_totals">Videoer: %s, lokale videoer: %s</string>
+    <string name="settings_activity_look_and_feel_category_title">Utseende og oppførsel</string>
+    <string name="settings_activity_video_playback_category_title">Videoavspilling</string>
+    <string name="settings_activity_video_list_category_title">Videoliste</string>
+    <string name="title_activity_me">Konto</string>
+    <string name="title_activity_select_server">Søk i tjener</string>
+    <string name="server_book_del_alert_msg">Er du sikker på at du ønsker å fjerne denne tjeneren fra adresseboken\?</string>
+    <string name="server_book_list_has_login">Har innlogging</string>
+    <string name="server_book_add_label">Etikett</string>
+    <string name="me_help_and_feedback_button">Hjelp og tilbakemelding</string>
+    <string name="me_logout_button">Logg ut</string>
+    <string name="server_book_valid_url_is_required">Gyldig nettadresse kreves</string>
+    <string name="server_book_label_is_required">Tjeneretikett kreves</string>
+    <string name="authentication_login_failed">Kunne ikke logge inn</string>
+    <string name="authentication_login_success">Innlogget</string>
+    <string name="hello_blank_fragment">Hei blanke fragment</string>
+    <string name="network_error">Tilknytningsfeil, sjekk tilkoblingen din</string>
+    <string name="server_selection_filter_hint">Filterliste</string>
+    <string name="bo">tibetansk</string>
+    <string name="th">thai</string>
+    <string name="te">telugu</string>
+    <string name="ta">tamil</string>
+    <string name="su">sundanesisk</string>
+    <string name="si">sinhala</string>
+    <string name="mn">mongolsk</string>
+    <string name="ml">malayalam</string>
+    <string name="lo">laotisk</string>
+    <string name="kn">kannada</string>
+    <string name="km">khmer</string>
+    <string name="jv">javanesisk</string>
+    <string name="he">hebraisk</string>
+    <string name="gu">gujarati</string>
+    <string name="bn">bengalsk</string>
+    <string name="hy">armensk</string>
+    <string name="server_selection_nsfw_instance">Arbeidsutrygg insans</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index c12c36f..25035ac 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -337,12 +337,14 @@
     <string name="error_field_required">Este campo é obrigatório</string>
     <string name="error_incorrect_password">Esta senha está incorreta</string>
     <string name="error_invalid_password">Esta senha é muito curta</string>
-    <string name="error_invalid_email">Este e-mail é inválido</string>
+    <string name="error_invalid_email">Este endereço de correio eletrônico é inválido</string>
     <string name="action_sign_in_short">Entrar</string>
     <string name="action_sign_in">Entrar</string>
     <string name="prompt_password">Senha</string>
-    <string name="prompt_email">Email / Nome de usuário</string>
+    <string name="prompt_email">E-mail / Nome de usuário</string>
     <string name="prompt_server">Servidor</string>
     <string name="title_activity_login">Entrar</string>
     <string name="title_activity_settings">Configurações</string>
+    <string name="network_error">Erro de acesso à rede, verifique sua conectividade</string>
+    <string name="server_selection_filter_hint">Filtrar a lista</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 4ac7419..adcc3a5 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -6,7 +6,7 @@
     <string name="nb">Bokmål norueguês</string>
     <string name="ve">Venda</string>
     <string name="title_activity_search">Busca</string>
-    <string name="prompt_email">Email / Nome de utilizador</string>
+    <string name="prompt_email">E-mail / Nome de utilizador</string>
     <string name="search_hint">Busca no PeerTube</string>
     <string name="be">Belarusian</string>
     <string name="error_field_required">Este campo é obrigatório</string>
@@ -53,7 +53,7 @@
     <string name="uk">Ucraniano</string>
     <string name="fo">Faroese</string>
     <string name="video_row_video_thumbnail">Miniatura do vídeo</string>
-    <string name="settings_permissions_error_float">A permissão Picture-in-Picture está desativada para este aplicação nas Configurações do Android</string>
+    <string name="settings_permissions_error_float">A permissão Picture-in-Picture está desativada para esta app nas Configurações do Android</string>
     <string name="pl">Polonês</string>
     <string name="menu_video_options_quality" formatted="true">Qualidade (%1$s)</string>
     <string name="ba">Bashkir</string>
@@ -61,7 +61,7 @@
     <string name="my">Burmese</string>
     <string name="kj">Kuanyama</string>
     <string name="ki">Kikuyu</string>
-    <string name="pref_description_dark_mode">Reinicie o aplicação para que o Tema Escuro tenha efeito.</string>
+    <string name="pref_description_dark_mode">Reinicie a app para que o Tema Escuro tenha efeito.</string>
     <string name="tlh">Klingon</string>
     <string name="id">Indonésio</string>
     <string name="jsl">Língua japonesa de sinais</string>
@@ -159,14 +159,14 @@
     <string name="avk">Kotava</string>
     <string name="bottom_nav_title_discover">Descobrir</string>
     <string name="account_bottom_menu_channels">Canais</string>
-    <string name="pref_description_app_theme">Reinicie a aplicação para que o tema tenha efeito.</string>
+    <string name="pref_description_app_theme">Reinicie a app para que o tema tenha efeito.</string>
     <string name="sr">Sérvio</string>
     <string name="ts">Tsonga</string>
     <string name="pref_background_behavior">Configuração da reprodução no fundo</string>
     <string name="ht">Haitiano</string>
     <string name="server_book_valid_url_is_required">URL válido é requerido</string>
     <string name="account_bottom_menu_about">Sobre</string>
-    <string name="error_invalid_email">Este e-mail é inválido</string>
+    <string name="error_invalid_email">Este endereço de correio eletrónico é inválido</string>
     <string name="th">Tailandês</string>
     <string name="rn">Rundi</string>
     <string name="cs">Czech</string>
@@ -180,7 +180,7 @@
     <string name="pref_background_audio">Continuar como um Stream de áudio no fundo</string>
     <string name="descr_overflow_button">Mais</string>
     <string name="menu_video_more_blacklist">Lista negra</string>
-    <string name="pref_description_language_app">Selecione o idioma para a interface da aplicação. Reinicie a aplicação para que a alteração tenha efeito.</string>
+    <string name="pref_description_language_app">Selecione o idioma para a interface da app. Reinicie a app para que a alteração tenha efeito.</string>
     <string name="pref_description_show_nsfw">Mostrar conteúdo NSFW</string>
     <string name="da">Danish</string>
     <string name="lightgreen">Verde claro</string>
@@ -345,4 +345,6 @@
     <string name="el">Grego moderno (1453-)</string>
     <string name="server_selection_select_a_server">Selecione um servidor da lista abaixo ou digite-o diretamente.</string>
     <string name="lg">Ganda</string>
+    <string name="network_error">Erro de acesso à rede, por favor verifique a sua conectividade</string>
+    <string name="server_selection_filter_hint">Filtrar a lista</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 6a91c97..d799535 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -351,4 +351,6 @@
     <string name="pref_language_app">Язык приложения</string>
     <string name="pref_description_back_pause">Приостановите фоновое воспроизведение при нажатии назад во время воспроизведения видео.</string>
     <string name="pref_title_back_pause">Пауза на кнопку Назад</string>
+    <string name="network_error">Ошибка доступа к сети, проверьте подключение</string>
+    <string name="server_selection_filter_hint">Список фильтров</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 831eda5..9933918 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -28,8 +28,8 @@
     <string name="meta_data_views">" Görüntüleme"</string>
     <string name="video_row_video_thumbnail">İzleti Küçük Resmi</string>
     <string name="video_row_account_avatar">Hesap Resmi</string>
-    <string name="pref_title_show_nsfw">İş Yeri İçin Uygun Olmayan (NSFW) İçerik</string>
-    <string name="pref_description_show_nsfw">İş yeri için uygun olmayan içeriği göster</string>
+    <string name="pref_title_show_nsfw">Ahlaksız İçerik</string>
+    <string name="pref_description_show_nsfw">Ahlaksız içeriği göster</string>
     <string name="pref_language">Dil süzgeci</string>
     <string name="pref_description_language">Tüm izletileri tüm dillerde göstermek yerine bir izleti dili seçin.</string>
     <string name="title_activity_url_video_play">URL İzleti Oynatma Etkinliği</string>
@@ -353,11 +353,13 @@
     <string name="pref_background_behavior">Arka planda oynatma yapılandırması</string>
     <string name="pref_background_stop">Tüm oynatmaları durdur</string>
     <string name="pref_background_audio">Arka planda ses akışı olarak devam et</string>
-    <string name="server_selection_nsfw_instance">İş Yeri İçin Uygun Olmayan (NSFW) Örnek</string>
+    <string name="server_selection_nsfw_instance">Ahlaksız Örnek</string>
     <string name="server_selection_video_totals">Video: %s, Yerel Video: %s</string>
     <string name="menu_video_options_quality_automated">Otomatik</string>
     <string name="pref_title_buildtime">Oluşturma Zamanı</string>
     <string name="hello_blank_fragment">Merhaba boş parça</string>
     <string name="authentication_token_refresh_success">Belirteç yenilendi</string>
     <string name="authentication_token_refresh_failed">Belirteç yenilenemedi</string>
+    <string name="network_error">Ağ erişim hatası, lütfen bağlantınızı gözden geçirin</string>
+    <string name="server_selection_filter_hint">Listeyi filtrele</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
new file mode 100644
index 0000000..3612f77
--- /dev/null
+++ b/app/src/main/res/values-uk/strings.xml
@@ -0,0 +1,350 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="settings_activity_look_and_feel_category_title">Зовнішній вигляд</string>
+    <string name="server_book_list_has_login">Має обліковий запис</string>
+    <string name="network_error">Помилка доступу до мережі, перевірте з’єднання</string>
+    <string name="video_login_required_for_service">Увійдіть, щоб користуватися цією службою</string>
+    <string name="video_rating_failed">Не вдалося оцінити</string>
+    <string name="pref_description_license">
+\n<b>Загальна публічна ліцензія GNU Affero v3.0</b>
+\n
+\nДозволи цієї найсильнішої ліцензії на копілефт обумовлені наданням повного джерельного коду ліцензованих творів та модифікацій, які включають більші твори з використанням ліцензованої роботи, за тією самою ліцензією. Повідомлення про авторські права та ліцензії повинні зберігатися. Учасники надають явне надання патентних прав. Коли модифікована версія використовується для надання послуги через мережу, повинен бути доступний повний джерельний код модифікованої версії.</string>
+    <string name="bottom_nav_title_discover">Огляд</string>
+    <string name="menu_video_options_quality_automated">Автоматизовано</string>
+    <string name="server_selection_video_totals">Відео: %s, Локальні відео: %s</string>
+    <string name="server_selection_nsfw_instance">Екземпляр NSFW</string>
+    <string name="settings_activity_video_playback_category_title">Відтворення відео</string>
+    <string name="settings_activity_video_list_category_title">Список відео</string>
+    <string name="title_activity_settings2">SettingsActivity2</string>
+    <string name="title_activity_select_server">Пошук сервера</string>
+    <string name="server_book_del_alert_msg">Дійсно бажаєте видалити цей сервер з адресної книги\?</string>
+    <string name="server_book_add_server_url">URL-адреса сервера</string>
+    <string name="server_book_add_label">Мітка</string>
+    <string name="me_help_and_feedback_button">Довідка та відгуки</string>
+    <string name="server_book_valid_url_is_required">Потрібна дійсна URL-адреса</string>
+    <string name="server_book_label_is_required">Потрібна мітка сервера</string>
+    <string name="server_book_no_servers_found">Серверні книги порожні</string>
+    <string name="authentication_login_failed">Помилка входу!</string>
+    <string name="authentication_login_success">Ви ввійшли</string>
+    <string name="hello_blank_fragment">Привіт, порожній фрагменте</string>
+    <string name="action_bar_title_server_selection">Вибрати сервер</string>
+    <string name="pref_title_buildtime">Дата збірки</string>
+    <string name="authentication_token_refresh_failed">Не вдалося оновити токен</string>
+    <string name="authentication_token_refresh_success">Токен оновлено</string>
+    <string name="video_download_permission_error">Не вдалося завантажити відео без дозволу на запис</string>
+    <string name="server_selection_filter_hint">Список фільтрів</string>
+    <string name="server_selection_peertube_server_url">URL-адреса сервера PeerTube</string>
+    <string name="server_selection_select_a_server">Виберіть сервер з переліку внизу або введіть його безпосередньо.</string>
+    <string name="server_selection_set_server">Сервер встановлено на: %s</string>
+    <string name="pref_background_behavior_summary">Поведінка відтворюваного відео після переходу в фоновий режим</string>
+    <string name="settings_permissions_error_float">Дозвіл на зображення в зображенні вимкнено для цього застосунку в Налаштуваннях Android</string>
+    <string name="settings_api_error_float">Версія Android не підтримує плаваюче відео</string>
+    <string name="pref_background_behavior">Налаштування відтворення у тлі</string>
+    <string name="pref_background_float">Продовжити відтворення відео у плаваючому вікні</string>
+    <string name="pref_background_stop">Зупинити все відтворення</string>
+    <string name="pref_background_audio">Продовжити фоновим аудіопотоком</string>
+    <string name="pref_description_language_app">Виберіть мову інтерфейсу застосунку. Перезапустіть застосунок, щоб зміни набули чинності.</string>
+    <string name="pref_language_app">Мова застосунку</string>
+    <string name="pref_description_back_pause">Зупиняти відтворення в тлі натисканням кнопки назад під час відтворення відео.</string>
+    <string name="pref_title_back_pause">Зупиняти кнопкою назад</string>
+    <string name="pref_description_background_play">Якщо ввімкнено, продовжує відтворювати відео у фоновому режимі.</string>
+    <string name="pref_title_background_play">Відтворення в тлі</string>
+    <string name="pref_title_peertube_server">Сервер PeerTube</string>
+    <string name="pref_description_language">Виберіть мову відео, замість перегляду всіх відео всіма мовами.</string>
+    <string name="pref_language">Фільтр мов</string>
+    <string name="pref_description_show_nsfw">Показувати вміст NSFW</string>
+    <string name="pref_title_show_nsfw">Вміст NSFW</string>
+    <string name="pref_title_version">Версія</string>
+    <string name="pref_title_license">Ліцензія</string>
+    <string name="pref_description_torrent_player">Відтворення відео через торрент-потік. Для цього потрібні дозволи на зберігання. (Альфа, не стабільне!)</string>
+    <string name="settings_activity_about_category_title">Про</string>
+    <string name="server_book_del_alert_title">Вилучити сервер</string>
+    <string name="video_speed_125">1.25x</string>
+    <string name="video_speed_075">0.75x</string>
+    <string name="title_activity_server_address_book">Адресна книга</string>
+    <string name="login_current_server_hint">Поточний сервер</string>
+    <string name="server_book_add_add_button">Додати</string>
+    <string name="server_book_add_password">Пароль</string>
+    <string name="server_book_add_username">Ім’я користувача</string>
+    <string name="server_book_add_pick_server_button">Шукати</string>
+    <string name="me_logout_button">Вийти</string>
+    <string name="api_error">Щось пішло не так, спробуйте пізніше!</string>
+    <string name="account_about_joined">Приєднання:</string>
+    <string name="account_about_description">Опис:</string>
+    <string name="account_about_subscribers">Підписники:</string>
+    <string name="account_about_account">Обліковий запис:</string>
+    <string name="account_bottom_menu_about">Про</string>
+    <string name="account_bottom_menu_channels">Канали</string>
+    <string name="account_bottom_menu_videos">Відео</string>
+    <string name="menu_video_options_quality" formatted="true">Якість (%1$s)</string>
+    <string name="menu_video_options_playback_speed" formatted="true">Швидкість відтворення (%1$s)</string>
+    <string name="video_meta_button_tags">Мітки</string>
+    <string name="video_meta_button_language">Мова</string>
+    <string name="video_meta_button_license">Ліцензія</string>
+    <string name="video_meta_button_category">Категорія</string>
+    <string name="video_meta_button_privacy">Приватність</string>
+    <string name="video_meta_button_download">Завантажити</string>
+    <string name="video_meta_button_share">Поділитися</string>
+    <string name="menu_video_more_blacklist">Список блокування</string>
+    <string name="menu_video_more_report">Звіт</string>
+    <string name="server_selection_signup_allowed_no">Ні</string>
+    <string name="server_selection_signup_allowed_yes">Так</string>
+    <string name="server_selection_signup_allowed">Реєстрацію дозволено: %s</string>
+    <string name="action_set_url">Вибрати сервер</string>
+    <string name="video_speed_20">2x</string>
+    <string name="video_speed_15">1,5x</string>
+    <string name="video_speed_10">Звичайна</string>
+    <string name="video_speed_05">0.5x</string>
+    <string name="bluegray">Сіро-блакитний</string>
+    <string name="gray">Сірий</string>
+    <string name="brown">Коричневий</string>
+    <string name="deeporange">Темно-помаранчевий</string>
+    <string name="orange">Помаранчевий</string>
+    <string name="amber">Бурштиновий</string>
+    <string name="yellow">Жовтий</string>
+    <string name="lime">Лаймовий</string>
+    <string name="lightgreen">Світло-зелений</string>
+    <string name="green">Зелений</string>
+    <string name="teal">Синьо-зелений</string>
+    <string name="cyan">Бірюзовий</string>
+    <string name="lightblue">Блакитний</string>
+    <string name="blue">Синій</string>
+    <string name="indigo">Індиго</string>
+    <string name="deeppurple">Насичений пурпуровий</string>
+    <string name="purple">Бузковий</string>
+    <string name="pink">Рожевий</string>
+    <string name="red">Червоний</string>
+    <string name="zu">зулуська</string>
+    <string name="za">чуанг</string>
+    <string name="yo">йоруба</string>
+    <string name="yi">ідиш</string>
+    <string name="xh">коса</string>
+    <string name="wo">волоф</string>
+    <string name="fy">західно-фризька</string>
+    <string name="cy">валлійська</string>
+    <string name="wa">валлонська</string>
+    <string name="vi">в\'єтнамська</string>
+    <string name="ve">венда</string>
+    <string name="uz">узбецька</string>
+    <string name="ur">урду</string>
+    <string name="uk">українська</string>
+    <string name="ug">уйгурська</string>
+    <string name="tw">тві</string>
+    <string name="tk">туркменська</string>
+    <string name="tr">турецька</string>
+    <string name="tn">тсвана</string>
+    <string name="ts">тсонга</string>
+    <string name="to">тонга (Острови Тонга)</string>
+    <string name="ti">тигринья</string>
+    <string name="bo">тибетська</string>
+    <string name="th">тайська</string>
+    <string name="te">телугу</string>
+    <string name="tt">татарська</string>
+    <string name="ta">тамільська</string>
+    <string name="tg">таджицька</string>
+    <string name="ty">таїтянська</string>
+    <string name="tl">тагальська</string>
+    <string name="swl">Шведська мова жестів</string>
+    <string name="sv">шведська</string>
+    <string name="ss">сваті</string>
+    <string name="sw">суахілі (макромова)</string>
+    <string name="su">сунданська</string>
+    <string name="es">іспанська</string>
+    <string name="st">південне сото</string>
+    <string name="nr">південна ндебеле</string>
+    <string name="sfs">Південноафриканська мова жестів</string>
+    <string name="so">сомалійська</string>
+    <string name="sl">словенська</string>
+    <string name="sk">словацька</string>
+    <string name="si">сингальська</string>
+    <string name="sd">синдхі</string>
+    <string name="ii">носу</string>
+    <string name="sn">шона</string>
+    <string name="sh">сербсько-хорватська</string>
+    <string name="sr">сербська</string>
+    <string name="gd">шотландська гельська</string>
+    <string name="sdl">Саудівська Аравія Мова жестів</string>
+    <string name="sc">сардинська</string>
+    <string name="sg">санґо</string>
+    <string name="sm">самоанська</string>
+    <string name="rsl">Російська мова жестів</string>
+    <string name="ru">російська</string>
+    <string name="rn">рунді</string>
+    <string name="rm">ретороманська</string>
+    <string name="ro">румунська</string>
+    <string name="qu">кечуа</string>
+    <string name="ps">пушту</string>
+    <string name="pt">португальська</string>
+    <string name="pl">польська</string>
+    <string name="fa">перська</string>
+    <string name="pa">панджабі</string>
+    <string name="pks">Пакистанська мова жестів</string>
+    <string name="os">осетинська</string>
+    <string name="om">оромо</string>
+    <string name="or">орія (макромови)</string>
+    <string name="oj">оджибвемовінська</string>
+    <string name="oc">окситанська</string>
+    <string name="ny">ньянджа</string>
+    <string name="nn">норвезька (нюношк)</string>
+    <string name="nb">норвезька (букмол)</string>
+    <string name="no">норвезька</string>
+    <string name="se">північносаамська</string>
+    <string name="nd">північна ндебеле</string>
+    <string name="ne">непальська (макромова)</string>
+    <string name="ng">ндонга</string>
+    <string name="nv">навахо</string>
+    <string name="na">науру</string>
+    <string name="mn">монгольська</string>
+    <string name="el">грецька сучасна (1453-)</string>
+    <string name="mh">маршальська</string>
+    <string name="mr">маратхі</string>
+    <string name="mi">маорійська</string>
+    <string name="gv">менська</string>
+    <string name="mt">мальтійська</string>
+    <string name="ml">малаялам</string>
+    <string name="ms">малайська (макромова)</string>
+    <string name="mg">малагасійська</string>
+    <string name="mk">македонська</string>
+    <string name="lb">люксембурзька</string>
+    <string name="lu">луба-катанґа</string>
+    <string name="jbo">ложбан</string>
+    <string name="lt">литовська</string>
+    <string name="ln">лінґала</string>
+    <string name="li">лімбурзька</string>
+    <string name="lv">латиська</string>
+    <string name="lo">лаоська</string>
+    <string name="ku">курдська</string>
+    <string name="kj">кваньяма</string>
+    <string name="avk">котава</string>
+    <string name="ko">корейська</string>
+    <string name="kg">конґо</string>
+    <string name="kv">комі</string>
+    <string name="tlh">клінгонська</string>
+    <string name="ky">киргизька</string>
+    <string name="rw">руандійська</string>
+    <string name="ki">кікую</string>
+    <string name="km">кхмерська</string>
+    <string name="kk">казахська</string>
+    <string name="ks">кашмірська</string>
+    <string name="kr">канурі</string>
+    <string name="kn">каннада</string>
+    <string name="kl">гренландська</string>
+    <string name="jv">яванська</string>
+    <string name="jsl">Японська мова жестів</string>
+    <string name="ja">японська</string>
+    <string name="it">італійська</string>
+    <string name="ga">ірландська</string>
+    <string name="ik">інуп\'як</string>
+    <string name="iu">інуктітут</string>
+    <string name="id">індонезійська</string>
+    <string name="ig">ігбо</string>
+    <string name="is">ісландська</string>
+    <string name="hu">угорська</string>
+    <string name="ho">гірімоту</string>
+    <string name="hi">гінді</string>
+    <string name="hz">гереро</string>
+    <string name="he">іврит</string>
+    <string name="ha">гауса</string>
+    <string name="ht">гаїтянська</string>
+    <string name="gu">гуджараті</string>
+    <string name="gn">ґуарані</string>
+    <string name="gsg">Німецька мова жестів</string>
+    <string name="de">німецька</string>
+    <string name="ka">грузинська</string>
+    <string name="lg">гандійська</string>
+    <string name="gl">галісійська</string>
+    <string name="ff">фула</string>
+    <string name="fsl">Французька мова жестів</string>
+    <string name="fr">французька</string>
+    <string name="fi">фінська</string>
+    <string name="fj">фіджійська</string>
+    <string name="fo">фарерська</string>
+    <string name="ee">еве</string>
+    <string name="et">естонська</string>
+    <string name="eo">есперанто</string>
+    <string name="en">англійська</string>
+    <string name="dz">дзонгкха</string>
+    <string name="nl">нідерландська</string>
+    <string name="dv">мальдівська</string>
+    <string name="dsl">Данська мова жестів</string>
+    <string name="da">данська</string>
+    <string name="cse">Чеська мова жестів</string>
+    <string name="cs">чеська</string>
+    <string name="hr">хорватська</string>
+    <string name="cr">крі</string>
+    <string name="co">корсиканська</string>
+    <string name="kw">корнська</string>
+    <string name="cv">чуваська</string>
+    <string name="csl">Китайська мова жестів</string>
+    <string name="zh">китайська</string>
+    <string name="ce">чеченська</string>
+    <string name="ch">чаморро</string>
+    <string name="ca">каталонська</string>
+    <string name="my">бірманська</string>
+    <string name="bg">болгарська</string>
+    <string name="bfi">Британська мова жестів</string>
+    <string name="br">бретонська</string>
+    <string name="bzs">Бразильська мова жестів</string>
+    <string name="bs">боснійська</string>
+    <string name="bi">біслама</string>
+    <string name="bn_rBD">бенгальська (Бангладеш)</string>
+    <string name="bn">бенгальська</string>
+    <string name="be">білоруська</string>
+    <string name="eu">баскська</string>
+    <string name="ba">башкирська</string>
+    <string name="bm">бамбара</string>
+    <string name="az">азербайджанська</string>
+    <string name="ay">аймарська</string>
+    <string name="av">аварська</string>
+    <string name="as">асамська</string>
+    <string name="hy">вірменська</string>
+    <string name="an">арагонська</string>
+    <string name="ar">арабська</string>
+    <string name="am">амхарська</string>
+    <string name="ase">Американська мова жестів</string>
+    <string name="sq">албанська</string>
+    <string name="ak">акан</string>
+    <string name="af">африкаанс</string>
+    <string name="aa">афарська</string>
+    <string name="ab">абхазька</string>
+    <string name="clear_search_history_prompt">Остаточно видалити історію пошуку\?</string>
+    <string name="clear_search_history">Очистити історію пошуку</string>
+    <string name="pref_title_torrent_player">Торрент-програвач відео</string>
+    <string name="pref_description_app_theme">Перезапустіть застосунок, щоб темний режим набув чинності.</string>
+    <string name="pref_title_app_theme">Тема застосунку</string>
+    <string name="pref_description_dark_mode">Перезапустіть програму, щоб темний режим набув чинності.</string>
+    <string name="pref_title_dark_mode">Темний режим</string>
+    <string name="invalid_url">Недійсна URL-адреса.</string>
+    <string name="menu_share">Поділитися</string>
+    <string name="descr_overflow_button">Додатково</string>
+    <string name="no_data_available">Нічого не знайдено</string>
+    <string name="title_activity_search">Шукати</string>
+    <string name="search_hint">Шукати на PeerTube</string>
+    <string name="title_activity_url_video_play">UrlVideoPlayActivity</string>
+    <string name="video_row_account_avatar">Аватар облікового запису</string>
+    <string name="video_row_video_thumbnail">Ескіз відео</string>
+    <string name="meta_data_views">" Перегляди"</string>
+    <string name="bottom_nav_title_subscriptions">Підписки</string>
+    <string name="bottom_nav_title_local">Локальне</string>
+    <string name="bottom_nav_title_recent">Нещодавнє</string>
+    <string name="bottom_nav_title_trending">Популярне</string>
+    <string name="action_bar_title_search">Шукати</string>
+    <string name="permission_rationale">Надайте доступ до контактів для заповнення електронної пошти.</string>
+    <string name="prompt_password">Пароль</string>
+    <string name="prompt_email">Електронна адреса / ім’я користувача</string>
+    <string name="action_sign_in">Увійти</string>
+    <string name="error_field_required">Це поле обов\'язкове</string>
+    <string name="error_incorrect_password">Цей пароль не правильний</string>
+    <string name="error_invalid_password">Цей пароль закороткий</string>
+    <string name="error_invalid_email">Ця адреса електронної пошти недійсна</string>
+    <string name="action_sign_in_short">Увійти</string>
+    <string name="bottom_nav_title_account">Обліковий запис</string>
+    <string name="title_activity_account">Обліковий запис</string>
+    <string name="title_activity_me">Обліковий запис</string>
+    <string name="action_bar_title_account">Обліковий запис</string>
+    <string name="action_bar_title_logout">Вийти</string>
+    <string name="action_bar_title_settings">Параметри</string>
+    <string name="prompt_server">Сервер</string>
+    <string name="title_activity_login">Увійти</string>
+    <string name="title_activity_settings">Параметри</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 7fdeaea..f1aa71f 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -54,7 +54,7 @@
     <string name="brown">褐色</string>
     <string name="gray">灰色</string>
     <string name="bluegray">蓝灰色</string>
-    <string name="meta_data_views">次观看</string>
+    <string name="meta_data_views">" 次观看"</string>
     <string name="bottom_nav_title_local">本地</string>
     <string name="title_activity_account">帐号</string>
     <string name="pref_language">按语言过滤</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index f5338b1..8e00abb 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -345,4 +345,6 @@
     <string name="menu_video_options_quality_automated">自動</string>
     <string name="authentication_token_refresh_success">權杖已重新整理</string>
     <string name="authentication_token_refresh_failed">無法重新整理權杖</string>
+    <string name="network_error">網路存取錯誤，請檢查您的網路連線</string>
+    <string name="server_selection_filter_hint">過濾清單</string>
 </resources>
\ No newline at end of file
diff --git a/fastlane/metadata/android/ar/full_description.txt b/fastlane/metadata/android/ar/full_description.txt
new file mode 100644
index 0000000..5e68aa3
--- /dev/null
+++ b/fastlane/metadata/android/ar/full_description.txt
@@ -0,0 +1 @@
+Thorium هو عميل PeerTube يمكنه الاتصال بأي خادم peertube يعمل بالإصدار v1.1.0-alpha.2 أو أعلى. PeerTube عبارة عن منصة دفق فيديو (ActivityPub) موحدة باستخدام P2P (BitTorrent) مباشرة في متصفح الويب. لمزيد من المعلومات ، يرجى زيارة https://joinpeertube.org/ لمزيد من المعلومات وقائمة الخوادم. يأتي هذا العميل مُهيئًا مسبقًا بخادم PeerTube واحد يديره منشئ التطبيق - وليس مشروع PeerTube نفسه ، الذي يسرد المزيد على http://instances.joinpeertube.org/ - للسماح لك بتذوق ما يمكن للعميل القيام به. اختر الخادم الخاص بك لضبط تجربتك! الميزات الحالية: - الاتصال بأي خادم PeerTube - فيديو تورنت أو تشغيل مباشر - بحث PeerTube - تنزيل / مشاركة الفيديو - ثيمات / الوضع الداكن - تشغيل الخلفية - تشغيل ملء الشاشة في الوضع الأفقي - سرعة التشغيل - تصفية محتوى NSFW - المصادقة / تسجيل الدخول - إبداء الإعجاب / عدم الإعجاب بالفيديو سآتي قريبا: - تعليق مقاطع الفيديو - تسجيل - صفحة نظرة عامة على المستخدم / القناة - تقرير مقاطع الفيديو الأذونات: - الوصول إلى التخزين ، مطلوب لتنزيل التورنت أو تنزيل الفيديو. مُرخصة بموجب رخصة جنو أفيرو العمومية v3.0 أذونات أقوى ترخيص حقوق متروكة مشروطة بإتاحة كود مصدر كامل للأعمال المرخصة والتعديلات ، والتي تشمل الأعمال الأكبر باستخدام عمل مرخص ، بموجب نفس الترخيص. يجب الحفاظ على إشعارات حقوق النشر والترخيص. يقدم المساهمون منحًا صريحًا لحقوق براءات الاختراع. عند استخدام نسخة معدلة لتقديم خدمة عبر شبكة ، يجب توفير كود المصدر الكامل للنسخة المعدلة. كود المصدر على: https://github.com/sschueller/peertube-android/
diff --git a/fastlane/metadata/android/ar/short_description.txt b/fastlane/metadata/android/ar/short_description.txt
new file mode 100644
index 0000000..2ecef04
--- /dev/null
+++ b/fastlane/metadata/android/ar/short_description.txt
@@ -0,0 +1 @@
+Thorium هو مشغل PeerTube غير رسمي
diff --git a/fastlane/metadata/android/ar/title.txt b/fastlane/metadata/android/ar/title.txt
new file mode 100644
index 0000000..e901099
--- /dev/null
+++ b/fastlane/metadata/android/ar/title.txt
@@ -0,0 +1 @@
+الثوريوم عميل غير رسمي لشركة P
diff --git a/fastlane/metadata/android/ar/video.txt b/fastlane/metadata/android/ar/video.txt
new file mode 100644
index 0000000..5824a09
--- /dev/null
+++ b/fastlane/metadata/android/ar/video.txt
@@ -0,0 +1 @@
+https://www.youtube.com/watch?v=PJIsiuSdpq8
diff --git a/fastlane/metadata/android/de/changelogs/1047.txt b/fastlane/metadata/android/de/changelogs/1047.txt
new file mode 100644
index 0000000..9f6c675
--- /dev/null
+++ b/fastlane/metadata/android/de/changelogs/1047.txt
@@ -0,0 +1 @@
+- Authentifizierungsaktualisierung
diff --git a/fastlane/metadata/android/de/full_description.txt b/fastlane/metadata/android/de/full_description.txt
new file mode 100644
index 0000000..e23eb1d
--- /dev/null
+++ b/fastlane/metadata/android/de/full_description.txt
@@ -0,0 +1,33 @@
+Thorium ist ein PeerTube-Client, der eine Verbindung zu jedem PeerTube-Server mit Version v1.1.0-alpha.2 oder höher herstellen kann.
+
+PeerTube ist eine föderierte (ActivityPub) Video-Streaming-Plattform, die P2P (BitTorrent) direkt im Webbrowser verwendet. Weitere Informationen finden Sie unter https://joinpeertube.org/ und eine Liste von Servern.
+
+Dieser Client wird vorkonfiguriert mit einem PeerTube-Server geliefert, der vom Ersteller der Anwendung verwaltet wird – nicht das PeerTube-Projekt selbst, das mehr unter http://instances.joinpeertube.org/ aufgelistet ist –, damit Sie einen Vorgeschmack darauf bekommen, wozu der Client in der Lage ist. Wählen Sie Ihren Server, um Ihre Erfahrung zu optimieren!
+
+Aktuelle Merkmale:
+- Verbindung zu jedem PeerTube-Server
+- Torrent-Video oder direkte Wiedergabe
+- PeerTube durchsuchen
+- Video herunterladen / weitergeben
+- Dunkel-Modus
+- Wiedergabe im Hintergrund
+- Vollbild-Wiedergabe im Querformat
+- Wiedergabegeschwindigkeit
+- NSFW-Inhalt filtern
+- Authentifizierung / Anmeldung
+- Video gefällt mir / gefällt mir nicht
+
+Demnächst:
+- Videos kommentieren
+- Registrieren
+- Benutzer-/Kanal-Übersichtsseite
+- Bericht Videos
+
+Genehmigungen:
+- Speicherzugang, erforderlich für Torrent-Herunterladen oder Video-Herunterladen.
+
+Lizenziert unter der GNU Affero General Public License v3.0
+
+Genehmigungen dieser stärksten Copyleft-Lizenz sind an die Bedingung geknüpft, den vollständigen Quellcode der lizenzierten Werke und Modifikationen, zu denen auch größere Werke gehören, die ein lizenziertes Werk verwenden, unter der gleichen Lizenz zur Verfügung zu stellen. Urheberrechts- und Lizenzhinweise müssen erhalten bleiben. Mitwirkende stellen eine ausdrückliche Gewährung von Patentrechten zur Verfügung. Wenn eine modifizierte Version verwendet wird, um einen Dienst über ein Netzwerk anzubieten, muss der vollständige Quellcode der modifizierten Version zur Verfügung gestellt werden.
+
+Quellcode unter: https://github.com/sschueller/peertube-android/
diff --git a/fastlane/metadata/android/de/short_description.txt b/fastlane/metadata/android/de/short_description.txt
new file mode 100644
index 0000000..ea2c0d2
--- /dev/null
+++ b/fastlane/metadata/android/de/short_description.txt
@@ -0,0 +1 @@
+Thorium ist ein inoffizieller PeerTube-Abspieler
diff --git a/fastlane/metadata/android/de/title.txt b/fastlane/metadata/android/de/title.txt
new file mode 100644
index 0000000..ed7acb6
--- /dev/null
+++ b/fastlane/metadata/android/de/title.txt
@@ -0,0 +1 @@
+Inoffizieller PeerTube-Client
diff --git a/fastlane/metadata/android/de/video.txt b/fastlane/metadata/android/de/video.txt
new file mode 100644
index 0000000..5824a09
--- /dev/null
+++ b/fastlane/metadata/android/de/video.txt
@@ -0,0 +1 @@
+https://www.youtube.com/watch?v=PJIsiuSdpq8
diff --git a/fastlane/metadata/android/en-US/changelogs/1050.txt b/fastlane/metadata/android/en-US/changelogs/1050.txt
new file mode 100644
index 0000000..fb65b55
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/1050.txt
@@ -0,0 +1,2 @@
+ - add support for disabling SSL
+ - translations
\ No newline at end of file
diff --git a/fastlane/metadata/android/fr-FR/changelogs/1048.txt b/fastlane/metadata/android/fr-FR/changelogs/1048.txt
new file mode 100644
index 0000000..84f95b9
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/1048.txt
@@ -0,0 +1 @@
+- sortie f-droid pour corriger le déploiement automatique
diff --git a/fastlane/metadata/android/fr-FR/full_description.txt b/fastlane/metadata/android/fr-FR/full_description.txt
index baf2ce7..d5116d7 100644
--- a/fastlane/metadata/android/fr-FR/full_description.txt
+++ b/fastlane/metadata/android/fr-FR/full_description.txt
@@ -1 +1,33 @@
-Thorium est un lecteur non-officiel de PeerTube
+Thorium est un client PeerTube qui peut se connecter à n'importe quel serveur Peertube exécutant la version v1.1.0-alpha.2 ou supérieure.
+
+PeerTube est une plateforme de streaming vidéo fédérée (ActivityPub) utilisant P2P (BitTorrent) directement dans le navigateur Web. Pour plus d'informations, veuillez visiter https://joinpeertube.org/ pour plus d'informations et une liste de serveurs.
+
+Ce client est préconfiguré avec un serveur PeerTube géré par le créateur de l'application – pas le projet PeerTube lui-même, qui en répertorie plus sur http://instances.joinpeertube.org/ – pour vous permettre d'avoir un avant-goût de ce dont le client est capable. Choisissez votre serveur pour optimiser votre expérience !
+
+Caractéristiques actuelles :
+- Connectez-vous à n'importe quel serveur PeerTube
+- Vidéo Torrent ou lecture directe
+- Rechercher PeerTube
+- Télécharger / Partager la vidéo
+- Thèmes / Mode sombre
+- Lecture en arrière-plan
+- Lecture plein écran en paysage
+- Vitesse de lecture
+- Filtrer le contenu NSFW
+- Authentification / Connexion
+- J'aime / n'aime pas la vidéo
+
+Prochainement :
+- Commenter des vidéos
+- S'inscrire
+- Page de présentation des utilisateurs / canaux
+- Signaler des vidéos
+
+Autorisations:
+- Accès au stockage, requis pour le téléchargement Torrent ou le téléchargement vidéo.
+
+Sous licence GNU Affero General Public License v3.0
+
+Les autorisations de cette licence copyleft la plus puissante sont conditionnées à la mise à disposition du code source complet des œuvres sous licence et des modifications, qui incluent des œuvres plus volumineuses utilisant une œuvre sous licence, sous la même licence. Les avis de droit d'auteur et de licence doivent être préservés. Les contributeurs accordent expressément les droits de brevet. Lorsqu'une version modifiée est utilisée pour fournir un service sur un réseau, le code source complet de la version modifiée doit être rendu disponible.
+
+Code source sur : https://github.com/sschueller/peertube-android/
diff --git a/fastlane/metadata/android/fr-FR/short_description.txt b/fastlane/metadata/android/fr-FR/short_description.txt
index baf2ce7..860707f 100644
--- a/fastlane/metadata/android/fr-FR/short_description.txt
+++ b/fastlane/metadata/android/fr-FR/short_description.txt
@@ -1 +1 @@
-Thorium est un lecteur non-officiel de PeerTube
+Thorium est un lecteur non officiel de PeerTube
diff --git a/fastlane/metadata/android/fr-FR/title.txt b/fastlane/metadata/android/fr-FR/title.txt
index 9284517..b3ff845 100644
--- a/fastlane/metadata/android/fr-FR/title.txt
+++ b/fastlane/metadata/android/fr-FR/title.txt
@@ -1 +1 @@
-Thorium an unofficial PeerTube client
\ No newline at end of file
+Client PeerTube non officiel
diff --git a/fastlane/metadata/android/it/changelogs/1047.txt b/fastlane/metadata/android/it/changelogs/1047.txt
new file mode 100644
index 0000000..5d71c6b
--- /dev/null
+++ b/fastlane/metadata/android/it/changelogs/1047.txt
@@ -0,0 +1 @@
+- Aggiornamento dell'autenticazione
diff --git a/fastlane/metadata/android/it/changelogs/1048.txt b/fastlane/metadata/android/it/changelogs/1048.txt
new file mode 100644
index 0000000..e751d75
--- /dev/null
+++ b/fastlane/metadata/android/it/changelogs/1048.txt
@@ -0,0 +1 @@
+- uscita F-Droid per correggere la distribuzione automatica
diff --git a/fastlane/metadata/android/it/changelogs/1049.txt b/fastlane/metadata/android/it/changelogs/1049.txt
new file mode 100644
index 0000000..04efcd7
--- /dev/null
+++ b/fastlane/metadata/android/it/changelogs/1049.txt
@@ -0,0 +1,7 @@
+- Aggiunto il supporto del reindirizzamento ipertestuale nella descrizione (@freeboub)
+- vari crash fix (@freeboub)
+- evitare di andare a pip quando si esce dall'applicazione a causa del pulsante di condivisione (@freeboub)
+- Aggiunto la possibilità di filtrare la lista dei server (@freeboub)
+- Gestione degli errori del rifattore Toast per dividere l'errore di rete (@freeboub)
+- Mantenere il rapporto d'aspetto video per pip (@freeboub)
+- la barra di navigazione non è stata ripristinata
diff --git a/fastlane/metadata/android/it/full_description.txt b/fastlane/metadata/android/it/full_description.txt
new file mode 100644
index 0000000..eeccf69
--- /dev/null
+++ b/fastlane/metadata/android/it/full_description.txt
@@ -0,0 +1,33 @@
+Thorium è un client PeerTube in grado di connettersi a qualsiasi server peertube che esegue la versione v1.1.0-alpha.2 o successiva. 
+
+PeerTube è una piattaforma di streaming video federata (ActivityPub) che utilizza P2P (BitTorrent) direttamente nel browser web. Per ulteriori informazioni, visitare https://joinpeertube.org/ per ulteriori informazioni e un elenco dei server.
+
+Questo client viene preconfigurato con un server PeerTube gestito dal creatore dell'applicazione – non il progetto PeerTube stesso, che elenca di più su http://instances.joinpeertube.org/ – per consentire di avere un assaggio di ciò che il client è in grado di. Scegli il tuo server per ottimizzare la tua esperienza!
+
+Caratteristiche attuali:
+- Connettersi a qualsiasi server PeerTube
+- Video Torrent o riproduzione diretta
+- Ricerca PeerTube
+- Scarica / Condividi video
+- Temi / Modalità scuro
+- Riproduzione nello sfondo
+- Riproduzione a schermo intero in orizzontale
+- Velocità di riproduzione
+- Filtrare il contenuto NSFW
+- Autenticazione / accesso
+- Video mi piace /non mi piace
+
+Comming Presto:
+- Commenta i video
+- Registrati
+- Pagina Panoramica utente/canale
+- Segnala video
+
+Autorizzazioni:
+- Accesso di archiviazione, necessario per lo scaricamento Torrent o lo scaricamento video. 
+
+Concesso in licenza ai sensi della GNU Affero General Public License v3.0
+
+Le autorizzazioni di questa licenza copyleft più forte sono condizionate a rendere disponibile il codice sorgente completo delle opere e delle modifiche con licenza, che includono opere più grandi utilizzando un lavoro concesso in licenza, sotto la stessa licenza. Le note sul copyright e sulla licenza devono essere conservate. I contributori forniscono una concessione espressa dei diritti di brevetto. Quando una versione modificata viene utilizzata per fornire un servizio in rete, è necessario reso disponibile il codice sorgente completo della versione modificata.
+
+Codice sorgente all'indirizzo: https://github.com/sschueller/peertube-android/
diff --git a/fastlane/metadata/android/it/short_description.txt b/fastlane/metadata/android/it/short_description.txt
new file mode 100644
index 0000000..47680c6
--- /dev/null
+++ b/fastlane/metadata/android/it/short_description.txt
@@ -0,0 +1 @@
+Thorium è un lettore PeerTube non ufficiale
diff --git a/fastlane/metadata/android/it/title.txt b/fastlane/metadata/android/it/title.txt
new file mode 100644
index 0000000..428b773
--- /dev/null
+++ b/fastlane/metadata/android/it/title.txt
@@ -0,0 +1 @@
+Cliente PeerTube non ufficiale
diff --git a/fastlane/metadata/android/it/video.txt b/fastlane/metadata/android/it/video.txt
new file mode 100644
index 0000000..5824a09
--- /dev/null
+++ b/fastlane/metadata/android/it/video.txt
@@ -0,0 +1 @@
+https://www.youtube.com/watch?v=PJIsiuSdpq8
diff --git a/fastlane/metadata/android/no-NO/video.txt b/fastlane/metadata/android/no-NO/video.txt
new file mode 100644
index 0000000..5824a09
--- /dev/null
+++ b/fastlane/metadata/android/no-NO/video.txt
@@ -0,0 +1 @@
+https://www.youtube.com/watch?v=PJIsiuSdpq8
diff --git a/fastlane/metadata/android/ru-RU/changelogs/1048.txt b/fastlane/metadata/android/ru-RU/changelogs/1048.txt
new file mode 100644
index 0000000..ca03994
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/1048.txt
@@ -0,0 +1 @@
+- выпуск в f-droid для исправления автоматического развёртывания
diff --git a/fastlane/metadata/android/ru-RU/changelogs/1049.txt b/fastlane/metadata/android/ru-RU/changelogs/1049.txt
new file mode 100644
index 0000000..3493f1a
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/1049.txt
@@ -0,0 +1,7 @@
+- Добавлена поддержка перенаправления гипертекста в описании (@freeboub)
+ - Различные исправления сбоев (@freeboub)
+ - Избежание появления pip при выходе из приложения из-за кнопки "Поделиться" (@freeboub)
+ - Добавлена возможность фильтрации списка серверов (@freeboub)
+ - Реорганизовано управление ошибками Toast для сетевой ошибки (@freeboub)
+ - Сохранение соотношения сторон видео для pip (@freeboub)
+ - Панель навигации не восстанавливалась при выходе из ландшафтного режима (@freeboub)
diff --git a/fastlane/metadata/android/tr-TR/changelogs/1048.txt b/fastlane/metadata/android/tr-TR/changelogs/1048.txt
new file mode 100644
index 0000000..79841fd
--- /dev/null
+++ b/fastlane/metadata/android/tr-TR/changelogs/1048.txt
@@ -0,0 +1 @@
+- otomatik dağıtımı düzeltmek için f-droid sürümü
diff --git a/fastlane/metadata/android/tr-TR/changelogs/1049.txt b/fastlane/metadata/android/tr-TR/changelogs/1049.txt
new file mode 100644
index 0000000..e5bc7ae
--- /dev/null
+++ b/fastlane/metadata/android/tr-TR/changelogs/1049.txt
@@ -0,0 +1,7 @@
+- açıklamada hipermetin yeniden yönlendirme desteği ekle (@freeboub)
+ - çeşitli çökme düzeltmeleri (@freeboub)
+ - paylaş düğmesi ile uygulamadan ayrılırken pip'e gitmekten kaçın (@freeboub)
+ - sunucu listesini filtreleme yeteneği ekle (@freeboub)
+ - ağ hatalarını ayırmak için Toast hata yönetimini yeniden düzenle (@freeboub)
+ - pip için video en/boy oranını koru (@freeboub)
+ - yatay moddan çıkarken gezinme çubuğu geri yüklenmiyordu (@freeboub)
diff --git a/fastlane/metadata/android/uk/changelogs/1047.txt b/fastlane/metadata/android/uk/changelogs/1047.txt
new file mode 100644
index 0000000..077cbe0
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/1047.txt
@@ -0,0 +1 @@
+- Оновлення автентифікації
diff --git a/fastlane/metadata/android/uk/changelogs/1048.txt b/fastlane/metadata/android/uk/changelogs/1048.txt
new file mode 100644
index 0000000..042cf14
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/1048.txt
@@ -0,0 +1 @@
+- випуск f-droid для виправлення автоматичного розгортання
diff --git a/fastlane/metadata/android/uk/changelogs/1049.txt b/fastlane/metadata/android/uk/changelogs/1049.txt
new file mode 100644
index 0000000..43cda85
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/1049.txt
@@ -0,0 +1,7 @@
+- додано підтримку перенаправлення гіпертексту в опис (@freeboub)
+ - різні виправлення збоїв (@freeboub)
+ - уникайте звз під час виходу з програми через кнопку спільного доступу (@freeboub)
+ - Додайно можливість фільтрувати список серверів (@freeboub)
+ - Управління помилками Refactor Toast для розділення помилки мережі (@freeboub)
+ - збереження співвідношення сторін відео для зображення в зображенні (@freeboub)
+ - панель навігації не відновлювалась після виходу з альбомного режиму (@freeboub)
diff --git a/fastlane/metadata/android/uk/full_description.txt b/fastlane/metadata/android/uk/full_description.txt
new file mode 100644
index 0000000..3110c73
--- /dev/null
+++ b/fastlane/metadata/android/uk/full_description.txt
@@ -0,0 +1,33 @@
+Thorium - це клієнт PeerTube, який може під'єднуватися до будь-якого сервера peertube, що працює версії v1.1.0-alpha.2 або новіших.
+
+PeerTube - це об'єднана (ActivityPub) платформа для потокового відео, що використовує P2P (BitTorrent) безпосередньо у браузері. Додаткові відомості та перелік серверів ви знайдете за адресою https://joinpeertube.org/ .
+
+Цей клієнт постачається з попередньо налаштованим сервером PeerTube, керованим творцем програми, а не самим проєктом PeerTube, який містить докладніші відомості на сайті http://instance.joinpeertube.org/, щоб дозволити вам відчути, на що здатний клієнт. Виберіть свій сервер, щоб налаштувати все що потрібно!
+
+Поточні функції:
+- Під'єднання до будь-якого сервера PeerTube
+- Торрент-відео або пряме відтворення
+- Пошук у PeerTube
+- Завантажити / Поділитися відео
+- Теми / Темний режим
+- Відтворення у тлі
+- Повноекранне відтворення в альбомному режимі
+- Швидкість відтворення
+- Фільтрувати вміст NSFW
+- Аутентифікація / Вхід
+- Вподобати / не подобається відео
+
+Скоро буде:
+- Коментувати відео
+- Реєстрація
+- Сторінка огляду користувача / каналу
+- Звіт про відео
+
+Дозволи:
+- Доступ до сховища, необхідний для завантаження торрента або завантаження відео.
+
+Ліцензовано під загальною публічною ліцензією GNU Affero v3.0
+
+Дозволи цієї найсильнішої ліцензії на копілефт обумовлені наданням повного джерельного коду ліцензованих творів та модифікацій, які включають більші твори з використанням ліцензованої роботи, за тією самою ліцензією. Повідомлення про авторські права та ліцензії повинні зберігатися. Учасники надають явне надання патентних прав. Коли модифікована версія використовується для надання послуги через мережу, джерельний код модифікованої версії повинен бути доступний.
+
+Джерельний код за адресою: https://github.com/sschueller/peertube-android/
diff --git a/fastlane/metadata/android/uk/short_description.txt b/fastlane/metadata/android/uk/short_description.txt
new file mode 100644
index 0000000..54abf3f
--- /dev/null
+++ b/fastlane/metadata/android/uk/short_description.txt
@@ -0,0 +1 @@
+Thorium - неофіційний програвач PeerTube
diff --git a/fastlane/metadata/android/uk/title.txt b/fastlane/metadata/android/uk/title.txt
new file mode 100644
index 0000000..991e4f2
--- /dev/null
+++ b/fastlane/metadata/android/uk/title.txt
@@ -0,0 +1 @@
+Thorium неоф. клієнт PeerTube
diff --git a/fastlane/metadata/android/uk/video.txt b/fastlane/metadata/android/uk/video.txt
new file mode 100644
index 0000000..5824a09
--- /dev/null
+++ b/fastlane/metadata/android/uk/video.txt
@@ -0,0 +1 @@
+https://www.youtube.com/watch?v=PJIsiuSdpq8

From fa01af706d0cd4126fb956230799a6cd4172365f Mon Sep 17 00:00:00 2001
From: Stefan Schueller <sschueller@nunight.com>
Date: Sun, 22 Nov 2020 15:16:27 +0100
Subject: [PATCH 4/5] Fixed new language names

---
 DEPLOYMENT.md                                       | 13 +++++++------
 .../android/{de => de-DE}/changelogs/1047.txt       |  0
 .../android/{de => de-DE}/full_description.txt      |  0
 .../android/{de => de-DE}/short_description.txt     |  0
 fastlane/metadata/android/{de => de-DE}/title.txt   |  0
 fastlane/metadata/android/{de => de-DE}/video.txt   |  0
 .../android/{it => it-IT}/changelogs/1047.txt       |  0
 .../android/{it => it-IT}/changelogs/1048.txt       |  0
 .../android/{it => it-IT}/changelogs/1049.txt       |  0
 .../android/{it => it-IT}/full_description.txt      |  0
 .../android/{it => it-IT}/short_description.txt     |  0
 fastlane/metadata/android/{it => it-IT}/title.txt   |  0
 fastlane/metadata/android/{it => it-IT}/video.txt   |  0
 13 files changed, 7 insertions(+), 6 deletions(-)
 rename fastlane/metadata/android/{de => de-DE}/changelogs/1047.txt (100%)
 rename fastlane/metadata/android/{de => de-DE}/full_description.txt (100%)
 rename fastlane/metadata/android/{de => de-DE}/short_description.txt (100%)
 rename fastlane/metadata/android/{de => de-DE}/title.txt (100%)
 rename fastlane/metadata/android/{de => de-DE}/video.txt (100%)
 rename fastlane/metadata/android/{it => it-IT}/changelogs/1047.txt (100%)
 rename fastlane/metadata/android/{it => it-IT}/changelogs/1048.txt (100%)
 rename fastlane/metadata/android/{it => it-IT}/changelogs/1049.txt (100%)
 rename fastlane/metadata/android/{it => it-IT}/full_description.txt (100%)
 rename fastlane/metadata/android/{it => it-IT}/short_description.txt (100%)
 rename fastlane/metadata/android/{it => it-IT}/title.txt (100%)
 rename fastlane/metadata/android/{it => it-IT}/video.txt (100%)

diff --git a/DEPLOYMENT.md b/DEPLOYMENT.md
index 3876b58..6aedc74 100644
--- a/DEPLOYMENT.md
+++ b/DEPLOYMENT.md
@@ -5,11 +5,12 @@
   3. Pull github develop
   4. Pull weblate develop
   5. Add change logs (fastlane/metadata/android/en-US/changelogs/XXX.txt)
-  6. Push to gitlab and github
-  7. Merge request into master and merge
-  8. Add Release Tag on master branch
-  9. Release to play store
-  10. Wait for gitlab -> github sync
-  11. Run publishGithub
+  6. Run ci-script/update-changelog.sh
+  7. Push to gitlab
+  8. Merge request into master and merge
+  9. Add Release Tag on master branch
+  10. Release to play store
+  11. Wait for gitlab -> github sync
+  12. Run publishGithub
 
 
diff --git a/fastlane/metadata/android/de/changelogs/1047.txt b/fastlane/metadata/android/de-DE/changelogs/1047.txt
similarity index 100%
rename from fastlane/metadata/android/de/changelogs/1047.txt
rename to fastlane/metadata/android/de-DE/changelogs/1047.txt
diff --git a/fastlane/metadata/android/de/full_description.txt b/fastlane/metadata/android/de-DE/full_description.txt
similarity index 100%
rename from fastlane/metadata/android/de/full_description.txt
rename to fastlane/metadata/android/de-DE/full_description.txt
diff --git a/fastlane/metadata/android/de/short_description.txt b/fastlane/metadata/android/de-DE/short_description.txt
similarity index 100%
rename from fastlane/metadata/android/de/short_description.txt
rename to fastlane/metadata/android/de-DE/short_description.txt
diff --git a/fastlane/metadata/android/de/title.txt b/fastlane/metadata/android/de-DE/title.txt
similarity index 100%
rename from fastlane/metadata/android/de/title.txt
rename to fastlane/metadata/android/de-DE/title.txt
diff --git a/fastlane/metadata/android/de/video.txt b/fastlane/metadata/android/de-DE/video.txt
similarity index 100%
rename from fastlane/metadata/android/de/video.txt
rename to fastlane/metadata/android/de-DE/video.txt
diff --git a/fastlane/metadata/android/it/changelogs/1047.txt b/fastlane/metadata/android/it-IT/changelogs/1047.txt
similarity index 100%
rename from fastlane/metadata/android/it/changelogs/1047.txt
rename to fastlane/metadata/android/it-IT/changelogs/1047.txt
diff --git a/fastlane/metadata/android/it/changelogs/1048.txt b/fastlane/metadata/android/it-IT/changelogs/1048.txt
similarity index 100%
rename from fastlane/metadata/android/it/changelogs/1048.txt
rename to fastlane/metadata/android/it-IT/changelogs/1048.txt
diff --git a/fastlane/metadata/android/it/changelogs/1049.txt b/fastlane/metadata/android/it-IT/changelogs/1049.txt
similarity index 100%
rename from fastlane/metadata/android/it/changelogs/1049.txt
rename to fastlane/metadata/android/it-IT/changelogs/1049.txt
diff --git a/fastlane/metadata/android/it/full_description.txt b/fastlane/metadata/android/it-IT/full_description.txt
similarity index 100%
rename from fastlane/metadata/android/it/full_description.txt
rename to fastlane/metadata/android/it-IT/full_description.txt
diff --git a/fastlane/metadata/android/it/short_description.txt b/fastlane/metadata/android/it-IT/short_description.txt
similarity index 100%
rename from fastlane/metadata/android/it/short_description.txt
rename to fastlane/metadata/android/it-IT/short_description.txt
diff --git a/fastlane/metadata/android/it/title.txt b/fastlane/metadata/android/it-IT/title.txt
similarity index 100%
rename from fastlane/metadata/android/it/title.txt
rename to fastlane/metadata/android/it-IT/title.txt
diff --git a/fastlane/metadata/android/it/video.txt b/fastlane/metadata/android/it-IT/video.txt
similarity index 100%
rename from fastlane/metadata/android/it/video.txt
rename to fastlane/metadata/android/it-IT/video.txt

From 638852ab01c4271c3ba18c425e89d237c7d3cd9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Sch=C3=BCller?= <sschueller@techdroid.com>
Date: Sun, 22 Nov 2020 16:12:19 +0100
Subject: [PATCH 5/5] Update make-github-release.sh fix wrong repo

---
 ci-scripts/make-github-release.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci-scripts/make-github-release.sh b/ci-scripts/make-github-release.sh
index ce7d128..3fb95a8 100755
--- a/ci-scripts/make-github-release.sh
+++ b/ci-scripts/make-github-release.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-repo="sschueller/easyrepost"
+repo="sschueller/peertube-android"
 username="sschueller"
 
 # set work dir