Peertube
/
TubeLab-App-Android
mirror of https://framagit.org/tom79/fedilab-tube
1
0
Fork 0
Code Issues Releases Wiki Activity

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

This commit is contained in:
Thomas 2020-12-29 17:11:56 +01:00
parent 8a8a433023 9f8358e471
commit 44d26bb1cf
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/res/values-fr/strings.xml
View File

@ -276,7 +276,7 @@
<string name="report_account">Signaler le compte</string> <string name="report_account">Signaler le compte</string>
<string-array name="settings_video_mode"> <string-array name="settings_video_mode">
<item>Normal</item> <item>Normal</item>
<item>Torrent</item> <item>Navigateur</item>
<item>Magnet</item> <item>Magnet</item>
<item>Torrent</item> <item>Torrent</item>
</string-array> </string-array>

6
app/src/main/res/values-ru/strings.xml
View File

@ -351,7 +351,7 @@
<string name="live">Прямой эфир</string> <string name="live">Прямой эфир</string>
<string name="live_not_started">Этот прямой эфир ещё не начался!</string> <string name="live_not_started">Этот прямой эфир ещё не начался!</string>
<string name="remote_account">Аккаунт из другой сети!</string> <string name="remote_account">Аккаунт из другой сети!</string>
<string name="instance_not_availabe">Instance is not available!</string> <string name="instance_not_availabe">Экземпляр недоступен!</string>
<string name="max_tag_size">The video should not have more than 5 tags!</string> <string name="max_tag_size">На видео не должно быть более 5 тегов!</string>
<string name="watermark">Watermark</string> <string name="watermark">Водяной знак</string>
</resources> </resources>