Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Weblate 2018-05-18 09:47:59 +00:00
commit 8067b07ee1

View file

@ -57,6 +57,7 @@ export function showStartChatInviteDialog() {
title: _t('Start a chat'), title: _t('Start a chat'),
description: _t("Who would you like to communicate with?"), description: _t("Who would you like to communicate with?"),
placeholder: _t("Email, name or matrix ID"), placeholder: _t("Email, name or matrix ID"),
validAddressTypes: ['mx-user-id', 'email'],
button: _t("Start Chat"), button: _t("Start Chat"),
onFinished: _onStartChatFinished, onFinished: _onStartChatFinished,
}); });