Merge branch 'master' into translations_ptbr

This commit is contained in:
Kim Gardner
2018-08-29 10:23:08 -04:00
committed by GitHub
4 changed files with 9 additions and 2 deletions
@@ -106,8 +106,8 @@ export default class PermalinkButton extends React.Component {
])}
>
{!copyFailure && !copySuccessful && t('common.copy')}
{copySuccessful && t('embedlink.copied')}
{copyFailure && 'Not supported'}
{copySuccessful && t('common.copied')}
{copyFailure && t('common.notsupported')}
</Button>
</div>
</div>
@@ -1,6 +1,9 @@
en:
talk-plugin-sort-most-upvoted:
label: Most upvoted first
de:
talk-plugin-sort-most-upvoted:
label: Am besten bewertet
es:
talk-plugin-sort-oldest:
label: Más votadas primero