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 Sep 6, 2019
2 parents 0d1ac99 + 2f6a649 commit 051db2e
Show file tree
Hide file tree
Showing 8 changed files with 436 additions and 108 deletions.
324 changes: 220 additions & 104 deletions composer.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion front/profile.form.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

include ('../../../inc/includes.php');

Session::checkRight("profile", "r");
Session::checkRight("profile", UPDATE);

$prof = new PluginTreeviewProfile();

Expand Down
Binary file added locales/pt_PT.mo
Binary file not shown.
104 changes: 104 additions & 0 deletions locales/pt_PT.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
# 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.
#
# Translators:
# Rui Melo <[email protected]>, 2019
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-24 14:48+0000\n"
"PO-Revision-Date: 2018-08-24 14:49+0000\n"
"Last-Translator: Rui Melo <[email protected]>, 2019\n"
"Language-Team: Portuguese (Portugal) (https://www.transifex.com/teclib/teams/28042/pt_PT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: pt_PT\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

#: left.php:36 left.php:53 inc/profile.class.php:137 inc/config.class.php:49
#: inc/config.class.php:243 inc/config.class.php:315
#: inc/preference.class.php:43 inc/preference.class.php:115 setup.php:112
msgid "Tree view"
msgstr "Vista em árvore"

#: inc/profile.class.php:106
msgid "Use the tree"
msgstr "Utilizar a árvore"

#: inc/config.class.php:60
msgid "Display"
msgstr "Mostrar"

#: inc/config.class.php:62
msgid "Target for all the nodes"
msgstr "Alvo para todos nós"

#: inc/config.class.php:65
msgid "New window"
msgstr "Nova janela"

#: inc/config.class.php:67
msgid "The central console"
msgstr "Consola central"

#: inc/config.class.php:71
msgid "Should folders be links"
msgstr "As pastas devem ser ligações"

#: inc/config.class.php:80
msgid "Nodes can be highlighted"
msgstr "Nós podemos ser destacados"

#: inc/config.class.php:88
msgid "Tree is drawn with lines"
msgstr "A árvore é desenhada com linhas"

#: inc/config.class.php:96
msgid "Tree is drawn with icons"
msgstr "A árvore é desenhada com ícones"

#: inc/config.class.php:106
msgid "Only one node within a parent"
msgstr "Apenas um nó dentro de um pai"

#: inc/config.class.php:107
msgid "can be expanded at the same time."
msgstr "pode ser expandido ao mesmo tempo."

#: inc/config.class.php:116
msgid "Item name"
msgstr "Nome do item"

#: inc/config.class.php:130
msgid "Location name"
msgstr "Nome do local"

#: inc/config.class.php:134 inc/config.class.php:138
msgid "Short name"
msgstr "Nome abreviado"

#: inc/config.class.php:136 inc/config.class.php:141
msgid "Long name"
msgstr "Nome completo"

#: inc/config.class.php:138 inc/config.class.php:141
msgid "Comment"
msgstr "Comentário"

#: inc/preference.class.php:58
msgid "Launch the plugin Treeview with GLPI launching"
msgstr "Activar o Treeview com no arranque do GLPI"

#: inc/preference.class.php:69
msgid ""
"Warning: If there are more than one plugin which be loaded at startup, then "
"only the first will be used"
msgstr ""
"Aviso: Se houver mais de um plugin que seja carregado na inicialização, "
"então apenas o primeiro será usado"
Binary file added locales/zh_CN.mo
Binary file not shown.
102 changes: 102 additions & 0 deletions locales/zh_CN.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
# 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.
#
# Translators:
# 李赋 <[email protected]>, 2019
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-24 14:48+0000\n"
"PO-Revision-Date: 2018-08-24 14:49+0000\n"
"Last-Translator: 李赋 <[email protected]>, 2019\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=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"

#: left.php:36 left.php:53 inc/profile.class.php:137 inc/config.class.php:49
#: inc/config.class.php:243 inc/config.class.php:315
#: inc/preference.class.php:43 inc/preference.class.php:115 setup.php:112
msgid "Tree view"
msgstr "树型视图"

#: inc/profile.class.php:106
msgid "Use the tree"
msgstr "使用树"

#: inc/config.class.php:60
msgid "Display"
msgstr "显示"

#: inc/config.class.php:62
msgid "Target for all the nodes"
msgstr "针对所有节点的目标"

#: inc/config.class.php:65
msgid "New window"
msgstr "新窗口"

#: inc/config.class.php:67
msgid "The central console"
msgstr "中央控制台"

#: inc/config.class.php:71
msgid "Should folders be links"
msgstr ""

#: inc/config.class.php:80
msgid "Nodes can be highlighted"
msgstr "节点可以突出显示"

#: inc/config.class.php:88
msgid "Tree is drawn with lines"
msgstr "树用线条绘制"

#: inc/config.class.php:96
msgid "Tree is drawn with icons"
msgstr "树用图标绘制"

#: inc/config.class.php:106
msgid "Only one node within a parent"
msgstr "父级中只有一个节点"

#: inc/config.class.php:107
msgid "can be expanded at the same time."
msgstr "可以同时扩展。"

#: inc/config.class.php:116
msgid "Item name"
msgstr "项目名称"

#: inc/config.class.php:130
msgid "Location name"
msgstr "地点名称"

#: inc/config.class.php:134 inc/config.class.php:138
msgid "Short name"
msgstr "简称"

#: inc/config.class.php:136 inc/config.class.php:141
msgid "Long name"
msgstr "全称"

#: inc/config.class.php:138 inc/config.class.php:141
msgid "Comment"
msgstr "注释"

#: inc/preference.class.php:58
msgid "Launch the plugin Treeview with GLPI launching"
msgstr "使用GLPI启动插件Treeview"

#: inc/preference.class.php:69
msgid ""
"Warning: If there are more than one plugin which be loaded at startup, then "
"only the first will be used"
msgstr "警告:如果启动时加载了多个插件,则只使用第一个插件"
4 changes: 2 additions & 2 deletions setup.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
--------------------------------------------------------------------------
*/

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

// Minimal GLPI version, inclusive
define('PLUGIN_TREEVIEW_MIN_GLPI', '9.2');
Expand Down Expand Up @@ -151,4 +151,4 @@ function plugin_treeview_check_prerequisites() {

function plugin_treeview_check_config() {
return true;
}
}
8 changes: 7 additions & 1 deletion treeview.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@
<author>Teclib'</author>
</authors>
<versions>
<version>
<num>1.8.1</num>
<compatibility>9.4</compatibility>
<compatibility>9.3</compatibility>
<compatibility>9.2</compatibility>
</version>
<version>
<num>1.8.0</num>
<compatibility>9.4</compatibility>
Expand Down Expand Up @@ -93,4 +99,4 @@
<tag>Management</tag>
</en>
</tags>
</root>
</root>

0 comments on commit 051db2e

Please sign in to comment.