Skip to content

Commit

Permalink
Merge branch 'release/1.8.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
cedric-anne committed Jul 6, 2018
2 parents 9406eea + 85cb569 commit 1572020
Show file tree
Hide file tree
Showing 10 changed files with 189 additions and 8 deletions.
Binary file modified locales/cs_CZ.mo
Binary file not shown.
6 changes: 3 additions & 3 deletions locales/cs_CZ.po
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ msgstr ""
"Project-Id-Version: GLPI Plugin - Fields\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-06-28 08:22+0000\n"
"PO-Revision-Date: 2018-06-28 08:23+0000\n"
"Last-Translator: Cédric Anne\n"
"PO-Revision-Date: 2018-06-28 12:37+0000\n"
"Last-Translator: Pavel Borecki <[email protected]>\n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/teclib/glpi-plugin-plugin-fields/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand Down Expand Up @@ -127,7 +127,7 @@ msgstr "Není možné přidat několik bloků s typem „Vložení do formulář
msgid ""
"You cannot add several blocks with type 'Insertion in the form of a specific"
" tab' on same object tab"
msgstr ""
msgstr "Není možné přidat několik bloků typu „Vložení ve formuláři konkrétní karty“ na té stejné kartě objektu"

#: inc/container.class.php:372
msgid "You cannot add several blocs with identical name on same object"
Expand Down
Binary file modified locales/en_US.mo
Binary file not shown.
5 changes: 3 additions & 2 deletions locales/en_US.po
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
# Cédric Anne, 2018
# Shawn Long <[email protected]>, 2016-2017
msgid ""
msgstr ""
"Project-Id-Version: GLPI Plugin - Fields\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-06-28 08:22+0000\n"
"PO-Revision-Date: 2018-06-28 08:23+0000\n"
"PO-Revision-Date: 2018-07-06 09:27+0000\n"
"Last-Translator: Cédric Anne\n"
"Language-Team: English (United States) (http://www.transifex.com/teclib/glpi-plugin-plugin-fields/language/en_US/)\n"
"MIME-Version: 1.0\n"
Expand Down Expand Up @@ -125,7 +126,7 @@ msgstr "You cannot add several blocks with type 'Insertion in the form' on same
msgid ""
"You cannot add several blocks with type 'Insertion in the form of a specific"
" tab' on same object tab"
msgstr ""
msgstr "You cannot add several blocks with type 'Insertion in the form of a specific tab' on same object tab"

#: inc/container.class.php:372
msgid "You cannot add several blocs with identical name on same object"
Expand Down
Binary file modified locales/fr_FR.mo
Binary file not shown.
4 changes: 2 additions & 2 deletions locales/fr_FR.po
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ msgstr ""
"Project-Id-Version: GLPI Plugin - Fields\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-06-28 08:22+0000\n"
"PO-Revision-Date: 2018-06-28 08:23+0000\n"
"PO-Revision-Date: 2018-07-06 09:26+0000\n"
"Last-Translator: Cédric Anne\n"
"Language-Team: French (France) (http://www.transifex.com/teclib/glpi-plugin-plugin-fields/language/fr_FR/)\n"
"MIME-Version: 1.0\n"
Expand Down Expand Up @@ -128,7 +128,7 @@ msgstr "Vous ne pouvez pas créer plusieurs blocs de type 'Insertion dans le for
msgid ""
"You cannot add several blocks with type 'Insertion in the form of a specific"
" tab' on same object tab"
msgstr ""
msgstr "Vous ne pouvez pas créer plusieurs blocs de type 'Insertion dans le formulaire d'un onglet spécifique' sur le même onglet d'un objet"

#: inc/container.class.php:372
msgid "You cannot add several blocs with identical name on same object"
Expand Down
Binary file added locales/zh_CN.mo
Binary file not shown.
176 changes: 176 additions & 0 deletions locales/zh_CN.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,176 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
# 杜哥 <[email protected]>, 2018
msgid ""
msgstr ""
"Project-Id-Version: GLPI Plugin - Fields\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-06-28 08:22+0000\n"
"PO-Revision-Date: 2018-07-01 15:42+0000\n"
"Last-Translator: 杜哥 <[email protected]>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/teclib/glpi-plugin-plugin-fields/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"

#: front/container.php:4 front/container.form.php:35 inc/menu.class.php:6
#: setup.php:174
msgid "Additionnal fields"
msgstr "附加字段"

#: hook.php:58
msgid "MySQL tables installation"
msgstr "安装MySQL数据表"

#: hook.php:106
msgid "The plugin can't be uninstalled when the plugin is disabled"
msgstr "插件处于禁用状态时无法卸载"

#: hook.php:115
msgid "MySQL tables uninstallation"
msgstr "卸载MySQL数据表"

#: inc/field.class.php:72
msgid "Field"
msgstr "字段"

#: inc/field.class.php:241
msgid "Fields"
msgstr "字段"

#: inc/field.class.php:290
msgid "Add a new field"
msgstr "添加新字段"

#: inc/field.class.php:294
msgid "No field for this block"
msgstr "此区域无字段"

#: inc/field.class.php:306 inc/field.class.php:419
msgid "Read only"
msgstr "只读"

#: inc/field.class.php:396
msgid "Configure"
msgstr "设置"

#: inc/field.class.php:396
msgid "Configure fields values"
msgstr "设置字段值"

#: inc/field.class.php:712
msgid "show"
msgstr "显示"

#: inc/field.class.php:858
msgid "Header"
msgstr "头部"

#: inc/field.class.php:859
msgid "Text (single line)"
msgstr "文本(单行)"

#: inc/field.class.php:860
msgid "Text (multiples lines)"
msgstr "文本(多行)"

#: inc/field.class.php:861
msgid "Number"
msgstr "整数"

#: inc/field.class.php:862
msgid "URL"
msgstr "网址"

#: inc/field.class.php:863
msgid "Dropdown"
msgstr "拖动"

#: inc/field.class.php:864
msgid "Yes/No"
msgstr "是/否"

#: inc/field.class.php:865
msgid "Date"
msgstr "日期"

#: inc/field.class.php:866
msgid "Date & time"
msgstr "时间&日期"

#: inc/container.class.php:12
msgid "Regenerate container files"
msgstr "生成容器文件"

#: inc/container.class.php:127
msgid "Updating generated containers files"
msgstr "刷新生成容器文件"

#: inc/container.class.php:318
msgid "You cannot add block without associated element type"
msgstr "您不能添加没有关联元素类型的块"

#: inc/container.class.php:335
msgid ""
"You cannot add several blocks with type 'Insertion in the form' on same "
"object"
msgstr "不能在同一个对象上添加几个带有'表单中插入'类型的块"

#: inc/container.class.php:350
msgid ""
"You cannot add several blocks with type 'Insertion in the form of a specific"
" tab' on same object tab"
msgstr "不能在同一个对象选项卡上以特定选项卡的形式使用“表单中插入特殊标签”类型添加几个块"

#: inc/container.class.php:372
msgid "You cannot add several blocs with identical name on same object"
msgstr "不能在同一对象上添加名称相同的多个块"

#: inc/container.class.php:512
msgid "Block"
msgstr "区域"

#: inc/container.class.php:583
msgid "Tab"
msgstr "标签"

#: inc/container.class.php:788
msgid "Add tab"
msgstr "添加标签"

#: inc/container.class.php:789
msgid "Insertion in the form (before save button)"
msgstr "在窗体中插入(保存按钮前)"

#: inc/container.class.php:790
msgid "Insertion in the form of a specific tab (before save button)"
msgstr "以特定选项卡的形式插入(保存按钮之前)"

#: inc/container.class.php:1149
msgid "Some mandatory fields are empty"
msgstr "一些强制字段是空的。"

#: inc/container.class.php:1154
msgid "Some numeric fields contains non numeric values"
msgstr "一些数值字段包含非数值"

#: inc/container.class.php:1159
msgid "Some URL fields contains invalid links"
msgstr "有些URL字段包含无效链接"

#: inc/labeltranslation.class.php:129
msgid "Language"
msgstr "语言"

#: inc/labeltranslation.class.php:130
msgid "Label"
msgstr "标签"

#: inc/dropdown.class.php:16
msgid "Updating generated dropdown files"
msgstr "更新生成下拉文件"
4 changes: 4 additions & 0 deletions plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,10 @@ Il existe un [script de migration](https://github.com/pluginsGLPI/customfields/b
<author>Johan Cwiklinski</author>
</authors>
<versions>
<version>
<num>1.8.1</num>
<compatibility>9.3</compatibility>
</version>
<version>
<num>1.8.0</num>
<compatibility>9.3</compatibility>
Expand Down
2 changes: 1 addition & 1 deletion setup.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
--------------------------------------------------------------------------
*/

define ('PLUGIN_FIELDS_VERSION', '1.8.0');
define ('PLUGIN_FIELDS_VERSION', '1.8.1');

// Minimal GLPI version, inclusive
define("PLUGIN_FIELDS_MIN_GLPI", "9.3");
Expand Down

0 comments on commit 1572020

Please sign in to comment.