Skip to content

Commit 051db2e

Browse files
cedric-annecedric-anne
committed
Merge branch 'release/1.8.1'
2 parents 0d1ac99 + 2f6a649 commit 051db2e

File tree

8 files changed

+436
-108
lines changed

8 files changed

+436
-108
lines changed

‎composer.lock

+220-104
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎front/profile.form.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

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

32-
Session::checkRight("profile", "r");
32+
Session::checkRight("profile", UPDATE);
3333

3434
$prof = new PluginTreeviewProfile();
3535

‎locales/pt_PT.mo

1.82 KB
Binary file not shown.

‎locales/pt_PT.po

+104
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
# SOME DESCRIPTIVE TITLE.
2+
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
3+
# This file is distributed under the same license as the PACKAGE package.
4+
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
5+
#
6+
# Translators:
7+
# Rui Melo <[email protected]>, 2019
8+
#
9+
#, fuzzy
10+
msgid ""
11+
msgstr ""
12+
"Project-Id-Version: PACKAGE VERSION\n"
13+
"Report-Msgid-Bugs-To: \n"
14+
"POT-Creation-Date: 2018-08-24 14:48+0000\n"
15+
"PO-Revision-Date: 2018-08-24 14:49+0000\n"
16+
"Last-Translator: Rui Melo <[email protected]>, 2019\n"
17+
"Language-Team: Portuguese (Portugal) (https://www.transifex.com/teclib/teams/28042/pt_PT/)\n"
18+
"MIME-Version: 1.0\n"
19+
"Content-Type: text/plain; charset=UTF-8\n"
20+
"Content-Transfer-Encoding: 8bit\n"
21+
"Language: pt_PT\n"
22+
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
23+
24+
#: left.php:36 left.php:53 inc/profile.class.php:137 inc/config.class.php:49
25+
#: inc/config.class.php:243 inc/config.class.php:315
26+
#: inc/preference.class.php:43 inc/preference.class.php:115 setup.php:112
27+
msgid "Tree view"
28+
msgstr "Vista em árvore"
29+
30+
#: inc/profile.class.php:106
31+
msgid "Use the tree"
32+
msgstr "Utilizar a árvore"
33+
34+
#: inc/config.class.php:60
35+
msgid "Display"
36+
msgstr "Mostrar"
37+
38+
#: inc/config.class.php:62
39+
msgid "Target for all the nodes"
40+
msgstr "Alvo para todos nós"
41+
42+
#: inc/config.class.php:65
43+
msgid "New window"
44+
msgstr "Nova janela"
45+
46+
#: inc/config.class.php:67
47+
msgid "The central console"
48+
msgstr "Consola central"
49+
50+
#: inc/config.class.php:71
51+
msgid "Should folders be links"
52+
msgstr "As pastas devem ser ligações"
53+
54+
#: inc/config.class.php:80
55+
msgid "Nodes can be highlighted"
56+
msgstr "Nós podemos ser destacados"
57+
58+
#: inc/config.class.php:88
59+
msgid "Tree is drawn with lines"
60+
msgstr "A árvore é desenhada com linhas"
61+
62+
#: inc/config.class.php:96
63+
msgid "Tree is drawn with icons"
64+
msgstr "A árvore é desenhada com ícones"
65+
66+
#: inc/config.class.php:106
67+
msgid "Only one node within a parent"
68+
msgstr "Apenas um nó dentro de um pai"
69+
70+
#: inc/config.class.php:107
71+
msgid "can be expanded at the same time."
72+
msgstr "pode ser expandido ao mesmo tempo."
73+
74+
#: inc/config.class.php:116
75+
msgid "Item name"
76+
msgstr "Nome do item"
77+
78+
#: inc/config.class.php:130
79+
msgid "Location name"
80+
msgstr "Nome do local"
81+
82+
#: inc/config.class.php:134 inc/config.class.php:138
83+
msgid "Short name"
84+
msgstr "Nome abreviado"
85+
86+
#: inc/config.class.php:136 inc/config.class.php:141
87+
msgid "Long name"
88+
msgstr "Nome completo"
89+
90+
#: inc/config.class.php:138 inc/config.class.php:141
91+
msgid "Comment"
92+
msgstr "Comentário"
93+
94+
#: inc/preference.class.php:58
95+
msgid "Launch the plugin Treeview with GLPI launching"
96+
msgstr "Activar o Treeview com no arranque do GLPI"
97+
98+
#: inc/preference.class.php:69
99+
msgid ""
100+
"Warning: If there are more than one plugin which be loaded at startup, then "
101+
"only the first will be used"
102+
msgstr ""
103+
"Aviso: Se houver mais de um plugin que seja carregado na inicialização, "
104+
"então apenas o primeiro será usado"

‎locales/zh_CN.mo

1.61 KB
Binary file not shown.

‎locales/zh_CN.po

+102
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
# SOME DESCRIPTIVE TITLE.
2+
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
3+
# This file is distributed under the same license as the PACKAGE package.
4+
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
5+
#
6+
# Translators:
7+
# 李赋 <[email protected]>, 2019
8+
#
9+
#, fuzzy
10+
msgid ""
11+
msgstr ""
12+
"Project-Id-Version: PACKAGE VERSION\n"
13+
"Report-Msgid-Bugs-To: \n"
14+
"POT-Creation-Date: 2018-08-24 14:48+0000\n"
15+
"PO-Revision-Date: 2018-08-24 14:49+0000\n"
16+
"Last-Translator: 李赋 <[email protected]>, 2019\n"
17+
"Language-Team: Chinese (China) (https://www.transifex.com/teclib/teams/28042/zh_CN/)\n"
18+
"MIME-Version: 1.0\n"
19+
"Content-Type: text/plain; charset=UTF-8\n"
20+
"Content-Transfer-Encoding: 8bit\n"
21+
"Language: zh_CN\n"
22+
"Plural-Forms: nplurals=1; plural=0;\n"
23+
24+
#: left.php:36 left.php:53 inc/profile.class.php:137 inc/config.class.php:49
25+
#: inc/config.class.php:243 inc/config.class.php:315
26+
#: inc/preference.class.php:43 inc/preference.class.php:115 setup.php:112
27+
msgid "Tree view"
28+
msgstr "树型视图"
29+
30+
#: inc/profile.class.php:106
31+
msgid "Use the tree"
32+
msgstr "使用树"
33+
34+
#: inc/config.class.php:60
35+
msgid "Display"
36+
msgstr "显示"
37+
38+
#: inc/config.class.php:62
39+
msgid "Target for all the nodes"
40+
msgstr "针对所有节点的目标"
41+
42+
#: inc/config.class.php:65
43+
msgid "New window"
44+
msgstr "新窗口"
45+
46+
#: inc/config.class.php:67
47+
msgid "The central console"
48+
msgstr "中央控制台"
49+
50+
#: inc/config.class.php:71
51+
msgid "Should folders be links"
52+
msgstr ""
53+
54+
#: inc/config.class.php:80
55+
msgid "Nodes can be highlighted"
56+
msgstr "节点可以突出显示"
57+
58+
#: inc/config.class.php:88
59+
msgid "Tree is drawn with lines"
60+
msgstr "树用线条绘制"
61+
62+
#: inc/config.class.php:96
63+
msgid "Tree is drawn with icons"
64+
msgstr "树用图标绘制"
65+
66+
#: inc/config.class.php:106
67+
msgid "Only one node within a parent"
68+
msgstr "父级中只有一个节点"
69+
70+
#: inc/config.class.php:107
71+
msgid "can be expanded at the same time."
72+
msgstr "可以同时扩展。"
73+
74+
#: inc/config.class.php:116
75+
msgid "Item name"
76+
msgstr "项目名称"
77+
78+
#: inc/config.class.php:130
79+
msgid "Location name"
80+
msgstr "地点名称"
81+
82+
#: inc/config.class.php:134 inc/config.class.php:138
83+
msgid "Short name"
84+
msgstr "简称"
85+
86+
#: inc/config.class.php:136 inc/config.class.php:141
87+
msgid "Long name"
88+
msgstr "全称"
89+
90+
#: inc/config.class.php:138 inc/config.class.php:141
91+
msgid "Comment"
92+
msgstr "注释"
93+
94+
#: inc/preference.class.php:58
95+
msgid "Launch the plugin Treeview with GLPI launching"
96+
msgstr "使用GLPI启动插件Treeview"
97+
98+
#: inc/preference.class.php:69
99+
msgid ""
100+
"Warning: If there are more than one plugin which be loaded at startup, then "
101+
"only the first will be used"
102+
msgstr "警告：如果启动时加载了多个插件，则只使用第一个插件"

‎setup.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
--------------------------------------------------------------------------
2828
*/
2929

30-
define('PLUGIN_TREEVIEW_VERSION', '1.8.0');
30+
define('PLUGIN_TREEVIEW_VERSION', '1.8.1');
3131

3232
// Minimal GLPI version, inclusive
3333
define('PLUGIN_TREEVIEW_MIN_GLPI', '9.2');
@@ -151,4 +151,4 @@ function plugin_treeview_check_prerequisites() {
151151

152152
function plugin_treeview_check_config() {
153153
return true;
154-
}
154+
}

‎treeview.xml

+7-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@
2525
<author>Teclib'</author>
2626
</authors>
2727
<versions>
28+
<version>
29+
<num>1.8.1</num>
30+
<compatibility>9.4</compatibility>
31+
<compatibility>9.3</compatibility>
32+
<compatibility>9.2</compatibility>
33+
</version>
2834
<version>
2935
<num>1.8.0</num>
3036
<compatibility>9.4</compatibility>
@@ -93,4 +99,4 @@
9399
<tag>Management</tag>
94100
</en>
95101
</tags>
96-
</root>
102+
</root>

0 commit comments

Comments
 (0)