Merge remote-tracking branch 'origin/support/2.5' into release/2.6

# Conflicts:
#	datamodels/2.x/itop-attachments/zh.dict.itop-attachments.php
#	datamodels/2.x/itop-backup/zh.dict.itop-backup.php
#	datamodels/2.x/itop-change-mgmt-itil/zh.dict.itop-change-mgmt-itil.php
#	datamodels/2.x/itop-change-mgmt/zh.dict.itop-change-mgmt.php
#	datamodels/2.x/itop-config-mgmt/es_cr.dict.itop-config-mgmt.php
#	datamodels/2.x/itop-config-mgmt/zh.dict.itop-config-mgmt.php
#	datamodels/2.x/itop-config/zh.dict.itop-config.php
#	datamodels/2.x/itop-datacenter-mgmt/zh.dict.itop-datacenter-mgmt.php
#	datamodels/2.x/itop-hub-connector/zh.dict.itop-hub-connector.php
#	datamodels/2.x/itop-incident-mgmt-itil/zh.dict.itop-incident-mgmt-itil.php
#	datamodels/2.x/itop-knownerror-mgmt/zh.dict.itop-knownerror-mgmt.php
#	datamodels/2.x/itop-portal-base/zh.dict.itop-portal-base.php
#	datamodels/2.x/itop-problem-mgmt/es_cr.dict.itop-problem-mgmt.php
#	datamodels/2.x/itop-problem-mgmt/zh.dict.itop-problem-mgmt.php
#	datamodels/2.x/itop-request-mgmt-itil/es_cr.dict.itop-request-mgmt-itil.php
#	datamodels/2.x/itop-request-mgmt-itil/zh.dict.itop-request-mgmt-itil.php
#	datamodels/2.x/itop-request-mgmt/es_cr.dict.itop-request-mgmt.php
#	datamodels/2.x/itop-request-mgmt/zh.dict.itop-request-mgmt.php
#	datamodels/2.x/itop-service-mgmt-provider/zh.dict.itop-service-mgmt-provider.php
#	datamodels/2.x/itop-service-mgmt/zh.dict.itop-service-mgmt.php
#	datamodels/2.x/itop-tickets/zh.dict.itop-tickets.php
#	datamodels/2.x/itop-welcome-itil/zh.dict.itop-welcome-itil.php
#	dictionaries/zh.dictionary.itop.core.php
#	dictionaries/zh.dictionary.itop.ui.php
This commit is contained in:
Pierre Goiffon
2018-12-10 08:38:19 +01:00
27 changed files with 4833 additions and 4948 deletions

View File

@@ -419,7 +419,7 @@
}, 300);
}
{% if sSearchValue is not null %}
{% if (sSearchValue is not null) and (sSearchValue != '') %}
// Filters from default value
$('#brick_search_field').trigger('change');
{% endif %}

View File

@@ -1,145 +1,147 @@
<?php
// Copyright (C) 2010-2015 Combodo SARL
//
// This file is part of iTop.
//
// iTop is free software; you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// iTop is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with iTop. If not, see <http://www.gnu.org/licenses/>
/**
* Localized data
*
* @copyright Copyright (C) 2010-2018 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
*
* This file is part of iTop.
*
* iTop is free software; you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* iTop is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with iTop. If not, see <http://www.gnu.org/licenses/>
* @copyright Copyright (C) 2010-2012 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
*/
// Portal
Dict::Add('ZH CN', 'Chinese', '简体中文', array(
'Page:DefaultTitle' => '%1$s User portal~~',
'Page:PleaseWait' => 'Please wait...~~',
'Page:Home' => 'Home~~',
'Page:GoPortalHome' => 'Home page~~',
'Page:GoPreviousPage' => 'Previous page~~',
'Page:ReloadPage' => 'Reload page~~',
'Portal:Button:Submit' => 'Submit~~',
'Portal:Button:Apply' => 'Update~~',
'Portal:Button:Cancel' => 'Cancel~~',
'Portal:Button:Close' => 'Close~~',
'Portal:Button:Add' => 'Add~~',
'Portal:Button:Remove' => 'Remove~~',
'Portal:Button:Delete' => 'Delete~~',
'Portal:EnvironmentBanner:Title' => 'You are currently in <strong>%1$s</strong> mode~~',
'Portal:EnvironmentBanner:GoToProduction' => 'Go back to PRODUCTION mode~~',
'Error:HTTP:401' => 'Authentication~~',
'Error:HTTP:404' => 'Page not found~~',
'Error:HTTP:500' => 'Oops! An error has occured.~~',
'Error:HTTP:GetHelp' => 'Please contact your %1$s administrator if the problem keeps happening.~~',
'Error:XHR:Fail' => 'Could not load data, please contact your %1$s administrator~~',
'Portal:ErrorUserLoggedOut' => 'You are logged out and need to log in again in order to continue.~~',
'Portal:Datatables:Language:Processing' => 'Please wait...~~',
'Portal:Datatables:Language:Search' => 'Filter:~~',
'Portal:Datatables:Language:LengthMenu' => 'Display _MENU_ items per page~~',
'Portal:Datatables:Language:ZeroRecords' => 'No result~~',
'Portal:Datatables:Language:Info' => 'Page _PAGE_ of _PAGES_~~',
'Portal:Datatables:Language:InfoEmpty' => 'No information~~',
'Portal:Datatables:Language:InfoFiltered' => 'filtered out of _MAX_ items~~',
'Portal:Datatables:Language:EmptyTable' => 'No data available in this table~~',
'Portal:Datatables:Language:DisplayLength:All' => 'All~~',
'Portal:Datatables:Language:Paginate:First' => 'First~~',
'Portal:Datatables:Language:Paginate:Previous' => 'Previous~~',
'Portal:Datatables:Language:Paginate:Next' => 'Next~~',
'Portal:Datatables:Language:Paginate:Last' => 'Last~~',
'Portal:Datatables:Language:Sort:Ascending' => 'enable for an ascending sort~~',
'Portal:Datatables:Language:Sort:Descending' => 'enable for a descending sort~~',
'Portal:Autocomplete:NoResult' => 'No data~~',
'Portal:Attachments:DropZone:Message' => 'Drop your files to add them as attachments~~',
'Portal:File:None' => 'No file~~',
'Portal:File:DisplayInfo' => '<a href="%2$s" class="file_download_link">%1$s</a>~~',
'Portal:File:DisplayInfo+' => '%1$s (%2$s) <a href="%3$s" class="file_open_link" target="_blank">Open</a> / <a href="%4$s" class="file_download_link">Download</a>~~',
'Portal:Calendar-FirstDayOfWeek' => 'zh-cn', //work with moment.js locales
'Page:DefaultTitle' => 'iTop 用户门户',
'Page:PleaseWait' => '请稍后...',
'Page:Home' => '主页',
'Page:GoPortalHome' => '主页面',
'Page:GoPreviousPage' => '上一页',
'Page:ReloadPage' => '重新加载',
'Portal:Button:Submit' => '提交',
'Portal:Button:Apply' => '更新',
'Portal:Button:Cancel' => '取消',
'Portal:Button:Close' => '关闭',
'Portal:Button:Add' => '添加',
'Portal:Button:Remove' => '移除',
'Portal:Button:Delete' => '删除',
'Portal:EnvironmentBanner:Title' => '您目前处于 <strong>%1$s</strong> 模式',
'Portal:EnvironmentBanner:GoToProduction' => '回到产品模式',
'Error:HTTP:401' => '认证',
'Error:HTTP:404' => '页面找不到',
'Error:HTTP:500' => 'Oops! 发生了一个错误.',
'Error:HTTP:GetHelp' => '如果问题仍然存在,请联系管理员.',
'Error:XHR:Fail' => '无法加载数据, 请联系管理员',
'Portal:ErrorUserLoggedOut' => '您已退出,请重新登录.',
'Portal:Datatables:Language:Processing' => '请稍后...',
'Portal:Datatables:Language:Search' => '过滤器:',
'Portal:Datatables:Language:LengthMenu' => '每页显示 _MENU_ ',
'Portal:Datatables:Language:ZeroRecords' => '没有结果',
'Portal:Datatables:Language:Info' => ' _PAGE_ 页,共 _PAGES_',
'Portal:Datatables:Language:InfoEmpty' => '没有信息',
'Portal:Datatables:Language:InfoFiltered' => 'filtered out of _MAX_ items',
'Portal:Datatables:Language:EmptyTable' => '表格中没有数据',
'Portal:Datatables:Language:DisplayLength:All' => '全部',
'Portal:Datatables:Language:Paginate:First' => '首页',
'Portal:Datatables:Language:Paginate:Previous' => '上一页',
'Portal:Datatables:Language:Paginate:Next' => '下一页',
'Portal:Datatables:Language:Paginate:Last' => '尾页',
'Portal:Datatables:Language:Sort:Ascending' => '升序排序',
'Portal:Datatables:Language:Sort:Descending' => '降序排序',
'Portal:Autocomplete:NoResult' => '没有数据',
'Portal:Attachments:DropZone:Message' => '把文件添加为附件',
'Portal:File:None' => '没有文件',
'Portal:File:DisplayInfo' => '<a href="%2$s" class="file_download_link">%1$s</a>',
'Portal:File:DisplayInfo+' => '%1$s (%2$s) <a href="%3$s" class="file_open_link" target="_blank">Open</a> / <a href="%4$s" class="file_download_link">Download</a>',
));
// UserProfile brick
Dict::Add('ZH CN', 'Chinese', '简体中文', array(
'Brick:Portal:UserProfile:Name' => 'User profile~~',
'Brick:Portal:UserProfile:Navigation:Dropdown:MyProfil' => 'My profile~~',
'Brick:Portal:UserProfile:Navigation:Dropdown:Logout' => 'Logoff~~',
'Brick:Portal:UserProfile:Password:Title' => 'Password~~',
'Brick:Portal:UserProfile:Password:ChoosePassword' => 'Choose password~~',
'Brick:Portal:UserProfile:Password:ConfirmPassword' => 'Confirm password~~',
'Brick:Portal:UserProfile:Password:CantChangeContactAdministrator' => 'To change your password, please contact your %1$s administrator~~',
'Brick:Portal:UserProfile:Password:CantChangeForUnknownReason' => 'Can\'t change password, please contact your %1$s administrator~~',
'Brick:Portal:UserProfile:PersonalInformations:Title' => 'Personal informations~~',
'Brick:Portal:UserProfile:Photo:Title' => 'Photo~~',
'Brick:Portal:UserProfile:Name' => '用户资料',
'Brick:Portal:UserProfile:Navigation:Dropdown:MyProfil' => '我的资料',
'Brick:Portal:UserProfile:Navigation:Dropdown:Logout' => '注销',
'Brick:Portal:UserProfile:Password:Title' => '密码',
'Brick:Portal:UserProfile:Password:ChoosePassword' => '新密码',
'Brick:Portal:UserProfile:Password:ConfirmPassword' => '确认密码',
'Brick:Portal:UserProfile:Password:CantChangeContactAdministrator' => '要修改密码,请联系管理员',
'Brick:Portal:UserProfile:Password:CantChangeForUnknownReason' => '无法修改密码, 请联系管理员',
'Brick:Portal:UserProfile:PersonalInformations:Title' => '个体信息',
'Brick:Portal:UserProfile:Photo:Title' => '头像',
));
// AggregatePageBrick
Dict::Add('ZH CN', 'Chinese', '简体中文', array(
'Brick:Portal:AggregatePage:DefaultTitle' => 'Dashboard~~',
'Brick:Portal:AggregatePage:DefaultTitle' => 'Dashboard',
));
// BrowseBrick brick
Dict::Add('ZH CN', 'Chinese', '简体中文', array(
'Brick:Portal:Browse:Name' => 'Browse throught items~~',
'Brick:Portal:Browse:Mode:List' => 'List~~',
'Brick:Portal:Browse:Mode:Tree' => 'Tree~~',
'Brick:Portal:Browse:Mode:Mosaic' => 'Mosaic~~',
'Brick:Portal:Browse:Action:Drilldown' => 'Drilldown~~',
'Brick:Portal:Browse:Action:View' => 'Details~~',
'Brick:Portal:Browse:Action:Edit' => 'Edit~~',
'Brick:Portal:Browse:Action:Create' => 'Create~~',
'Brick:Portal:Browse:Action:CreateObjectFromThis' => 'New %1$s~~',
'Brick:Portal:Browse:Tree:ExpandAll' => 'Expand all~~',
'Brick:Portal:Browse:Tree:CollapseAll' => 'Collapse all~~',
'Brick:Portal:Browse:Filter:NoData' => 'No item~~',
'Brick:Portal:Browse:Name' => '浏览项目',
'Brick:Portal:Browse:Mode:List' => '列表',
'Brick:Portal:Browse:Mode:Tree' => '树形',
'Brick:Portal:Browse:Mode:Mosaic' => '嵌套',
'Brick:Portal:Browse:Action:Drilldown' => '明细',
'Brick:Portal:Browse:Action:View' => '详情',
'Brick:Portal:Browse:Action:Edit' => '编辑',
'Brick:Portal:Browse:Action:Create' => '新建',
'Brick:Portal:Browse:Action:CreateObjectFromThis' => '新建 %1$s',
'Brick:Portal:Browse:Tree:ExpandAll' => '全部展开',
'Brick:Portal:Browse:Tree:CollapseAll' => '全部收起',
'Brick:Portal:Browse:Filter:NoData' => '没有项目',
));
// ManageBrick brick
Dict::Add('ZH CN', 'Chinese', '简体中文', array(
'Brick:Portal:Manage:Name' => 'Manage items~~',
'Brick:Portal:Manage:Table:NoData' => 'No item.~~',
'Brick:Portal:Manage:Table:ItemActions' => 'Actions~~',
'Brick:Portal:Manage:DisplayMode:list' => 'List~~',
'Brick:Portal:Manage:DisplayMode:pie-chart' => 'Pie Chart~~',
'Brick:Portal:Manage:DisplayMode:bar-chart' => 'Bar Chart~~',
'Brick:Portal:Manage:Others' => 'Others~~',
'Brick:Portal:Manage:All' => 'All~~',
'Brick:Portal:Manage:Group' => 'Group~~',
'Brick:Portal:Manage:fct:count' => 'Total~~',
'Brick:Portal:Manage:fct:sum' => 'Sum~~',
'Brick:Portal:Manage:fct:avg' => 'Average~~',
'Brick:Portal:Manage:fct:min' => 'Min~~',
'Brick:Portal:Manage:fct:max' => 'Max~~',
'Brick:Portal:Manage:Name' => '管理项目',
'Brick:Portal:Manage:Table:NoData' => '没有项目.',
'Brick:Portal:Manage:Table:ItemActions' => 'Actions',
'Brick:Portal:Manage:DisplayMode:list' => '列表',
'Brick:Portal:Manage:DisplayMode:pie-chart' => '饼图',
'Brick:Portal:Manage:DisplayMode:bar-chart' => '条形图',
'Brick:Portal:Manage:Others' => 'Others',
'Brick:Portal:Manage:All' => '全部',
'Brick:Portal:Manage:Group' => '分组',
'Brick:Portal:Manage:fct:count' => '个数',
'Brick:Portal:Manage:fct:sum' => '总数',
'Brick:Portal:Manage:fct:avg' => '平均',
'Brick:Portal:Manage:fct:min' => '最小',
'Brick:Portal:Manage:fct:max' => '最大',
));
// ObjectBrick brick
Dict::Add('ZH CN', 'Chinese', '简体中文', array(
'Brick:Portal:Object:Name' => 'Object~~',
'Brick:Portal:Object:Form:Create:Title' => 'New %1$s~~',
'Brick:Portal:Object:Form:Edit:Title' => 'Updating %2$s (%1$s)~~',
'Brick:Portal:Object:Form:View:Title' => '%1$s : %2$s~~',
'Brick:Portal:Object:Form:Stimulus:Title' => 'Please, fill the following informations:~~',
'Brick:Portal:Object:Form:Message:Saved' => 'Saved~~',
'Brick:Portal:Object:Search:Regular:Title' => 'Select %1$s (%2$s)~~',
'Brick:Portal:Object:Search:Hierarchy:Title' => 'Select %1$s (%2$s)~~',
'Brick:Portal:Object:Name' => '对象',
'Brick:Portal:Object:Form:Create:Title' => '新建 %1$s',
'Brick:Portal:Object:Form:Edit:Title' => '正在更新 %2$s (%1$s)',
'Brick:Portal:Object:Form:View:Title' => '%1$s : %2$s',
'Brick:Portal:Object:Form:Stimulus:Title' => 'Please, fill the following informations:',
'Brick:Portal:Object:Form:Message:Saved' => '已保存',
'Brick:Portal:Object:Search:Regular:Title' => '选择 %1$s (%2$s)',
'Brick:Portal:Object:Search:Hierarchy:Title' => '选择 %1$s (%2$s)',
));
// CreateBrick brick
Dict::Add('ZH CN', 'Chinese', '简体中文', array(
'Brick:Portal:Create:Name' => 'Quick creation~~',
'Brick:Portal:Create:ChooseType' => 'Please, choose a type~~',
'Brick:Portal:Create:Name' => '快速创建',
'Brick:Portal:Create:ChooseType' => 'Please, choose a type',
));
// Filter brick
Dict::Add('ZH CN', 'Chinese', '简体中文', array(
'Brick:Portal:Filter:Name' => 'Prefilter a brick~~',
'Brick:Portal:Filter:SearchInput:Placeholder' => 'eg. connect wifi~~',
'Brick:Portal:Filter:SearchInput:Submit' => 'Search~~',
'Brick:Portal:Filter:Name' => 'Prefilter a brick',
'Brick:Portal:Filter:SearchInput:Placeholder' => '例如. 连接 wifi',
'Brick:Portal:Filter:SearchInput:Submit' => '搜素',
));