1
0
mirror of https://github.com/TwidereProject/Twidere-Android synced 2024-12-24 07:26:56 +01:00

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

This commit is contained in:
Mariotaku Lee 2016-05-16 21:40:27 +08:00
commit 2e0507d7a3

View File

@ -657,7 +657,7 @@
<string name="server_address">Adresse du serveur</string> <string name="server_address">Adresse du serveur</string>
<string name="security_key">Clé de sécurité</string> <string name="security_key">Clé de sécurité</string>
<string name="hide_card_actions">Cacher les actions de carte</string> <string name="hide_card_actions">Cacher les actions de carte</string>
<string name="drafts_hint_messages">Vos tweets non-lus sont sauvés ici</string> <string name="drafts_hint_messages">Vos tweets non-envoyés sont sauvés ici</string>
<string name="keyboard_shortcuts">Raccourcis clavier</string> <string name="keyboard_shortcuts">Raccourcis clavier</string>
<string name="keyboard_shortcut_hint">Pressez les touches</string> <string name="keyboard_shortcut_hint">Pressez les touches</string>
<string name="conflicts_with_name">En conflit avec <xliff:g id="name">%s</xliff:g></string> <string name="conflicts_with_name">En conflit avec <xliff:g id="name">%s</xliff:g></string>