Merge remote-tracking branch 'upstream/develop' into public-redir

This commit is contained in:
Michael 2018-06-02 06:18:45 +00:00
commit 885f2b52d1
2 changed files with 3 additions and 3 deletions

View file

@ -184,7 +184,7 @@ class Post extends BaseObject
} }
// Showing the one or the other text, depending upon if we can only hide it or really delete it. // Showing the one or the other text, depending upon if we can only hide it or really delete it.
$delete = $origin ? L10n::t('Delete') : L10n::t('Remove from your stream'); $delete = $origin ? L10n::t('Delete globally') : L10n::t('Remove locally');
$drop = [ $drop = [
'dropping' => $dropping, 'dropping' => $dropping,