Merge branch 'master' into translations_ptbr

locales/de.yml

@@ -48,6 +48,8 @@ de:
   comment_post_notif_premod: 'Vielen Dank für Ihren Kommentar. Unsere Moderatoren werden ihn in Kürze bearbeiten.'
   comment_singular: Kommentar
   common:
+    copied: 'Kopiert'
+    notsupported: 'Nicht unterstützt'
     copy: Kopieren
     error: 'Ein Problem ist aufgetreten.'
     reaction: 'Reaktion'

locales/en.yml

@@ -49,6 +49,8 @@ en:
   comment_singular: Comment
   common:
     copy: Copy
+    copied: 'Copied'
+    notsupported: 'Not supported'
     error: 'An error has occurred.'
     reaction: reaction
     reactions: reactions

plugins/talk-plugin-permalink/client/components/PermalinkButton.js

@@ -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>

plugins/talk-plugin-sort-most-upvoted/client/translations.yml

@@ -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