Merge branch 'release/2.4.1'

locales/zh_CN.po

@@ -0,0 +1,268 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-06-28 09:42+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: 李赋 <[email protected]>, 2018\n"
+"Language-Team: Chinese (China) (https://www.transifex.com/teclib/teams/28042/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: front/action.php:55 inc/replace.class.php:466
+msgid "Replacement successful"
+msgstr "置换成功"
+
+#: front/action.php:96 inc/uninstall.class.php:320
+msgid "Uninstallation successful"
+msgstr "卸载成功"
+
+#: ajax/locations.php:43 inc/preference.class.php:74 inc/replace.class.php:579
+msgid "Keep previous location"
+msgstr "保留以前的位置"
+
+#: ajax/locations.php:44 inc/preference.class.php:75 inc/replace.class.php:583
+msgid "Empty location"
+msgstr "空位"
+
+#: hook.php:50 inc/uninstall.class.php:110 inc/uninstall.class.php:781
+msgid "Uninstall"
+msgstr "卸载"
+
+#: inc/model.class.php:42
+msgid "Uninstallation template"
+msgstr ""
+
+#: inc/model.class.php:108 inc/model.class.php:988 inc/model.class.php:1030
+msgid "Uninstallation"
+msgstr "卸载"
+
+#: inc/model.class.php:110 inc/model.class.php:990 inc/model.class.php:1032
+#: inc/replace.class.php:61 inc/replace.class.php:108
+msgid "Replacement"
+msgstr "替代"
+
+#: inc/model.class.php:120
+msgid "PDF Archiving"
+msgstr "PDF存档"
+
+#: inc/model.class.php:122
+msgid "CSV Archiving"
+msgstr "CSV存档"
+
+#: inc/model.class.php:125
+msgid "Purge"
+msgstr "清除"
+
+#: inc/model.class.php:126
+msgid "Delete + Comment"
+msgstr "删除+评论"
+
+#: inc/model.class.php:127
+msgid "Keep + Comment"
+msgstr "保留+评论"
+
+#: inc/model.class.php:168
+msgid "Replacing data"
+msgstr "替换数据"
+
+#: inc/model.class.php:212 inc/model.class.php:831
+msgid "Type of template"
+msgstr "模板类型"
+
+#: inc/model.class.php:221 inc/model.class.php:795
+msgid "Transfer's model to use"
+msgstr "使用转移的模型"
+
+#: inc/model.class.php:241 inc/replace.class.php:593
+msgid "New status of the computer"
+msgstr "计算机的新状态"
+
+#: inc/model.class.php:253 inc/model.class.php:841
+msgid "Action on group"
+msgstr "作用于群组"
+
+#: inc/model.class.php:265
+msgid "New group"
+msgstr "新群组"
+
+#: inc/model.class.php:286
+msgid "Add template"
+msgstr "添加模板"
+
+#: inc/model.class.php:289
+msgid "Manage templates"
+msgstr "管理模板"
+
+#: inc/model.class.php:300
+msgid "Erase datas"
+msgstr "擦除数据"
+
+#: inc/model.class.php:303 inc/model.class.php:703
+msgid "Delete software history (computers)"
+msgstr "删除软件历史（计算机）"
+
+#: inc/model.class.php:308 inc/model.class.php:861
+msgid "Delete the whole history"
+msgstr "删除所有历史记录"
+
+#: inc/model.class.php:390 inc/model.class.php:440
+msgid "Informations replacement"
+msgstr "信息替换"
+
+#: inc/model.class.php:391 inc/replace.class.php:539
+msgid "General informations"
+msgstr "一般信息"
+
+#: inc/model.class.php:413 inc/replace.class.php:554
+msgid "Overwrite informations (from old item to the new)"
+msgstr "覆盖信息（从旧项目到新项目）"
+
+#: inc/model.class.php:420 inc/model.class.php:851 inc/replace.class.php:557
+msgid "Archiving method of the old material"
+msgstr "历史档案的存档方法"
+
+#: inc/model.class.php:430
+msgid "Plugin PDF is installed and activated"
+msgstr "插件PDF已安装并激活"
+
+#: inc/model.class.php:433
+msgid ""
+"Plugin PDF is not installed, you won't be able to use PDF format for "
+"archiving"
+msgstr "未安装插件PDF，您将无法使用PDF格式进行存档"
+
+#: inc/model.class.php:441 inc/replace.class.php:615
+msgid "Connections with other materials"
+msgstr "用其他材料连接"
+
+#: inc/model.class.php:515 inc/replace.class.php:650
+msgid "Direct connections"
+msgstr "直接连接"
+
+#: inc/model.class.php:588
+msgid "OCSNG link"
+msgid_plural "OCSNG links"
+msgstr[0] "OCSNG链接"
+
+#: inc/model.class.php:590
+msgid "These options only apply to computers coming from OCSNG"
+msgstr "这些选项仅适用于来自OCSNG的计算机"
+
+#: inc/model.class.php:594 inc/model.class.php:814
+msgid "Delete computer in OCSNG"
+msgstr "在OCSNG中删除计算机"
+
+#: inc/model.class.php:600 inc/model.class.php:822
+msgid "Delete link with computer in OCSNG"
+msgstr "在OCSNG中删除与计算机的链接"
+
+#: inc/model.class.php:614
+msgid "Delete computer in FusionInventory"
+msgstr "在FusionInventory中删除计算机"
+
+#: inc/model.class.php:626
+msgid "Additionnal fields"
+msgstr "附加字段"
+
+#: inc/model.class.php:630
+msgid "Delete Fields plugin informations"
+msgstr "删除字段插件信息"
+
+#: inc/model.class.php:995 inc/uninstall.class.php:728
+msgid "Keep in the current group"
+msgstr "保持在当前组中"
+
+#: inc/preference.class.php:54 inc/uninstall.class.php:646
+msgid "Item's location after uninstall"
+msgstr "卸载后项目的位置"
+
+#: inc/uninstall.class.php:38 setup.php:89
+msgid "Item's uninstallation"
+msgstr "项目卸载"
+
+#: inc/uninstall.class.php:114
+msgid "Please wait, uninstallation is running..."
+msgstr "请稍等，卸载正在运行..."
+
+#: inc/uninstall.class.php:522
+msgid "Item is now uninstalled"
+msgstr "现在已卸载项目"
+
+#: inc/uninstall.class.php:526
+msgid "Item replaced by a new one"
+msgstr "项目由新项目替换"
+
+#: inc/uninstall.class.php:530
+msgid "Item replacing an old one"
+msgstr "项目替换旧项目"
+
+#: inc/uninstall.class.php:535
+msgid "Removed from OCSNG with ID"
+msgstr "已从带有ID的OCSNG中删除"
+
+#: inc/uninstall.class.php:729
+msgid "Affect to a new group"
+msgstr "对新组的影响"
+
+#: inc/replace.class.php:40
+msgid "Item's replacement"
+msgstr "替代项目"
+
+#: inc/replace.class.php:65
+msgid "Please wait, replacement is running..."
+msgstr "请稍等，更换正在运行..."
+
+#: inc/replace.class.php:130
+msgid "This document is the archive of this replaced item"
+msgstr "此文档是此替换项目的存档"
+
+#: inc/replace.class.php:135
+msgid "Archive of old material"
+msgstr "历史档案"
+
+#: inc/replace.class.php:409
+msgid "See attached document"
+msgstr "见附件"
+
+#: inc/replace.class.php:488
+msgid "This item is a replacement for item"
+msgstr "此项目是项目的替代品"
+
+#: inc/replace.class.php:490
+msgid "This item was replaced by"
+msgstr "这个项目被替换为"
+
+#: inc/replace.class.php:538 inc/replace.class.php:614
+msgid "Reminder of the replacement model"
+msgstr "提醒更换型号"
+
+#: inc/replace.class.php:576
+msgid "New location of item"
+msgstr "项目的新位置"
+
+#: inc/replace.class.php:661
+msgid "Choices for item to replace"
+msgstr "选择要替换的项目"
+
+#: inc/replace.class.php:664
+msgid "Old item"
+msgstr "旧项目"
+
+#: inc/replace.class.php:674
+msgid "New item"
+msgstr "新项目"
+
+#: inc/replace.class.php:706
+msgid "Replace"
+msgstr "替代"
+

setup.php

@@ -28,7 +28,7 @@
  @since     2009
  ---------------------------------------------------------------------- */
 
-define ('PLUGIN_UNINSTALL_VERSION', '2.4.0');
+define ('PLUGIN_UNINSTALL_VERSION', '2.4.1');
 
 // Minimal GLPI version, inclusive
 define("PLUGIN_UNINSTALL_MIN_GLPI", "9.3");

uninstall.xml

@@ -23,6 +23,10 @@
       <author>Remi Collet</author>
    </authors>
    <versions>
+      <version>
+         <num>2.4.1</num>
+         <compatibility>9.3</compatibility>
+      </version>
       <version>
          <num>2.4.0</num>
          <compatibility>9.3</compatibility>