diff options
| author | Carlos Tadeu Panato Junior <ctadeu@gmail.com> | 2018-08-16 11:40:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-16 11:40:46 +0200 |
| commit | f24f06c101811c472da00aad6aa5ae7d9bc1c18c (patch) | |
| tree | 58d83a52d4fb00aac1cb95f1c139eef88d4aae49 /i18n/en.json | |
| parent | ffb1d8c7984657f9351da37a534f94578741ffb5 (diff) | |
| parent | 43483805eabcb36ef9018f12a82a6d3ac055baf5 (diff) | |
| download | chat-f24f06c101811c472da00aad6aa5ae7d9bc1c18c.tar.gz chat-f24f06c101811c472da00aad6aa5ae7d9bc1c18c.tar.bz2 chat-f24f06c101811c472da00aad6aa5ae7d9bc1c18c.zip | |
Merge release-5.2
Diffstat (limited to 'i18n/en.json')
| -rw-r--r-- | i18n/en.json | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/i18n/en.json b/i18n/en.json index d3ffdebb5..19c92a0b4 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -5943,10 +5943,6 @@ "translation": "We found multiple users matching your credentials and were unable to log you in. Please contact an administrator." }, { - "id": "store.sql_user.get_system_install_date.app_error", - "translation": "Unable to infer the system date based on the first user creation date." - }, - { "id": "store.sql_user.get_new_users.app_error", "translation": "We encountered an error while finding the new users" }, @@ -5963,6 +5959,10 @@ "translation": "We encountered an error while finding user profiles" }, { + "id": "store.sql_user.get_system_install_date.app_error", + "translation": "Unable to infer the system date based on the first user creation date." + }, + { "id": "store.sql_user.get_total_users_count.app_error", "translation": "We could not count the users" }, |