composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-18 23:08:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'support/3.2' into develop

Browse Source 
# Conflicts:
#	composer.lock
#	datamodels/2.x/authent-local/dictionaries/pt_br.dict.authent-local.php
#	dictionaries/fr.dictionary.itop.ui.php
#	dictionaries/it.dictionary.itop.ui.php
#	dictionaries/pt_br.dictionary.itop.ui.php
#	lib/composer/autoload_classmap.php
#	lib/composer/autoload_static.php
#	lib/composer/installed.json
#	lib/composer/installed.php
#	lib/symfony/cache/Traits/RelayProxy.php
#	lib/symfony/form/Exception/AccessException.php
#	lib/symfony/form/Exception/ErrorMappingException.php
#	lib/symfony/form/Exception/StringCastException.php
#	lib/symfony/http-foundation/Request.php
#	lib/symfony/polyfill-intl-icu/composer.json
#	lib/symfony/property-access/LICENSE
#	lib/symfony/security-core/Event/AuthenticationSuccessEvent.php
This commit is contained in:
Benjamin DALSASS
2026-02-19 09:22:08 +01:00
parent 0134ead5dd d2f67dcb3c
commit 2b828f8a22
71 changed files with 1041 additions and 1387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
dictionaries/zh_cn.dictionary.itop.ui.php
View File

@@ -401,7 +401,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
Dict::Add('ZH CN', 'Chinese', '简体中文', [
'BooleanLabel:yes' => '是',
'BooleanLabel:no' => '否',
'UI:Login:Title' => ITOP_APPLICATION_SHORT.'登录',
'UI:WelcomeMenu:Title' => '欢迎使用'.ITOP_APPLICATION_SHORT, 'UI:WelcomeMenu:AllOpenRequests' => '所有打开的需求: %1$d',
'UI:WelcomeMenu:MyCalls' => '我办理的需求',
'UI:WelcomeMenu:OpenIncidents' => '所有打开的事件: %1$d',
@@ -559,52 +558,9 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
'UI:SearchValue:CheckAll' => '全选',
'UI:SearchValue:UncheckAll' => '反选',
'UI:SelectOne' => '-- 请选择 --',
'UI:Login:Welcome' => '欢迎使用'.ITOP_APPLICATION_SHORT.'!',
'UI:Login:IncorrectLoginPassword' => '用户名或密码错误, 请重试.',
'UI:Login:IdentifyYourself' => '请完成身份认证',
'UI:Login:UserNamePrompt' => '用户名',
'UI:Login:PasswordPrompt' => '密码',
'UI:Login:ForgotPwd' => '忘记密码?',
'UI:Login:ForgotPwdForm' => '忘记密码',
'UI:Login:ForgotPwdForm+' => ITOP_APPLICATION_SHORT.'将会给您发送一封密码重置邮件.',
'UI:Login:ResetPassword' => '立即发送!',
'UI:Login:ResetPwdFailed' => '邮件发送失败: %1$s',
'UI:Login:SeparatorOr' => '或',
'UI:ResetPwd-Error-WrongLogin' => '\'%1$s\' 用户名无效',
'UI:ResetPwd-Error-NotPossible' => '外部账号不允许重置密码.',
'UI:ResetPwd-Error-FixedPwd' => '此账号不允许重置密码.',
'UI:ResetPwd-Error-NoContact' => '此账号没有关联到人员.',
'UI:ResetPwd-Error-NoEmailAtt' => '此账号未关联邮箱地址,请联系管理员.',
'UI:ResetPwd-Error-NoEmail' => '缺少邮箱地址. 请联系管理员.',
'UI:ResetPwd-Error-Send' => '邮件发送存在技术原因. 请联系管理员.',
'UI:ResetPwd-EmailSent' => '请检查您的收件箱并根据指引进行操作. 如果您没有收到邮件, 请检查您登录时的输入是否存在错误.',
'UI:ResetPwd-EmailSubject' => '重置'.ITOP_APPLICATION_SHORT.'密码',
'UI:ResetPwd-EmailBody' => '<body><p>您已请求重置'.ITOP_APPLICATION_SHORT.'密码.</p><p>请点击这个链接 (一次性) <a href="%1$s">来输入新的密码</a></p>.',
'UI:ResetPwd-Title' => '重置密码',
'UI:ResetPwd-Error-InvalidToken' => '对不起, 密码已经被重置, 请检查是否收到了多封密码重置邮件. 请点击最新邮件里的链接.',
'UI:ResetPwd-Error-EnterPassword' => '请输入 \'%1$s\' 的新密码.',
'UI:ResetPwd-Ready' => '密码已修改成功.',
'UI:ResetPwd-Login' => '点击这里登录...',
'UI:Login:About' => ITOP_APPLICATION.'由 Combodo 创建',
'UI:Login:ChangeYourPassword' => '修改您的密码',
'UI:Login:OldPasswordPrompt' => '旧密码',
'UI:Login:NewPasswordPrompt' => '新密码',
'UI:Login:RetypeNewPasswordPrompt' => '重复新密码',
'UI:Login:IncorrectOldPassword' => '错误: 旧密码错误',
'UI:LogOffMenu' => '注销',
'UI:LogOff:ThankYou' => '感谢使用'.ITOP_APPLICATION, 'UI:LogOff:ClickHereToLoginAgain' => '点击这里再次登录...',
'UI:ChangePwdMenu' => '修改密码...',
'UI:Login:PasswordChanged' => '密码已成功设置!',
'UI:Login:PasswordNotChanged' => '错误!密码未改变!',
'UI:AccessRO-All' => ITOP_APPLICATION.'是只读的',
'UI:AccessRO-Users' => ITOP_APPLICATION.'对于终端用户是只读的',
'UI:ApplicationEnvironment' => '应用环境: %1$s',
'UI:Login:RetypePwdDoesNotMatch' => '新密码输入不一致!',
'UI:Button:Login' => '登录'.ITOP_APPLICATION_SHORT, 'UI:Login:Error:AccessRestricted' => ITOP_APPLICATION_SHORT.'访问被限制. 请联系管理员.',
'UI:Login:Error:AccessAdmin' => '只有具有管理员权限的人才能访问. 请联系管理员.',
'UI:Login:Error:WrongOrganizationName' => '未知组织',
'UI:Login:Error:MultipleContactsHaveSameEmail' => '多个联系人存在相同的邮箱',
'UI:Login:Error:NoValidProfiles' => '无效的资料',
'UI:CSVImport:MappingSelectOne' => '-- 请选择 --',
'UI:CSVImport:MappingNotApplicable' => '-- 忽略此字段 --',
'UI:CSVImport:NoData' => '数据为空..., 请提供数据!',