Mastodon
/
Twidere-App-Android-Twitter-Mastodon
mirror of https://github.com/TwidereProject/Twidere-Android
1
0
Fork 0
Code Issues Releases Wiki Activity

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

# Conflicts:
#	twidere/src/main/res-localized/values-fr/strings.xml
This commit is contained in:
Mariotaku Lee 2017-04-03 11:51:32 +08:00
parent e3339cc77f af5156935d
commit ae16db66ec
No known key found for this signature in database
GPG Key ID: 15C10F89D7C33535
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -874,7 +874,7 @@
<string name="title_add_or_remove_from_list">Ajouter ou supprimer de la liste</string>
<string name="title_block_user">Bloquer <xliff:g id="name">%s</xliff:g></string>
<string name="title_blocked_users">Utilisateurs bloqués</string>
<string name="title_browser_sign_in">Connexion du naviguateur</string>
<string name="title_browser_sign_in">Connexion via le navigateur</string>
<string name="title_buffer_settings">Paramètres de Buffer</string>
<string name="title_compose">Écrire</string>
<string name="title_conversation">Conversation</string>