PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

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

Browse source
This commit is contained in:
RiotTranslate 2017-05-26 23:20:37 +00:00
commit 59cb7ad0e6
7 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/views/login/PasswordLogin.js
View file

@ -128,7 +128,7 @@ class PasswordLogin extends React.Component {
type="text" type="text"
name="username" // make it a little easier for browser's remember-password name="username" // make it a little easier for browser's remember-password
onChange={this.onUsernameChanged} onChange={this.onUsernameChanged}
placeholder={_t('username')} placeholder={_t('User name')}
value={this.state.username} value={this.state.username}
autoFocus autoFocus
/>; />;

2
src/i18n/strings/de_DE.json
View file

@ -252,7 +252,7 @@
"Upload Files": "Dateien hochladen", "Upload Files": "Dateien hochladen",
"Upload file": "Datei hochladen", "Upload file": "Datei hochladen",
"User Interface": "Nutzerschnittstelle", "User Interface": "Nutzerschnittstelle",
"username": "Nutzername", "User name": "Nutzername",
"Users": "Nutzer", "Users": "Nutzer",
"User": "Nutzer", "User": "Nutzer",
"Verification Pending": "Verifizierung ausstehend", "Verification Pending": "Verifizierung ausstehend",

2
src/i18n/strings/en_EN.json
View file

@ -508,7 +508,7 @@
"Use with caution": "Use with caution", "Use with caution": "Use with caution",
"User ID": "User ID", "User ID": "User ID",
"User Interface": "User Interface", "User Interface": "User Interface",
"username": "username", "User name": "User name",
"Users": "Users", "Users": "Users",
"User": "User", "User": "User",
"Verification Pending": "Verification Pending", "Verification Pending": "Verification Pending",

2
src/i18n/strings/pt.json
View file

@ -246,7 +246,7 @@
"Upload file": "Enviar arquivo", "Upload file": "Enviar arquivo",
"User ID": "Identificador de Usuário", "User ID": "Identificador de Usuário",
"User Interface": "Interface de usuário", "User Interface": "Interface de usuário",
"username": "Nome de usuária/o", "User name": "Nome de usuária/o",
"Users": "Usuários", "Users": "Usuários",
"User": "Usuária/o", "User": "Usuária/o",
"Verification Pending": "Verificação pendente", "Verification Pending": "Verificação pendente",

2
src/i18n/strings/pt_BR.json
View file

@ -251,7 +251,7 @@
"Upload file": "Enviar arquivo", "Upload file": "Enviar arquivo",
"User ID": "Identificador de Usuário", "User ID": "Identificador de Usuário",
"User Interface": "Interface de usuário", "User Interface": "Interface de usuário",
"username": "Nome de usuária/o", "User name": "Nome de usuária/o",
"Users": "Usuários", "Users": "Usuários",
"User": "Usuária/o", "User": "Usuária/o",
"Verification Pending": "Verificação pendente", "Verification Pending": "Verificação pendente",

2
src/i18n/strings/ru.json
View file

@ -180,7 +180,7 @@
"Upload file": "Загрузка файла", "Upload file": "Загрузка файла",
"User ID": "ID пользователя", "User ID": "ID пользователя",
"User Interface": "Пользовательский интерфейс", "User Interface": "Пользовательский интерфейс",
"username": "Имя пользователя", "User name": "Имя пользователя",
"Users": "Пользователи", "Users": "Пользователи",
"User": "Пользователь", "User": "Пользователь",
"Verification Pending": "Ожидание проверки", "Verification Pending": "Ожидание проверки",

1
src/languageHandler.js
View file

@ -57,6 +57,7 @@ export function setLanguage(preferredLangs) {
for (let i = 0; i < preferredLangs.length; ++i) { for (let i = 0; i < preferredLangs.length; ++i) {
if (availLangs.hasOwnProperty(preferredLangs[i])) { if (availLangs.hasOwnProperty(preferredLangs[i])) {
langToUse = preferredLangs[i]; langToUse = preferredLangs[i];
break;
} }
} }
if (!langToUse) { if (!langToUse) {