Peertube
/
peertube-live-streaming
mirror of https://codeberg.org/Schoumi/PeerTubeLive.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'weblate/master' 

# Conflicts:
#	app/src/main/res/values-fr/strings.xml
#	app/src/main/res/values/strings.xml
This commit is contained in:
Schoumi 2021-07-26 18:32:54 +02:00
parent e0c822a812 1de6d2cd1b
commit 0f5c390855
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,10 +55,8 @@
<string name="stream_ended">Direct terminé</string>
<string name="end_stream">Arrêter le direct</string>
<string name="creating">Patientez pendant la creation du direct</string>
<!-- placeholders -->
<string name="exemple_instance">ex: peertube.fr, https://peertube.fr</string>
<string name="exemple_instance">ex : peertube.fr, https ://peertube.fr</string>
<!-- category -->
<string name="music">Musique</string>
<string name="films">Films</string>

16
app/src/main/res/values/strings.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Peertube Live</string>
<string name="app_name">PeerTube Live</string>
<!-- errors -->
<string name="network_error">No Internet Connection Found</string>
<string name="unknwon_error">Unknown Error</string>
@ -10,14 +10,14 @@
<string name="instance_error">Instance cannot be empty</string>
<string name="username_error">Username cannot be empty</string>
<string name="password_error">Password cannot be empty</string>
<string name="malformed_instance_error">Instance should be a valid url</string>
<string name="malformed_instance_error">The instance must have a valid URL</string>
<string name="account_exist">This account already exist</string>
<!-- messages -->
<string name="no_instance">No account registered. Add a PeerTube account using the \'+\' in the top bar</string>
<string name="loading_channels">Loading your channel list</string>
<string name="try_connect">Waiting for connection</string>
<string name="permissions">We need the access to the camera and microphone to live stream. To change permissions settings click below</string>
<string name="delete_account">Are you sure you want to delete the account %s associated with the server %s ?</string>
<string name="permissions">Camera and mic access needed to livestream. Click below to change permissions settings.</string>
<string name="delete_account">Delete the %s account associated with the %s server\?</string>
<string name="tags_rules">Maximum 5 tags, each between 2 and 30 characters, separate by comma</string>
<string name="save_replay_info">If you enable this option, your live will be terminated if you exceed your video quota</string>
<string name="back_reason">Your live has ended after you pressed back button</string>
@ -27,7 +27,7 @@
<string name="ask_end_stream">Do you want to stop the live?</string>
<!-- buttons -->
<string name="choose_channel">Channel</string>
<string name="go_live">Go Live!</string>
<string name="go_live">Start livestream</string>
<string name="cancel">Cancel</string>
<string name="yes">Yes</string>
<string name="no">No</string>
@ -52,13 +52,11 @@
<string name="tags">Tags</string>
<string name="description">Description</string>
<string name="save_replay">Automatically publish a replay when your live ends</string>
<string name="stream_ended">Live ended</string>
<string name="end_stream">Stop the live</string>
<string name="stream_ended">Livestream ended</string>
<string name="end_stream">Stop livestream</string>
<string name="creating">Wait for live creation</string>
<!-- placeholders -->
<string name="exemple_instance">e.g. peertube.fr, https://peertube.fr</string>
<!-- category -->
<string name="music">Music</string>
<string name="films">Films</string>