diff options
| -rw-r--r-- | app/user.go | 6 | ||||
| -rw-r--r-- | i18n/de.json | 6 | ||||
| -rw-r--r-- | i18n/en.json | 8 | ||||
| -rw-r--r-- | i18n/es.json | 8 | ||||
| -rw-r--r-- | i18n/fr.json | 6 | ||||
| -rw-r--r-- | i18n/it.json | 8 | ||||
| -rw-r--r-- | i18n/ja.json | 10 | ||||
| -rw-r--r-- | i18n/ko.json | 6 | ||||
| -rw-r--r-- | i18n/nl.json | 6 | ||||
| -rw-r--r-- | i18n/pl.json | 6 | ||||
| -rw-r--r-- | i18n/pt-BR.json | 8 | ||||
| -rw-r--r-- | i18n/ru.json | 34 | ||||
| -rw-r--r-- | i18n/tr.json | 8 | ||||
| -rw-r--r-- | i18n/zh-CN.json | 54 | ||||
| -rw-r--r-- | i18n/zh-TW.json | 6 |
15 files changed, 119 insertions, 61 deletions
diff --git a/app/user.go b/app/user.go index d6ec9ddc1..48237f300 100644 --- a/app/user.go +++ b/app/user.go @@ -1534,6 +1534,12 @@ func (a *App) UpdateOAuthUserAttrs(userData io.Reader, user *model.User, provide } } + if user.DeleteAt > 0 { + // Make sure they are not disabled + user.DeleteAt = 0 + userAttrsChanged = true + } + if userAttrsChanged { var result store.StoreResult if result = <-a.Srv.Store.User().Update(user, true); result.Err != nil { diff --git a/i18n/de.json b/i18n/de.json index b91e6e5b8..2d3b5d755 100644 --- a/i18n/de.json +++ b/i18n/de.json @@ -2164,6 +2164,10 @@ "translation": "Keine Datei unter 'file' in der Anfrage" }, { + "id": "api.team.import_team.no_import_from.app_error", + "translation": "Falsch gebildete Anfrage: Feld filesize fehlt." + }, + { "id": "api.team.import_team.open.app_error", "translation": "Konnte Datei nicht öffnen" }, @@ -2800,7 +2804,7 @@ "translation": "Die Willkommens-E-Mail konnte nicht versandt werden" }, { - "id": "api.user.update_active.no_deactivate_ldap.app_error", + "id": "api.user.update_active.no_deactivate_sso.app_error", "translation": "Sie können den Aktivitätsstatus des AD-/LDAP-Kontos nicht ändern. Bitte ändern Sie diesen über den AD-/LDAP-Server." }, { diff --git a/i18n/en.json b/i18n/en.json index 932130d0d..c1c73ce91 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -2164,6 +2164,10 @@ "translation": "No file under 'file' in request" }, { + "id": "api.team.import_team.no_import_from.app_error", + "translation": "Malformed request: importFrom field is not present." + }, + { "id": "api.team.import_team.open.app_error", "translation": "Could not open file" }, @@ -2172,10 +2176,6 @@ "translation": "Could not parse multipart form" }, { - "id": "api.team.import_team.no_import_from.app_error", - "translation": "Malformed request: importFrom field is not present." - }, - { "id": "api.team.import_team.unavailable.app_error", "translation": "Malformed request: filesize field is not present." }, diff --git a/i18n/es.json b/i18n/es.json index 54bd737aa..e62574a61 100644 --- a/i18n/es.json +++ b/i18n/es.json @@ -2164,6 +2164,10 @@ "translation": "No hay un archivo bajo la solicitud de 'archivo'" }, { + "id": "api.team.import_team.no_import_from.app_error", + "translation": "Solicitud con formato incorrecto: campo importFrom no está presente." + }, + { "id": "api.team.import_team.open.app_error", "translation": "No se pudo abrir el archivo" }, @@ -2800,8 +2804,8 @@ "translation": "Error al enviar la notificación de bienvenida por correo electrónico" }, { - "id": "api.user.update_active.no_deactivate_ldap.app_error", - "translation": "No puedes modificar el estado de activación de cuentas AD/LDAP. Por favor, haz la modificación a través del servidor AD/LDAP." + "id": "api.user.update_active.no_deactivate_sso.app_error", + "translation": "No puedes modificar el estado de activación para cuentas de tipo SSO. Por favor, haz la modificación a través del servicio SSO." }, { "id": "api.user.update_active.permissions.app_error", diff --git a/i18n/fr.json b/i18n/fr.json index 835a5c0a0..717e468ca 100644 --- a/i18n/fr.json +++ b/i18n/fr.json @@ -2164,6 +2164,10 @@ "translation": "Aucun fichier pour les 'fichiers' dans la requête" }, { + "id": "api.team.import_team.no_import_from.app_error", + "translation": "Requête malformée : le champ de taille de fichier n'est pas présent." + }, + { "id": "api.team.import_team.open.app_error", "translation": "Impossible d'ouvrir le fichier" }, @@ -2800,7 +2804,7 @@ "translation": "Impossible d'envoyer l'e-mail de bienvenue" }, { - "id": "api.user.update_active.no_deactivate_ldap.app_error", + "id": "api.user.update_active.no_deactivate_sso.app_error", "translation": "Vous ne pouvez pas modifier le statut actif des comptes AD/LDAP. Veuillez désactiver ce compte dans votre serveur AD/LDAP." }, { diff --git a/i18n/it.json b/i18n/it.json index de5db2b60..126bc26ae 100644 --- a/i18n/it.json +++ b/i18n/it.json @@ -2164,6 +2164,10 @@ "translation": "Non ci sono file nella richiesta sotto il campo 'file'" }, { + "id": "api.team.import_team.no_import_from.app_error", + "translation": "Richiesta malformata: campo importFrom non presente." + }, + { "id": "api.team.import_team.open.app_error", "translation": "Impossibile aprire il file" }, @@ -2800,8 +2804,8 @@ "translation": "Invio email di benvenuto fallito" }, { - "id": "api.user.update_active.no_deactivate_ldap.app_error", - "translation": "Non è possibile modificare lo stato di attivazione degli account AD/LDAP. Vanno modificati sul server AD/LDAP." + "id": "api.user.update_active.no_deactivate_sso.app_error", + "translation": "Non è possibile modificare lo stato di attivazione degli account SSO. Vanno modificati sul server SSO." }, { "id": "api.user.update_active.permissions.app_error", diff --git a/i18n/ja.json b/i18n/ja.json index a96de4d1a..875e57842 100644 --- a/i18n/ja.json +++ b/i18n/ja.json @@ -2164,6 +2164,10 @@ "translation": "リクエストの'file'以下にファイルがありません" }, { + "id": "api.team.import_team.no_import_from.app_error", + "translation": "不正なリクエスト: importFromが存在しません。" + }, + { "id": "api.team.import_team.open.app_error", "translation": "ファイルを開けません" }, @@ -2800,8 +2804,8 @@ "translation": "歓迎の電子メールを送信できませんでした" }, { - "id": "api.user.update_active.no_deactivate_ldap.app_error", - "translation": "AD/LDAPアカウントのアクティベーション状態を変更することはできません。AD/LDAPサーバーを通じて変更してください。" + "id": "api.user.update_active.no_deactivate_sso.app_error", + "translation": "SSOアカウントのアクティベーション状態を変更することはできません。SSOサーバーを通じて変更してください。" }, { "id": "api.user.update_active.permissions.app_error", @@ -3537,7 +3541,7 @@ }, { "id": "app.plugin.upload_disabled.app_error", - "translation": "\bプラグインのアップロードは無効化されています。" + "translation": "プラグインのアップロードは無効化されています。" }, { "id": "app.user_access_token.disabled", diff --git a/i18n/ko.json b/i18n/ko.json index 7e16baffc..f6bb947da 100644 --- a/i18n/ko.json +++ b/i18n/ko.json @@ -2164,6 +2164,10 @@ "translation": "요청의 'file' 항목에 파일이 없습니다." }, { + "id": "api.team.import_team.no_import_from.app_error", + "translation": "Malformed request: importFrom field is not present." + }, + { "id": "api.team.import_team.open.app_error", "translation": "파일을 열 수 없습니다." }, @@ -2800,7 +2804,7 @@ "translation": "가입 환영 메일을 발송하지 못하였습니다." }, { - "id": "api.user.update_active.no_deactivate_ldap.app_error", + "id": "api.user.update_active.no_deactivate_sso.app_error", "translation": "You can not modify the activation status of LDAP accounts. Please modify through the LDAP server." }, { diff --git a/i18n/nl.json b/i18n/nl.json index ec16368b1..8f4ad26f1 100644 --- a/i18n/nl.json +++ b/i18n/nl.json @@ -2164,6 +2164,10 @@ "translation": "Geen bestand bij 'licentie' in aanvraag" }, { + "id": "api.team.import_team.no_import_from.app_error", + "translation": "Malformed request: importFrom field is not present." + }, + { "id": "api.team.import_team.open.app_error", "translation": "Kan het bestand niet openen" }, @@ -2800,7 +2804,7 @@ "translation": "Welkomst mail kon niet verstuurd worden, fout=%v" }, { - "id": "api.user.update_active.no_deactivate_ldap.app_error", + "id": "api.user.update_active.no_deactivate_sso.app_error", "translation": "Je kan niet de activatie status veranderen van AD/LDAP account. Wijzig dit via de AD/LDAP server." }, { diff --git a/i18n/pl.json b/i18n/pl.json index 5188261d0..4f9d3e4b9 100644 --- a/i18n/pl.json +++ b/i18n/pl.json @@ -2164,6 +2164,10 @@ "translation": "Brak pliku w polu 'file' w żądaniu" }, { + "id": "api.team.import_team.no_import_from.app_error", + "translation": "Nieprawidłowe zapytanie: pole rozmiaru pliku nie istnieje." + }, + { "id": "api.team.import_team.open.app_error", "translation": "Nie można otworzyć pliku." }, @@ -2800,7 +2804,7 @@ "translation": "Nie udało się pomyślnie wysłać emaila powitalnego" }, { - "id": "api.user.update_active.no_deactivate_ldap.app_error", + "id": "api.user.update_active.no_deactivate_sso.app_error", "translation": "Nie możesz zmieniać stanu aktywacji kont AD/LDAP. Proszę je zmodyfikować przez serwer LDAP." }, { diff --git a/i18n/pt-BR.json b/i18n/pt-BR.json index d0999a6ee..5a8276e52 100644 --- a/i18n/pt-BR.json +++ b/i18n/pt-BR.json @@ -2164,6 +2164,10 @@ "translation": "Nenhum arquivo sobre a 'file' no pedido" }, { + "id": "api.team.import_team.no_import_from.app_error", + "translation": "Requisição mal formada: campo filesize não está presente." + }, + { "id": "api.team.import_team.open.app_error", "translation": "Não foi possível abrir o arquivo" }, @@ -2800,8 +2804,8 @@ "translation": "Erro ao enviar boas vindas por email" }, { - "id": "api.user.update_active.no_deactivate_ldap.app_error", - "translation": "Você não pode modificar o status de ativação de contas AD/LDAP. Por favor modifique através do servidor AD/LDAP." + "id": "api.user.update_active.no_deactivate_sso.app_error", + "translation": "Você não pode modificar o status de ativação de contas SSO. Por favor modifique através do servidor SSO." }, { "id": "api.user.update_active.permissions.app_error", diff --git a/i18n/ru.json b/i18n/ru.json index ebbe860ec..28862571f 100644 --- a/i18n/ru.json +++ b/i18n/ru.json @@ -637,15 +637,15 @@ }, { "id": "api.command_dnd.desc", - "translation": "Do not disturb disables desktop and mobile push notifications." + "translation": "Режим \"Не беспокоить\" отключает настольные и мобильные push-уведомления." }, { "id": "api.command_dnd.disabled", - "translation": "Do Not Disturb is disabled." + "translation": "Режим \"Не беспокоить\" отключен." }, { "id": "api.command_dnd.error", - "translation": "Error to retrieve the user status." + "translation": "Ошибка получения статуса пользователя." }, { "id": "api.command_dnd.name", @@ -653,7 +653,7 @@ }, { "id": "api.command_dnd.success", - "translation": "Do Not Disturb is enabled. You will not receive desktop or mobile push notifications until Do Not Disturb is turned off." + "translation": "Режим \"Не беспокоить\" включен. Вы не будете получать оповещения на рабочем столе или мобильных устройствах до тех пор, пока не отключите режим \"Не беспокоить\"." }, { "id": "api.command_echo.create.app_error", @@ -849,11 +849,11 @@ }, { "id": "api.command_remove.desc", - "translation": "Remove a member from the channel" + "translation": "Удалить участника из канала" }, { "id": "api.command_remove.direct_group.app_error", - "translation": "You can't remove someone from a direct message channel." + "translation": "Вы не можете удалить кого-либо из канала прямого сообщения." }, { "id": "api.command_remove.hint", @@ -861,7 +861,7 @@ }, { "id": "api.command_remove.message.app_error", - "translation": "Перед сообщение должна быть команда /rename." + "translation": "Сообщение должно быть предоставлено командой /remove или /kick." }, { "id": "api.command_remove.missing.app_error", @@ -873,11 +873,11 @@ }, { "id": "api.command_remove.permission.app_error", - "translation": "У вас нет прав для переименовании канала." + "translation": "У Вас нет соответствующих прав для удаления участника." }, { "id": "api.command_remove.user_not_in_channel", - "translation": "{{.Username}} is not a member of this channel." + "translation": "{{.Username}} не является участником этого канала." }, { "id": "api.command_search.desc", @@ -1559,15 +1559,15 @@ }, { "id": "api.opengraph.init.debug", - "translation": "Initializing open graph protocol api routes" + "translation": "Инициализация открытых графиков для api" }, { "id": "api.plugin.upload.array.app_error", - "translation": "File array is empty in multipart/form request" + "translation": "Файловый массив пуст в запросе multipart/form" }, { "id": "api.plugin.upload.file.app_error", - "translation": "Unable to open file in multipart/form request" + "translation": "Невозможно открыть файл в запросе multipart/form" }, { "id": "api.plugin.upload.no_file.app_error", @@ -1575,11 +1575,11 @@ }, { "id": "api.post.check_for_out_of_channel_mentions.link.private", - "translation": "add them to this private channel" + "translation": "добавьте их в этот приватный канал" }, { "id": "api.post.check_for_out_of_channel_mentions.link.public", - "translation": "add them to the channel" + "translation": "добавить их в этот канал" }, { "id": "api.post.check_for_out_of_channel_mentions.message.multiple", @@ -2164,6 +2164,10 @@ "translation": "Нет файла 'file' в запросе" }, { + "id": "api.team.import_team.no_import_from.app_error", + "translation": "Неправильный запрос: отсутствует поле \"filesize\"." + }, + { "id": "api.team.import_team.open.app_error", "translation": "Не могу открыть файл" }, @@ -2800,7 +2804,7 @@ "translation": "Не удалось отправить приветственное письмо" }, { - "id": "api.user.update_active.no_deactivate_ldap.app_error", + "id": "api.user.update_active.no_deactivate_sso.app_error", "translation": "Вы не можете изменять состояние активности учетных записей AD/LDAP. Пожалуйста, измените его через сервер AD/LDAP." }, { diff --git a/i18n/tr.json b/i18n/tr.json index 560189fa9..bcc6a0c19 100644 --- a/i18n/tr.json +++ b/i18n/tr.json @@ -2164,6 +2164,10 @@ "translation": "İstekte 'dosya' altında dosya yok" }, { + "id": "api.team.import_team.no_import_from.app_error", + "translation": "İstek biçimi bozuk: İçe Aktarılacak Konum alanı bulunamadı." + }, + { "id": "api.team.import_team.open.app_error", "translation": "Dosya açılamadı" }, @@ -2800,8 +2804,8 @@ "translation": "Karşılama e-postası gönderilemedi" }, { - "id": "api.user.update_active.no_deactivate_ldap.app_error", - "translation": "AD/LDAP hesaplarının etkinleştirme durumu değiştirilemez. Lütfen değişiklikleri AD/LDAP sunucusu üzerinde yapın." + "id": "api.user.update_active.no_deactivate_sso.app_error", + "translation": "SSO hesaplarının etkinleştirme durumu değiştirilemez. Lütfen değişiklikleri SSO sunucusu üzerinde yapın." }, { "id": "api.user.update_active.permissions.app_error", diff --git a/i18n/zh-CN.json b/i18n/zh-CN.json index fef4935e8..f8e65303e 100644 --- a/i18n/zh-CN.json +++ b/i18n/zh-CN.json @@ -637,15 +637,15 @@ }, { "id": "api.command_dnd.desc", - "translation": "Do not disturb disables desktop and mobile push notifications." + "translation": "请勿打扰将关闭桌面和移动设备推送通知。" }, { "id": "api.command_dnd.disabled", - "translation": "Do Not Disturb is disabled." + "translation": "请勿打扰已禁用。" }, { "id": "api.command_dnd.error", - "translation": "Error to retrieve the user status." + "translation": "获取用户状态错误。" }, { "id": "api.command_dnd.name", @@ -653,7 +653,7 @@ }, { "id": "api.command_dnd.success", - "translation": "Do Not Disturb is enabled. You will not receive desktop or mobile push notifications until Do Not Disturb is turned off." + "translation": "请勿打扰已启用。您不会在桌面或移动设备收到推送通知直到请勿打扰关闭。" }, { "id": "api.command_echo.create.app_error", @@ -737,7 +737,7 @@ }, { "id": "api.command_kick.name", - "translation": "kick" + "translation": "踢出" }, { "id": "api.command_leave.desc", @@ -849,19 +849,19 @@ }, { "id": "api.command_remove.desc", - "translation": "Remove a member from the channel" + "translation": "从频道移除位成员" }, { "id": "api.command_remove.direct_group.app_error", - "translation": "You can't remove someone from a direct message channel." + "translation": "您不能从私信频道移出成员。" }, { "id": "api.command_remove.hint", - "translation": "@[username]" + "translation": "@[用户名]" }, { "id": "api.command_remove.message.app_error", - "translation": "/name 命令必须有消息。" + "translation": "/name 或 /kick 命令必须有消息。" }, { "id": "api.command_remove.missing.app_error", @@ -869,15 +869,15 @@ }, { "id": "api.command_remove.name", - "translation": "remove" + "translation": "删除" }, { "id": "api.command_remove.permission.app_error", - "translation": "您没有权限重命名频道。" + "translation": "您没有权限移除成员。" }, { "id": "api.command_remove.user_not_in_channel", - "translation": "{{.Username}} is not a member of this channel." + "translation": "{{.Username}} 不是此频道的成员。" }, { "id": "api.command_search.desc", @@ -1575,19 +1575,19 @@ }, { "id": "api.post.check_for_out_of_channel_mentions.link.private", - "translation": "add them to this private channel" + "translation": "添加他们到此私有频道" }, { "id": "api.post.check_for_out_of_channel_mentions.link.public", - "translation": "add them to the channel" + "translation": "添加他们到频道" }, { "id": "api.post.check_for_out_of_channel_mentions.message.multiple", - "translation": "@{{.Usernames}} and @{{.LastUsername}} were mentioned but they are not in the channel. Would you like to {{.Phrase}}? They will have access to all message history." + "translation": "@{{.Usernames}} 以及 @{{.LastUsername}} 被提及到但他们并不在频道里。您想要{{.Phrase}}吗？他们将可以访问所有消息历史。" }, { "id": "api.post.check_for_out_of_channel_mentions.message.one", - "translation": "@{{.Username}} was mentioned but they are not in the channel. Would you like to {{.Phrase}}? They will have access to all message history." + "translation": "@{{.Usernames}} 被提及到但他们并不在频道里。您想要{{.Phrase}}吗？他们将可以访问所有消息历史。" }, { "id": "api.post.create_post.attach_files.error", @@ -2164,6 +2164,10 @@ "translation": "请求中‘file’，文件不存在" }, { + "id": "api.team.import_team.no_import_from.app_error", + "translation": "错误请求：缺少 filesize 字段。" + }, + { "id": "api.team.import_team.open.app_error", "translation": "不能打开文件" }, @@ -2800,8 +2804,8 @@ "translation": "未能成功发送欢迎电子邮件" }, { - "id": "api.user.update_active.no_deactivate_ldap.app_error", - "translation": "您无法修改 AD/LDAP 帐号的激活状态。请到 AD/LDAP 服务器上修改。" + "id": "api.user.update_active.no_deactivate_sso.app_error", + "translation": "您无法修改 SSO 帐号的激活状态。请到 SSO 服务器上修改。" }, { "id": "api.user.update_active.permissions.app_error", @@ -3493,7 +3497,7 @@ }, { "id": "app.plugin.config.app_error", - "translation": "Error saving plugin state in config" + "translation": "保存插件状态到配置出错" }, { "id": "app.plugin.deactivate.app_error", @@ -3501,7 +3505,7 @@ }, { "id": "app.plugin.disabled.app_error", - "translation": "Plugins have been disabled." + "translation": "插件已禁用。" }, { "id": "app.plugin.extract.app_error", @@ -3529,7 +3533,7 @@ }, { "id": "app.plugin.not_installed.app_error", - "translation": "Plugin is not installed" + "translation": "插件未安装" }, { "id": "app.plugin.remove.app_error", @@ -3537,7 +3541,7 @@ }, { "id": "app.plugin.upload_disabled.app_error", - "translation": "Plugins and/or plugin uploads have been disabled." + "translation": "插件上传已禁用。" }, { "id": "app.user_access_token.disabled", @@ -3825,7 +3829,7 @@ }, { "id": "ent.elasticsearch.indexer.do_job.get_oldest_post.error", - "translation": "The oldest post could not be retrieved from the database." + "translation": "无法从数据库获取最旧的消息。" }, { "id": "ent.elasticsearch.indexer.do_job.parse_end_time.error", @@ -3857,7 +3861,7 @@ }, { "id": "ent.elasticsearch.start.create_bulk_processor_failed.app_error", - "translation": "Failed to create Elasticsearch bulk processor" + "translation": "创建 Elasticsearch 批量处理器失败" }, { "id": "ent.elasticsearch.start.index_settings_failed", @@ -3865,7 +3869,7 @@ }, { "id": "ent.elasticsearch.start.start_bulk_processor_failed.app_error", - "translation": "Failed to start Elasticsearch bulk processor" + "translation": "开始 Elasticsearch 批量处理器失败" }, { "id": "ent.elasticsearch.test_config.connect_failed", diff --git a/i18n/zh-TW.json b/i18n/zh-TW.json index 388323044..c293cc1c9 100644 --- a/i18n/zh-TW.json +++ b/i18n/zh-TW.json @@ -2164,6 +2164,10 @@ "translation": "要求中的 'file' 欄位沒有檔案" }, { + "id": "api.team.import_team.no_import_from.app_error", + "translation": "要求格式錯誤：沒有檔案大小欄位。" + }, + { "id": "api.team.import_team.open.app_error", "translation": "無法開啟檔案" }, @@ -2800,7 +2804,7 @@ "translation": "歡迎電子郵件傳送失敗" }, { - "id": "api.user.update_active.no_deactivate_ldap.app_error", + "id": "api.user.update_active.no_deactivate_sso.app_error", "translation": "不能變更 AD/LDAP 帳號的啟用狀態。請變更 AD/LDAP 伺服器上對應的帳號狀態。" }, { |