Skip to content

Commit f276c96

Browse files
committed
Merge branch 'release/2.9.1'
2 parents 3e57a21 + f12cbff commit f276c96

23 files changed

+219
-317
lines changed

composer.lock

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

genericobject.xml

+5
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@
2424
<author>Walid Nouh</author>
2525
</authors>
2626
<versions>
27+
<version>
28+
<num>2.9.1</num>
29+
<compatibility>~9.5.0</compatibility>
30+
<download_url>https://github.com/pluginsGLPI/genericobject/releases/download/2.9.1/glpi-genericobject-2.9.1.tar.bz2</download_url>
31+
</version>
2732
<version>
2833
<num>2.9.0</num>
2934
<compatibility>~9.5.0</compatibility>

inc/object.class.php

+2
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ public function __construct() {
6464
if (preg_match("/PluginGenericobject(.*)/", $class, $results)) {
6565
if (preg_match("/^(.*)y$/i", $results[1], $end_results)) {
6666
static::$rightname = 'plugin_genericobject_'.strtolower($end_results[1]).'ies';
67+
} else if (preg_match("/^(.*)ss$/i", $results[1])) {
68+
static::$rightname = 'plugin_genericobject_'.strtolower($results[1]).'es';
6769
} else {
6870
static::$rightname = 'plugin_genericobject_'.strtolower($results[1]).'s';
6971
}

locales/cs_CZ.po

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ msgid ""
99
msgstr ""
1010
"Project-Id-Version: GLPI Plugin - Genericobject\n"
1111
"Report-Msgid-Bugs-To: \n"
12-
"POT-Creation-Date: 2020-07-03 18:57+0000\n"
12+
"POT-Creation-Date: 2020-10-27 15:13+0000\n"
1313
"PO-Revision-Date: 2019-11-09 06:06+0000\n"
1414
"Last-Translator: Pavel Borecki <[email protected]>\n"
1515
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/teclib/glpi-project-plugin-genericobject/language/cs_CZ/)\n"
@@ -142,11 +142,11 @@ msgid ""
142142
"files in %1$s"
143143
msgstr "Nejspíš ve své databázi máte pro tento modul v nepořádku data a chybí soubory v %1$s"
144144

145-
#: inc/object.class.php:537
145+
#: inc/object.class.php:539
146146
msgid "Object preview"
147147
msgstr "Náhled objektu"
148148

149-
#: inc/object.class.php:801
149+
#: inc/object.class.php:803
150150
msgid "You must configure rights to enable the preview"
151151
msgstr "Pro zapnutí náhledu je třeba nastavit oprávnění"
152152

locales/en_GB.mo

0 Bytes
Binary file not shown.

locales/en_GB.po

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: PACKAGE VERSION\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2020-07-03 18:57+0000\n"
11-
"PO-Revision-Date: 2020-07-03 18:57+0000\n"
10+
"POT-Creation-Date: 2020-10-27 15:13+0000\n"
11+
"PO-Revision-Date: 2020-10-27 15:13+0000\n"
1212
"Last-Translator: Automatically generated\n"
1313
"Language-Team: none\n"
1414
"Language: en_GB\n"
@@ -143,11 +143,11 @@ msgstr ""
143143
"You probably have garbage data in your database for this plugin and missing "
144144
"files in %1$s"
145145

146-
#: inc/object.class.php:537
146+
#: inc/object.class.php:539
147147
msgid "Object preview"
148148
msgstr "Object preview"
149149

150-
#: inc/object.class.php:801
150+
#: inc/object.class.php:803
151151
msgid "You must configure rights to enable the preview"
152152
msgstr "You must configure rights to enable the preview"
153153

locales/es_ES.po

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: GLPI Plugin - Genericobject\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2020-07-03 18:57+0000\n"
11+
"POT-Creation-Date: 2020-10-27 15:13+0000\n"
1212
"PO-Revision-Date: 2019-11-08 14:59+0000\n"
1313
"Last-Translator: Cédric Anne\n"
1414
"Language-Team: Spanish (Spain) (http://www.transifex.com/teclib/glpi-project-plugin-genericobject/language/es_ES/)\n"
@@ -141,11 +141,11 @@ msgid ""
141141
"files in %1$s"
142142
msgstr ""
143143

144-
#: inc/object.class.php:537
144+
#: inc/object.class.php:539
145145
msgid "Object preview"
146146
msgstr "Vista previa del objeto"
147147

148-
#: inc/object.class.php:801
148+
#: inc/object.class.php:803
149149
msgid "You must configure rights to enable the preview"
150150
msgstr "Tiene que configurar los permisos para acceder a la vista previa"
151151

locales/fi_FI.po

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: GLPI Plugin - Genericobject\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2020-07-03 18:57+0000\n"
11+
"POT-Creation-Date: 2020-10-27 15:13+0000\n"
1212
"PO-Revision-Date: 2019-11-08 14:59+0000\n"
1313
"Last-Translator: Cédric Anne\n"
1414
"Language-Team: Finnish (Finland) (http://www.transifex.com/teclib/glpi-project-plugin-genericobject/language/fi_FI/)\n"
@@ -141,11 +141,11 @@ msgid ""
141141
"files in %1$s"
142142
msgstr "Tietokannassa on ongelma liittyen liitännäiseen ja puuttuvia tiedostoja %1$s"
143143

144-
#: inc/object.class.php:537
144+
#: inc/object.class.php:539
145145
msgid "Object preview"
146146
msgstr "Kohteen esikatselu"
147147

148-
#: inc/object.class.php:801
148+
#: inc/object.class.php:803
149149
msgid "You must configure rights to enable the preview"
150150
msgstr "Oikeudet on määritettävä, jotta esikatselu voidaan ottaa käyttöön"
151151

locales/fr_CA.po

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: GLPI Plugin - Genericobject\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2020-07-03 18:57+0000\n"
11+
"POT-Creation-Date: 2020-10-27 15:13+0000\n"
1212
"PO-Revision-Date: 2020-06-09 02:45+0000\n"
1313
"Last-Translator: Tiago Graca\n"
1414
"Language-Team: French (Canada) (http://www.transifex.com/teclib/glpi-project-plugin-genericobject/language/fr_CA/)\n"
@@ -141,11 +141,11 @@ msgid ""
141141
"files in %1$s"
142142
msgstr "Vous avez probablement d'anciennes données dans votre base de données pour ce plugin et des fichiers sont manquants dans %1$s"
143143

144-
#: inc/object.class.php:537
144+
#: inc/object.class.php:539
145145
msgid "Object preview"
146146
msgstr "Prévisualisation d'un objet de ce type"
147147

148-
#: inc/object.class.php:801
148+
#: inc/object.class.php:803
149149
msgid "You must configure rights to enable the preview"
150150
msgstr "Vous devez configurer les droits sur cet objet pour voir la prévisualisation"
151151

locales/fr_FR.po

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ msgid ""
1313
msgstr ""
1414
"Project-Id-Version: GLPI Plugin - Genericobject\n"
1515
"Report-Msgid-Bugs-To: \n"
16-
"POT-Creation-Date: 2020-07-03 18:57+0000\n"
16+
"POT-Creation-Date: 2020-10-27 15:13+0000\n"
1717
"PO-Revision-Date: 2019-11-08 14:59+0000\n"
1818
"Last-Translator: Cédric Anne\n"
1919
"Language-Team: French (France) (http://www.transifex.com/teclib/glpi-project-plugin-genericobject/language/fr_FR/)\n"
@@ -146,11 +146,11 @@ msgid ""
146146
"files in %1$s"
147147
msgstr "Vous avez probablement d'anciennes données dans votre base pour ce plugin ou des fichiers manquants dans %1$s"
148148

149-
#: inc/object.class.php:537
149+
#: inc/object.class.php:539
150150
msgid "Object preview"
151151
msgstr "Prévisualisation d'un objet de ce type"
152152

153-
#: inc/object.class.php:801
153+
#: inc/object.class.php:803
154154
msgid "You must configure rights to enable the preview"
155155
msgstr "Vous devez configurer les droits sur cet objet pour voir la prévisualisation"
156156

locales/genericobject.pot

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2020-07-03 18:57+0000\n"
11+
"POT-Creation-Date: 2020-10-27 15:13+0000\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -140,11 +140,11 @@ msgid ""
140140
"files in %1$s"
141141
msgstr ""
142142

143-
#: inc/object.class.php:537
143+
#: inc/object.class.php:539
144144
msgid "Object preview"
145145
msgstr ""
146146

147-
#: inc/object.class.php:801
147+
#: inc/object.class.php:803
148148
msgid "You must configure rights to enable the preview"
149149
msgstr ""
150150

locales/hr_HR.po

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: GLPI Plugin - Genericobject\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2020-07-03 18:57+0000\n"
11+
"POT-Creation-Date: 2020-10-27 15:13+0000\n"
1212
"PO-Revision-Date: 2020-02-12 13:54+0000\n"
1313
"Last-Translator: milotype <[email protected]>\n"
1414
"Language-Team: Croatian (Croatia) (http://www.transifex.com/teclib/glpi-project-plugin-genericobject/language/hr_HR/)\n"
@@ -141,11 +141,11 @@ msgid ""
141141
"files in %1$s"
142142
msgstr "U bazi podataka vjerojatno imaš smeće za ovaj dodatak i nedostaju datoteke u %1$s"
143143

144-
#: inc/object.class.php:537
144+
#: inc/object.class.php:539
145145
msgid "Object preview"
146146
msgstr "Pregled objekta"
147147

148-
#: inc/object.class.php:801
148+
#: inc/object.class.php:803
149149
msgid "You must configure rights to enable the preview"
150150
msgstr "Za aktiviranje pregleda moraš konfigurirati prava"
151151

locales/it_IT.po

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ msgid ""
1010
msgstr ""
1111
"Project-Id-Version: GLPI Plugin - Genericobject\n"
1212
"Report-Msgid-Bugs-To: \n"
13-
"POT-Creation-Date: 2020-07-03 18:57+0000\n"
13+
"POT-Creation-Date: 2020-10-27 15:13+0000\n"
1414
"PO-Revision-Date: 2019-11-08 14:59+0000\n"
1515
"Last-Translator: Cédric Anne\n"
1616
"Language-Team: Italian (Italy) (http://www.transifex.com/teclib/glpi-project-plugin-genericobject/language/it_IT/)\n"
@@ -143,11 +143,11 @@ msgid ""
143143
"files in %1$s"
144144
msgstr "Per questo plugin hai, probabilmente, dei dati inutili nel tuo database e file mancanti in %1$s"
145145

146-
#: inc/object.class.php:537
146+
#: inc/object.class.php:539
147147
msgid "Object preview"
148148
msgstr "Anteprima dell'oggetto"
149149

150-
#: inc/object.class.php:801
150+
#: inc/object.class.php:803
151151
msgid "You must configure rights to enable the preview"
152152
msgstr "Bisogna configurare i diritti per abilitare l'anteprima"
153153

locales/ko_KR.po

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: GLPI Plugin - Genericobject\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2020-07-03 18:57+0000\n"
11+
"POT-Creation-Date: 2020-10-27 15:13+0000\n"
1212
"PO-Revision-Date: 2020-02-03 04:26+0000\n"
1313
"Last-Translator: SeongHyeon Cho <[email protected]>\n"
1414
"Language-Team: Korean (Korea) (http://www.transifex.com/teclib/glpi-project-plugin-genericobject/language/ko_KR/)\n"
@@ -141,11 +141,11 @@ msgid ""
141141
"files in %1$s"
142142
msgstr "이 플러그인에 대한 데이터베이스 내에 개비지 데이터가 있거나 %1$s내의 파일이 누락된 것 같습니다"
143143

144-
#: inc/object.class.php:537
144+
#: inc/object.class.php:539
145145
msgid "Object preview"
146146
msgstr "객체 미리보기"
147147

148-
#: inc/object.class.php:801
148+
#: inc/object.class.php:803
149149
msgid "You must configure rights to enable the preview"
150150
msgstr "미리보기 활성화에 대한 권한을 구성해야 합니다"
151151

locales/pl_PL.po

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: GLPI Plugin - Genericobject\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2020-07-03 18:57+0000\n"
11+
"POT-Creation-Date: 2020-10-27 15:13+0000\n"
1212
"PO-Revision-Date: 2019-11-08 14:59+0000\n"
1313
"Last-Translator: Cédric Anne\n"
1414
"Language-Team: Polish (Poland) (http://www.transifex.com/teclib/glpi-project-plugin-genericobject/language/pl_PL/)\n"
@@ -141,11 +141,11 @@ msgid ""
141141
"files in %1$s"
142142
msgstr ""
143143

144-
#: inc/object.class.php:537
144+
#: inc/object.class.php:539
145145
msgid "Object preview"
146146
msgstr "Podgląd obiektu"
147147

148-
#: inc/object.class.php:801
148+
#: inc/object.class.php:803
149149
msgid "You must configure rights to enable the preview"
150150
msgstr ""
151151

locales/pt_BR.po

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ msgid ""
1010
msgstr ""
1111
"Project-Id-Version: GLPI Plugin - Genericobject\n"
1212
"Report-Msgid-Bugs-To: \n"
13-
"POT-Creation-Date: 2020-07-03 18:57+0000\n"
13+
"POT-Creation-Date: 2020-10-27 15:13+0000\n"
1414
"PO-Revision-Date: 2019-11-08 14:59+0000\n"
1515
"Last-Translator: Cédric Anne\n"
1616
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/teclib/glpi-project-plugin-genericobject/language/pt_BR/)\n"
@@ -143,11 +143,11 @@ msgid ""
143143
"files in %1$s"
144144
msgstr "Deve ter dados no lixo da tua base de dados porque estão a faltas ficheiros neste plugin %1$s"
145145

146-
#: inc/object.class.php:537
146+
#: inc/object.class.php:539
147147
msgid "Object preview"
148148
msgstr "Pré-visualização do objet"
149149

150-
#: inc/object.class.php:801
150+
#: inc/object.class.php:803
151151
msgid "You must configure rights to enable the preview"
152152
msgstr "Você deve configurar os direitos para habilitar pré-visualização"
153153

locales/pt_PT.po

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: GLPI Plugin - Genericobject\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2020-07-03 18:57+0000\n"
10+
"POT-Creation-Date: 2020-10-27 15:13+0000\n"
1111
"PO-Revision-Date: 2019-11-08 14:59+0000\n"
1212
"Last-Translator: Cédric Anne\n"
1313
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/teclib/glpi-project-plugin-genericobject/language/pt_PT/)\n"
@@ -140,11 +140,11 @@ msgid ""
140140
"files in %1$s"
141141
msgstr "Provavelmente tem dados incorretos na sua base de dados para este plugin e arquivos ausentes em %1$s"
142142

143-
#: inc/object.class.php:537
143+
#: inc/object.class.php:539
144144
msgid "Object preview"
145145
msgstr "Pré-visualização de objetos"
146146

147-
#: inc/object.class.php:801
147+
#: inc/object.class.php:803
148148
msgid "You must configure rights to enable the preview"
149149
msgstr "Deve configurar os direitos para habilitar a visualização"
150150

locales/ro_RO.po

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: GLPI Plugin - Genericobject\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2020-07-03 18:57+0000\n"
11+
"POT-Creation-Date: 2020-10-27 15:13+0000\n"
1212
"PO-Revision-Date: 2019-11-08 14:59+0000\n"
1313
"Last-Translator: Cédric Anne\n"
1414
"Language-Team: Romanian (Romania) (http://www.transifex.com/teclib/glpi-project-plugin-genericobject/language/ro_RO/)\n"
@@ -141,11 +141,11 @@ msgid ""
141141
"files in %1$s"
142142
msgstr ""
143143

144-
#: inc/object.class.php:537
144+
#: inc/object.class.php:539
145145
msgid "Object preview"
146146
msgstr "Previzualizeaza un obiect de acest tip"
147147

148-
#: inc/object.class.php:801
148+
#: inc/object.class.php:803
149149
msgid "You must configure rights to enable the preview"
150150
msgstr "Trebuie sa configurati drepturi pe acest obiect pentru a putea previzualiza"
151151

locales/ru_RU.po

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ msgid ""
99
msgstr ""
1010
"Project-Id-Version: GLPI Plugin - Genericobject\n"
1111
"Report-Msgid-Bugs-To: \n"
12-
"POT-Creation-Date: 2020-07-03 18:57+0000\n"
12+
"POT-Creation-Date: 2020-10-27 15:13+0000\n"
1313
"PO-Revision-Date: 2019-11-08 14:59+0000\n"
1414
"Last-Translator: Cédric Anne\n"
1515
"Language-Team: Russian (Russia) (http://www.transifex.com/teclib/glpi-project-plugin-genericobject/language/ru_RU/)\n"
@@ -142,11 +142,11 @@ msgid ""
142142
"files in %1$s"
143143
msgstr ""
144144

145-
#: inc/object.class.php:537
145+
#: inc/object.class.php:539
146146
msgid "Object preview"
147147
msgstr "Предпросмотр"
148148

149-
#: inc/object.class.php:801
149+
#: inc/object.class.php:803
150150
msgid "You must configure rights to enable the preview"
151151
msgstr "Вы должны настроить права для предпросмотра"
152152

locales/sv_SE.po

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: GLPI Plugin - Genericobject\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2020-07-03 18:57+0000\n"
11+
"POT-Creation-Date: 2020-10-27 15:13+0000\n"
1212
"PO-Revision-Date: 2019-11-08 14:59+0000\n"
1313
"Last-Translator: Cédric Anne\n"
1414
"Language-Team: Swedish (Sweden) (http://www.transifex.com/teclib/glpi-project-plugin-genericobject/language/sv_SE/)\n"
@@ -141,11 +141,11 @@ msgid ""
141141
"files in %1$s"
142142
msgstr "Du har troligtvis skräpdata i databasen för denna plug-in och saknar filer i %1$s"
143143

144-
#: inc/object.class.php:537
144+
#: inc/object.class.php:539
145145
msgid "Object preview"
146146
msgstr "Förhandsgranska tillgång"
147147

148-
#: inc/object.class.php:801
148+
#: inc/object.class.php:803
149149
msgid "You must configure rights to enable the preview"
150150
msgstr "Du måste konfigurera rättigheter för att aktivera förhandsgranskning"
151151

0 commit comments

Comments
 (0)