Merge branch 'master' into italian-translation

This commit is contained in:
Kim Gardner
2018-10-30 18:01:25 +00:00
committed by GitHub
3 changed files with 3 additions and 1 deletions
@@ -645,7 +645,7 @@ export default class Comment extends React.Component {
})}
onClick={this.onClickEdit}
>
Edit
{t('framework.edit')}
</a>
)}
</span>
+1
View File
@@ -318,6 +318,7 @@ en:
comments: comments
configure_stream: Configure
content_not_available: 'This content is not available'
edit: Edit
edit_name:
button: Submit
error: 'Usernames can contain letters numbers and _ only'
+1
View File
@@ -290,6 +290,7 @@ es:
comments: comentarios
configure_stream: 'Configurar'
content_not_available: 'Este contenido no se encuentra disponible'
edit: Editar
edit_name:
button: Enviar
error: 'Nombres de usuarios pueden solamente incluir letras, números y _'