Merge branch 'support/3.2' into develop

datamodels/2.x/itop-config/dictionaries/zh_cn.dict.itop-config.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Localized data
  *
@@ -20,7 +21,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
-Dict::Add('ZH CN', 'Chinese', '简体中文', array(
+Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Menu:ConfigFileEditor' => 'Plain text editor~~',
 	'Menu:ConfigEditor' => '编辑配置文件',
 	'itop-config/Operation:Edit/Title' => '配置文件编辑器',
@@ -39,4 +40,4 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'config-error-file-changed' => '错误: 配置文件在您打开以后已被更改, 无法保存. 请刷新并再次保存.',
 	'config-not-allowed-in-demo' => '抱歉, '.ITOP_APPLICATION_SHORT.'处于<b>演示模式</b>: 不能编辑配置文件.',
 	'config-interactive-not-allowed' => ITOP_APPLICATION_SHORT.'交互式配置编辑器已禁用. 请在配置文件中查看 <code>\'config_editor\' => \'disabled\'</code>.',
-));
+]);