Merge branch 'master' into master

This commit is contained in:
Konrad Pozniak 2017-10-16 23:31:39 +02:00 committed by GitHub
commit 5176fc104d
15 changed files with 17 additions and 10 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

View file

@ -12,6 +12,8 @@
android:title="@string/status_share_content"/>
</menu>
</item>
<item android:title="@string/action_copy_link"
android:id="@+id/status_copy_link" />
<item android:title="@string/action_mute"
android:id="@+id/status_mute" />
<item android:title="@string/action_block"

View file

@ -97,6 +97,8 @@
<string name="action_undo">Annuler</string>
<string name="action_view_follow_requests">Demandes de follow</string>
<string name="action_view_mutes">Utilisateurs muets</string>
<string name="action_copy_link">Copier le lien</string>
<string name="send_status_link_to">Partager lURL de votre pouet avec…</string>
<string name="send_status_content_to">Partager le pouet avec…</string>
<string name="download_image">Téléchargement de %1$s</string>

View file

@ -100,8 +100,11 @@
<string name="action_reject">Reject</string>
<string name="action_search">Search</string>
<string name="action_access_saved_toot">Drafts</string>
<string name="download_image">Downloading %1$s</string>
<string name="action_copy_link">Copy the link</string>
<string name="send_status_link_to">Share toot URL to…</string>
<string name="send_status_content_to">Share toot to…</string>