From db3c351723a4ea1fd3fc98c1478da13743ff62db Mon Sep 17 00:00:00 2001 From: Adrien Clairembault Date: Wed, 19 Jun 2019 15:06:22 +0200 Subject: [PATCH 1/4] Patch Stan --- inc/preference.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inc/preference.class.php b/inc/preference.class.php index 99bdc9b..0cd26ca 100644 --- 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(); } From b3e85eb69b986d32672aaabf2eb0222264e1def3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Mon, 8 Jul 2019 15:23:43 +0200 Subject: [PATCH 2/4] Update locales --- locales/cs_CZ.mo | Bin 5836 -> 5834 bytes locales/cs_CZ.po | 11 +- locales/en_GB.mo | Bin 5368 -> 5368 bytes locales/en_GB.po | 10 +- locales/fr_FR.mo | Bin 5863 -> 5861 bytes locales/fr_FR.po | 13 +- locales/pl_PL.mo | Bin 5015 -> 5013 bytes locales/pl_PL.po | 11 +- locales/pt_BR.mo | Bin 4967 -> 4965 bytes locales/pt_BR.po | 12 +- locales/pt_PT.mo | Bin 0 -> 5721 bytes locales/pt_PT.po | 307 ++++++++++++++++++++++++++++++++++++++++++ locales/ru_RU.mo | Bin 2834 -> 2832 bytes locales/ru_RU.po | 11 +- locales/tr_TR.mo | Bin 5620 -> 5618 bytes locales/tr_TR.po | 13 +- locales/uninstall.pot | 4 +- locales/zh_CN.mo | Bin 4424 -> 4422 bytes locales/zh_CN.po | 12 +- 19 files changed, 368 insertions(+), 36 deletions(-) create mode 100644 locales/pt_PT.mo create mode 100644 locales/pt_PT.po diff --git a/locales/cs_CZ.mo b/locales/cs_CZ.mo index 8ceee4ba8aa36d30dc47107d4d4d43efbcde4121..38b002671679d641b7e246961a44ad582d880755 100644 GIT binary patch delta 648 zcmXZYJ1j$C6u|K>MKo3}e7Q3)Kn0r4MbaD;nxR3#o*n}xG@Eqx- z9nu%4XV8@`f;i(YGDG03z77(x$DqcmPXX}E<_w~NJihH<>aZu~{rywyonJ%TT-sgkFn$%(j*W_tXG?my?aN^t-H delta 650 zcmXZYO(?^07{KvgqOGx+G4lTRl9$b|wm%13Da$4b)9m0S2W4s(J9vqrB& zkSTWu2U$&WbHT|$&QkJy+Sb2)p6B=fJw4C=dC-sgYOE;jC{ik0rj%1D_3Fs`h2`Xb zSdR`8Lgm3a3}7e5(T-c#jJw#17g&i|^x_+~qn#$TXkr(RIaOM95Ug?F#$%Mi>q35y z%%)zk0zV7qzi5zGaA=~5GH3!d?qC~UqBML)8Tbo5=yv7b54zI%hKn4?02|nXduZSl z(n~#IHNGQ{`r%K$yo_mOGj%AN=|;I1#$KF5xxbGlo}$#fp!E4j6UfR+s+8)(E?mTU zl#6%RggKNIexntun05dg(S~ytigWm3uwR3@cV*huh+-VHW}5i#CmcinOfH2h1EpRn2Cg9dOWJb fA!8&O93S=0MkgYN)ApQYXe1Pyio`S8abo=kZrn{% diff --git a/locales/cs_CZ.po b/locales/cs_CZ.po index aceb564..539a765 100644 --- 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 , YEAR. # +# Translators: +# Pavel Borecki , 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 , 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 index 44b49de5d901d6204f8a0a061963b7552aa368ba..9075a5cf6ee652af996ebc3692b1008746725981 100644 GIT binary patch delta 44 ncmeyN`9pJq951h>u7SC(frWyhv6Ye0WNlt)RFTcWyi3^u3D64V delta 44 ncmeyN`9pJq951hhu7Rblp@D*-ft8W*WNlt)RFTcWyi3^u2#5;R diff --git a/locales/en_GB.po b/locales/en_GB.po index 6a67985..9a031f4 100644 --- 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 index edcc6d3805bd3ef1558d25b4f8ea219723d7ee46..ebb79688de5d0290e1e015016c49cd8c6286b20d 100644 GIT binary patch delta 648 zcmXZZJ1j$S6vy#HG(nWA_bV#it-suRJD>}Ln3{N`#bPjYAcBNQ4AM~|3}Pmc5QCu- z8WCcXkg(`rwKUiamJ;H7=v_Yld++(*^E?0hV$$X$oEyK+5qT&QDHoB=Vi7OyV;P=d zBi^FEf5is;MnBe-h`4bGTQHJ!6>GWQ!vJ1j8>X=di##H&*zJ+HI4mMO&_?U1jgL@2 ze2JBKht>FuHJHIFEGzvF5_e@OB3We)2XGB_uxsqX`#1}WMFuswpRQ9l ziY`o`9$6Cg1fH+}-*FH>Q3Li@h%{puHOOMt4J_pT0JT1W-S~kWXg3p6Cl8|!=aAnd zTc}BQQ71S?-Eeifns=BV>N8f4v3h-WFyuG^i>q*C*o?(iW|n3a=FQ;raxCO?ESnX#f<<_ORrr7|{Kgt=$c+3i7^H0tFoVUoirVo$ zayfE|8st7Y|At(`UscYMG^%T`GSq^tsO$TYtP;jHjG#7lfpvJR6BaL@sLAW7I*dIS zk9(+Bc8q!hkC=q-=*2J8fSw$YatxpbnT)!K$&9y9*Y9CHeqc4a9K_Vl18B!E@|$EC zHR&2^2Ro=6&JX6|HWS^=#%eJx%kHw=jZIFAC%HRlLZh=|Q)3fh;~kkEb=wDho{;GZ h8n4Ih54yWLoI}BYZ)G6$E}`A;3HA7T4=meZ;x7h{Q1<`; diff --git a/locales/fr_FR.po b/locales/fr_FR.po index 11361c5..7401cd5 100644 --- 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 , YEAR. # +# Translators: +# Walid Nouh, 2017 +# Johan Cwiklinski , 2017 +# alexandre delaunay , 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 , 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 index f9adbde6eea3e4fc4ed0ab12056be30985513e21..20d070aef352d23cf28a9292fd6a75ab5b0b06ea 100644 GIT binary patch delta 567 zcmXZZ&o2W(6u|N4M^lPwQ9mnM2c^v>yW2ynCqi6o)XxJFAyG*aKN1x;*+g8piim@= zn@IW>kZ{MT7e^9t)k`R0hVN5k ztlXoG&q$Mcwy6_Fa0oM)!ZlpLGi<;&)E$4IoRFGoH)HEyyP7!u#b)-L^kBYM2?r%*L#A&bCt~Phd80%oh%e qrQ+VMF}ZP2$i-~aBFQq$bj-GMmieD|?lwL8mKLXsY*@dc)8EnTQ>bMge#T&2K;-m9Kpc6lxfkwms2EEu! zd>r{DGuVdn*nykagGZ=|U89bFaD2sXzQ0fta+9^rH<6kp)@c7PoFSlztU3b@aFXv+ zWUky|7$1=)wUns~`fv!RF@Ock;~CcB8*0TLs3+hdI|BzD0|h#L1R~gqdDNrcLS66} zHIXvvk-ejC+`_%+iA|tZGUvFA+=6VNZd|Io)a)A8lo^~hLqUHiXoVwzAdhP, YEAR. # +# Translators: +# Jacek Maciol , 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 , 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 index 0f4aed6018a0166f2a5a676a95bcee6d77d30031..d06f1b7777ce4b139e0009ccffc052c29f28749d 100644 GIT binary patch delta 567 zcmXZYJxBs!7{KvYLM=5llRmVMBg@h{x;uyL8XWqdtq3D%szFGIBKn~1T7rfksHTR- zz^TNcrKL3rx}l*dC?bf425E?f{;zt&{oZ?cp7(j4`-s2Cul^j?jYEjCM~HwBqUfu7 zi$T6^Y{ggX#$QZgq)`YzPNITY?80qq!c$D(1@_@1M)3y+FhubXj`@XEX|O^-7VcpS z9wWJ;fML8wIlw)(;}^;cT}-WD52`qhvVH^QeFrG(&#)6OYw-tUXYmrSglORKNg#q{ zlnnx`FE>h{7pKw0EYe#Xp@HX^LK}P0N!LY8q6_y?#t*R#izpl4p6rUsETRw{oUpXgW!{s-+aeFmK delta 569 zcmXZYJxD@P6u|K-L6(|YiG683NbN%(JawrD5t5Px_QFcYsRjolYA^~~gqENoh@z>X zF>ooIT3TA8D2Heal9p(Qhz5uLH+{qX-Fvv_o^xI`@E*9VnTj_iA-*j_ID`;oTisi9 za;{((zTp7Ya1=dlLfCN{70h5i?qEBf;s{=#AD^%fe{mRHB!_UqE{gvJ)(FVNJ#^y< za#xhlh1Vz>xW^v+MEPI~T`TBA6%#1)3n2)P3vZTOx4EKu%?7HJrWISe3p4b zP3N}rh5Y7*8eiSY>B@2ucw0dD?A A+5i9m diff --git a/locales/pt_BR.po b/locales/pt_BR.po index 5604e6d..1242727 100644 --- 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 , YEAR. # +# Translators: +# Arthur Ramos Schaefer , 2017 +# Eduardo Spinola , 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 , 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 new file mode 100644 index 0000000000000000000000000000000000000000..f37011c6810884962521416d5c906654f0ad5036 GIT binary patch literal 5721 zcmaKvU5q6~6~_x$K}Q7v@e9R5U3W(2&ewu0v%APJADfYx-En6?pCmQiHTO33?Yi{G zy*tDh!h>iq5lu|Q2P23dEYSy7V?xxJOyWnP#`s{25KT0`sShN+=!?Ho{c-Od7CTe( z@9sKv>eM;^bNbvr-*Dv1iffJWZpOxyN*VA|NBAe#)k<9lTmilbydJy(yal`ooCn_s zo&nzuZi62H9|qqHJ_X(keht*%i{M+pm%v-We}L};uf0a8cYyPtJbx5?KiI9_e-V^@ zFM`*CKLKUmUxRN2{|L(Ze}ZDi)vs6TD0mC_E^q~$1Rn(734Rt7JDvsQ+?PPH`*+}b z!GD9Y-%W2Q_nQP|-JRguz>k6asSf{S{}dE`PgL)}0-{1aTg|@!iXA@#W&KOl{43x* z&;JF*U#$tHJ_w!!r@&oM&hdHhEcku!b>I~oUi^0rD0-(rj;>ZfS+@c5r~3Sp{T>I! zZ%=~~x9@;#seTIH3H}mX042!c_v4_P_v4`W^AS+a_c>73eH9da&w(O$3H-qoO8o{D zzC6yP`0q>L_24%_vExUe==m)ucK-$Z5cnSu6Vy=_zXzPJ@Ej<5x}covG4L385foni z9+bHK3!DaTM7h{|4=DS70=yA?2*fn?X;9+zBq-~@4$6K%1}DKkRnJ$k_%@zz1;rnm zp!n^P>iG$9j^`IZvFBw_&UXZ3xm7oV!p9aU_N;*t-%oQb#A-8*yL6oBAHH1toI@thnZU1+p|HgbEl0??4VxN z>&5%J>p~l=r8MY7eXHG`c5$e?C`uz!zmJl(?%KTLLJ`P2$c+juZ$F?*1qiC;j*9}D z={=X~2&-h<)M8s;)iP#b3D#wL5ak{1P?k2^WopI7Hn;jVz3jSOo8Vafz?dvwIX9`J?W#trTdo?Ik&uh_DnqyN6EvbJ)>I2L^8LR4@_!x zC(1;po~%W)salOVX3%kQBcxWMR2&}+kF8d_y?kHCF7W27)zoBGhbA|fI%5-?61B18 zt&g0w_M`XAy7)HAbm9iONTMXmO&r@$y~g|Ud_LOxXjV#9VF~r_e#H!z*#9&2+B$?G z21Y`QTE($UZ$$8JKZr}6qc8MiWAc>WkjdI7+U!XjjnLCG&ofkx^=hF;ORc0jlK0Sk z*7ioI@ToVl$MF^i;3|yN=nRDk+!WmZ@Wr05)WM zMO=vpXCDzS>DmlEHiOuPh*C zfYi=@uiUWy_S|3BA=TWKWp4a&)Ms0%dx#p@S`S+f*i`EFqTX6szHjNws(xVg{Py~} zvlF-*pS3o#b`-YmE!tUY$1UoKt#doA<<$BeS}PE3Q7_ER-_@GCvo&`@&mUi0Sh#JD z3&GZTl3SDy0%^lYZ3ybq}rQC+e@|Hg=Us9JY>hndUH*M_nseaV6=^ZHR<@dC^ zCW>c>%iYs{!-)-(v|ijM$;G2o#|xrn zHn%|>?E_&NG^rH5AO^~B}d|GRKS+hl*z-i~u<}4k2``{Z+Q)=32(R1`1QGjzz+EhceY`Q%M*Q%LFx)7TqVRX^u zqt$oy+Fl$5ymuwHP?kPYL`;XaX$&YQdDM1l^Wgd1g?`F-DI*l-nZ;GhQj6AFXin5> z7Pz)(d;ekJWBU$IO32BP(+TjMJ)`$T#F|}0LfYfuoNf8S#C$!WvZH$!WQwX&rUiBkfMxdois>{CBlfwh0Q->T_twdALQHN1z z4wHY})phi8DG_S&wxx+lUKcSMaapENDuAmxCg)Z7dN*1rtJZ15cJUcqB>t&V0R`hJ zApMnt@IEwU^CUS)?=;T6;iK%{G*IZPBHObu)RAzGmC4~c@2o?Q^nzV!6KqJz9iBsX z=*thKJ1b(&Ax4({6~A#Q=i, YEAR. +# +# Translators: +# Rui Melo , 2019 +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-07-08 13:22+0000\n" +"PO-Revision-Date: 2017-01-03 22:10+0000\n" +"Last-Translator: Rui Melo , 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" + +#: front/action.php:55 inc/replace.class.php:476 +msgid "Replacement successful" +msgstr "Substituição bem sucedida" + +#: front/action.php:96 inc/uninstall.class.php:324 +msgid "Uninstallation successful" +msgstr "Desinstalação bem sucedida" + +#: ajax/locations.php:43 inc/preference.class.php:74 inc/replace.class.php:589 +msgid "Keep previous location" +msgstr "Manter o local anterior" + +#: ajax/locations.php:44 inc/preference.class.php:75 inc/replace.class.php:593 +msgid "Empty location" +msgstr "Localização vazia" + +#: hook.php:42 inc/uninstall.class.php:110 +msgid "Uninstall" +msgstr "Desinstalar" + +#: inc/config.class.php:39 inc/model.class.php:66 inc/uninstall.class.php:38 +msgid "Item's Lifecycle" +msgstr "Ciclo de vida do item" + +#: inc/config.class.php:81 +msgid "Shortcuts" +msgstr "Atalhos" + +#: inc/config.class.php:87 +msgid "Location preferences" +msgstr "Preferências de localização" + +#: inc/config.class.php:95 +msgid "Replace status dropdown by plugin actions" +msgstr "Substituir o dropdown de estado pelas ações do plugin" + +#: inc/model.class.php:106 inc/model.class.php:986 inc/model.class.php:1028 +msgid "Uninstallation" +msgstr "Desinstalação" + +#: inc/model.class.php:108 inc/model.class.php:988 inc/model.class.php:1030 +#: inc/replace.class.php:61 inc/replace.class.php:108 +msgid "Replacement" +msgstr "Substituição" + +#: inc/model.class.php:118 +msgid "PDF Archiving" +msgstr "Arquivo PDF" + +#: inc/model.class.php:120 +msgid "CSV Archiving" +msgstr "Arquivo CSV" + +#: inc/model.class.php:123 +msgid "Purge" +msgstr "Purge" + +#: inc/model.class.php:124 +msgid "Delete + Comment" +msgstr "Deletar + Comentar" + +#: inc/model.class.php:125 +msgid "Keep + Comment" +msgstr "Manter + Comentar" + +#: inc/model.class.php:166 +msgid "Replacing data" +msgstr "Substituição de dados" + +#: inc/model.class.php:210 inc/model.class.php:829 +msgid "Type of template" +msgstr "Tipo de Template" + +#: inc/model.class.php:219 inc/model.class.php:793 +msgid "Transfer's model to use" +msgstr "Modelo de transferência está a utilizar" + +#: inc/model.class.php:239 inc/replace.class.php:603 +msgid "New status of the computer" +msgstr "Novo estado do computador" + +#: inc/model.class.php:251 inc/model.class.php:839 +msgid "Action on group" +msgstr "Ação em grupo" + +#: inc/model.class.php:263 +msgid "New group" +msgstr "Novo grupo" + +#: inc/model.class.php:284 +msgid "Add template" +msgstr "Adicionar template" + +#: inc/model.class.php:287 +msgid "Manage templates" +msgstr "Gerir modelos" + +#: inc/model.class.php:298 +msgid "Erase datas" +msgstr "Apagar Dados" + +#: inc/model.class.php:301 inc/model.class.php:701 +msgid "Delete software history (computers)" +msgstr "Apagar histórico de software (computadores)" + +#: inc/model.class.php:306 inc/model.class.php:859 +msgid "Delete the whole history" +msgstr "Apagar toda a história" + +#: inc/model.class.php:388 inc/model.class.php:438 +msgid "Informations replacement" +msgstr "Informações substituídas" + +#: inc/model.class.php:389 inc/replace.class.php:549 +msgid "General informations" +msgstr "Informações gerais" + +#: inc/model.class.php:411 inc/replace.class.php:564 +msgid "Overwrite informations (from old item to the new)" +msgstr "Sobrescrever informações (do item antigo para o novo)" + +#: inc/model.class.php:418 inc/model.class.php:849 inc/replace.class.php:567 +msgid "Archiving method of the old material" +msgstr "Método de arquivamento do material antigo" + +#: inc/model.class.php:428 +msgid "Plugin PDF is installed and activated" +msgstr "Plugin PDF é instalado e ativado" + +#: inc/model.class.php:431 +msgid "" +"Plugin PDF is not installed, you won't be able to use PDF format for " +"archiving" +msgstr "" +"Plugin PDF não está instalado, você não será capaz de usar o formato PDF " +"para arquivamento" + +#: inc/model.class.php:439 inc/replace.class.php:625 +msgid "Connections with other materials" +msgstr "Conexões com outros materias" + +#: inc/model.class.php:513 inc/replace.class.php:660 +msgid "Direct connections" +msgstr "Conexões diretas" + +#: inc/model.class.php:586 +msgid "OCSNG link" +msgid_plural "OCSNG links" +msgstr[0] "Ligação OCSNG" +msgstr[1] "Ligações OCSNG" + +#: inc/model.class.php:588 +msgid "These options only apply to computers coming from OCSNG" +msgstr "Estas opções se aplicam somente computadores vindo de OCSNG" + +#: inc/model.class.php:592 inc/model.class.php:812 +msgid "Delete computer in OCSNG" +msgstr "Excluir computador em OCSNG" + +#: inc/model.class.php:598 inc/model.class.php:820 +msgid "Delete link with computer in OCSNG" +msgstr "Excluir link com computador em OCSNG" + +#: inc/model.class.php:612 +msgid "Delete computer in FusionInventory" +msgstr "Excluir o computador em FusionInventory" + +#: inc/model.class.php:624 +msgid "Additionnal fields" +msgstr "Campos adicionais" + +#: inc/model.class.php:628 +msgid "Delete Fields plugin informations" +msgstr "Excluir informações do plugin de campos" + +#: inc/model.class.php:993 inc/uninstall.class.php:762 +msgid "Keep in the current group" +msgstr "Manter-se no grupo atual" + +#: inc/preference.class.php:54 +msgid "Item's location after uninstall" +msgstr "Localização do item após desinstalar" + +#: inc/uninstall.class.php:114 +msgid "Please wait, uninstallation is running..." +msgstr "Por favor aguarde, desinstalação em execução…" + +#: inc/uninstall.class.php:545 +msgid "Item is now uninstalled" +msgstr "Item está agora desinstalado" + +#: inc/uninstall.class.php:547 +#, php-format +msgid "Item is now uninstalled with model %s" +msgstr "Item é desinstalado agora com modelo %s" + +#: inc/uninstall.class.php:553 +msgid "Item replaced by a new one" +msgstr "Item substituído por um novo" + +#: inc/uninstall.class.php:555 +#, php-format +msgid "Item replaced by a new one with model %s" +msgstr "Item substituído por um novo com modelo %s" + +#: inc/uninstall.class.php:561 +msgid "Item replacing an old one" +msgstr "Item de substituição de um antigo" + +#: inc/uninstall.class.php:566 +msgid "Removed from OCSNG with ID" +msgstr "Removido do OCSNG com ID" + +#: inc/uninstall.class.php:663 +msgid "Apply model" +msgstr "Aplicar o modelo" + +#: inc/uninstall.class.php:680 +msgid "Item's location after applying model" +msgstr "Localização do item depois de aplicar o modelo" + +#: inc/uninstall.class.php:763 +msgid "Affect to a new group" +msgstr "Afetar a um novo grupo" + +#: inc/uninstall.class.php:815 +msgid "Lifecycle" +msgstr "Ciclo de vida" + +#: inc/replace.class.php:40 +msgid "Item's replacement" +msgstr "Substituição do item" + +#: inc/replace.class.php:65 +msgid "Please wait, replacement is running..." +msgstr "Por favor aguarde, substituição em execução…" + +#: inc/replace.class.php:130 +msgid "This document is the archive of this replaced item" +msgstr "Este documento é o arquivo deste item substituído" + +#: inc/replace.class.php:135 +msgid "Archive of old material" +msgstr "Arquivo de material antigo" + +#: inc/replace.class.php:409 +msgid "See attached document" +msgstr "Consulte o documento anexado" + +#: inc/replace.class.php:498 +msgid "This item is a replacement for item" +msgstr "Este item é um substituto para item" + +#: inc/replace.class.php:500 +msgid "This item was replaced by" +msgstr "Este item foi substituído por" + +#: inc/replace.class.php:548 inc/replace.class.php:624 +msgid "Reminder of the replacement model" +msgstr "Lembrete do modelo de substituição" + +#: inc/replace.class.php:586 +msgid "New location of item" +msgstr "Nova localização do item" + +#: inc/replace.class.php:671 +msgid "Choices for item to replace" +msgstr "Escolhas para item substituir" + +#: inc/replace.class.php:674 +msgid "Old item" +msgstr "Item velho" + +#: inc/replace.class.php:684 +msgid "New item" +msgstr "Novo item" + +#: inc/replace.class.php:719 +msgid "Replace" +msgstr "Substituição" + +#: setup.php:111 +msgid "Item's Lifecycle (uninstall)" +msgstr "Ciclo de vida do item (desinstalar)" diff --git a/locales/ru_RU.mo b/locales/ru_RU.mo index 5fbd94887604ab2667b172c826c64b406f92fb39..e0fddcc65b4f0232329c247c4a4bbd34864b87df 100644 GIT binary patch delta 308 zcmW;GKS%;$7{~F)?8+p>rIQBhIsysrh4r9zCFw58Gg^77kA{2R?n3Uk&jIgUqlvLB1KGZiyYz+mhc>FnBXzK z;|YG^KK`K1?`D|60L$3K20md4r&z#m3~-&1o*d8wJ0e$ji9>wDJo;IdVubdwGqeYL zSjR`)!wKeahIVd__L1fIE9Ix-n$o9ASG_QbjVWs?+is~&{~;M9ceko>bKj3WqeDWW Z(vfFO9P0nvYsHy5*WC+M9sfE7=MPF0D>488 delta 310 zcmWm8AxHyp6vy%3)N^jgu()AR&p8-!{>M!jx+`+-4kmcsI4v4P!@?M7Pz)lNZ9|*g zVqLR{)nqjZHk-jB82sKVpBH|Q_Zt*%i-W)GwGruYOe#zI9G7O%%1ZONh*fN16Z=@f z2VBBeoWUPV^Mwg%0c+@B2LrsqD!yO|zi=5dIUQ<_rIwSnF~S?X$0@AjrAcgHT5J>3 zhex=9mpF}2Sim<-?>;as@;!Xdlt;aF<2Fs*wd=08vg)`@z7w0Id(k`Vot~KB_`K`c k`=OthC^ms_w_`8bat`91@UCG!XIpJQ*$wxGzgEfm2SkJ{!2kdN diff --git a/locales/ru_RU.po b/locales/ru_RU.po index 05108b7..4bafbcc 100644 --- a/locales/ru_RU.po +++ b/locales/ru_RU.po @@ -3,17 +3,20 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # +# Translators: +# Nikolay , 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: Nikolay , 2018\n" "Language-Team: Russian (Russia) (https://www.transifex.com/teclib/teams/28042/ru_RU/)\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: ru_RU\n" "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" @@ -297,7 +300,7 @@ msgstr "" msgid "New item" msgstr "" -#: inc/replace.class.php:716 +#: inc/replace.class.php:719 msgid "Replace" msgstr "" diff --git a/locales/tr_TR.mo b/locales/tr_TR.mo index 6aac3b93f5bfb0abf9cf1a27787324e13cb5ff7b..229f07c5340fea603d859e47f8cc854fab2122cd 100644 GIT binary patch delta 654 zcmXZZO(;ZB6u|LACI*A?Ir25eS9%`ry(u$hAqu6`$VZWtGz%#fG*apQ>cx&sQD*;SEQW50|6d+;ZINe zi5mA%MdQ^-)6$OYE#2tFc-l$Sbu*|1mr-wIEB*cw9p<;F2l+u0Jua&{7=*D6XK)ZV zF&k4@kFVH_SsY()#=w5;M7^O^)Q#7%4EK;Fa)$azZ!nHeXkjf$dJ}e>ffioD8azV% z)_154Jfog8m5#q%tYjVL#JWr?Vp`Fl9gaDUVe!iyj+-NiGGzeKd zc*;dgK@fT>g^ExDJ=T+G3xW{DV=jeaJ*x+ym;RsZvg~i>?aaJ4Grz6BR%hmv-wBC) zJ0~(MBF&gc1m9v9H*f&AF^ZpX2)j6nzmQiVagiim!7Vh9JfjzYF7_VZoU*t08@dhrS7V;8x z{D*#DC{NKei{V%8+ z`G+x;Qnq@pcz?%?eK$@3 DsR>U% diff --git a/locales/tr_TR.po b/locales/tr_TR.po index 006cfe4..f35cb8e 100644 --- a/locales/tr_TR.po +++ b/locales/tr_TR.po @@ -3,17 +3,20 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # +# Translators: +# Kaya Zeren , 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" -"Last-Translator: Kaya Zeren , 2017\n" +"POT-Creation-Date: 2019-07-08 13:22+0000\n" +"PO-Revision-Date: 2017-01-03 22:10+0000\n" +"Last-Translator: Kaya Zeren , 2018\n" "Language-Team: Turkish (Turkey) (https://www.transifex.com/teclib/teams/28042/tr_TR/)\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: tr_TR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" @@ -294,7 +297,7 @@ msgstr "Eski öge" msgid "New item" msgstr "Yeni öge" -#: inc/replace.class.php:716 +#: inc/replace.class.php:719 msgid "Replace" msgstr "Değiştir" diff --git a/locales/uninstall.pot b/locales/uninstall.pot index ea1375f..3e95191 100644 --- a/locales/uninstall.pot +++ b/locales/uninstall.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-09-10 10:23+0000\n" +"POT-Creation-Date: 2019-07-08 13:22+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -293,7 +293,7 @@ msgstr "" msgid "New item" msgstr "" -#: inc/replace.class.php:716 +#: inc/replace.class.php:719 msgid "Replace" msgstr "" diff --git a/locales/zh_CN.mo b/locales/zh_CN.mo index 6aafd2d59be2219bf78fd3dbdd0ff791a44d594b..b3bc09703a3e9f3b560e88ef26b0865ae38998d4 100644 GIT binary patch delta 567 zcmXZY&npCB7{Kv&(^~eYRU~SxO~f{tnN@Zt4kYEmCUS70Y;1}A$VD3egC7?cB_|hb zxi}~X9JMzGxj4DF?9GpSpPhG_<}=UpKJ&cuywB;!^wm$mI}0dP4J(yUN*za);#L>h z8*C=N*Kq|qh~Kdhzp)L2F{N72KyEe2L-J$TjSJY02iSwB*o6-<<<$y5NYG3DVm*fA zew@@A+6>A@Ig|~ibiAVDeUv^YNGo-&*RQotdi@P$fX}$+zf?)cq<^|F$#F!8dr=Cr z*pDMRUPYN;OM8TJGPgL46_h~|O@7~2>?H0($xmtvi@eAm&uf=aHr&Jk+(S9SOEmBW zW%4hSlW0i#-y0~6Gg?RI^X1pNwUC=Pts&FOrR=QhI2ns8T$nazio2!l(#E1J^fsUOdER%Pcb@k?{gA%=4tb{`qR%i<2N4}bi7@C~ zynag%{^-I0)BZ58Q`C@B|LPyBK-@8{d#XE&7FR zFd7fyq^OGu@tJik6mA&4m mntC~JxvJc|aKe diff --git a/locales/zh_CN.po b/locales/zh_CN.po index 22f07ea..6617f65 100644 --- a/locales/zh_CN.po +++ b/locales/zh_CN.po @@ -3,17 +3,21 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # +# Translators: +# liAnGjiA , 2018 +# 李赋 , 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: 李赋 , 2018\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=CHARSET\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" @@ -292,7 +296,7 @@ msgstr "旧项目" msgid "New item" msgstr "新项目" -#: inc/replace.class.php:716 +#: inc/replace.class.php:719 msgid "Replace" msgstr "替代" From 65f9217bb58cf0e8015e6812d9563658dd2b9adc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Mon, 8 Jul 2019 15:24:07 +0200 Subject: [PATCH 3/4] Update PHP dependencies --- composer.lock | 316 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 216 insertions(+), 100 deletions(-) diff --git a/composer.lock b/composer.lock index 08ca859..87774d5 100644 --- a/composer.lock +++ b/composer.lock @@ -9,21 +9,21 @@ "packages-dev": [ { "name": "consolidation/annotated-command", - "version": "2.10.1", + "version": "2.12.0", "source": { "type": "git", "url": "https://github.com/consolidation/annotated-command.git", - "reference": "288593672a8ca9ead2c73a8bfbfa4737862bfd6a" + "reference": "512a2e54c98f3af377589de76c43b24652bcb789" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/288593672a8ca9ead2c73a8bfbfa4737862bfd6a", - "reference": "288593672a8ca9ead2c73a8bfbfa4737862bfd6a", + "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/512a2e54c98f3af377589de76c43b24652bcb789", + "reference": "512a2e54c98f3af377589de76c43b24652bcb789", "shasum": "" }, "require": { "consolidation/output-formatters": "^3.4", - "php": ">=5.4.0", + "php": ">=5.4.5", "psr/log": "^1", "symfony/console": "^2.8|^3|^4", "symfony/event-dispatcher": "^2.5|^3|^4", @@ -101,20 +101,20 @@ } ], "description": "Initialize Symfony Console commands from annotated command class methods.", - "time": "2018-12-14T01:52:35+00:00" + "time": "2019-03-08T16:55:03+00:00" }, { "name": "consolidation/config", - "version": "1.1.1", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/consolidation/config.git", - "reference": "925231dfff32f05b787e1fddb265e789b939cf4c" + "reference": "cac1279bae7efb5c7fb2ca4c3ba4b8eb741a96c1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/config/zipball/925231dfff32f05b787e1fddb265e789b939cf4c", - "reference": "925231dfff32f05b787e1fddb265e789b939cf4c", + "url": "https://api.github.com/repos/consolidation/config/zipball/cac1279bae7efb5c7fb2ca4c3ba4b8eb741a96c1", + "reference": "cac1279bae7efb5c7fb2ca4c3ba4b8eb741a96c1", "shasum": "" }, "require": { @@ -123,9 +123,9 @@ "php": ">=5.4.0" }, "require-dev": { - "g1a/composer-test-scenarios": "^1", + "g1a/composer-test-scenarios": "^3", + "php-coveralls/php-coveralls": "^1", "phpunit/phpunit": "^5", - "satooshi/php-coveralls": "^1.0", "squizlabs/php_codesniffer": "2.*", "symfony/console": "^2.5|^3|^4", "symfony/yaml": "^2.8.11|^3|^4" @@ -135,6 +135,33 @@ }, "type": "library", "extra": { + "scenarios": { + "symfony4": { + "require-dev": { + "symfony/console": "^4.0" + }, + "config": { + "platform": { + "php": "7.1.3" + } + } + }, + "symfony2": { + "require-dev": { + "symfony/console": "^2.8", + "symfony/event-dispatcher": "^2.8", + "phpunit/phpunit": "^4.8.36" + }, + "remove": [ + "php-coveralls/php-coveralls" + ], + "config": { + "platform": { + "php": "5.4.8" + } + } + } + }, "branch-alias": { "dev-master": "1.x-dev" } @@ -155,35 +182,76 @@ } ], "description": "Provide configuration services for a commandline tool.", - "time": "2018-10-24T17:55:35+00:00" + "time": "2019-03-03T19:37:04+00:00" }, { "name": "consolidation/log", - "version": "1.0.6", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/consolidation/log.git", - "reference": "dfd8189a771fe047bf3cd669111b2de5f1c79395" + "reference": "b2e887325ee90abc96b0a8b7b474cd9e7c896e3a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/log/zipball/dfd8189a771fe047bf3cd669111b2de5f1c79395", - "reference": "dfd8189a771fe047bf3cd669111b2de5f1c79395", + "url": "https://api.github.com/repos/consolidation/log/zipball/b2e887325ee90abc96b0a8b7b474cd9e7c896e3a", + "reference": "b2e887325ee90abc96b0a8b7b474cd9e7c896e3a", "shasum": "" }, "require": { - "php": ">=5.5.0", - "psr/log": "~1.0", + "php": ">=5.4.5", + "psr/log": "^1.0", "symfony/console": "^2.8|^3|^4" }, "require-dev": { - "g1a/composer-test-scenarios": "^1", - "phpunit/phpunit": "4.*", - "satooshi/php-coveralls": "^2", - "squizlabs/php_codesniffer": "2.*" + "g1a/composer-test-scenarios": "^3", + "php-coveralls/php-coveralls": "^1", + "phpunit/phpunit": "^6", + "squizlabs/php_codesniffer": "^2" }, "type": "library", "extra": { + "scenarios": { + "symfony4": { + "require": { + "symfony/console": "^4.0" + }, + "config": { + "platform": { + "php": "7.1.3" + } + } + }, + "symfony2": { + "require": { + "symfony/console": "^2.8" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.36" + }, + "remove": [ + "php-coveralls/php-coveralls" + ], + "config": { + "platform": { + "php": "5.4.8" + } + } + }, + "phpunit4": { + "require-dev": { + "phpunit/phpunit": "^4.8.36" + }, + "remove": [ + "php-coveralls/php-coveralls" + ], + "config": { + "platform": { + "php": "5.4.8" + } + } + } + }, "branch-alias": { "dev-master": "1.x-dev" } @@ -204,20 +272,20 @@ } ], "description": "Improved Psr-3 / Psr\\Log logger based on Symfony Console components.", - "time": "2018-05-25T18:14:39+00:00" + "time": "2019-01-01T17:30:51+00:00" }, { "name": "consolidation/output-formatters", - "version": "3.4.0", + "version": "3.5.0", "source": { "type": "git", "url": "https://github.com/consolidation/output-formatters.git", - "reference": "a942680232094c4a5b21c0b7e54c20cce623ae19" + "reference": "99ec998ffb697e0eada5aacf81feebfb13023605" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/a942680232094c4a5b21c0b7e54c20cce623ae19", - "reference": "a942680232094c4a5b21c0b7e54c20cce623ae19", + "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/99ec998ffb697e0eada5aacf81feebfb13023605", + "reference": "99ec998ffb697e0eada5aacf81feebfb13023605", "shasum": "" }, "require": { @@ -227,11 +295,10 @@ "symfony/finder": "^2.5|^3|^4" }, "require-dev": { - "g1a/composer-test-scenarios": "^2", + "g1a/composer-test-scenarios": "^3", + "php-coveralls/php-coveralls": "^1", "phpunit/phpunit": "^5.7.27", - "satooshi/php-coveralls": "^2", "squizlabs/php_codesniffer": "^2.7", - "symfony/console": "3.2.3", "symfony/var-dumper": "^2.8|^3|^4", "victorjonsson/markdowndocs": "^1.3" }, @@ -240,6 +307,52 @@ }, "type": "library", "extra": { + "scenarios": { + "symfony4": { + "require": { + "symfony/console": "^4.0" + }, + "require-dev": { + "phpunit/phpunit": "^6" + }, + "config": { + "platform": { + "php": "7.1.3" + } + } + }, + "symfony3": { + "require": { + "symfony/console": "^3.4", + "symfony/finder": "^3.4", + "symfony/var-dumper": "^3.4" + }, + "config": { + "platform": { + "php": "5.6.32" + } + } + }, + "symfony2": { + "require": { + "symfony/console": "^2.8" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.36" + }, + "remove": [ + "php-coveralls/php-coveralls" + ], + "config": { + "platform": { + "php": "5.4.8" + } + }, + "scenario-options": { + "create-lockfile": "false" + } + } + }, "branch-alias": { "dev-master": "3.x-dev" } @@ -260,25 +373,25 @@ } ], "description": "Format text by applying transformations provided by plug-in formatters.", - "time": "2018-10-19T22:35:38+00:00" + "time": "2019-05-30T23:16:01+00:00" }, { "name": "consolidation/robo", - "version": "1.3.3", + "version": "1.4.9", "source": { "type": "git", "url": "https://github.com/consolidation/Robo.git", - "reference": "01789e1c4f3b0d7e5b4ee0aca1843a9438ff4983" + "reference": "5c6b3840a45afda1cbffbb3bb1f94dd5f9f83345" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/Robo/zipball/01789e1c4f3b0d7e5b4ee0aca1843a9438ff4983", - "reference": "01789e1c4f3b0d7e5b4ee0aca1843a9438ff4983", + "url": "https://api.github.com/repos/consolidation/Robo/zipball/5c6b3840a45afda1cbffbb3bb1f94dd5f9f83345", + "reference": "5c6b3840a45afda1cbffbb3bb1f94dd5f9f83345", "shasum": "" }, "require": { - "consolidation/annotated-command": "^2.10.1", - "consolidation/config": "^1.0.10", + "consolidation/annotated-command": "^2.10.2", + "consolidation/config": "^1.2", "consolidation/log": "~1", "consolidation/output-formatters": "^3.1.13", "consolidation/self-update": "^1", @@ -304,7 +417,7 @@ "natxet/cssmin": "3.0.4", "nikic/php-parser": "^3.1.5", "patchwork/jsqueeze": "~2", - "pear/archive_tar": "^1.4.2", + "pear/archive_tar": "^1.4.4", "php-coveralls/php-coveralls": "^1", "phpunit/php-code-coverage": "~2|~4", "squizlabs/php_codesniffer": "^2.8" @@ -349,7 +462,7 @@ } }, "branch-alias": { - "dev-master": "1.x-dev" + "dev-master": "2.x-dev" } }, "autoload": { @@ -368,7 +481,7 @@ } ], "description": "Modern task runner", - "time": "2018-12-14T02:54:30+00:00" + "time": "2019-03-19T18:07:19+00:00" }, { "name": "consolidation/self-update", @@ -549,16 +662,16 @@ }, { "name": "glpi-project/tools", - "version": "0.1.5", + "version": "0.1.8", "source": { "type": "git", "url": "https://github.com/glpi-project/tools.git", - "reference": "5ff99fa5967b468af3d3ba2d7a69ede1214273ea" + "reference": "39ca503a00454e6c5d7d97bd8baff358d262a897" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/glpi-project/tools/zipball/5ff99fa5967b468af3d3ba2d7a69ede1214273ea", - "reference": "5ff99fa5967b468af3d3ba2d7a69ede1214273ea", + "url": "https://api.github.com/repos/glpi-project/tools/zipball/39ca503a00454e6c5d7d97bd8baff358d262a897", + "reference": "39ca503a00454e6c5d7d97bd8baff358d262a897", "shasum": "" }, "require": { @@ -595,7 +708,7 @@ "plugins", "tools" ], - "time": "2018-06-21T11:59:33+00:00" + "time": "2019-06-07T09:46:17+00:00" }, { "name": "grasmash/expander", @@ -944,16 +1057,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.3.2", + "version": "3.4.2", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "6ad28354c04b364c3c71a34e4a18b629cc3b231e" + "reference": "b8a7362af1cc1aadb5bd36c3defc4dda2cf5f0a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/6ad28354c04b364c3c71a34e4a18b629cc3b231e", - "reference": "6ad28354c04b364c3c71a34e4a18b629cc3b231e", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/b8a7362af1cc1aadb5bd36c3defc4dda2cf5f0a8", + "reference": "b8a7362af1cc1aadb5bd36c3defc4dda2cf5f0a8", "shasum": "" }, "require": { @@ -986,25 +1099,25 @@ } ], "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", - "homepage": "http://www.squizlabs.com/php-codesniffer", + "homepage": "https://github.com/squizlabs/PHP_CodeSniffer", "keywords": [ "phpcs", "standards" ], - "time": "2018-09-23T23:08:17+00:00" + "time": "2019-04-10T23:49:02+00:00" }, { "name": "symfony/console", - "version": "v3.4.20", + "version": "v3.4.29", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "8f80fc39bbc3b7c47ee54ba7aa2653521ace94bb" + "reference": "c4d2f3529755ffc0be9fb823583b28d8744eeb3d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/8f80fc39bbc3b7c47ee54ba7aa2653521ace94bb", - "reference": "8f80fc39bbc3b7c47ee54ba7aa2653521ace94bb", + "url": "https://api.github.com/repos/symfony/console/zipball/c4d2f3529755ffc0be9fb823583b28d8744eeb3d", + "reference": "c4d2f3529755ffc0be9fb823583b28d8744eeb3d", "shasum": "" }, "require": { @@ -1016,6 +1129,9 @@ "symfony/dependency-injection": "<3.4", "symfony/process": "<3.3" }, + "provide": { + "psr/log-implementation": "1.0" + }, "require-dev": { "psr/log": "~1.0", "symfony/config": "~3.3|~4.0", @@ -1025,7 +1141,7 @@ "symfony/process": "~3.3|~4.0" }, "suggest": { - "psr/log-implementation": "For using the console logger", + "psr/log": "For using the console logger", "symfony/event-dispatcher": "", "symfony/lock": "", "symfony/process": "" @@ -1060,20 +1176,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2018-11-26T12:48:07+00:00" + "time": "2019-06-05T11:33:52+00:00" }, { "name": "symfony/debug", - "version": "v3.4.20", + "version": "v3.4.29", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "a2233f555ddf55e5600f386fba7781cea1cb82d3" + "reference": "1172dc1abe44dfadd162239153818b074e6e53bf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/a2233f555ddf55e5600f386fba7781cea1cb82d3", - "reference": "a2233f555ddf55e5600f386fba7781cea1cb82d3", + "url": "https://api.github.com/repos/symfony/debug/zipball/1172dc1abe44dfadd162239153818b074e6e53bf", + "reference": "1172dc1abe44dfadd162239153818b074e6e53bf", "shasum": "" }, "require": { @@ -1116,20 +1232,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2018-11-27T12:43:10+00:00" + "time": "2019-06-18T21:26:03+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v3.4.20", + "version": "v3.4.29", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "cc35e84adbb15c26ae6868e1efbf705a917be6b5" + "reference": "f18fdd6cc7006441865e698420cee26bac94741f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/cc35e84adbb15c26ae6868e1efbf705a917be6b5", - "reference": "cc35e84adbb15c26ae6868e1efbf705a917be6b5", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/f18fdd6cc7006441865e698420cee26bac94741f", + "reference": "f18fdd6cc7006441865e698420cee26bac94741f", "shasum": "" }, "require": { @@ -1179,20 +1295,20 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2018-11-30T18:07:24+00:00" + "time": "2019-06-25T07:45:31+00:00" }, { "name": "symfony/filesystem", - "version": "v3.4.20", + "version": "v3.4.29", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "b49b1ca166bd109900e6a1683d9bb1115727ef2d" + "reference": "70adda061ef83bb7def63a17953dc41f203308a7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/b49b1ca166bd109900e6a1683d9bb1115727ef2d", - "reference": "b49b1ca166bd109900e6a1683d9bb1115727ef2d", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/70adda061ef83bb7def63a17953dc41f203308a7", + "reference": "70adda061ef83bb7def63a17953dc41f203308a7", "shasum": "" }, "require": { @@ -1229,20 +1345,20 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2018-11-11T19:48:54+00:00" + "time": "2019-06-23T09:29:17+00:00" }, { "name": "symfony/finder", - "version": "v3.4.20", + "version": "v3.4.29", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "6cf2be5cbd0e87aa35c01f80ae0bf40b6798e442" + "reference": "5f80266a729e30bbcc37f8bf0e62c3d5a38c8208" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/6cf2be5cbd0e87aa35c01f80ae0bf40b6798e442", - "reference": "6cf2be5cbd0e87aa35c01f80ae0bf40b6798e442", + "url": "https://api.github.com/repos/symfony/finder/zipball/5f80266a729e30bbcc37f8bf0e62c3d5a38c8208", + "reference": "5f80266a729e30bbcc37f8bf0e62c3d5a38c8208", "shasum": "" }, "require": { @@ -1278,20 +1394,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2018-11-11T19:48:54+00:00" + "time": "2019-05-30T15:47:52+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.10.0", + "version": "v1.11.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "e3d826245268269cd66f8326bd8bc066687b4a19" + "reference": "82ebae02209c21113908c229e9883c419720738a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e3d826245268269cd66f8326bd8bc066687b4a19", - "reference": "e3d826245268269cd66f8326bd8bc066687b4a19", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/82ebae02209c21113908c229e9883c419720738a", + "reference": "82ebae02209c21113908c229e9883c419720738a", "shasum": "" }, "require": { @@ -1303,7 +1419,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.9-dev" + "dev-master": "1.11-dev" } }, "autoload": { @@ -1336,20 +1452,20 @@ "polyfill", "portable" ], - "time": "2018-08-06T14:22:27+00:00" + "time": "2019-02-06T07:57:58+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.10.0", + "version": "v1.11.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "c79c051f5b3a46be09205c73b80b346e4153e494" + "reference": "fe5e94c604826c35a32fa832f35bd036b6799609" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/c79c051f5b3a46be09205c73b80b346e4153e494", - "reference": "c79c051f5b3a46be09205c73b80b346e4153e494", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fe5e94c604826c35a32fa832f35bd036b6799609", + "reference": "fe5e94c604826c35a32fa832f35bd036b6799609", "shasum": "" }, "require": { @@ -1361,7 +1477,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.9-dev" + "dev-master": "1.11-dev" } }, "autoload": { @@ -1395,20 +1511,20 @@ "portable", "shim" ], - "time": "2018-09-21T13:07:52+00:00" + "time": "2019-02-06T07:57:58+00:00" }, { "name": "symfony/process", - "version": "v3.4.20", + "version": "v3.4.29", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "abb46b909dd6ba0b50e10d4c10ffe6ee96dd70f2" + "reference": "d129c017e8602507688ef2c3007951a16c1a8407" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/abb46b909dd6ba0b50e10d4c10ffe6ee96dd70f2", - "reference": "abb46b909dd6ba0b50e10d4c10ffe6ee96dd70f2", + "url": "https://api.github.com/repos/symfony/process/zipball/d129c017e8602507688ef2c3007951a16c1a8407", + "reference": "d129c017e8602507688ef2c3007951a16c1a8407", "shasum": "" }, "require": { @@ -1444,20 +1560,20 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2018-11-20T16:10:26+00:00" + "time": "2019-05-30T15:47:52+00:00" }, { "name": "symfony/yaml", - "version": "v3.4.20", + "version": "v3.4.29", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "291e13d808bec481eab83f301f7bff3e699ef603" + "reference": "212a27b731e5bfb735679d1ffaac82bd6a1dc996" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/291e13d808bec481eab83f301f7bff3e699ef603", - "reference": "291e13d808bec481eab83f301f7bff3e699ef603", + "url": "https://api.github.com/repos/symfony/yaml/zipball/212a27b731e5bfb735679d1ffaac82bd6a1dc996", + "reference": "212a27b731e5bfb735679d1ffaac82bd6a1dc996", "shasum": "" }, "require": { @@ -1503,7 +1619,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2018-11-11T19:48:54+00:00" + "time": "2019-03-25T07:48:46+00:00" } ], "aliases": [], From e2e351cf57d56c4c4bdc47a05d0d69d424f8bb05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Mon, 8 Jul 2019 15:25:50 +0200 Subject: [PATCH 4/4] Add 2.6.1 version definition --- setup.php | 2 +- uninstall.xml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/setup.php b/setup.php index e83bc93..60cca60 100644 --- a/setup.php +++ b/setup.php @@ -28,7 +28,7 @@ @since 2009 ---------------------------------------------------------------------- */ -define ('PLUGIN_UNINSTALL_VERSION', '2.6.0'); +define ('PLUGIN_UNINSTALL_VERSION', '2.6.1'); // Minimal GLPI version, inclusive define("PLUGIN_UNINSTALL_MIN_GLPI", "9.3"); diff --git a/uninstall.xml b/uninstall.xml index 796c348..9c7c619 100644 --- a/uninstall.xml +++ b/uninstall.xml @@ -25,6 +25,11 @@ Remi Collet + + 2.6.1 + 9.4 + 9.3 + 2.6.0 9.4