mirror of
https://github.com/wassname/talk.git
synced 2026-07-09 09:20:38 +08:00
Merge branch 'master' into italian-translation
This commit is contained in:
@@ -645,7 +645,7 @@ export default class Comment extends React.Component {
|
||||
})}
|
||||
onClick={this.onClickEdit}
|
||||
>
|
||||
Edit
|
||||
{t('framework.edit')}
|
||||
</a>
|
||||
)}
|
||||
</span>
|
||||
|
||||
@@ -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'
|
||||
|
||||
@@ -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 _'
|
||||
|
||||
Reference in New Issue
Block a user