Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Thomas 2020-12-24 16:40:35 +01:00
commit 3425e1e593
16 changed files with 39 additions and 7 deletions

View File

@ -353,4 +353,6 @@
<string name="live">Live</string> <string name="live">Live</string>
<string name="live_not_started">This live has not started!</string> <string name="live_not_started">This live has not started!</string>
<string name="remote_account">Account from another network!</string> <string name="remote_account">Account from another network!</string>
<string name="instance_not_availabe">Instance is not available!</string>
<string name="max_tag_size">The video should not have more than 5 tags!</string>
</resources> </resources>

View File

@ -349,4 +349,6 @@
<string name="live">Live</string> <string name="live">Live</string>
<string name="live_not_started">This live has not started!</string> <string name="live_not_started">This live has not started!</string>
<string name="remote_account">Account from another network!</string> <string name="remote_account">Account from another network!</string>
<string name="instance_not_availabe">Instance is not available!</string>
<string name="max_tag_size">The video should not have more than 5 tags!</string>
</resources> </resources>

View File

@ -348,4 +348,6 @@
<string name="live">Live</string> <string name="live">Live</string>
<string name="live_not_started">This live has not started!</string> <string name="live_not_started">This live has not started!</string>
<string name="remote_account">Account from another network!</string> <string name="remote_account">Account from another network!</string>
<string name="instance_not_availabe">Instance is not available!</string>
<string name="max_tag_size">The video should not have more than 5 tags!</string>
</resources> </resources>

View File

@ -349,4 +349,6 @@
<string name="live">Live</string> <string name="live">Live</string>
<string name="live_not_started">This live has not started!</string> <string name="live_not_started">This live has not started!</string>
<string name="remote_account">Account from another network!</string> <string name="remote_account">Account from another network!</string>
<string name="instance_not_availabe">Instance is not available!</string>
<string name="max_tag_size">The video should not have more than 5 tags!</string>
</resources> </resources>

View File

@ -349,4 +349,6 @@
<string name="live">Live</string> <string name="live">Live</string>
<string name="live_not_started">This live has not started!</string> <string name="live_not_started">This live has not started!</string>
<string name="remote_account">Account from another network!</string> <string name="remote_account">Account from another network!</string>
<string name="instance_not_availabe">Instance is not available!</string>
<string name="max_tag_size">The video should not have more than 5 tags!</string>
</resources> </resources>

View File

@ -349,4 +349,6 @@
<string name="live">Live</string> <string name="live">Live</string>
<string name="live_not_started">This live has not started!</string> <string name="live_not_started">This live has not started!</string>
<string name="remote_account">Account from another network!</string> <string name="remote_account">Account from another network!</string>
<string name="instance_not_availabe">Instance is not available!</string>
<string name="max_tag_size">The video should not have more than 5 tags!</string>
</resources> </resources>

View File

@ -348,4 +348,6 @@
<string name="live">Live</string> <string name="live">Live</string>
<string name="live_not_started">This live has not started!</string> <string name="live_not_started">This live has not started!</string>
<string name="remote_account">Account from another network!</string> <string name="remote_account">Account from another network!</string>
<string name="instance_not_availabe">Instance is not available!</string>
<string name="max_tag_size">The video should not have more than 5 tags!</string>
</resources> </resources>

View File

@ -348,4 +348,6 @@
<string name="live">Live</string> <string name="live">Live</string>
<string name="live_not_started">This live has not started!</string> <string name="live_not_started">This live has not started!</string>
<string name="remote_account">Account from another network!</string> <string name="remote_account">Account from another network!</string>
<string name="instance_not_availabe">Instance is not available!</string>
<string name="max_tag_size">The video should not have more than 5 tags!</string>
</resources> </resources>

View File

@ -349,4 +349,6 @@
<string name="live">Live</string> <string name="live">Live</string>
<string name="live_not_started">This live has not started!</string> <string name="live_not_started">This live has not started!</string>
<string name="remote_account">Account from another network!</string> <string name="remote_account">Account from another network!</string>
<string name="instance_not_availabe">Instance is not available!</string>
<string name="max_tag_size">The video should not have more than 5 tags!</string>
</resources> </resources>

View File

@ -351,4 +351,6 @@
<string name="live">Live</string> <string name="live">Live</string>
<string name="live_not_started">This live has not started!</string> <string name="live_not_started">This live has not started!</string>
<string name="remote_account">Account from another network!</string> <string name="remote_account">Account from another network!</string>
<string name="instance_not_availabe">Instance is not available!</string>
<string name="max_tag_size">The video should not have more than 5 tags!</string>
</resources> </resources>

View File

@ -349,4 +349,6 @@
<string name="live">Live</string> <string name="live">Live</string>
<string name="live_not_started">This live has not started!</string> <string name="live_not_started">This live has not started!</string>
<string name="remote_account">Account from another network!</string> <string name="remote_account">Account from another network!</string>
<string name="instance_not_availabe">Instance is not available!</string>
<string name="max_tag_size">The video should not have more than 5 tags!</string>
</resources> </resources>

View File

@ -350,4 +350,6 @@
<string name="live">Live</string> <string name="live">Live</string>
<string name="live_not_started">This live has not started!</string> <string name="live_not_started">This live has not started!</string>
<string name="remote_account">Account from another network!</string> <string name="remote_account">Account from another network!</string>
<string name="instance_not_availabe">Instance is not available!</string>
<string name="max_tag_size">The video should not have more than 5 tags!</string>
</resources> </resources>

View File

@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools"> <resources xmlns:tools="http://schemas.android.com/tools">
<string name="set_cast">Enable Chromecast (beta)</string> <string name="set_cast">Включить Chromecast (бета-версия)</string>
<string name="please_wait">Please wait</string> <string name="please_wait">Пожалуйста подождите</string>
<string name="set_cast_description">Allow to discover Chromecast devices on the network.</string> <string name="set_cast_description">Позволяет обнаружить устройства Chromecast в сети.</string>
<string name="set_video_in_list">Видео в списке</string> <string name="set_video_in_list">Видео в списке</string>
<string name="set_video_in_list_description">Изменить расположение для отображения видео в списке</string> <string name="set_video_in_list_description">Изменить расположение для отображения видео в списке</string>
<string name="no_instances">Нет экземпляров !</string> <string name="no_instances">Нет экземпляров !</string>
<string name="show_more">Показать еще</string> <string name="show_more">Показать еще</string>
<string name="show_less">Показать меньше</string> <string name="show_less">Показать меньше</string>
<string name="cast">ChromeCast</string> <string name="cast">ChromeCast</string>
<string name="chromecast_choice">ChromeCast choice</string> <string name="chromecast_choice">Выбор ChromeCast</string>
<string name="set_play_screen_lock">Блокировка экрана</string> <string name="set_play_screen_lock">Блокировка экрана</string>
<string name="set_play_screen_lock_description">Продолжать воспроизведение видео, когда экран заблокирован</string> <string name="set_play_screen_lock_description">Продолжать воспроизведение видео, когда экран заблокирован</string>
<string name="save">Сохранить</string> <string name="save">Сохранить</string>
@ -348,7 +348,9 @@
<string name="set_video_minimize_description">Уменьшить размер видео, когда приложение находится в фоновом режиме (Android N+)</string> <string name="set_video_minimize_description">Уменьшить размер видео, когда приложение находится в фоновом режиме (Android N+)</string>
<string name="set_video_language">Добавить языковой фильтр</string> <string name="set_video_language">Добавить языковой фильтр</string>
<string name="set_video_language_description">Фильтровать видео с разными языками</string> <string name="set_video_language_description">Фильтровать видео с разными языками</string>
<string name="live">Live</string> <string name="live">Прямой эфир</string>
<string name="live_not_started">This live has not started!</string> <string name="live_not_started">Этот прямой эфир ещё не начался!</string>
<string name="remote_account">Account from another network!</string> <string name="remote_account">Аккаунт из другой сети!</string>
<string name="instance_not_availabe">Instance is not available!</string>
<string name="max_tag_size">The video should not have more than 5 tags!</string>
</resources> </resources>

View File

@ -349,4 +349,6 @@
<string name="live">Live</string> <string name="live">Live</string>
<string name="live_not_started">This live has not started!</string> <string name="live_not_started">This live has not started!</string>
<string name="remote_account">Account from another network!</string> <string name="remote_account">Account from another network!</string>
<string name="instance_not_availabe">Instance is not available!</string>
<string name="max_tag_size">The video should not have more than 5 tags!</string>
</resources> </resources>

View File

@ -347,4 +347,6 @@
<string name="live">Live</string> <string name="live">Live</string>
<string name="live_not_started">This live has not started!</string> <string name="live_not_started">This live has not started!</string>
<string name="remote_account">Account from another network!</string> <string name="remote_account">Account from another network!</string>
<string name="instance_not_availabe">Instance is not available!</string>
<string name="max_tag_size">The video should not have more than 5 tags!</string>
</resources> </resources>

View File

@ -348,4 +348,6 @@
<string name="live">Live</string> <string name="live">Live</string>
<string name="live_not_started">This live has not started!</string> <string name="live_not_started">This live has not started!</string>
<string name="remote_account">Account from another network!</string> <string name="remote_account">Account from another network!</string>
<string name="instance_not_availabe">Instance is not available!</string>
<string name="max_tag_size">The video should not have more than 5 tags!</string>
</resources> </resources>