Merge branch 'release/2.6.1'

pluginsGLPI · Jul 8, 2019 · 56466dd · 56466dd
2 parents efc90c1 + e2e351c
commit 56466dd
Show file tree

Hide file tree

Showing 23 changed files with 592 additions and 139 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/inc/preference.class.php b/inc/preference.class.php
@@ -207,7 +207,7 @@ static function getLocationByUserByEntity($user_id, $template, $entity) {
 
    function getTabNameForItem(CommonGLPI $item, $withtemplate = 0) {
 
-      if ($item->getType() == 'Preference' && Session::haveRight(PluginUninstallProfile::$rightname, READ)) {
+      if ($item->getType() == 'Preference' && Session::haveRight('uninstall:profile', READ)) {
          return PluginUninstallUninstall::getTypeName();
       }
       return '';
@@ -217,7 +217,7 @@ function getTabNameForItem(CommonGLPI $item, $withtemplate = 0) {
    static function displayTabContentForItem(CommonGLPI $item, $tabnum = 1, $withtemplate = 0) {
       global $CFG_GLPI;
 
-      if ($item->getType() == 'Preference' && Session::haveRight(PluginUninstallProfile::$rightname, READ)) {
+      if ($item->getType() == 'Preference' && Session::haveRight('uninstall:profile', READ)) {
          $pref = new self();
          $pref->showFormUserPreferences();
       }

diff --git a/locales/cs_CZ.mo b/locales/cs_CZ.mo
diff --git a/locales/cs_CZ.po b/locales/cs_CZ.po
@@ -3,17 +3,20 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
+# Translators:
+# Pavel Borecki <[email protected]>, 2018
+# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-09-10 10:23+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"POT-Creation-Date: 2019-07-08 13:22+0000\n"
+"PO-Revision-Date: 2017-01-03 22:10+0000\n"
 "Last-Translator: Pavel Borecki <[email protected]>, 2018\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/teclib/teams/28042/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
@@ -297,7 +300,7 @@ msgstr "Původní položka"
 msgid "New item"
 msgstr "Nová položka"
 
-#: inc/replace.class.php:716
+#: inc/replace.class.php:719
 msgid "Replace"
 msgstr "Nahradit"
 

diff --git a/locales/en_GB.mo b/locales/en_GB.mo
diff --git a/locales/en_GB.po b/locales/en_GB.po
@@ -1,14 +1,14 @@
 # English translations for PACKAGE package.
-# Copyright (C) 2018 THE PACKAGE'S COPYRIGHT HOLDER
+# Copyright (C) 2019 THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# Automatically generated, 2018.
+# Automatically generated, 2019.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-09-10 10:23+0000\n"
-"PO-Revision-Date: 2018-09-10 10:23+0000\n"
+"POT-Creation-Date: 2019-07-08 13:22+0000\n"
+"PO-Revision-Date: 2019-07-08 13:22+0000\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: en_GB\n"
@@ -294,7 +294,7 @@ msgstr "Old item"
 msgid "New item"
 msgstr "New item"
 
-#: inc/replace.class.php:716
+#: inc/replace.class.php:719
 msgid "Replace"
 msgstr "Replace"
 

diff --git a/locales/fr_FR.mo b/locales/fr_FR.mo
diff --git a/locales/fr_FR.po b/locales/fr_FR.po
@@ -3,17 +3,22 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
+# Translators:
+# Walid Nouh, 2017
+# Johan Cwiklinski <[email protected]>, 2017
+# alexandre delaunay <[email protected]>, 2018
+# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-09-10 10:23+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"POT-Creation-Date: 2019-07-08 13:22+0000\n"
+"PO-Revision-Date: 2017-01-03 22:10+0000\n"
 "Last-Translator: alexandre delaunay <[email protected]>, 2018\n"
 "Language-Team: French (France) (https://www.transifex.com/teclib/teams/28042/fr_FR/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr_FR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -295,7 +300,7 @@ msgstr "Ancien matériel"
 msgid "New item"
 msgstr "Nouveau matériel"
 
-#: inc/replace.class.php:716
+#: inc/replace.class.php:719
 msgid "Replace"
 msgstr "Remplacer"
 

diff --git a/locales/pl_PL.mo b/locales/pl_PL.mo
diff --git a/locales/pl_PL.po b/locales/pl_PL.po
@@ -3,17 +3,20 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
+# Translators:
+# Jacek Maciol <[email protected]>, 2017
+# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-09-10 10:23+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"POT-Creation-Date: 2019-07-08 13:22+0000\n"
+"PO-Revision-Date: 2017-01-03 22:10+0000\n"
 "Last-Translator: Jacek Maciol <[email protected]>, 2017\n"
 "Language-Team: Polish (Poland) (https://www.transifex.com/teclib/teams/28042/pl_PL/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl_PL\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
@@ -297,7 +300,7 @@ msgstr "Stary przedmiot"
 msgid "New item"
 msgstr "Nowy przedmiot"
 
-#: inc/replace.class.php:716
+#: inc/replace.class.php:719
 msgid "Replace"
 msgstr "Zastąp"
 

diff --git a/locales/pt_BR.mo b/locales/pt_BR.mo
diff --git a/locales/pt_BR.po b/locales/pt_BR.po
@@ -3,17 +3,21 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
+# Translators:
+# Arthur Ramos Schaefer <[email protected]>, 2017
+# Eduardo Spinola <[email protected]>, 2017
+# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-09-10 10:23+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"POT-Creation-Date: 2019-07-08 13:22+0000\n"
+"PO-Revision-Date: 2017-01-03 22:10+0000\n"
 "Last-Translator: Eduardo Spinola <[email protected]>, 2017\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/teclib/teams/28042/pt_BR/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -295,7 +299,7 @@ msgstr "Item antigo"
 msgid "New item"
 msgstr "Novo item"
 
-#: inc/replace.class.php:716
+#: inc/replace.class.php:719
 msgid "Replace"
 msgstr "Substituir"
 

diff --git a/locales/pt_PT.mo b/locales/pt_PT.mo