From d22b656a46a113bb96e18270a038750d73655a4e Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sat, 30 Oct 2021 08:27:49 +0200 Subject: [PATCH 01/39] AR translation update THX abidin toumi --- src/lang/ar/LC_MESSAGES/strings.mo | Bin 2599 -> 5404 bytes src/lang/ar/LC_MESSAGES/strings.po | 153 ++++++++++++++++++++--------- 2 files changed, 104 insertions(+), 49 deletions(-) diff --git a/src/lang/ar/LC_MESSAGES/strings.mo b/src/lang/ar/LC_MESSAGES/strings.mo index a5cca2272e2302e9b60f9c81ef7948f64b6f2c3b..8a39c18a9f58b4a449fb20125ed3d13af5442663 100644 GIT binary patch literal 5404 zcmcJRTWlOx8GuiUxzsICS_+f`Jq>Y)+pN9oq-nCT-MC4dM%0OwI8jlN=y-R$o_0O6 znwhn0B&0f7+o>y{g7&GZL==i06E`>)np8-(GIJ zg`a{)KB5#|^$ffNjzL-P!%xD~@OJop_-Xh$lzo@r-S8KNe}uB{?@;u;2k(KKKC0B0 z;JxrpxD(1b1Mp*T2#WrbP)vWu$Za!r;b)NtX8e-j%kU8LSK%Q16FdmFp!9R_St$0L zhM1yWfnxV-hAU9)`8njT`nBO7;3pWrWB3m!_xLYthj(GD?7JUwq}m4Wg;^;32BF;l z1eEihhHO<6Q1(s2#4h+{#;-sPufZIQ;TCuYhkYDoq3G>59D<_f>rnjY7*-8uV7y7G zZ^Q2~Ut+Nj{{u5{0;S)AuR)2+eJB@wyW#!tAbbE?@Ig3Z=Fh<|GX4qtJp3&bKfenl z|865$gbzT`*9#?XhhYb_p!jJXcEZ;oCaPaTS^s;8D)nbG{-+tg2k%4Pj??76TcGUA z!eekRJPf}BhhPLX+=}xhZik?(e;SJYV^Ho{GyDORbAM*$e+A|K?;74tlFRv>Q1XAj z89xPOpAWNe28#YmP}cnp%K3kT{8j%p<2w;bK4>@vJK;CrS@;~>#AX>!K(YHbh7pwW z{$ltqD0(*GRAIZ}J&^DxpV%cIp>BL)qkNKk4<$XN9)=Rr&(P$|Jv8w_>nE|5`jnjS zr%6nA(YDegeo|wSx4UT)=Y6#8H2EanxHGYH2NZvF)3`#Clf6(rp0MPTyp$S}{Cku} z3M6;WLCGok_R_kNUK&ry4avu^7}-v^nbt#l%*guShfJR|x#^c@Mz_pTlIjr}Axd&# zo6L0-wQmR2a;V2VUvKURHaA5>af?&5i^yGD9mVtNXf@Q{m~Mu+5ldM; z=9KM#q^Wp*=(r^bf#d7?)n(}0+VbuE`{}7?$}Lh;_tuTZgyUXdZ(nC+(F*NiBLRkO zuTr+vuve*;Enn}Klp;z&L(+6_ea(nfV%oPS9j_{#)JbYMP50wzS=5K-?&?@ea_eD_ z!kAXaZObo=YxLE-B-=#5AgL^M+^hNp8=H!@CU}RO@QLcEI!>-re)SAy7zS#@E0qws z)}&KP!*AvTb?tE|_SP&o z>X$6n`DS88y1!Mjk;*g%>Dt!*m}8fVZD~lRRXVDNqdu%xTskXWCiPvS*p_-%ksYIL zgI>ApO{IM!CvMMD`kBMUjB!<7w;xLqJu?)PoMPtjYAMK!c!-COW{weVsmaU%(kHKb zvbo)vTrQK_MK`}A`*4=8T?#NW;#+P|ws=(X+8T9=j;lkjI^po5C8M65`@(8yxn5{> z6}*Z5?P%!9u{V99G9$J%k=Fx0s|$MDcoG5_Vco@yYX;zhwKQt zb3M67d%7*ZyR&`h@X*2Lt#V!2_Whn4^4w-dhYBPbiY=!!#c?fK)bVU|8MEGuF2=L*f}9knR@wS-YE2+N!>!9?>v~zVxL(rwL(Gwj za;T_Tj?ct1(W<7}T7R}tdIry2Z229~jcw6&3_c@9uib?{bfGa?5qH*->s>%qZQajz zbdKp$5|wMwD(**Njb-!kZ2D6!^U-Cd&$9+~*EM&qMJp&=jFyxPF#RIlURC_Ff)^JF zZ7OH|VmuR{iq5ACYth?sgeXAH(p47!lx^vJ^hR_wx`=4itl^r=(UJ(_g+v1fiFGx_ z(iIkyN9`7g>hUGm>m`q$fr$$MZU#$6t%_>HPmy zSx^64rl}dNo7xr6M?VygL}yzJZ|>8H0|}(U?{e|Q=xXZfC3cbI;xv5D97&8nOjJz7 zHk>;{AyVrb&86j-=Bh-}_`F^ib9-go}81d!uQ9WT>O-W4uK zsjfsnHc=I0XNe?L`W9!bFm0+dS;cas4MWo56)75{IoWwpDqjThD!r(qw;3(#cs^Q6 zH>`ay*g}oqgw^`&nm0mWAEl?0lb0o>qm}wX^X`a|D!LSZxBdi~=Q&vxpN?xuYDUXa z*2#sE|Aa{e+-jLrFZRpZn4I}RkCQuG!-Ep0=B;jtq*)P-yO;|3fX0$qNtvZ_Yk3e` Wo^)B%`iQ65%M*+XmXdeTNd5`SkT5GX;Y!5phn}g5DUw+%uU9j zO+-YZj#>;dh#75M)Xv(TTiBwB?V(e~<)Dl!{N+im2dTr@c=;>82Veb_3JNG5Od$acz3?ctFktCu??$#?Nck)z^D#qWeH zN=m8HP03bJuAQuJtCUfZn;@Gk`yhV>4n2M=ApT!bjU9bG{rXx;m7YmCo)PN2(sQ+6 zwe*Ar!nz@~T=%CI={uf5y+5s1_oY?nfVWg%_O_?CRX2w^FNO80*Y9f!90}Ic2W#uA z0)b#4pkH}|xlPx@;m%N3@8H=kf^{CW4+mWf(=#nWcV zM9r*Ow4D)NMr|2k=FPG*9v>6U${UV3ljemp>5M8mmYmyk%-QCpiJ8de@F;^v&D=KK zbiLlbbIiF*vJn{|nWrR_b3fi-qA@b+h_AI8W$I*BvI3jhJn%CjtC8xIGhsX9GC|#v v{Y`tVOnu9$wf?WrEU?gsnb#kzJiTEZ(rf<8{0IwKARP%JW@U2{oA3SsYE>1n diff --git a/src/lang/ar/LC_MESSAGES/strings.po b/src/lang/ar/LC_MESSAGES/strings.po index 0e59837..3c9e69d 100644 --- a/src/lang/ar/LC_MESSAGES/strings.po +++ b/src/lang/ar/LC_MESSAGES/strings.po @@ -1,6 +1,7 @@ # # Translators: # ButterflyOfFire, 2019 +# abidin toumi , 2021 # msgid "" msgstr "" @@ -8,7 +9,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" "PO-Revision-Date: 2018-11-16 20:30+0000\n" -"Last-Translator: ButterflyOfFire, 2019\n" +"Last-Translator: abidin toumi , 2021\n" "Language-Team: Arabic (https://www.transifex.com/Friendica/teams/12172/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -45,12 +46,12 @@ msgstr "اللغة" #: src\classes\Controllers\Web\Search.php:65 msgctxt "field" msgid "Locality" -msgstr "" +msgstr "المنطقة" #: src\classes\Controllers\Web\Search.php:66 msgctxt "field" msgid "Region" -msgstr "المنطقة" +msgstr "الإقليم" #: src\classes\Controllers\Web\Search.php:67 msgctxt "field" @@ -63,33 +64,33 @@ msgstr "الخوادم العمومية" #: src\templates\layout.phtml:4 src\templates\layout.phtml:18 msgid "Friendica Directory" -msgstr "" +msgstr "دليل فرنديكا" #: src\templates\layout.phtml:23 src\templates\layout.phtml:25 #: src\templates\layout.phtml:43 src\templates\layout.phtml:45 #: src\templates\search.phtml:4 src\templates\search.phtml:12 msgid "Search terms" -msgstr "" +msgstr "مصطلحات البحث" #: src\templates\layout.phtml:24 src\templates\layout.phtml:45 #: src\templates\search.phtml:11 msgctxt "noun" msgid "Search" -msgstr "البحث" +msgstr "ابحث" #: src\templates\layout.phtml:27 src\templates\layout.phtml:47 #: src\templates\search.phtml:14 msgctxt "verb" msgid "Search" -msgstr "البحث" +msgstr "ابحث" #: src\templates\layout.phtml:33 msgid "Toggle navigation" -msgstr "" +msgstr "بدل التصفح" #: src\templates\layout.phtml:55 msgid "Directory" -msgstr "" +msgstr "الدليل" #: src\templates\layout.phtml:60 msgid "Public servers" @@ -98,12 +99,12 @@ msgstr "الخوادم العمومية" #: src\templates\search.phtml:19 msgid "%d result for \"%s\"" msgid_plural "%d results for \"%s\"" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" -msgstr[5] "" +msgstr[0] "%d نتائج لـ \"%s\"" +msgstr[1] "نتيجة %d لـ \"%s\"" +msgstr[2] "نتيجتان %d لـ \"%s\"" +msgstr[3] "%d نتائج لـ \"%s\"" +msgstr[4] "%d نتيجة لـ \"%s\"" +msgstr[5] "%dنتيجة لـ \"%s\"" #: src\templates\servers.phtml:2 msgid "Top servers pagination" @@ -115,20 +116,20 @@ msgstr "" #: src\templates\sub\profile.phtml:5 msgid "Filter by locality" -msgstr "" +msgstr "رشح حسب المنطقة" #: src\templates\sub\profile.phtml:11 msgid "Filter by region" -msgstr "تصفية حسب المنطقة" +msgstr "رشح حسب الإقليم" #: src\templates\sub\profile.phtml:17 msgid "Filter by country" -msgstr "تصفية حسب الدولة" +msgstr "رشح حسب الدولة" #: src\templates\sub\profile.phtml:31 msgctxt "verb" msgid "Follow" -msgstr "اتبع" +msgstr "تابع" #: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47 msgid "Language" @@ -136,19 +137,19 @@ msgstr "اللغة" #: src\templates\sub\profile.phtml:50 msgid "Filter by language" -msgstr "تصفية حسب اللغة" +msgstr "رشح حسب اللغة" #: src\templates\sub\profile.phtml:56 msgid "Location" -msgstr "" +msgstr "الموقع" #: src\templates\sub\profile.phtml:69 msgid "Search Tag" -msgstr "" +msgstr "ابحث عن وسم" #: src\templates\sub\profiles.phtml:1 msgid "Account type tabs" -msgstr "" +msgstr "ألسنة نوع الحساب" #: src\templates\sub\profiles.phtml:4 src\templates\sub\profiles.phtml:7 msgid "Top %s pagination" @@ -160,25 +161,25 @@ msgstr "" #: src\templates\statistics.phtml:66 src\templates\sub\server.phtml:15 msgid "Stable Version" -msgstr "إصدار ثابت" +msgstr "الإصدار المستقر" #: src\templates\statistics.phtml:68 src\templates\sub\server.phtml:17 msgid "Develop Version" -msgstr "إصدار قيد التطوير" +msgstr "الإصدار الاختباري" #: src\templates\sub\server.phtml:19 msgid "Outdated Version" msgstr "إصدار قديم" -#: src\templates\sub\server.phtml:55 +#: src\templates\sub\server.phtml:72 msgid "Admin" msgstr "المدير" -#: src\templates\sub\server.phtml:62 +#: src\templates\sub\server.phtml:79 msgid "No description provided" -msgstr "لم يتم تقديم أي وصف" +msgstr "لم يقدم أي وصف" -#: src\templates\sub\server.phtml:65 +#: src\templates\sub\server.phtml:82 msgid "Visit Server" msgstr "زُر الخادم" @@ -211,23 +212,23 @@ msgstr "الكل" msgctxt "account-type" msgid "People (%d)" msgid_plural "People (%d)" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" -msgstr[5] "" +msgstr[0] "أشخاص (%d)" +msgstr[1] "أشخاص (%d)" +msgstr[2] "أشخاص (%d)" +msgstr[3] "أشخاص (%d)" +msgstr[4] "أشخاص (%d)" +msgstr[5] "أشخاص (%d)" -#: src\classes\Views\Widget\AccountTypeTabs.php:57 +#: src\classes\Views\Widget\AccountTypeTabs.php:59 msgctxt "account-type" msgid "Forum (%d)" msgid_plural "Forums (%d)" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" -msgstr[5] "" +msgstr[0] "منتديات (%d)" +msgstr[1] "منتديات (%d)" +msgstr[2] "منتديات (%d)" +msgstr[3] "منتديات (%d)" +msgstr[4] "منتديات (%d)" +msgstr[5] "منتديات (%d)" #: src\templates\layout.phtml:97 msgid "Stats" @@ -235,7 +236,7 @@ msgstr "الإحصائيات" #: src\templates\statistics.phtml:4 msgid "Directory statistics" -msgstr "إحصائيات السِجِل" +msgstr "إحصائيات الدليل" #: src\templates\statistics.phtml:5 msgid "Profiles" @@ -254,7 +255,7 @@ msgstr "اللغات" #: src\templates\statistics.phtml:17 msgid "" "Out of %s profiles reporting their language there are:" -msgstr "" +msgstr "من بين %s ملفا شخصيا عرف عن لغته هناك:" #: src\templates\statistics.phtml:27 msgid "Servers" @@ -274,11 +275,11 @@ msgstr "" #: src\templates\statistics.phtml:33 msgid "Out of those, there are:" -msgstr "" +msgstr "من بين هؤلاء هناك:" #: src\templates\statistics.phtml:47 msgid "Out of %s servers reporting their language there are:" -msgstr "" +msgstr "من بين %s خادما عرف عن لغته هناك:" #: src\templates\statistics.phtml:57 msgid "Versions" @@ -286,7 +287,7 @@ msgstr "الإصدارات" #: src\templates\statistics.phtml:58 msgid "Out of %s servers reporting their version there are:" -msgstr "" +msgstr "من بين %s خادما عرف عن إصداره هناك:" #: src\templates\statistics.phtml:7 msgid "" @@ -296,11 +297,11 @@ msgstr "" #: src\templates\statistics.phtml:35 msgid "%s available servers (%s)" -msgstr "" +msgstr "%s خادم متوفر (%s)" #: src\templates\layout.phtml:91 msgid "Friendica Directory version %s" -msgstr "" +msgstr "إصدار دليل فرنديكا %s" #: src\templates\layout.phtml:94 msgid "Source Code on GitHub" @@ -317,3 +318,57 @@ msgid "" "%s public servers (%s) currently open for registration. Check them out!" msgstr "" +"يوجد %s خادم عمومي (%s) مفتوح للستجيل. ألق " +"نظرة عليهم!" + +#: src\classes\Views\Widget\AccountTypeTabs.php:57 +msgctxt "account-type" +msgid "News (%d)" +msgid_plural "News (%d)" +msgstr[0] "أخبار (%d)" +msgstr[1] "أخبار (%d)" +msgstr[2] "أخبار (%d)" +msgstr[3] "أخبار (%d)" +msgstr[4] "أخبار (%d)" +msgstr[5] "أخبار (%d)" + +#: src\classes\Views\Widget\AccountTypeTabs.php:58 +msgctxt "account-type" +msgid "Organization (%d)" +msgid_plural "Organizations (%d)" +msgstr[0] "منظمات (%d)" +msgstr[1] "منظمات (%d)" +msgstr[2] "منظمات (%d)" +msgstr[3] "منظمات (%d)" +msgstr[4] "منظمات (%d)" +msgstr[5] "منظمات (%d)" + +#: src\templates\sub\server.phtml:40 +msgid "Health Score" +msgstr "تقييم الصحة" + +#: src\templates\sub\server.phtml:52 +msgid "%s User" +msgid_plural "%s Users" +msgstr[0] "لا مستخدمين %s" +msgstr[1] "مستخدم %s" +msgstr[2] "مستخدمان %s" +msgstr[3] "%s مستخدمين" +msgstr[4] "%s مستخدما" +msgstr[5] "%s مستخدم" + +#: src\templates\sub\server.phtml:54 +msgid "None" +msgstr "لا شيء" + +#: src\templates\sub\server.phtml:59 src\templates\sub\server.phtml:63 +msgid "Registration Policy" +msgstr "سياسة التسجيل" + +#: src\templates\sub\server.phtml:60 +msgid "By Approval" +msgstr "يحتاج الموافقة" + +#: src\templates\sub\server.phtml:64 +msgid "Open" +msgstr "مفتوح" From ca605b8f235f42303b94ac1e750c95b0f869fc2e Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Mon, 6 Dec 2021 20:29:32 +0100 Subject: [PATCH 02/39] added HU translation fixes #73 --- src/lang/hu/LC_MESSAGES/strings.mo | Bin 0 -> 5933 bytes src/lang/hu/LC_MESSAGES/strings.po | 362 +++++++++++++++++++++++++++++ 2 files changed, 362 insertions(+) create mode 100644 src/lang/hu/LC_MESSAGES/strings.mo create mode 100644 src/lang/hu/LC_MESSAGES/strings.po diff --git a/src/lang/hu/LC_MESSAGES/strings.mo b/src/lang/hu/LC_MESSAGES/strings.mo new file mode 100644 index 0000000000000000000000000000000000000000..3598ddd5b3eb1072066665bf96a67e5eca3f6074 GIT binary patch literal 5933 zcmcJSUu+yl9ml7{Kx_UqO=&1CZ6={^^Y3h*)3o6dr*)ijY@FDx?L<)?Ky!QJyYcSr ztaj!uy%SX7r4r%+MU)~Tfv~DdL~2@9K@~`OKw258Z-^&UA%rU4kdTTHf<6G>-~PGX zOKmF!vGUw!W_EVw_xsK7_nYw__6+@i;h97EGD`guj0y0KA^hMO{}f|Sf@N?wco{ql zDo}y1fDeHG0zV1v{xoA>0QZ7l0*`>70jnT={{nbFSOf0^Ly*RQ6Qp^rgL}Z&QoaMy zckhBU|9jwr;2*)q!M}l@1s}XOS%-u8V@L5r^B)IEmFLp_vuXPR_(k+Dr|tEW8a#)7 z3(kPI!78{5laao2pbOpt9|rdgGp4~4Aj$bN5T;7$3gn;c@V0y3*bZGMUck3Alan{E`ry<1@Jc@t-lW+6U*RUa2llb zuYmYt4t_}P0Q?I0ZIFYngJtm7;1l3Kz|Vn?;fK~elClEg6`KRGB)gQdmeL17``o9j6o!TJT={q3p=PMxX z%Nrn#+XTrEf1mdM9VC0*kHu)dhd>S<21&1ZknDQ}q;UaAcJHKo2_%1d86ikhcE~lHPlvH1&^w-vEz+68t_$ z_WvhH^FNA7$WNXIY2C{p3f>3h9_Vhf(2a zgLKFq((@@4(t~7=D7&FrfvWGC8#Qz(Z}N+|R^hH@I^05#I*BshvvMuDl>^C+_@6w~Av zWaCFs=&7PSjdBF#Nt9_6df+1Q`7lY1kvb2hX?vEh>5v~7F$eN4Q|L4NqLCpRNod$9 zV?*sXPNPF~gz`kqlN=*DGBo_)h&gm>EFDoC8nkPka<(4Fopu;X-+EoH1L?Xo6>Q)ZORtcZM*-}m^jU*97nf(%WXH1+=`lEQ}vee*%@uE zZgI#Oh=%gx>9WpD=HiCBMsLW=i@NAQ>I69PU-q%LG!vaPN)Lv<75_9 zmv!{}k}YDR*kapqy~cBo=x;rZUQ?bl@UcLLR{0IuF%|Mmb!vu^i%?c}nkU<&|I;*? zwLU70ZE7Qr=28~4CR{F?`+hdvYhu#;l44UWc-ybek%PtFfgd$E+l|C~Kx3#Fh&gg)eDjqb^&K zB6OM@^JP_pY|Ee#r!%&q+o2;NQ(a=u_&H@~+cma=1cRKHDS)OmY_+Kj&&}^5+>jt^ z$WTQC)+ssoj^%;2$aqS4S)}lb%jZo$en$WM`BGoIb2{BWVpbE&i{MXSPR z+kQiYO8ER>)7rpP#>TE*y*i2`)HiBPzBuaW)>uCyjahtT#>x}rXD7y*?Xg3{7v?Th zbNS1o1an?r@af9)qD=KX6w-tiSKHPUMe)AR9Zbc=2@gB|%f#-$hC2%FMw zUgxedJ?%B(Z{S(m+;9A@@;cFmugwl0@O9})-;)iF;TBgD91`(Gr)R@x!%@+#P~4G1 z7or=zp5!fjBYN5u>3wGgV_h5F4B7@KYM|ZZz5`KdCRmKL!wb`kHd-1#MsVS^JvLv^ z#@%wn*P>fcq$wI*e8r(QY|W-H7c63>*OEO6!TqlEI&4O+MxAbE*14!1K;b`U>5fstw52qjds=0Gl%{8RC{)bRL&2#0H3erOPf_?HMRP z3js;(jQ_d*xG2LR#U>Qe2lpU9DBzZ)2&@^!~b@c?{4R;lHl2zxuS^c5chS&QFk!Z zct`k0xoE+>_z)44Xv}4!OTJUMY854Lc}K&2-BGsPddW5BSrXHCF3QcR}GvA|McPr z>tFohx^|Q6*eo(2_AkEg73(YT!43k%Ca?O%s distinct potential profile " +"URLs." +msgstr "" +"Ez a könyvtár körülbelül %s különböző lehetséges profil " +"URL-t ismer." + +#: src\templates\statistics.phtml:16 src\templates\statistics.phtml:46 +msgid "Languages" +msgstr "Nyelvek" + +#: src\templates\statistics.phtml:17 +msgid "" +"Out of %s profiles reporting their language there are:" +msgstr "" +"A nyelvüket jelentő %s profil közül ezek az alábbiak:" + +#: src\templates\statistics.phtml:27 +msgid "Servers" +msgstr "Kiszolgálók" + +#: src\templates\statistics.phtml:28 +msgid "" +"This directory knows about %s distinct potential server " +"URLs." +msgstr "" +"Ez a könyvtár körülbelül %s különböző lehetséges kiszolgáló " +"URL-t ismer." + +#: src\templates\statistics.phtml:29 +msgid "" +"Out of those, there are %s domains (%s) that have been a " +"Friendica server at least once." +msgstr "" +"Ezek közül %s tartomány (%s) van, amelyek legalább egyszer " +"Friendica kiszolgálók voltak." + +#: src\templates\statistics.phtml:33 +msgid "Out of those, there are:" +msgstr "Ezek közül ezek az alábbiak:" + +#: src\templates\statistics.phtml:47 +msgid "Out of %s servers reporting their language there are:" +msgstr "" +"A nyelvüket jelentő %s kiszolgáló közül ezek az alábbiak:" + +#: src\templates\statistics.phtml:57 +msgid "Versions" +msgstr "Verziók" + +#: src\templates\statistics.phtml:58 +msgid "Out of %s servers reporting their version there are:" +msgstr "" +"A verziójukat jelentő %s kiszolgáló közül ezek az alábbiak:" + +#: src\templates\statistics.phtml:7 +msgid "" +"Out of those, there are %s profiles (%s) that opted in the " +"public directory at least once." +msgstr "" +"Ezek közül %s profil (%s) van, amelyek legalább egyszer " +"beléptek a nyilvános könyvtárba." + +#: src\templates\statistics.phtml:35 +msgid "%s available servers (%s)" +msgstr "%s elérhető kiszolgáló (%s)" + +#: src\templates\layout.phtml:91 +msgid "Friendica Directory version %s" +msgstr "Friendica könyvtár verzió: %s" + +#: src\templates\layout.phtml:94 +msgid "Source Code on GitHub" +msgstr "Forráskód a GitHubon" + +#: src\templates\statistics.phtml:11 +msgid "" +"Out of those, there currently are %s available profiles " +"(%s). Check them out!" +msgstr "" +"Ezek közül jelenleg %s elérhető profil (%s) van. Nézze meg őket!" + +#: src\templates\statistics.phtml:39 +msgid "" +"%s public servers (%s) currently open for registration. Check them out!" +msgstr "" +"%s nyilvános kiszolgáló (%s) jelenleg nyitott a " +"regisztrációra. Nézze meg azokat!" + +#: src\classes\Views\Widget\AccountTypeTabs.php:57 +msgctxt "account-type" +msgid "News (%d)" +msgid_plural "News (%d)" +msgstr[0] "Hírek (%d)" +msgstr[1] "Hírek (%d)" + +#: src\classes\Views\Widget\AccountTypeTabs.php:58 +msgctxt "account-type" +msgid "Organization (%d)" +msgid_plural "Organizations (%d)" +msgstr[0] "Szervezet (%d)" +msgstr[1] "Szervezetek (%d)" + +#: src\templates\sub\server.phtml:40 +msgid "Health Score" +msgstr "Egészségpont" + +#: src\templates\sub\server.phtml:52 +msgid "%s User" +msgid_plural "%s Users" +msgstr[0] "%s felhasználó" +msgstr[1] "%s felhasználó" + +#: src\templates\sub\server.phtml:54 +msgid "None" +msgstr "Nincs" + +#: src\templates\sub\server.phtml:59 src\templates\sub\server.phtml:63 +msgid "Registration Policy" +msgstr "Regisztrációs irányelv" + +#: src\templates\sub\server.phtml:60 +msgid "By Approval" +msgstr "Jóváhagyás által" + +#: src\templates\sub\server.phtml:64 +msgid "Open" +msgstr "Nyitott" From 6ccbeef59ca5c44875bfcda62c4389de41d0fada Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Wed, 29 Dec 2021 17:24:24 +0100 Subject: [PATCH 03/39] [Composer] Updated dependencies before release - Updating atlas/pdo (1.1.2 => 1.2.0) - Updating gettext/languages (2.6.0 => 2.9.0) - Updating gettext/gettext (v4.8.2 => v4.8.6) - Updating masterminds/html5 (2.7.1 => 2.7.5) - Updating psr/log (1.1.3 => 1.1.4) - Updating monolog/monolog (1.25.4 => 1.26.1) - Updating sarahman/simple-filesystem-cache (1.0.1 => 1.0.2) - Updating seld/cli-prompt (1.0.3 => 1.0.4) - Updating bower-asset/fontawesome (5.13.1 => 5.15.4) - Updating laminas/laminas-zendframework-bridge (1.0.4 => 1.1.1) - Updating pear/pear_exception (v1.0.1 => v1.0.2) - Updating pear/pear-core-minimal (v1.10.10 => v1.10.11) --- composer.lock | 2954 +++++++++++++++++++++++++++---------------------- 1 file changed, 1628 insertions(+), 1326 deletions(-) diff --git a/composer.lock b/composer.lock index 381151a..972e764 100644 --- a/composer.lock +++ b/composer.lock @@ -41,16 +41,16 @@ }, { "name": "atlas/pdo", - "version": "1.1.2", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/atlasphp/Atlas.Pdo.git", - "reference": "69b7c968b6c685043d215c1ddbe48e526a73ca80" + "reference": "b64a164290b93bffd2e034dc6e49535afc7dea80" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/atlasphp/Atlas.Pdo/zipball/69b7c968b6c685043d215c1ddbe48e526a73ca80", - "reference": "69b7c968b6c685043d215c1ddbe48e526a73ca80", + "url": "https://api.github.com/repos/atlasphp/Atlas.Pdo/zipball/b64a164290b93bffd2e034dc6e49535afc7dea80", + "reference": "b64a164290b93bffd2e034dc6e49535afc7dea80", "shasum": "" }, "require": { @@ -84,7 +84,7 @@ "pdo", "sql" ], - "time": "2019-12-23T15:09:02+00:00" + "time": "2020-12-31T16:08:34+00:00" }, { "name": "boronczyk/localization-middleware", @@ -173,16 +173,16 @@ }, { "name": "bower-asset/fontawesome", - "version": "5.13.1", + "version": "5.15.4", "source": { "type": "git", "url": "https://github.com/FortAwesome/Font-Awesome.git", - "reference": "1147d199a35293b391152ee85e2d30988439157f" + "reference": "7d3d774145ac38663f6d1effc6def0334b68ab7e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FortAwesome/Font-Awesome/zipball/1147d199a35293b391152ee85e2d30988439157f", - "reference": "1147d199a35293b391152ee85e2d30988439157f", + "url": "https://api.github.com/repos/FortAwesome/Font-Awesome/zipball/7d3d774145ac38663f6d1effc6def0334b68ab7e", + "reference": "7d3d774145ac38663f6d1effc6def0334b68ab7e", "shasum": "" }, "type": "bower-asset-library" @@ -526,62 +526,6 @@ "description": "A utility class to make easy work with XML in PHP.", "time": "2018-03-10T14:43:36+00:00" }, - { - "name": "doctrine/instantiator", - "version": "1.3.1", - "source": { - "type": "git", - "url": "https://github.com/doctrine/instantiator.git", - "reference": "f350df0268e904597e3bd9c4685c53e0e333feea" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/f350df0268e904597e3bd9c4685c53e0e333feea", - "reference": "f350df0268e904597e3bd9c4685c53e0e333feea", - "shasum": "" - }, - "require": { - "php": "^7.1 || ^8.0" - }, - "require-dev": { - "doctrine/coding-standard": "^6.0", - "ext-pdo": "*", - "ext-phar": "*", - "phpbench/phpbench": "^0.13", - "phpstan/phpstan-phpunit": "^0.11", - "phpstan/phpstan-shim": "^0.11", - "phpunit/phpunit": "^7.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.2.x-dev" - } - }, - "autoload": { - "psr-4": { - "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Marco Pivetta", - "email": "ocramius@gmail.com", - "homepage": "http://ocramius.github.com/" - } - ], - "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", - "homepage": "https://www.doctrine-project.org/projects/instantiator.html", - "keywords": [ - "constructor", - "instantiate" - ], - "time": "2020-05-29T17:27:14+00:00" - }, { "name": "fxp/composer-asset-plugin", "version": "v1.4.6", @@ -643,16 +587,16 @@ }, { "name": "gettext/gettext", - "version": "v4.8.2", + "version": "v4.8.6", "source": { "type": "git", "url": "https://github.com/php-gettext/Gettext.git", - "reference": "e474f872f2c8636cf53fd283ec4ce1218f3d236a" + "reference": "bbeb8f4d3077663739aecb4551b22e720c0e9efe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-gettext/Gettext/zipball/e474f872f2c8636cf53fd283ec4ce1218f3d236a", - "reference": "e474f872f2c8636cf53fd283ec4ce1218f3d236a", + "url": "https://api.github.com/repos/php-gettext/Gettext/zipball/bbeb8f4d3077663739aecb4551b22e720c0e9efe", + "reference": "bbeb8f4d3077663739aecb4551b22e720c0e9efe", "shasum": "" }, "require": { @@ -660,7 +604,7 @@ "php": ">=5.4.0" }, "require-dev": { - "illuminate/view": "*", + "illuminate/view": "^5.0.x-dev", "phpunit/phpunit": "^4.8|^5.7|^6.5", "squizlabs/php_codesniffer": "^3.0", "symfony/yaml": "~2", @@ -701,27 +645,40 @@ "po", "translation" ], - "time": "2019-12-02T10:21:14+00:00" + "funding": [ + { + "url": "https://paypal.me/oscarotero", + "type": "custom" + }, + { + "url": "https://github.com/oscarotero", + "type": "github" + }, + { + "url": "https://www.patreon.com/misteroom", + "type": "patreon" + } + ], + "time": "2021-10-19T10:44:53+00:00" }, { "name": "gettext/languages", - "version": "2.6.0", + "version": "2.9.0", "source": { "type": "git", "url": "https://github.com/php-gettext/Languages.git", - "reference": "38ea0482f649e0802e475f0ed19fa993bcb7a618" + "reference": "ed56dd2c7f4024cc953ed180d25f02f2640e3ffa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-gettext/Languages/zipball/38ea0482f649e0802e475f0ed19fa993bcb7a618", - "reference": "38ea0482f649e0802e475f0ed19fa993bcb7a618", + "url": "https://api.github.com/repos/php-gettext/Languages/zipball/ed56dd2c7f4024cc953ed180d25f02f2640e3ffa", + "reference": "ed56dd2c7f4024cc953ed180d25f02f2640e3ffa", "shasum": "" }, "require": { "php": ">=5.3" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^2.16.0", "phpunit/phpunit": "^4.8 || ^5.7 || ^6.5 || ^7.5 || ^8.4" }, "bin": [ @@ -762,7 +719,17 @@ "translations", "unicode" ], - "time": "2019-11-13T10:30:21+00:00" + "funding": [ + { + "url": "https://paypal.me/mlocati", + "type": "custom" + }, + { + "url": "https://github.com/mlocati", + "type": "github" + } + ], + "time": "2021-11-11T17:30:39+00:00" }, { "name": "gofabian/negotiation-middleware", @@ -867,31 +834,27 @@ }, { "name": "laminas/laminas-zendframework-bridge", - "version": "1.0.4", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/laminas/laminas-zendframework-bridge.git", - "reference": "fcd87520e4943d968557803919523772475e8ea3" + "reference": "6ede70583e101030bcace4dcddd648f760ddf642" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/fcd87520e4943d968557803919523772475e8ea3", - "reference": "fcd87520e4943d968557803919523772475e8ea3", + "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/6ede70583e101030bcace4dcddd648f760ddf642", + "reference": "6ede70583e101030bcace4dcddd648f760ddf642", "shasum": "" }, "require": { - "php": "^5.6 || ^7.0" + "php": "^5.6 || ^7.0 || ^8.0" }, "require-dev": { - "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.1", + "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.1 || ^9.3", "squizlabs/php_codesniffer": "^3.5" }, "type": "library", "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev", - "dev-develop": "1.1.x-dev" - }, "laminas": { "module": "Laminas\\ZendFrameworkBridge" } @@ -915,20 +878,26 @@ "laminas", "zf" ], - "time": "2020-05-20T16:45:56+00:00" + "funding": [ + { + "url": "https://funding.communitybridge.org/projects/laminas-project", + "type": "community_bridge" + } + ], + "time": "2020-09-14T14:23:00+00:00" }, { "name": "masterminds/html5", - "version": "2.7.1", + "version": "2.7.5", "source": { "type": "git", "url": "https://github.com/Masterminds/html5-php.git", - "reference": "a3edfe52f9e7380e498d33157e1330e85386645d" + "reference": "f640ac1bdddff06ea333a920c95bbad8872429ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/a3edfe52f9e7380e498d33157e1330e85386645d", - "reference": "a3edfe52f9e7380e498d33157e1330e85386645d", + "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/f640ac1bdddff06ea333a920c95bbad8872429ab", + "reference": "f640ac1bdddff06ea333a920c95bbad8872429ab", "shasum": "" }, "require": { @@ -938,9 +907,7 @@ "php": ">=5.3.0" }, "require-dev": { - "phpunit/phpunit": "^4.8.35", - "sami/sami": "~2.0", - "satooshi/php-coveralls": "1.0.*" + "phpunit/phpunit": "^4.8.35 || ^5.7.21 || ^6 || ^7" }, "type": "library", "extra": { @@ -982,20 +949,20 @@ "serializer", "xml" ], - "time": "2020-02-06T11:39:04+00:00" + "time": "2021-07-01T14:25:37+00:00" }, { "name": "monolog/monolog", - "version": "1.25.4", + "version": "1.26.1", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "3022efff205e2448b560c833c6fbbf91c3139168" + "reference": "c6b00f05152ae2c9b04a448f99c7590beb6042f5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/3022efff205e2448b560c833c6fbbf91c3139168", - "reference": "3022efff205e2448b560c833c6fbbf91c3139168", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/c6b00f05152ae2c9b04a448f99c7590beb6042f5", + "reference": "c6b00f05152ae2c9b04a448f99c7590beb6042f5", "shasum": "" }, "require": { @@ -1011,7 +978,7 @@ "graylog2/gelf-php": "~1.0", "php-amqplib/php-amqplib": "~2.4", "php-console/php-console": "^3.1.3", - "php-parallel-lint/php-parallel-lint": "^1.0", + "phpstan/phpstan": "^0.12.59", "phpunit/phpunit": "~4.5", "ruflin/elastica": ">=0.90 <3.0", "sentry/sentry": "^0.13", @@ -1031,11 +998,6 @@ "sentry/sentry": "Allow sending log messages to a Sentry server" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, "autoload": { "psr-4": { "Monolog\\": "src/Monolog" @@ -1059,7 +1021,17 @@ "logging", "psr-3" ], - "time": "2020-05-22T07:31:27+00:00" + "funding": [ + { + "url": "https://github.com/Seldaek", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/monolog/monolog", + "type": "tidelift" + } + ], + "time": "2021-05-28T08:32:12+00:00" }, { "name": "mrpetovan/net_ping", @@ -1222,16 +1194,16 @@ }, { "name": "pear/pear-core-minimal", - "version": "v1.10.10", + "version": "v1.10.11", "source": { "type": "git", "url": "https://github.com/pear/pear-core-minimal.git", - "reference": "625a3c429d9b2c1546438679074cac1b089116a7" + "reference": "68d0d32ada737153b7e93b8d3c710ebe70ac867d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/625a3c429d9b2c1546438679074cac1b089116a7", - "reference": "625a3c429d9b2c1546438679074cac1b089116a7", + "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/68d0d32ada737153b7e93b8d3c710ebe70ac867d", + "reference": "68d0d32ada737153b7e93b8d3c710ebe70ac867d", "shasum": "" }, "require": { @@ -1262,27 +1234,27 @@ } ], "description": "Minimal set of PEAR core files to be used as composer dependency", - "time": "2019-11-19T19:00:24+00:00" + "time": "2021-08-10T22:31:03+00:00" }, { "name": "pear/pear_exception", - "version": "v1.0.1", + "version": "v1.0.2", "source": { "type": "git", "url": "https://github.com/pear/PEAR_Exception.git", - "reference": "dbb42a5a0e45f3adcf99babfb2a1ba77b8ac36a7" + "reference": "b14fbe2ddb0b9f94f5b24cf08783d599f776fff0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pear/PEAR_Exception/zipball/dbb42a5a0e45f3adcf99babfb2a1ba77b8ac36a7", - "reference": "dbb42a5a0e45f3adcf99babfb2a1ba77b8ac36a7", + "url": "https://api.github.com/repos/pear/PEAR_Exception/zipball/b14fbe2ddb0b9f94f5b24cf08783d599f776fff0", + "reference": "b14fbe2ddb0b9f94f5b24cf08783d599f776fff0", "shasum": "" }, "require": { - "php": ">=4.4.0" + "php": ">=5.2.0" }, "require-dev": { - "phpunit/phpunit": "*" + "phpunit/phpunit": "<9" }, "type": "class", "extra": { @@ -1317,7 +1289,1108 @@ "keywords": [ "exception" ], - "time": "2019-12-10T10:24:42+00:00" + "time": "2021-03-21T15:43:46+00:00" + }, + { + "name": "pimple/pimple", + "version": "v3.2.3", + "source": { + "type": "git", + "url": "https://github.com/silexphp/Pimple.git", + "reference": "9e403941ef9d65d20cba7d54e29fe906db42cf32" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/silexphp/Pimple/zipball/9e403941ef9d65d20cba7d54e29fe906db42cf32", + "reference": "9e403941ef9d65d20cba7d54e29fe906db42cf32", + "shasum": "" + }, + "require": { + "php": ">=5.3.0", + "psr/container": "^1.0" + }, + "require-dev": { + "symfony/phpunit-bridge": "^3.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.2.x-dev" + } + }, + "autoload": { + "psr-0": { + "Pimple": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "Pimple, a simple Dependency Injection Container", + "homepage": "http://pimple.sensiolabs.org", + "keywords": [ + "container", + "dependency injection" + ], + "time": "2018-01-21T07:42:36+00:00" + }, + { + "name": "psr/cache", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/php-fig/cache.git", + "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8", + "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Cache\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interface for caching libraries", + "keywords": [ + "cache", + "psr", + "psr-6" + ], + "time": "2016-08-06T20:24:11+00:00" + }, + { + "name": "psr/container", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/container.git", + "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Container\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common Container Interface (PHP FIG PSR-11)", + "homepage": "https://github.com/php-fig/container", + "keywords": [ + "PSR-11", + "container", + "container-interface", + "container-interop", + "psr" + ], + "time": "2017-02-14T16:28:37+00:00" + }, + { + "name": "psr/http-message", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/php-fig/http-message.git", + "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363", + "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Http\\Message\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interface for HTTP messages", + "homepage": "https://github.com/php-fig/http-message", + "keywords": [ + "http", + "http-message", + "psr", + "psr-7", + "request", + "response" + ], + "time": "2016-08-06T14:39:51+00:00" + }, + { + "name": "psr/log", + "version": "1.1.4", + "source": { + "type": "git", + "url": "https://github.com/php-fig/log.git", + "reference": "d49695b909c3b7628b6289db5479a1c204601f11" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11", + "reference": "d49695b909c3b7628b6289db5479a1c204601f11", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Log\\": "Psr/Log/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common interface for logging libraries", + "homepage": "https://github.com/php-fig/log", + "keywords": [ + "log", + "psr", + "psr-3" + ], + "time": "2021-05-03T11:20:27+00:00" + }, + { + "name": "psr/simple-cache", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/php-fig/simple-cache.git", + "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", + "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\SimpleCache\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interfaces for simple caching", + "keywords": [ + "cache", + "caching", + "psr", + "psr-16", + "simple-cache" + ], + "time": "2017-10-23T01:57:42+00:00" + }, + { + "name": "sarahman/simple-filesystem-cache", + "version": "1.0.2", + "source": { + "type": "git", + "url": "https://github.com/sarahman/simple-filesystem-cache.git", + "reference": "adb8f79a3890e51692db02aadeaa42999f7ff5e3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sarahman/simple-filesystem-cache/zipball/adb8f79a3890e51692db02aadeaa42999f7ff5e3", + "reference": "adb8f79a3890e51692db02aadeaa42999f7ff5e3", + "shasum": "" + }, + "require": { + "ext-json": "*", + "psr/simple-cache": "*" + }, + "provide": { + "psr/simple-cache-implementation": "1.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.8" + }, + "type": "library", + "autoload": { + "psr-4": { + "Sarahman\\SimpleCache\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Syed Abidur Rahman", + "email": "aabid048@gmail.com" + } + ], + "description": "Simple file system cache library for PHP built on top of PSR-16.", + "time": "2020-08-09T05:14:17+00:00" + }, + { + "name": "seld/cli-prompt", + "version": "1.0.4", + "source": { + "type": "git", + "url": "https://github.com/Seldaek/cli-prompt.git", + "reference": "b8dfcf02094b8c03b40322c229493bb2884423c5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Seldaek/cli-prompt/zipball/b8dfcf02094b8c03b40322c229493bb2884423c5", + "reference": "b8dfcf02094b8c03b40322c229493bb2884423c5", + "shasum": "" + }, + "require": { + "php": ">=5.3" + }, + "require-dev": { + "phpstan/phpstan": "^0.12.63" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Seld\\CliPrompt\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be" + } + ], + "description": "Allows you to prompt for user input on the command line, and optionally hide the characters they type", + "keywords": [ + "cli", + "console", + "hidden", + "input", + "prompt" + ], + "time": "2020-12-15T21:32:01+00:00" + }, + { + "name": "slim/php-view", + "version": "2.2.1", + "source": { + "type": "git", + "url": "https://github.com/slimphp/PHP-View.git", + "reference": "a13ada9d7962ca1b48799c0d9ffbca4c33245aed" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/slimphp/PHP-View/zipball/a13ada9d7962ca1b48799c0d9ffbca4c33245aed", + "reference": "a13ada9d7962ca1b48799c0d9ffbca4c33245aed", + "shasum": "" + }, + "require": { + "psr/http-message": "^1.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.8", + "slim/slim": "^3.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Slim\\Views\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Glenn Eggleton", + "email": "geggleto@gmail.com" + } + ], + "description": "Render PHP view scripts into a PSR-7 Response object.", + "keywords": [ + "framework", + "php", + "phtml", + "renderer", + "slim", + "template", + "view" + ], + "time": "2019-04-15T20:43:28+00:00" + }, + { + "name": "slim/slim", + "version": "3.12.3", + "source": { + "type": "git", + "url": "https://github.com/slimphp/Slim.git", + "reference": "1c9318a84ffb890900901136d620b4f03a59da38" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/slimphp/Slim/zipball/1c9318a84ffb890900901136d620b4f03a59da38", + "reference": "1c9318a84ffb890900901136d620b4f03a59da38", + "shasum": "" + }, + "require": { + "ext-json": "*", + "ext-libxml": "*", + "ext-simplexml": "*", + "nikic/fast-route": "^1.0", + "php": ">=5.5.0", + "pimple/pimple": "^3.0", + "psr/container": "^1.0", + "psr/http-message": "^1.0" + }, + "provide": { + "psr/http-message-implementation": "1.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.0", + "squizlabs/php_codesniffer": "^2.5" + }, + "type": "library", + "autoload": { + "psr-4": { + "Slim\\": "Slim" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Josh Lockhart", + "email": "hello@joshlockhart.com", + "homepage": "https://joshlockhart.com" + }, + { + "name": "Andrew Smith", + "email": "a.smith@silentworks.co.uk", + "homepage": "http://silentworks.co.uk" + }, + { + "name": "Rob Allen", + "email": "rob@akrabat.com", + "homepage": "http://akrabat.com" + }, + { + "name": "Gabriel Manricks", + "email": "gmanricks@me.com", + "homepage": "http://gabrielmanricks.com" + } + ], + "description": "Slim is a PHP micro framework that helps you quickly write simple yet powerful web applications and APIs", + "homepage": "https://slimframework.com", + "keywords": [ + "api", + "framework", + "micro", + "router" + ], + "time": "2019-11-28T17:40:33+00:00" + }, + { + "name": "willdurand/negotiation", + "version": "v2.3.1", + "source": { + "type": "git", + "url": "https://github.com/willdurand/Negotiation.git", + "reference": "03436ededa67c6e83b9b12defac15384cb399dc9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/willdurand/Negotiation/zipball/03436ededa67c6e83b9b12defac15384cb399dc9", + "reference": "03436ededa67c6e83b9b12defac15384cb399dc9", + "shasum": "" + }, + "require": { + "php": ">=5.4.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.3-dev" + } + }, + "autoload": { + "psr-4": { + "Negotiation\\": "src/Negotiation" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "William Durand", + "email": "will+git@drnd.me" + } + ], + "description": "Content Negotiation tools for PHP provided as a standalone library.", + "homepage": "http://williamdurand.fr/Negotiation/", + "keywords": [ + "accept", + "content", + "format", + "header", + "negotiation" + ], + "time": "2017-05-14T17:21:12+00:00" + } + ], + "packages-dev": [ + { + "name": "bower-asset/bootstrap", + "version": "v4.6.1", + "source": { + "type": "git", + "url": "https://github.com/twbs/bootstrap.git", + "reference": "043a03c95a2ad6738f85b65e53b9dbdfb03b8d10" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/twbs/bootstrap/zipball/043a03c95a2ad6738f85b65e53b9dbdfb03b8d10", + "reference": "043a03c95a2ad6738f85b65e53b9dbdfb03b8d10", + "shasum": "" + }, + "type": "bower-asset-library" + }, + { + "name": "composer/xdebug-handler", + "version": "1.4.6", + "source": { + "type": "git", + "url": "https://github.com/composer/xdebug-handler.git", + "reference": "f27e06cd9675801df441b3656569b328e04aa37c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/f27e06cd9675801df441b3656569b328e04aa37c", + "reference": "f27e06cd9675801df441b3656569b328e04aa37c", + "shasum": "" + }, + "require": { + "php": "^5.3.2 || ^7.0 || ^8.0", + "psr/log": "^1.0" + }, + "require-dev": { + "phpstan/phpstan": "^0.12.55", + "symfony/phpunit-bridge": "^4.2 || ^5" + }, + "type": "library", + "autoload": { + "psr-4": { + "Composer\\XdebugHandler\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "John Stevenson", + "email": "john-stevenson@blueyonder.co.uk" + } + ], + "description": "Restarts a process without Xdebug.", + "keywords": [ + "Xdebug", + "performance" + ], + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2021-03-25T17:01:18+00:00" + }, + { + "name": "doctrine/instantiator", + "version": "1.4.0", + "source": { + "type": "git", + "url": "https://github.com/doctrine/instantiator.git", + "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/d56bf6102915de5702778fe20f2de3b2fe570b5b", + "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0" + }, + "require-dev": { + "doctrine/coding-standard": "^8.0", + "ext-pdo": "*", + "ext-phar": "*", + "phpbench/phpbench": "^0.13 || 1.0.0-alpha2", + "phpstan/phpstan": "^0.12", + "phpstan/phpstan-phpunit": "^0.12", + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com", + "homepage": "https://ocramius.github.io/" + } + ], + "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", + "homepage": "https://www.doctrine-project.org/projects/instantiator.html", + "keywords": [ + "constructor", + "instantiate" + ], + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator", + "type": "tidelift" + } + ], + "time": "2020-11-10T18:47:58+00:00" + }, + { + "name": "felixfbecker/advanced-json-rpc", + "version": "v3.2.1", + "source": { + "type": "git", + "url": "https://github.com/felixfbecker/php-advanced-json-rpc.git", + "reference": "b5f37dbff9a8ad360ca341f3240dc1c168b45447" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/felixfbecker/php-advanced-json-rpc/zipball/b5f37dbff9a8ad360ca341f3240dc1c168b45447", + "reference": "b5f37dbff9a8ad360ca341f3240dc1c168b45447", + "shasum": "" + }, + "require": { + "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0", + "php": "^7.1 || ^8.0", + "phpdocumentor/reflection-docblock": "^4.3.4 || ^5.0.0" + }, + "require-dev": { + "phpunit/phpunit": "^7.0 || ^8.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "AdvancedJsonRpc\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "ISC" + ], + "authors": [ + { + "name": "Felix Becker", + "email": "felix.b@outlook.com" + } + ], + "description": "A more advanced JSONRPC implementation", + "time": "2021-06-11T22:34:44+00:00" + }, + { + "name": "felixfbecker/language-server-protocol", + "version": "1.5.1", + "source": { + "type": "git", + "url": "https://github.com/felixfbecker/php-language-server-protocol.git", + "reference": "9d846d1f5cf101deee7a61c8ba7caa0a975cd730" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/felixfbecker/php-language-server-protocol/zipball/9d846d1f5cf101deee7a61c8ba7caa0a975cd730", + "reference": "9d846d1f5cf101deee7a61c8ba7caa0a975cd730", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "require-dev": { + "phpstan/phpstan": "*", + "squizlabs/php_codesniffer": "^3.1", + "vimeo/psalm": "^4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "LanguageServerProtocol\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "ISC" + ], + "authors": [ + { + "name": "Felix Becker", + "email": "felix.b@outlook.com" + } + ], + "description": "PHP classes for the Language Server Protocol", + "keywords": [ + "language", + "microsoft", + "php", + "server" + ], + "time": "2021-02-22T14:02:09+00:00" + }, + { + "name": "muglug/package-versions-56", + "version": "1.2.4", + "source": { + "type": "git", + "url": "https://github.com/muglug/PackageVersions.git", + "reference": "a67bed26deaaf9269a348e53063bc8d4dcc60ffd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/muglug/PackageVersions/zipball/a67bed26deaaf9269a348e53063bc8d4dcc60ffd", + "reference": "a67bed26deaaf9269a348e53063bc8d4dcc60ffd", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.0", + "php": "^5.6 || ^7.0" + }, + "require-dev": { + "composer/composer": "^1.3", + "ext-zip": "*", + "phpunit/phpunit": "^5.7.5" + }, + "type": "composer-plugin", + "extra": { + "class": "Muglug\\PackageVersions\\Installer", + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Muglug\\PackageVersions\\": "src/PackageVersions" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com" + }, + { + "name": "Abdul Malik Ikhsan", + "email": "samsonasik@gmail.com" + }, + { + "name": "Matt Brown", + "email": "github@muglug.com" + } + ], + "description": "A backport of ocramius/package-versions that supports php ^5.6. Composer plugin that provides efficient querying for installed package versions (no runtime IO)", + "time": "2018-03-26T03:22:13+00:00" + }, + { + "name": "myclabs/deep-copy", + "version": "1.10.2", + "source": { + "type": "git", + "url": "https://github.com/myclabs/DeepCopy.git", + "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/776f831124e9c62e1a2c601ecc52e776d8bb7220", + "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0" + }, + "replace": { + "myclabs/deep-copy": "self.version" + }, + "require-dev": { + "doctrine/collections": "^1.0", + "doctrine/common": "^2.6", + "phpunit/phpunit": "^7.1" + }, + "type": "library", + "autoload": { + "psr-4": { + "DeepCopy\\": "src/DeepCopy/" + }, + "files": [ + "src/DeepCopy/deep_copy.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Create deep copies (clones) of your objects", + "keywords": [ + "clone", + "copy", + "duplicate", + "object", + "object graph" + ], + "funding": [ + { + "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy", + "type": "tidelift" + } + ], + "time": "2020-11-13T09:40:50+00:00" + }, + { + "name": "netresearch/jsonmapper", + "version": "v1.6.0", + "source": { + "type": "git", + "url": "https://github.com/cweiske/jsonmapper.git", + "reference": "0d4d1b48d682a93b6bfedf60b88c7750e9cb0b06" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/0d4d1b48d682a93b6bfedf60b88c7750e9cb0b06", + "reference": "0d4d1b48d682a93b6bfedf60b88c7750e9cb0b06", + "shasum": "" + }, + "require": { + "ext-json": "*", + "ext-pcre": "*", + "ext-reflection": "*", + "ext-spl": "*", + "php": ">=5.6" + }, + "require-dev": { + "phpunit/phpunit": "~4.8.35 || ~5.7 || ~6.4", + "squizlabs/php_codesniffer": "~1.5" + }, + "type": "library", + "autoload": { + "psr-0": { + "JsonMapper": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "OSL-3.0" + ], + "authors": [ + { + "name": "Christian Weiske", + "email": "cweiske@cweiske.de", + "homepage": "http://github.com/cweiske/jsonmapper/", + "role": "Developer" + } + ], + "description": "Map nested JSON structures onto PHP classes", + "time": "2019-08-15T19:41:25+00:00" + }, + { + "name": "nikic/php-parser", + "version": "v4.13.2", + "source": { + "type": "git", + "url": "https://github.com/nikic/PHP-Parser.git", + "reference": "210577fe3cf7badcc5814d99455df46564f3c077" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/210577fe3cf7badcc5814d99455df46564f3c077", + "reference": "210577fe3cf7badcc5814d99455df46564f3c077", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "php": ">=7.0" + }, + "require-dev": { + "ircmaxell/php-yacc": "^0.0.7", + "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0" + }, + "bin": [ + "bin/php-parse" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.9-dev" + } + }, + "autoload": { + "psr-4": { + "PhpParser\\": "lib/PhpParser" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Nikita Popov" + } + ], + "description": "A PHP parser written in PHP", + "keywords": [ + "parser", + "php" + ], + "time": "2021-11-30T19:35:32+00:00" + }, + { + "name": "openlss/lib-array2xml", + "version": "0.5.1", + "source": { + "type": "git", + "url": "https://github.com/nullivex/lib-array2xml.git", + "reference": "c8b5998a342d7861f2e921403f44e0a2f3ef2be0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nullivex/lib-array2xml/zipball/c8b5998a342d7861f2e921403f44e0a2f3ef2be0", + "reference": "c8b5998a342d7861f2e921403f44e0a2f3ef2be0", + "shasum": "" + }, + "require": { + "php": ">=5.3.2" + }, + "type": "library", + "autoload": { + "psr-0": { + "LSS": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "Bryan Tong", + "email": "contact@nullivex.com", + "homepage": "http://bryantong.com" + }, + { + "name": "Tony Butler", + "email": "spudz76@gmail.com", + "homepage": "http://openlss.org" + } + ], + "description": "Array2XML conversion library credit to lalit.org", + "homepage": "http://openlss.org", + "keywords": [ + "array", + "array conversion", + "xml", + "xml conversion" + ], + "time": "2016-11-10T19:10:18+00:00" + }, + { + "name": "php-cs-fixer/diff", + "version": "v1.3.1", + "source": { + "type": "git", + "url": "https://github.com/PHP-CS-Fixer/diff.git", + "reference": "dbd31aeb251639ac0b9e7e29405c1441907f5759" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/dbd31aeb251639ac0b9e7e29405c1441907f5759", + "reference": "dbd31aeb251639ac0b9e7e29405c1441907f5759", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0 || ^8.0" + }, + "require-dev": { + "phpunit/phpunit": "^5.7.23 || ^6.4.3 || ^7.0", + "symfony/process": "^3.3" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Kore Nordmann", + "email": "mail@kore-nordmann.de" + }, + { + "name": "SpacePossum" + } + ], + "description": "sebastian/diff v2 backport support for PHP5.6", + "homepage": "https://github.com/PHP-CS-Fixer", + "keywords": [ + "diff" + ], + "time": "2020-10-14T08:39:05+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -1532,39 +2605,40 @@ }, { "name": "phpunit/php-code-coverage", - "version": "2.2.4", + "version": "4.0.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979" + "reference": "ef7b2f56815df854e66ceaee8ebe9393ae36a40d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/eabf68b476ac7d0f73793aada060f1c1a9bf8979", - "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ef7b2f56815df854e66ceaee8ebe9393ae36a40d", + "reference": "ef7b2f56815df854e66ceaee8ebe9393ae36a40d", "shasum": "" }, "require": { - "php": ">=5.3.3", - "phpunit/php-file-iterator": "~1.3", - "phpunit/php-text-template": "~1.2", - "phpunit/php-token-stream": "~1.3", - "sebastian/environment": "^1.3.2", - "sebastian/version": "~1.0" + "ext-dom": "*", + "ext-xmlwriter": "*", + "php": "^5.6 || ^7.0", + "phpunit/php-file-iterator": "^1.3", + "phpunit/php-text-template": "^1.2", + "phpunit/php-token-stream": "^1.4.2 || ^2.0", + "sebastian/code-unit-reverse-lookup": "^1.0", + "sebastian/environment": "^1.3.2 || ^2.0", + "sebastian/version": "^1.0 || ^2.0" }, "require-dev": { - "ext-xdebug": ">=2.1.4", - "phpunit/phpunit": "~4" + "ext-xdebug": "^2.1.4", + "phpunit/phpunit": "^5.7" }, "suggest": { - "ext-dom": "*", - "ext-xdebug": ">=2.2.1", - "ext-xmlwriter": "*" + "ext-xdebug": "^2.5.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.2.x-dev" + "dev-master": "4.0.x-dev" } }, "autoload": { @@ -1590,7 +2664,7 @@ "testing", "xunit" ], - "time": "2015-10-06T15:47:00+00:00" + "time": "2017-04-02T07:44:40+00:00" }, { "name": "phpunit/php-file-iterator", @@ -1731,29 +2805,29 @@ }, { "name": "phpunit/php-token-stream", - "version": "1.4.12", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "1ce90ba27c42e4e44e6d8458241466380b51fa16" + "reference": "791198a2c6254db10131eecfe8c06670700904db" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/1ce90ba27c42e4e44e6d8458241466380b51fa16", - "reference": "1ce90ba27c42e4e44e6d8458241466380b51fa16", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/791198a2c6254db10131eecfe8c06670700904db", + "reference": "791198a2c6254db10131eecfe8c06670700904db", "shasum": "" }, "require": { "ext-tokenizer": "*", - "php": ">=5.3.3" + "php": "^7.0" }, "require-dev": { - "phpunit/phpunit": "~4.2" + "phpunit/phpunit": "^6.2.4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "2.0-dev" } }, "autoload": { @@ -1777,44 +2851,54 @@ "tokenizer" ], "abandoned": true, - "time": "2017-12-04T08:55:13+00:00" + "time": "2017-11-27T05:48:46+00:00" }, { "name": "phpunit/phpunit", - "version": "4.8.36", + "version": "5.7.27", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "46023de9a91eec7dfb06cc56cb4e260017298517" + "reference": "b7803aeca3ccb99ad0a506fa80b64cd6a56bbc0c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/46023de9a91eec7dfb06cc56cb4e260017298517", - "reference": "46023de9a91eec7dfb06cc56cb4e260017298517", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b7803aeca3ccb99ad0a506fa80b64cd6a56bbc0c", + "reference": "b7803aeca3ccb99ad0a506fa80b64cd6a56bbc0c", "shasum": "" }, "require": { "ext-dom": "*", "ext-json": "*", - "ext-pcre": "*", - "ext-reflection": "*", - "ext-spl": "*", - "php": ">=5.3.3", - "phpspec/prophecy": "^1.3.1", - "phpunit/php-code-coverage": "~2.1", + "ext-libxml": "*", + "ext-mbstring": "*", + "ext-xml": "*", + "myclabs/deep-copy": "~1.3", + "php": "^5.6 || ^7.0", + "phpspec/prophecy": "^1.6.2", + "phpunit/php-code-coverage": "^4.0.4", "phpunit/php-file-iterator": "~1.4", "phpunit/php-text-template": "~1.2", "phpunit/php-timer": "^1.0.6", - "phpunit/phpunit-mock-objects": "~2.3", - "sebastian/comparator": "~1.2.2", - "sebastian/diff": "~1.2", - "sebastian/environment": "~1.3", - "sebastian/exporter": "~1.2", - "sebastian/global-state": "~1.0", - "sebastian/version": "~1.0", - "symfony/yaml": "~2.1|~3.0" + "phpunit/phpunit-mock-objects": "^3.2", + "sebastian/comparator": "^1.2.4", + "sebastian/diff": "^1.4.3", + "sebastian/environment": "^1.3.4 || ^2.0", + "sebastian/exporter": "~2.0", + "sebastian/global-state": "^1.1", + "sebastian/object-enumerator": "~2.0", + "sebastian/resource-operations": "~1.0", + "sebastian/version": "^1.0.6|^2.0.1", + "symfony/yaml": "~2.1|~3.0|~4.0" + }, + "conflict": { + "phpdocumentor/reflection-docblock": "3.0.2" + }, + "require-dev": { + "ext-pdo": "*" }, "suggest": { + "ext-xdebug": "*", "phpunit/php-invoker": "~1.1" }, "bin": [ @@ -1823,7 +2907,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.8.x-dev" + "dev-master": "5.7.x-dev" } }, "autoload": { @@ -1849,30 +2933,33 @@ "testing", "xunit" ], - "time": "2017-06-21T08:07:12+00:00" + "time": "2018-02-01T05:50:59+00:00" }, { "name": "phpunit/phpunit-mock-objects", - "version": "2.3.8", + "version": "3.4.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983" + "reference": "a23b761686d50a560cc56233b9ecf49597cc9118" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/ac8e7a3db35738d56ee9a76e78a4e03d97628983", - "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/a23b761686d50a560cc56233b9ecf49597cc9118", + "reference": "a23b761686d50a560cc56233b9ecf49597cc9118", "shasum": "" }, "require": { "doctrine/instantiator": "^1.0.2", - "php": ">=5.3.3", - "phpunit/php-text-template": "~1.2", - "sebastian/exporter": "~1.2" + "php": "^5.6 || ^7.0", + "phpunit/php-text-template": "^1.2", + "sebastian/exporter": "^1.2 || ^2.0" + }, + "conflict": { + "phpunit/phpunit": "<5.4.0" }, "require-dev": { - "phpunit/phpunit": "~4.4" + "phpunit/phpunit": "^5.4" }, "suggest": { "ext-soap": "*" @@ -1880,7 +2967,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.3.x-dev" + "dev-master": "3.2.x-dev" } }, "autoload": { @@ -1906,324 +2993,162 @@ "xunit" ], "abandoned": true, - "time": "2015-10-02T06:51:40+00:00" + "time": "2017-06-30T09:13:00+00:00" }, { - "name": "pimple/pimple", - "version": "v3.2.3", + "name": "sabre/event", + "version": "5.1.4", "source": { "type": "git", - "url": "https://github.com/silexphp/Pimple.git", - "reference": "9e403941ef9d65d20cba7d54e29fe906db42cf32" + "url": "https://github.com/sabre-io/event.git", + "reference": "d7da22897125d34d7eddf7977758191c06a74497" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/silexphp/Pimple/zipball/9e403941ef9d65d20cba7d54e29fe906db42cf32", - "reference": "9e403941ef9d65d20cba7d54e29fe906db42cf32", + "url": "https://api.github.com/repos/sabre-io/event/zipball/d7da22897125d34d7eddf7977758191c06a74497", + "reference": "d7da22897125d34d7eddf7977758191c06a74497", "shasum": "" }, "require": { - "php": ">=5.3.0", - "psr/container": "^1.0" + "php": "^7.1 || ^8.0" }, "require-dev": { - "symfony/phpunit-bridge": "^3.2" + "friendsofphp/php-cs-fixer": "~2.17.1", + "phpstan/phpstan": "^0.12", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.2.x-dev" - } - }, - "autoload": { - "psr-0": { - "Pimple": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - } - ], - "description": "Pimple, a simple Dependency Injection Container", - "homepage": "http://pimple.sensiolabs.org", - "keywords": [ - "container", - "dependency injection" - ], - "time": "2018-01-21T07:42:36+00:00" - }, - { - "name": "psr/cache", - "version": "1.0.1", - "source": { - "type": "git", - "url": "https://github.com/php-fig/cache.git", - "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8", - "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, "autoload": { "psr-4": { - "Psr\\Cache\\": "src/" - } + "Sabre\\Event\\": "lib/" + }, + "files": [ + "lib/coroutine.php", + "lib/Loop/functions.php", + "lib/Promise/functions.php" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "name": "Evert Pot", + "email": "me@evertpot.com", + "homepage": "http://evertpot.com/", + "role": "Developer" } ], - "description": "Common interface for caching libraries", + "description": "sabre/event is a library for lightweight event-based programming", + "homepage": "http://sabre.io/event/", "keywords": [ - "cache", - "psr", - "psr-6" + "EventEmitter", + "async", + "coroutine", + "eventloop", + "events", + "hooks", + "plugin", + "promise", + "reactor", + "signal" ], - "time": "2016-08-06T20:24:11+00:00" + "time": "2021-11-04T06:51:17+00:00" }, { - "name": "psr/container", - "version": "1.0.0", + "name": "sabre/uri", + "version": "2.2.2", "source": { "type": "git", - "url": "https://github.com/php-fig/container.git", - "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f" + "url": "https://github.com/sabre-io/uri.git", + "reference": "7cb0f489578afad5006e85cd60f18ff33f2d440d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f", - "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "url": "https://api.github.com/repos/sabre-io/uri/zipball/7cb0f489578afad5006e85cd60f18ff33f2d440d", + "reference": "7cb0f489578afad5006e85cd60f18ff33f2d440d", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": "^7.1 || ^8.0" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "~2.17.1", + "phpstan/phpstan": "^0.12", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, "autoload": { + "files": [ + "lib/functions.php" + ], "psr-4": { - "Psr\\Container\\": "src/" + "Sabre\\Uri\\": "lib/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "name": "Evert Pot", + "email": "me@evertpot.com", + "homepage": "http://evertpot.com/", + "role": "Developer" } ], - "description": "Common Container Interface (PHP FIG PSR-11)", - "homepage": "https://github.com/php-fig/container", + "description": "Functions for making sense out of URIs.", + "homepage": "http://sabre.io/uri/", "keywords": [ - "PSR-11", - "container", - "container-interface", - "container-interop", - "psr" + "rfc3986", + "uri", + "url" ], - "time": "2017-02-14T16:28:37+00:00" + "time": "2021-11-04T09:29:58+00:00" }, { - "name": "psr/http-message", - "version": "1.0.1", + "name": "scssphp/scssphp", + "version": "v1.9.0", "source": { "type": "git", - "url": "https://github.com/php-fig/http-message.git", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363" + "url": "https://github.com/scssphp/scssphp.git", + "reference": "bc8bece4e5e176973a832f3763049ddbba16e6fd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Psr\\Http\\Message\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" - } - ], - "description": "Common interface for HTTP messages", - "homepage": "https://github.com/php-fig/http-message", - "keywords": [ - "http", - "http-message", - "psr", - "psr-7", - "request", - "response" - ], - "time": "2016-08-06T14:39:51+00:00" - }, - { - "name": "psr/log", - "version": "1.1.3", - "source": { - "type": "git", - "url": "https://github.com/php-fig/log.git", - "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc", - "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Psr\\Log\\": "Psr/Log/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" - } - ], - "description": "Common interface for logging libraries", - "homepage": "https://github.com/php-fig/log", - "keywords": [ - "log", - "psr", - "psr-3" - ], - "time": "2020-03-23T09:12:05+00:00" - }, - { - "name": "psr/simple-cache", - "version": "1.0.1", - "source": { - "type": "git", - "url": "https://github.com/php-fig/simple-cache.git", - "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", - "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Psr\\SimpleCache\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" - } - ], - "description": "Common interfaces for simple caching", - "keywords": [ - "cache", - "caching", - "psr", - "psr-16", - "simple-cache" - ], - "time": "2017-10-23T01:57:42+00:00" - }, - { - "name": "sarahman/simple-filesystem-cache", - "version": "1.0.1", - "source": { - "type": "git", - "url": "https://github.com/sarahman/simple-filesystem-cache.git", - "reference": "0cf570831c11887335d2b901067086cc0a2023e9" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sarahman/simple-filesystem-cache/zipball/0cf570831c11887335d2b901067086cc0a2023e9", - "reference": "0cf570831c11887335d2b901067086cc0a2023e9", + "url": "https://api.github.com/repos/scssphp/scssphp/zipball/bc8bece4e5e176973a832f3763049ddbba16e6fd", + "reference": "bc8bece4e5e176973a832f3763049ddbba16e6fd", "shasum": "" }, "require": { + "ext-ctype": "*", "ext-json": "*", - "phpunit/phpunit": "^4.8", - "psr/simple-cache": "*" + "php": ">=5.6.0" }, - "provide": { - "psr/simple-cache-implementation": "1.0" + "require-dev": { + "bamarni/composer-bin-plugin": "^1.4", + "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.3 || ^9.4", + "sass/sass-spec": "*", + "squizlabs/php_codesniffer": "~3.5", + "symfony/phpunit-bridge": "^5.1", + "thoughtbot/bourbon": "^7.0", + "twbs/bootstrap": "~5.0", + "twbs/bootstrap4": "4.6.0", + "zurb/foundation": "~6.5" }, + "suggest": { + "ext-iconv": "Can be used as fallback when ext-mbstring is not available", + "ext-mbstring": "For best performance, mbstring should be installed as it is faster than ext-iconv" + }, + "bin": [ + "bin/pscss" + ], "type": "library", "autoload": { "psr-4": { - "Sarahman\\SimpleCache\\": "src" + "ScssPhp\\ScssPhp\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -2232,12 +3157,77 @@ ], "authors": [ { - "name": "Syed Abidur Rahman", - "email": "aabid048@gmail.com" + "name": "Anthon Pang", + "email": "apang@softwaredevelopment.ca", + "homepage": "https://github.com/robocoder" + }, + { + "name": "Cédric Morin", + "email": "cedric@yterium.com", + "homepage": "https://github.com/Cerdic" } ], - "description": "Simple file system cache library for PHP built on top of PSR-16.", - "time": "2019-04-04T12:48:29+00:00" + "description": "scssphp is a compiler for SCSS written in PHP.", + "homepage": "http://scssphp.github.io/scssphp/", + "keywords": [ + "css", + "less", + "sass", + "scss", + "stylesheet" + ], + "time": "2021-12-13T11:55:16+00:00" + }, + { + "name": "sebastian/code-unit-reverse-lookup", + "version": "1.0.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", + "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/1de8cd5c010cb153fcd68b8d0f64606f523f7619", + "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619", + "shasum": "" + }, + "require": { + "php": ">=5.6" + }, + "require-dev": { + "phpunit/phpunit": "^8.5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Looks up which function or method a line of code belongs to", + "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-11-30T08:15:22+00:00" }, { "name": "sebastian/comparator", @@ -2357,28 +3347,28 @@ }, { "name": "sebastian/environment", - "version": "1.3.8", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea" + "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/be2c607e43ce4c89ecd60e75c6a85c126e754aea", - "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/5795ffe5dc5b02460c3e34222fee8cbe245d8fac", + "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac", "shasum": "" }, "require": { - "php": "^5.3.3 || ^7.0" + "php": "^5.6 || ^7.0" }, "require-dev": { - "phpunit/phpunit": "^4.8 || ^5.0" + "phpunit/phpunit": "^5.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { @@ -2403,25 +3393,25 @@ "environment", "hhvm" ], - "time": "2016-08-18T05:49:44+00:00" + "time": "2016-11-26T07:53:53+00:00" }, { "name": "sebastian/exporter", - "version": "1.2.2", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4" + "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/42c4c2eec485ee3e159ec9884f95b431287edde4", - "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4", + "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4", "shasum": "" }, "require": { "php": ">=5.3.3", - "sebastian/recursion-context": "~1.0" + "sebastian/recursion-context": "~2.0" }, "require-dev": { "ext-mbstring": "*", @@ -2430,7 +3420,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { @@ -2470,7 +3460,7 @@ "export", "exporter" ], - "time": "2016-06-17T09:04:28+00:00" + "time": "2016-11-19T08:54:04+00:00" }, { "name": "sebastian/global-state", @@ -2524,17 +3514,63 @@ "time": "2015-10-12T03:26:01+00:00" }, { - "name": "sebastian/recursion-context", - "version": "1.0.5", + "name": "sebastian/object-enumerator", + "version": "2.0.1", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7" + "url": "https://github.com/sebastianbergmann/object-enumerator.git", + "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/b19cc3298482a335a95f3016d2f8a6950f0fbcd7", - "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7", + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/1311872ac850040a79c3c058bea3e22d0f09cbb7", + "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7", + "shasum": "" + }, + "require": { + "php": ">=5.6", + "sebastian/recursion-context": "~2.0" + }, + "require-dev": { + "phpunit/phpunit": "~5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Traverses array structures and object graphs to enumerate all referenced objects", + "homepage": "https://github.com/sebastianbergmann/object-enumerator/", + "time": "2017-02-18T15:18:39+00:00" + }, + { + "name": "sebastian/recursion-context", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/recursion-context.git", + "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/2c3ba150cbec723aa057506e73a8d33bdb286c9a", + "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a", "shasum": "" }, "require": { @@ -2546,7 +3582,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { @@ -2574,23 +3610,73 @@ ], "description": "Provides functionality to recursively process PHP variables", "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "time": "2016-10-03T07:41:43+00:00" + "time": "2016-11-19T07:33:16+00:00" }, { - "name": "sebastian/version", - "version": "1.0.6", + "name": "sebastian/resource-operations", + "version": "1.0.0", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/version.git", - "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6" + "url": "https://github.com/sebastianbergmann/resource-operations.git", + "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6", - "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6", + "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52", + "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52", "shasum": "" }, + "require": { + "php": ">=5.6.0" + }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides a list of PHP built-in functions that operate on resources", + "homepage": "https://www.github.com/sebastianbergmann/resource-operations", + "time": "2015-07-28T20:34:47+00:00" + }, + { + "name": "sebastian/version", + "version": "2.0.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/version.git", + "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019", + "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019", + "shasum": "" + }, + "require": { + "php": ">=5.6" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, "autoload": { "classmap": [ "src/" @@ -2609,194 +3695,24 @@ ], "description": "Library that helps with managing the version number of Git-hosted PHP projects", "homepage": "https://github.com/sebastianbergmann/version", - "time": "2015-06-21T13:59:46+00:00" - }, - { - "name": "seld/cli-prompt", - "version": "1.0.3", - "source": { - "type": "git", - "url": "https://github.com/Seldaek/cli-prompt.git", - "reference": "a19a7376a4689d4d94cab66ab4f3c816019ba8dd" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Seldaek/cli-prompt/zipball/a19a7376a4689d4d94cab66ab4f3c816019ba8dd", - "reference": "a19a7376a4689d4d94cab66ab4f3c816019ba8dd", - "shasum": "" - }, - "require": { - "php": ">=5.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Seld\\CliPrompt\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jordi Boggiano", - "email": "j.boggiano@seld.be" - } - ], - "description": "Allows you to prompt for user input on the command line, and optionally hide the characters they type", - "keywords": [ - "cli", - "console", - "hidden", - "input", - "prompt" - ], - "time": "2017-03-18T11:32:45+00:00" - }, - { - "name": "slim/php-view", - "version": "2.2.1", - "source": { - "type": "git", - "url": "https://github.com/slimphp/PHP-View.git", - "reference": "a13ada9d7962ca1b48799c0d9ffbca4c33245aed" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/slimphp/PHP-View/zipball/a13ada9d7962ca1b48799c0d9ffbca4c33245aed", - "reference": "a13ada9d7962ca1b48799c0d9ffbca4c33245aed", - "shasum": "" - }, - "require": { - "psr/http-message": "^1.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.8", - "slim/slim": "^3.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Slim\\Views\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Glenn Eggleton", - "email": "geggleto@gmail.com" - } - ], - "description": "Render PHP view scripts into a PSR-7 Response object.", - "keywords": [ - "framework", - "php", - "phtml", - "renderer", - "slim", - "template", - "view" - ], - "time": "2019-04-15T20:43:28+00:00" - }, - { - "name": "slim/slim", - "version": "3.12.3", - "source": { - "type": "git", - "url": "https://github.com/slimphp/Slim.git", - "reference": "1c9318a84ffb890900901136d620b4f03a59da38" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/slimphp/Slim/zipball/1c9318a84ffb890900901136d620b4f03a59da38", - "reference": "1c9318a84ffb890900901136d620b4f03a59da38", - "shasum": "" - }, - "require": { - "ext-json": "*", - "ext-libxml": "*", - "ext-simplexml": "*", - "nikic/fast-route": "^1.0", - "php": ">=5.5.0", - "pimple/pimple": "^3.0", - "psr/container": "^1.0", - "psr/http-message": "^1.0" - }, - "provide": { - "psr/http-message-implementation": "1.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.0", - "squizlabs/php_codesniffer": "^2.5" - }, - "type": "library", - "autoload": { - "psr-4": { - "Slim\\": "Slim" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Josh Lockhart", - "email": "hello@joshlockhart.com", - "homepage": "https://joshlockhart.com" - }, - { - "name": "Andrew Smith", - "email": "a.smith@silentworks.co.uk", - "homepage": "http://silentworks.co.uk" - }, - { - "name": "Rob Allen", - "email": "rob@akrabat.com", - "homepage": "http://akrabat.com" - }, - { - "name": "Gabriel Manricks", - "email": "gmanricks@me.com", - "homepage": "http://gabrielmanricks.com" - } - ], - "description": "Slim is a PHP micro framework that helps you quickly write simple yet powerful web applications and APIs", - "homepage": "https://slimframework.com", - "keywords": [ - "api", - "framework", - "micro", - "router" - ], - "time": "2019-11-28T17:40:33+00:00" + "time": "2016-10-03T07:35:21+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.17.0", + "version": "v1.23.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9" + "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e94c8b1bbe2bc77507a1056cdb06451c75b427f9", - "reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce", + "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=7.1" }, "suggest": { "ext-ctype": "For best performance" @@ -2804,7 +3720,11 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.17-dev" + "dev-main": "1.23-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -2837,20 +3757,34 @@ "polyfill", "portable" ], - "time": "2020-05-12T16:14:59+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2021-02-19T12:13:01+00:00" }, { "name": "symfony/yaml", - "version": "v3.4.42", + "version": "v3.4.47", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "7233ac2bfdde24d672f5305f2b3f6b5d741ef8eb" + "reference": "88289caa3c166321883f67fe5130188ebbb47094" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/7233ac2bfdde24d672f5305f2b3f6b5d741ef8eb", - "reference": "7233ac2bfdde24d672f5305f2b3f6b5d741ef8eb", + "url": "https://api.github.com/repos/symfony/yaml/zipball/88289caa3c166321883f67fe5130188ebbb47094", + "reference": "88289caa3c166321883f67fe5130188ebbb47094", "shasum": "" }, "require": { @@ -2867,11 +3801,6 @@ "symfony/console": "For validating YAML files using the lint command" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - }, "autoload": { "psr-4": { "Symfony\\Component\\Yaml\\": "" @@ -2896,699 +3825,21 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2020-05-11T07:51:54+00:00" - }, - { - "name": "webmozart/assert", - "version": "1.5.0", - "source": { - "type": "git", - "url": "https://github.com/webmozarts/assert.git", - "reference": "88e6d84706d09a236046d686bbea96f07b3a34f4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/webmozarts/assert/zipball/88e6d84706d09a236046d686bbea96f07b3a34f4", - "reference": "88e6d84706d09a236046d686bbea96f07b3a34f4", - "shasum": "" - }, - "require": { - "php": "^5.3.3 || ^7.0", - "symfony/polyfill-ctype": "^1.8" - }, - "require-dev": { - "phpunit/phpunit": "^4.8.36 || ^7.5.13" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.3-dev" - } - }, - "autoload": { - "psr-4": { - "Webmozart\\Assert\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Bernhard Schussek", - "email": "bschussek@gmail.com" - } - ], - "description": "Assertions to validate method input/output with nice error messages.", - "keywords": [ - "assert", - "check", - "validate" - ], - "time": "2019-08-24T08:43:50+00:00" - }, - { - "name": "willdurand/negotiation", - "version": "v2.3.1", - "source": { - "type": "git", - "url": "https://github.com/willdurand/Negotiation.git", - "reference": "03436ededa67c6e83b9b12defac15384cb399dc9" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/willdurand/Negotiation/zipball/03436ededa67c6e83b9b12defac15384cb399dc9", - "reference": "03436ededa67c6e83b9b12defac15384cb399dc9", - "shasum": "" - }, - "require": { - "php": ">=5.4.0" - }, - "require-dev": { - "phpunit/phpunit": "~4.5" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.3-dev" - } - }, - "autoload": { - "psr-4": { - "Negotiation\\": "src/Negotiation" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "William Durand", - "email": "will+git@drnd.me" - } - ], - "description": "Content Negotiation tools for PHP provided as a standalone library.", - "homepage": "http://williamdurand.fr/Negotiation/", - "keywords": [ - "accept", - "content", - "format", - "header", - "negotiation" - ], - "time": "2017-05-14T17:21:12+00:00" - } - ], - "packages-dev": [ - { - "name": "bower-asset/bootstrap", - "version": "v4.5.0", - "source": { - "type": "git", - "url": "https://github.com/twbs/bootstrap.git", - "reference": "7a6da5e3e7ad7c749dde806546a35d4d4259d965" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/twbs/bootstrap/zipball/7a6da5e3e7ad7c749dde806546a35d4d4259d965", - "reference": "7a6da5e3e7ad7c749dde806546a35d4d4259d965", - "shasum": "" - }, - "type": "bower-asset-library" - }, - { - "name": "composer/xdebug-handler", - "version": "1.4.2", - "source": { - "type": "git", - "url": "https://github.com/composer/xdebug-handler.git", - "reference": "fa2aaf99e2087f013a14f7432c1cd2dd7d8f1f51" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/fa2aaf99e2087f013a14f7432c1cd2dd7d8f1f51", - "reference": "fa2aaf99e2087f013a14f7432c1cd2dd7d8f1f51", - "shasum": "" - }, - "require": { - "php": "^5.3.2 || ^7.0 || ^8.0", - "psr/log": "^1.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 8" - }, - "type": "library", - "autoload": { - "psr-4": { - "Composer\\XdebugHandler\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "John Stevenson", - "email": "john-stevenson@blueyonder.co.uk" - } - ], - "description": "Restarts a process without Xdebug.", - "keywords": [ - "Xdebug", - "performance" - ], "funding": [ { - "url": "https://packagist.com", + "url": "https://symfony.com/sponsor", "type": "custom" }, { - "url": "https://github.com/composer", + "url": "https://github.com/fabpot", "type": "github" }, { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2020-06-04T11:16:35+00:00" - }, - { - "name": "felixfbecker/advanced-json-rpc", - "version": "v3.1.1", - "source": { - "type": "git", - "url": "https://github.com/felixfbecker/php-advanced-json-rpc.git", - "reference": "0ed363f8de17d284d479ec813c9ad3f6834b5c40" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/felixfbecker/php-advanced-json-rpc/zipball/0ed363f8de17d284d479ec813c9ad3f6834b5c40", - "reference": "0ed363f8de17d284d479ec813c9ad3f6834b5c40", - "shasum": "" - }, - "require": { - "netresearch/jsonmapper": "^1.0 || ^2.0", - "php": ">=7.0", - "phpdocumentor/reflection-docblock": "^4.0.0 || ^5.0.0" - }, - "require-dev": { - "phpunit/phpunit": "^6.0.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "AdvancedJsonRpc\\": "lib/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "ISC" - ], - "authors": [ - { - "name": "Felix Becker", - "email": "felix.b@outlook.com" - } - ], - "description": "A more advanced JSONRPC implementation", - "time": "2020-03-11T15:21:41+00:00" - }, - { - "name": "felixfbecker/language-server-protocol", - "version": "v1.4.0", - "source": { - "type": "git", - "url": "https://github.com/felixfbecker/php-language-server-protocol.git", - "reference": "378801f6139bb74ac215d81cca1272af61df9a9f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/felixfbecker/php-language-server-protocol/zipball/378801f6139bb74ac215d81cca1272af61df9a9f", - "reference": "378801f6139bb74ac215d81cca1272af61df9a9f", - "shasum": "" - }, - "require": { - "php": "^7.0" - }, - "require-dev": { - "phpstan/phpstan": "*", - "phpunit/phpunit": "^6.3", - "squizlabs/php_codesniffer": "^3.1" - }, - "type": "library", - "autoload": { - "psr-4": { - "LanguageServerProtocol\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "ISC" - ], - "authors": [ - { - "name": "Felix Becker", - "email": "felix.b@outlook.com" - } - ], - "description": "PHP classes for the Language Server Protocol", - "keywords": [ - "language", - "microsoft", - "php", - "server" - ], - "time": "2019-06-23T21:03:50+00:00" - }, - { - "name": "muglug/package-versions-56", - "version": "1.2.4", - "source": { - "type": "git", - "url": "https://github.com/muglug/PackageVersions.git", - "reference": "a67bed26deaaf9269a348e53063bc8d4dcc60ffd" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/muglug/PackageVersions/zipball/a67bed26deaaf9269a348e53063bc8d4dcc60ffd", - "reference": "a67bed26deaaf9269a348e53063bc8d4dcc60ffd", - "shasum": "" - }, - "require": { - "composer-plugin-api": "^1.0", - "php": "^5.6 || ^7.0" - }, - "require-dev": { - "composer/composer": "^1.3", - "ext-zip": "*", - "phpunit/phpunit": "^5.7.5" - }, - "type": "composer-plugin", - "extra": { - "class": "Muglug\\PackageVersions\\Installer", - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Muglug\\PackageVersions\\": "src/PackageVersions" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Marco Pivetta", - "email": "ocramius@gmail.com" - }, - { - "name": "Abdul Malik Ikhsan", - "email": "samsonasik@gmail.com" - }, - { - "name": "Matt Brown", - "email": "github@muglug.com" - } - ], - "description": "A backport of ocramius/package-versions that supports php ^5.6. Composer plugin that provides efficient querying for installed package versions (no runtime IO)", - "time": "2018-03-26T03:22:13+00:00" - }, - { - "name": "netresearch/jsonmapper", - "version": "v1.6.0", - "source": { - "type": "git", - "url": "https://github.com/cweiske/jsonmapper.git", - "reference": "0d4d1b48d682a93b6bfedf60b88c7750e9cb0b06" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/0d4d1b48d682a93b6bfedf60b88c7750e9cb0b06", - "reference": "0d4d1b48d682a93b6bfedf60b88c7750e9cb0b06", - "shasum": "" - }, - "require": { - "ext-json": "*", - "ext-pcre": "*", - "ext-reflection": "*", - "ext-spl": "*", - "php": ">=5.6" - }, - "require-dev": { - "phpunit/phpunit": "~4.8.35 || ~5.7 || ~6.4", - "squizlabs/php_codesniffer": "~1.5" - }, - "type": "library", - "autoload": { - "psr-0": { - "JsonMapper": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "OSL-3.0" - ], - "authors": [ - { - "name": "Christian Weiske", - "email": "cweiske@cweiske.de", - "homepage": "http://github.com/cweiske/jsonmapper/", - "role": "Developer" - } - ], - "description": "Map nested JSON structures onto PHP classes", - "time": "2019-08-15T19:41:25+00:00" - }, - { - "name": "nikic/php-parser", - "version": "v4.5.0", - "source": { - "type": "git", - "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "53c2753d756f5adb586dca79c2ec0e2654dd9463" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/53c2753d756f5adb586dca79c2ec0e2654dd9463", - "reference": "53c2753d756f5adb586dca79c2ec0e2654dd9463", - "shasum": "" - }, - "require": { - "ext-tokenizer": "*", - "php": ">=7.0" - }, - "require-dev": { - "ircmaxell/php-yacc": "0.0.5", - "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0" - }, - "bin": [ - "bin/php-parse" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.3-dev" - } - }, - "autoload": { - "psr-4": { - "PhpParser\\": "lib/PhpParser" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Nikita Popov" - } - ], - "description": "A PHP parser written in PHP", - "keywords": [ - "parser", - "php" - ], - "time": "2020-06-03T07:24:19+00:00" - }, - { - "name": "openlss/lib-array2xml", - "version": "0.5.1", - "source": { - "type": "git", - "url": "https://github.com/nullivex/lib-array2xml.git", - "reference": "c8b5998a342d7861f2e921403f44e0a2f3ef2be0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/nullivex/lib-array2xml/zipball/c8b5998a342d7861f2e921403f44e0a2f3ef2be0", - "reference": "c8b5998a342d7861f2e921403f44e0a2f3ef2be0", - "shasum": "" - }, - "require": { - "php": ">=5.3.2" - }, - "type": "library", - "autoload": { - "psr-0": { - "LSS": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "Bryan Tong", - "email": "contact@nullivex.com", - "homepage": "http://bryantong.com" - }, - { - "name": "Tony Butler", - "email": "spudz76@gmail.com", - "homepage": "http://openlss.org" - } - ], - "description": "Array2XML conversion library credit to lalit.org", - "homepage": "http://openlss.org", - "keywords": [ - "array", - "array conversion", - "xml", - "xml conversion" - ], - "time": "2016-11-10T19:10:18+00:00" - }, - { - "name": "php-cs-fixer/diff", - "version": "v1.3.0", - "source": { - "type": "git", - "url": "https://github.com/PHP-CS-Fixer/diff.git", - "reference": "78bb099e9c16361126c86ce82ec4405ebab8e756" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/78bb099e9c16361126c86ce82ec4405ebab8e756", - "reference": "78bb099e9c16361126c86ce82ec4405ebab8e756", - "shasum": "" - }, - "require": { - "php": "^5.6 || ^7.0" - }, - "require-dev": { - "phpunit/phpunit": "^5.7.23 || ^6.4.3", - "symfony/process": "^3.3" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Kore Nordmann", - "email": "mail@kore-nordmann.de" - }, - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - }, - { - "name": "SpacePossum" - } - ], - "description": "sebastian/diff v2 backport support for PHP5.6", - "homepage": "https://github.com/PHP-CS-Fixer", - "keywords": [ - "diff" - ], - "time": "2018-02-15T16:58:55+00:00" - }, - { - "name": "sabre/event", - "version": "5.1.0", - "source": { - "type": "git", - "url": "https://github.com/sabre-io/event.git", - "reference": "d00a17507af0e7544cfe17096372f5d733e3b276" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sabre-io/event/zipball/d00a17507af0e7544cfe17096372f5d733e3b276", - "reference": "d00a17507af0e7544cfe17096372f5d733e3b276", - "shasum": "" - }, - "require": { - "php": "^7.1" - }, - "require-dev": { - "friendsofphp/php-cs-fixer": "~2.16.1", - "phpunit/phpunit": "^7 || ^8" - }, - "type": "library", - "autoload": { - "psr-4": { - "Sabre\\Event\\": "lib/" - }, - "files": [ - "lib/coroutine.php", - "lib/Loop/functions.php", - "lib/Promise/functions.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Evert Pot", - "email": "me@evertpot.com", - "homepage": "http://evertpot.com/", - "role": "Developer" - } - ], - "description": "sabre/event is a library for lightweight event-based programming", - "homepage": "http://sabre.io/event/", - "keywords": [ - "EventEmitter", - "async", - "coroutine", - "eventloop", - "events", - "hooks", - "plugin", - "promise", - "reactor", - "signal" - ], - "time": "2020-01-31T18:52:29+00:00" - }, - { - "name": "sabre/uri", - "version": "2.2.0", - "source": { - "type": "git", - "url": "https://github.com/sabre-io/uri.git", - "reference": "059d11012603be2e32ddb7543602965563ddbb09" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sabre-io/uri/zipball/059d11012603be2e32ddb7543602965563ddbb09", - "reference": "059d11012603be2e32ddb7543602965563ddbb09", - "shasum": "" - }, - "require": { - "php": "^7.1" - }, - "require-dev": { - "friendsofphp/php-cs-fixer": "~2.16.1", - "phpunit/phpunit": "^7 || ^8" - }, - "type": "library", - "autoload": { - "files": [ - "lib/functions.php" - ], - "psr-4": { - "Sabre\\Uri\\": "lib/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Evert Pot", - "email": "me@evertpot.com", - "homepage": "http://evertpot.com/", - "role": "Developer" - } - ], - "description": "Functions for making sense out of URIs.", - "homepage": "http://sabre.io/uri/", - "keywords": [ - "rfc3986", - "uri", - "url" - ], - "time": "2020-01-31T18:53:43+00:00" - }, - { - "name": "scssphp/scssphp", - "version": "1.1.1", - "source": { - "type": "git", - "url": "https://github.com/scssphp/scssphp.git", - "reference": "824e4cec10b2bfa88eec5dac23991cb9106622c1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/scssphp/scssphp/zipball/824e4cec10b2bfa88eec5dac23991cb9106622c1", - "reference": "824e4cec10b2bfa88eec5dac23991cb9106622c1", - "shasum": "" - }, - "require": { - "ext-ctype": "*", - "ext-json": "*", - "php": ">=5.6.0" - }, - "require-dev": { - "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.3", - "squizlabs/php_codesniffer": "~3.5", - "twbs/bootstrap": "~4.3", - "zurb/foundation": "~6.5" - }, - "bin": [ - "bin/pscss" - ], - "type": "library", - "autoload": { - "psr-4": { - "ScssPhp\\ScssPhp\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Anthon Pang", - "email": "apang@softwaredevelopment.ca", - "homepage": "https://github.com/robocoder" - }, - { - "name": "Cédric Morin", - "email": "cedric@yterium.com", - "homepage": "https://github.com/Cerdic" - } - ], - "description": "scssphp is a compiler for SCSS written in PHP.", - "homepage": "http://scssphp.github.io/scssphp/", - "keywords": [ - "css", - "less", - "sass", - "scss", - "stylesheet" - ], - "time": "2020-06-04T17:30:40+00:00" + "time": "2020-10-24T10:57:07+00:00" }, { "name": "vimeo/psalm", @@ -3665,6 +3916,56 @@ ], "time": "2018-11-09T19:18:46+00:00" }, + { + "name": "webmozart/assert", + "version": "1.5.0", + "source": { + "type": "git", + "url": "https://github.com/webmozarts/assert.git", + "reference": "88e6d84706d09a236046d686bbea96f07b3a34f4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/webmozarts/assert/zipball/88e6d84706d09a236046d686bbea96f07b3a34f4", + "reference": "88e6d84706d09a236046d686bbea96f07b3a34f4", + "shasum": "" + }, + "require": { + "php": "^5.3.3 || ^7.0", + "symfony/polyfill-ctype": "^1.8" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.36 || ^7.5.13" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.3-dev" + } + }, + "autoload": { + "psr-4": { + "Webmozart\\Assert\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Bernhard Schussek", + "email": "bschussek@gmail.com" + } + ], + "description": "Assertions to validate method input/output with nice error messages.", + "keywords": [ + "assert", + "check", + "validate" + ], + "time": "2019-08-24T08:43:50+00:00" + }, { "name": "webmozart/glob", "version": "4.1.0", @@ -3756,6 +4057,7 @@ } ], "description": "A robust cross-platform utility for normalizing, comparing and modifying file paths.", + "abandoned": "symfony/filesystem", "time": "2015-12-17T08:42:14+00:00" } ], From fe9b12164dd35c090203e5c52cae9145a9b2620f Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Wed, 29 Dec 2021 18:57:18 +0100 Subject: [PATCH 04/39] [v2.3.3] Bump version number for release --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 276cbf9..0bee604 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.3.0 +2.3.3 From 5de396bc6725f85a4b1539dbaaa4d51ea10631e3 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 9 Jan 2022 18:16:15 -0500 Subject: [PATCH 05/39] Add Hungarian to the available languages --- src/settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/settings.php b/src/settings.php index a7d1751..2fe4e95 100644 --- a/src/settings.php +++ b/src/settings.php @@ -19,7 +19,7 @@ $settings = [ 'displayErrorDetails' => false, // set to false in production 'addContentLengthHeader' => false, // Allow the web server to send the content-length header 'i18n' => [ - 'locales' => ['en_US', 'fr_FR', 'cs_CZ', 'de_DE', 'pl_PL', 'ja_JP', 'en_GB', 'it_IT', 'fr_FR', 'et_EE', 'nl_NL', 'th_TH', 'zh_CN', 'ar', 'gd'], + 'locales' => ['en_US', 'fr_FR', 'cs_CZ', 'de_DE', 'pl_PL', 'ja_JP', 'en_GB', 'it_IT', 'fr_FR', 'et_EE', 'nl_NL', 'th_TH', 'zh_CN', 'ar', 'gd', 'hu'], 'default' => 'en_US', 'path' => __DIR__ . '/lang' ], From b344935edcc2907021dc5e5bfd1ebc79b3f870bd Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Mon, 10 Jan 2022 02:24:09 -0500 Subject: [PATCH 06/39] [v2.3.4] Bump version number for release --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 0bee604..3f684d2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.3.3 +2.3.4 From 1356001334180bab9097b9ffc11c0887c92eebcd Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sat, 22 Jan 2022 19:08:37 +0100 Subject: [PATCH 07/39] =?UTF-8?q?added=20SV=20translation=20THX=20Kristoff?= =?UTF-8?q?er=20Grundstr=C3=B6m?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lang/sv/LC_MESSAGES/strings.mo | Bin 0 -> 3130 bytes src/lang/sv/LC_MESSAGES/strings.po | 347 +++++++++++++++++++++++++++++ 2 files changed, 347 insertions(+) create mode 100644 src/lang/sv/LC_MESSAGES/strings.mo create mode 100644 src/lang/sv/LC_MESSAGES/strings.po diff --git a/src/lang/sv/LC_MESSAGES/strings.mo b/src/lang/sv/LC_MESSAGES/strings.mo new file mode 100644 index 0000000000000000000000000000000000000000..3a9a1455ef7ddd04cf8cd3ee6ba3e8bdb4385c9c GIT binary patch literal 3130 zcmZvdOKep|7{^B~KB|b~0}+$~thSWX+k5drZh`P@CD2D`A%wVKde7X`L+8$%%*?%Q zjdA0Kg~W}p!9+}8VO$xKh6T8}8(p|?qlqyrWZ{mLi3?-&|D7|pw*@Di`VeEs*TF0aDz*0ZH$7AldOFNO8Rjl7II=^5?I>^>7xd*-nto4T9uX z6@>mm1lOWlBHptI|WWNXD8v6vK?_LV?FT?uRAjRVrNcPd7xNQ&7c;cQw$KIyjB2t?q3C|rcfM9=$%G!Vtp~U(lwRmbz}LCKDVPQ za;s#HpLWu+zJiYJbKV-A9DqQyM5@HBk{ml)(mLMX=LYtb!VY#QZlszWUgC$c%$k-^ z?5L~@`s7KWlcq={1TCpd#?Rn%YBW2VT3PePF0s*6d1?9V60e!2_G=`nbG*CB%7o63 zrq+2jYE!A>v?h30-wACNbnc5|E1&NSNQ84IO-*=GGa(l}n=m|3HBB0rdaCF^b5^A_K3zn-GYtt~rw|5&Klg%98SGqQ(^A;l9EUy(^E|O>)3h}S zGh)f%+F0t}Z_cu5pC_}E3rxLZGbTxpVJ%u|QUoWgJ9Z{@sSlPgQOolb`K3(u98zkn zU_vg??T7~u+RkXriAkFXoqkvto^M<&31`=wC_-8&T|KU+QpG(*gqK(`>qIw9DN4w) zMizRC=rCO0*`86OlvyaoL5{dzz>SQK$5HUR%6m`A%vc|dyCjXH!_CA+GX~!ja*dS*1*+ucW>g7wicT{Cg2lPcdkoB9>=h{k%Ld(t9=YS|klGWuYg}}FoGz^B0C!5TDO@qf zCfe6&a$F};^I7TUZQ9bv6DRNI$cMT1vQn#5cbb6>>@ zl{YJ5-tlw_9-}VWqM)^}!(BxNu8{;c^9q-5@ghltWux#=ChZ$2+NhC5rGqA_bn`1Y zd1xMLowRVoWuex!m*+`oUg?lXijq?ECgvGDSXJjzwPHGw=n<=Qo}Fo5UsR%~b-7v= z-aNcGEFE-*|8$z6!U;C9G$(y1Yc!Nri(*<7FZWP6D, 2022 +# +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" +"PO-Revision-Date: 2018-11-16 20:30+0000\n" +"Last-Translator: Kristoffer Grundström , 2022\n" +"Language-Team: Swedish (https://www.transifex.com/Friendica/teams/12172/sv/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: sv\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 2.2\n" + +#: src\classes\Content\Pager.php:168 src\classes\Content\Pager.php:216 +msgid "Previous" +msgstr "Föregående" + +#: src\classes\Content\Pager.php:173 src\classes\Content\Pager.php:273 +msgid "Next" +msgstr "Nästa" + +#: src\classes\Content\Pager.php:211 +msgid "First" +msgstr "Första" + +#: src\classes\Content\Pager.php:278 +msgid "Last" +msgstr "Sista" + +#: src\classes\Controllers\Web\Directory.php:73 +msgid "People" +msgstr "Personer" + +#: src\classes\Controllers\Web\Search.php:64 +msgctxt "field" +msgid "Language" +msgstr "Språk" + +#: src\classes\Controllers\Web\Search.php:65 +msgctxt "field" +msgid "Locality" +msgstr "" + +#: src\classes\Controllers\Web\Search.php:66 +msgctxt "field" +msgid "Region" +msgstr "Region" + +#: src\classes\Controllers\Web\Search.php:67 +msgctxt "field" +msgid "Country" +msgstr "Land" + +#: src\classes\Controllers\Web\Servers.php:90 +msgid "Public Servers" +msgstr "Publika servrar" + +#: src\templates\layout.phtml:4 src\templates\layout.phtml:18 +msgid "Friendica Directory" +msgstr "Friendica-mapp" + +#: src\templates\layout.phtml:23 src\templates\layout.phtml:25 +#: src\templates\layout.phtml:43 src\templates\layout.phtml:45 +#: src\templates\search.phtml:4 src\templates\search.phtml:12 +msgid "Search terms" +msgstr "" + +#: src\templates\layout.phtml:24 src\templates\layout.phtml:45 +#: src\templates\search.phtml:11 +msgctxt "noun" +msgid "Search" +msgstr "Sök" + +#: src\templates\layout.phtml:27 src\templates\layout.phtml:47 +#: src\templates\search.phtml:14 +msgctxt "verb" +msgid "Search" +msgstr "Sök" + +#: src\templates\layout.phtml:33 +msgid "Toggle navigation" +msgstr "Växla navigering" + +#: src\templates\layout.phtml:55 +msgid "Directory" +msgstr "Mapp" + +#: src\templates\layout.phtml:60 +msgid "Public servers" +msgstr "Publika servrar" + +#: src\templates\search.phtml:19 +msgid "%d result for \"%s\"" +msgid_plural "%d results for \"%s\"" +msgstr[0] "%d resultat för \"%s\"" +msgstr[1] "%d resultat för \"%s\"" + +#: src\templates\servers.phtml:2 +msgid "Top servers pagination" +msgstr "" + +#: src\templates\servers.phtml:12 +msgid "Bottom servers pagination" +msgstr "" + +#: src\templates\sub\profile.phtml:5 +msgid "Filter by locality" +msgstr "" + +#: src\templates\sub\profile.phtml:11 +msgid "Filter by region" +msgstr "Filtrera efter region" + +#: src\templates\sub\profile.phtml:17 +msgid "Filter by country" +msgstr "Filtrera efter land" + +#: src\templates\sub\profile.phtml:31 +msgctxt "verb" +msgid "Follow" +msgstr "Följ" + +#: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47 +msgid "Language" +msgstr "Språk" + +#: src\templates\sub\profile.phtml:50 +msgid "Filter by language" +msgstr "Filtrera efter språk" + +#: src\templates\sub\profile.phtml:56 +msgid "Location" +msgstr "Plats" + +#: src\templates\sub\profile.phtml:69 +msgid "Search Tag" +msgstr "Söktagg" + +#: src\templates\sub\profiles.phtml:1 +msgid "Account type tabs" +msgstr "" + +#: src\templates\sub\profiles.phtml:4 src\templates\sub\profiles.phtml:7 +msgid "Top %s pagination" +msgstr "" + +#: src\templates\sub\profiles.phtml:13 src\templates\sub\profiles.phtml:16 +msgid "Bottom %s pagination" +msgstr "" + +#: src\templates\statistics.phtml:66 src\templates\sub\server.phtml:15 +msgid "Stable Version" +msgstr "Stabil version" + +#: src\templates\statistics.phtml:68 src\templates\sub\server.phtml:17 +msgid "Develop Version" +msgstr "Utvecklarversion" + +#: src\templates\sub\server.phtml:19 +msgid "Outdated Version" +msgstr "Utdaterad version" + +#: src\templates\sub\server.phtml:72 +msgid "Admin" +msgstr "Admin" + +#: src\templates\sub\server.phtml:79 +msgid "No description provided" +msgstr "Ingen beskrivning tillhandahölls" + +#: src\templates\sub\server.phtml:82 +msgid "Visit Server" +msgstr "Besök servern" + +#: src\templates\widget\popularcountries.phtml:2 +msgid "Popular Countries" +msgstr "Populära länder" + +#: src\templates\widget\popularlanguages.phtml:2 +msgid "Popular Languages" +msgstr "Populära språk" + +#: src\templates\widget\populartags.phtml:2 +msgid "Popular Tags" +msgstr "Populära taggar" + +#: src\templates\sub\server.phtml:44 src\templates\sub\server.phtml:45 +msgid "Default Language" +msgstr "Standardspråk" + +#: src\templates\sub\server.phtml:49 +msgid "Known Users" +msgstr "Kända användare" + +#: src\classes\Views\Widget\AccountTypeTabs.php:48 +msgctxt "account-type" +msgid "All" +msgstr "Alla" + +#: src\classes\Views\Widget\AccountTypeTabs.php:56 +msgctxt "account-type" +msgid "People (%d)" +msgid_plural "People (%d)" +msgstr[0] "Person (%d)" +msgstr[1] "Personer (%d)" + +#: src\classes\Views\Widget\AccountTypeTabs.php:59 +msgctxt "account-type" +msgid "Forum (%d)" +msgid_plural "Forums (%d)" +msgstr[0] "" +msgstr[1] "" + +#: src\templates\layout.phtml:97 +msgid "Stats" +msgstr "Statistik" + +#: src\templates\statistics.phtml:4 +msgid "Directory statistics" +msgstr "" + +#: src\templates\statistics.phtml:5 +msgid "Profiles" +msgstr "Profiler" + +#: src\templates\statistics.phtml:6 +msgid "" +"This directory knows about %s distinct potential profile " +"URLs." +msgstr "" + +#: src\templates\statistics.phtml:16 src\templates\statistics.phtml:46 +msgid "Languages" +msgstr "Språk" + +#: src\templates\statistics.phtml:17 +msgid "" +"Out of %s profiles reporting their language there are:" +msgstr "" + +#: src\templates\statistics.phtml:27 +msgid "Servers" +msgstr "Servrar" + +#: src\templates\statistics.phtml:28 +msgid "" +"This directory knows about %s distinct potential server " +"URLs." +msgstr "" + +#: src\templates\statistics.phtml:29 +msgid "" +"Out of those, there are %s domains (%s) that have been a " +"Friendica server at least once." +msgstr "" + +#: src\templates\statistics.phtml:33 +msgid "Out of those, there are:" +msgstr "Utav dessa så finns det:" + +#: src\templates\statistics.phtml:47 +msgid "Out of %s servers reporting their language there are:" +msgstr "" + +#: src\templates\statistics.phtml:57 +msgid "Versions" +msgstr "Versioner" + +#: src\templates\statistics.phtml:58 +msgid "Out of %s servers reporting their version there are:" +msgstr "" + +#: src\templates\statistics.phtml:7 +msgid "" +"Out of those, there are %s profiles (%s) that opted in the " +"public directory at least once." +msgstr "" + +#: src\templates\statistics.phtml:35 +msgid "%s available servers (%s)" +msgstr "%s tillgängliga servrar (%s)" + +#: src\templates\layout.phtml:91 +msgid "Friendica Directory version %s" +msgstr "" + +#: src\templates\layout.phtml:94 +msgid "Source Code on GitHub" +msgstr "Källkod på GitHub" + +#: src\templates\statistics.phtml:11 +msgid "" +"Out of those, there currently are %s available profiles " +"(%s). Check them out!" +msgstr "" + +#: src\templates\statistics.phtml:39 +msgid "" +"%s public servers (%s) currently open for registration. Check them out!" +msgstr "" + +#: src\classes\Views\Widget\AccountTypeTabs.php:57 +msgctxt "account-type" +msgid "News (%d)" +msgid_plural "News (%d)" +msgstr[0] "Nyhet (%d)" +msgstr[1] "Nyheterna (%d)" + +#: src\classes\Views\Widget\AccountTypeTabs.php:58 +msgctxt "account-type" +msgid "Organization (%d)" +msgid_plural "Organizations (%d)" +msgstr[0] "Organisation (%d)" +msgstr[1] "Organisationer (%d)" + +#: src\templates\sub\server.phtml:40 +msgid "Health Score" +msgstr "" + +#: src\templates\sub\server.phtml:52 +msgid "%s User" +msgid_plural "%s Users" +msgstr[0] "%s Användare" +msgstr[1] "%s Användare" + +#: src\templates\sub\server.phtml:54 +msgid "None" +msgstr "Ingen" + +#: src\templates\sub\server.phtml:59 src\templates\sub\server.phtml:63 +msgid "Registration Policy" +msgstr "Registreringspolicy" + +#: src\templates\sub\server.phtml:60 +msgid "By Approval" +msgstr "Genom godkännande" + +#: src\templates\sub\server.phtml:64 +msgid "Open" +msgstr "Öppna" From c34fcd11f84bfed61638a393f16dff61dac70c78 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sat, 22 Jan 2022 19:09:24 +0100 Subject: [PATCH 08/39] added Swedish to the languages array --- src/settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/settings.php b/src/settings.php index 2fe4e95..6141cdf 100644 --- a/src/settings.php +++ b/src/settings.php @@ -19,7 +19,7 @@ $settings = [ 'displayErrorDetails' => false, // set to false in production 'addContentLengthHeader' => false, // Allow the web server to send the content-length header 'i18n' => [ - 'locales' => ['en_US', 'fr_FR', 'cs_CZ', 'de_DE', 'pl_PL', 'ja_JP', 'en_GB', 'it_IT', 'fr_FR', 'et_EE', 'nl_NL', 'th_TH', 'zh_CN', 'ar', 'gd', 'hu'], + 'locales' => ['en_US', 'fr_FR', 'cs_CZ', 'de_DE', 'pl_PL', 'ja_JP', 'en_GB', 'it_IT', 'fr_FR', 'et_EE', 'nl_NL', 'th_TH', 'zh_CN', 'ar', 'gd', 'hu', 'sv'], 'default' => 'en_US', 'path' => __DIR__ . '/lang' ], From ef91f43be0c740de62b3271028e8a456092397f1 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 23 Jan 2022 06:13:16 -0500 Subject: [PATCH 09/39] [v2.3.5] Bump version number for release --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 3f684d2..cc6c9a4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.3.4 +2.3.5 From 146d4e637415c945b41cfce3b506442646cece72 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Fri, 18 Mar 2022 17:41:59 +0100 Subject: [PATCH 10/39] PL translation updated THX strebski --- src/lang/pl/LC_MESSAGES/strings.mo | Bin 5406 -> 6018 bytes src/lang/pl/LC_MESSAGES/strings.po | 77 +++++++++++++++++++++++------ 2 files changed, 62 insertions(+), 15 deletions(-) diff --git a/src/lang/pl/LC_MESSAGES/strings.mo b/src/lang/pl/LC_MESSAGES/strings.mo index f4b847ef518ba54977fa309948d97f58bb73ac26..a5c8819d42b44ccbd0a130e7d9355de81a8db0fc 100644 GIT binary patch delta 2223 zcma*nTWB0r9LMpKG`%Km(xmpHt(nHAwn=(PG}`+mO_RpjBsRT>f-;#M)5#_~%k0*$ zYjo8YU+jZSE0sch5Wxp2;zA`*L})5#Uy2XK3X0f*J{1HN5h{Lv*|Tl&MGyO*&zUo4 z=A84NGkd<}%}s?L>Z{HeN*}S3NK_i*;>T4SD4XXPvliR24xhyq3^2gcxETM&*;qH% zm?gLrS70kv<9^ir&tNSM<9uTZCZeJnCQ%Q12kY?z>qXR!U!ey04jb@Cd>DVj8f=(X z8puI@ri}vwm`>DMcH8!DdwvL)F}^u$8%C`m_HsiOd+-wO$5}j0EAGQ27I8T?E-)s< zEvSipge1dEp%(Oo^&8YgZy}E~ze>h8e^FV4v&fUIN3C!*a>;a}Zrp<`)*QkI@F=Q( z5|x=e4&dw9kJnHWXyj(uj!SVLY68z;fiNBi%{+~d;2Y@RhuDr^;u`!D7vd@o8o1TE z4Y_3ckTK0M>##M2%h^|X)Wl*oKo|a0Oa5D^G&A}M97IiIii1}4HEJ(hLv5y;sLb3! zer7St(nOk2D{4nw--gOiKQ6-rK7^C@{4A>fCyU8Hbu(oi zwJt-gv=P|`rWG}zPSj@WLG?d~-8h6h@hocP*U`fj1*ZEFl~<9m%q>jdAE>Y5c@7#V zjrwdRQT^UVx|s8*34Dqg@RGegZM}~C%rEx*4l=f>B|Yk2XriLjwx9;+Ms2zysCV@u z4&eplXDZo28hANAh;670^`h?YN2T@!Y{L=Uho`OIVk_q>c`szDU=C2x0}i25f5e^- zTLaXD()Rontl+$v(5BNh6{T63*+ghh^bmA4s|ihb7O|Jm>YpGqmd2kc+JsK2I`c1R zt25vCqns#1jf7UF@>q$xN4=sai4HQ;sscbGW zlR{Ou5xure+2U(5TM4~GeX=`<^~453WfifDXwr!-+i@e&PVg4Y9%AbO4r>VQUTq|O zCMx@h#|gcwwS?ZGiZ)Xpu`@n3yS1)4;~dTSk+Ejt&t`vL-Ia6prqfaQvO5;Xb1v5$ z@ZGWO31`R)BR@Vm_u%~gFy)(pw4W-zKlegq!(o3U$Ydio8-yumFdPfKT=D4zuT|{s z_a`#Wy5_`sbFb!lUU)K<-H^?t{i=az#7zbH(w#FM?{A4OR^M(J48m;W3}vI~_l7gc zz}dk_zG{0$#@%3SqZf|vYI8a^cXSj#uenjt#Y#?Ixs=N$!--Uo)WYsNyd9K_fvsyy2J6@m2+dMoHH8dYp*UG@cfkPf?5$8(wd$)r2#l)Dx? z8b&JO3rpq~dcueqmoiA*E!B<(ZXz5Hubi8H>t79C@P8Z1Y4%3#L+>^CrDxFa)XckK gj(1yZL%B;P94_BZHD|kJE*FQ()pBcmbIJC900Ey)d;kCd delta 1650 zcmYk+OGs2v9LMqFdrBK0X;x}YsbfA$)6_D{5+7xxMf9RT#x%3hE{sY!5fe!ewCHhr z5=fhNErKCxQ5Z_A7D2elqUcFM3pWL|u)e>UTXdLnKmU8~J@0epO!-(z=uJlaRYTfL z&LtPb8nYkE;<=D6CK%(zOIU&ru@66BI&M!ihR}3kCidVW3}PBy!Bo71bMQXuy>X;| z$V?GrQ1IFDC#qsfQncYboX>qeF2Pz%#y#l5E>y#Q)R>2z@}P4+irJK(!&bbFE%*hS z>ED#oie@y7ete4yaT~2#*o_*{6f!pR2{rR?jImJMad!;}=xNwM<`b#RYf(wGshT!zWP#K8N{u6ASP$&cpYp zer7PF;5UIPy15XV9LFNZDs*u!8c+k-LZuSCjz@3;)nO?ct%290wzLs-7IveaTga>C zG-|*XQdxiP?F|aF0(Vh+HGw%e?cD!BRdCaaW}c0DUX1Ff8MQV0kZm=cj=iV}S;#J# zlgQ7U<9EZ_nxC>_zu zNe53!|0_zGlm@J}>d5-9sn_?voZxSYBTy%6oPuiflC@MiSUSZ@jLj@1Yeq`NWG$=G z3bIyom2OCyt+rT+GaN~UTs3=-zWmE=f1%x)z5Wk1aH-q? diff --git a/src/lang/pl/LC_MESSAGES/strings.po b/src/lang/pl/LC_MESSAGES/strings.po index c1d03b7..ed4d666 100644 --- a/src/lang/pl/LC_MESSAGES/strings.po +++ b/src/lang/pl/LC_MESSAGES/strings.po @@ -2,6 +2,7 @@ # Translators: # Karol Kosek, 2018 # Waldemar Stoczkowski, 2020 +# Piotr Strębski , 2022 # msgid "" msgstr "" @@ -9,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" "PO-Revision-Date: 2018-11-16 20:30+0000\n" -"Last-Translator: Waldemar Stoczkowski, 2020\n" +"Last-Translator: Piotr Strębski , 2022\n" "Language-Team: Polish (https://www.transifex.com/Friendica/teams/12172/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -143,7 +144,7 @@ msgstr "Lokalizacja" #: src\templates\sub\profile.phtml:69 msgid "Search Tag" -msgstr "Wyszukaj tag" +msgstr "Wyszukaj znacznik" #: src\templates\sub\profiles.phtml:1 msgid "Account type tabs" @@ -169,15 +170,15 @@ msgstr "Rozwój wersji" msgid "Outdated Version" msgstr "Przestarzała wersja" -#: src\templates\sub\server.phtml:55 +#: src\templates\sub\server.phtml:72 msgid "Admin" msgstr "Admin" -#: src\templates\sub\server.phtml:62 +#: src\templates\sub\server.phtml:79 msgid "No description provided" msgstr "Nie podano opisu" -#: src\templates\sub\server.phtml:65 +#: src\templates\sub\server.phtml:82 msgid "Visit Server" msgstr "Odwiedź serwer" @@ -191,11 +192,11 @@ msgstr "Popularne języki" #: src\templates\widget\populartags.phtml:2 msgid "Popular Tags" -msgstr "Popularne tagi" +msgstr "Popularne znaczniki" #: src\templates\sub\server.phtml:44 src\templates\sub\server.phtml:45 msgid "Default Language" -msgstr "Domyślny Język" +msgstr "Domyślny język" #: src\templates\sub\server.phtml:49 msgid "Known Users" @@ -210,19 +211,19 @@ msgstr "Wszystko" msgctxt "account-type" msgid "People (%d)" msgid_plural "People (%d)" -msgstr[0] "(%d) Osoba" -msgstr[1] " (%d) Osoby" -msgstr[2] "(%d) Osób" -msgstr[3] "(%d) Osób" +msgstr[0] "Osoba (%d)" +msgstr[1] "Osoby (%d)" +msgstr[2] "Osób (%d)" +msgstr[3] "Osoby (%d)" -#: src\classes\Views\Widget\AccountTypeTabs.php:57 +#: src\classes\Views\Widget\AccountTypeTabs.php:59 msgctxt "account-type" msgid "Forum (%d)" msgid_plural "Forums (%d)" msgstr[0] "Forum (%d)" -msgstr[1] "Fora (%d)" -msgstr[2] "Forum (%d)" -msgstr[3] "Forów (%d)" +msgstr[1] "Forów (%d)" +msgstr[2] "Forów (%d)" +msgstr[3] "Fora (%d)" #: src\templates\layout.phtml:97 msgid "Stats" @@ -323,3 +324,49 @@ msgid "" msgstr "" "%s serwery publiczne (%s) obecnie otwarte do rejestracji. " "Sprawdź je!" + +#: src\classes\Views\Widget\AccountTypeTabs.php:57 +msgctxt "account-type" +msgid "News (%d)" +msgid_plural "News (%d)" +msgstr[0] "Wiadomość (%d)" +msgstr[1] "Wiadomości (%d)" +msgstr[2] "Wiadomości (%d)" +msgstr[3] "Wiadomości (%d)" + +#: src\classes\Views\Widget\AccountTypeTabs.php:58 +msgctxt "account-type" +msgid "Organization (%d)" +msgid_plural "Organizations (%d)" +msgstr[0] "Organizacja (%d)" +msgstr[1] "Organizacje (%d)" +msgstr[2] "Organizacji (%d)" +msgstr[3] "Organizacje (%d)" + +#: src\templates\sub\server.phtml:40 +msgid "Health Score" +msgstr "Ocena zdrowia" + +#: src\templates\sub\server.phtml:52 +msgid "%s User" +msgid_plural "%s Users" +msgstr[0] "%s użytkownik" +msgstr[1] "%s użytkowników" +msgstr[2] "%s użytkowników" +msgstr[3] "%s użytkownicy" + +#: src\templates\sub\server.phtml:54 +msgid "None" +msgstr "Brak" + +#: src\templates\sub\server.phtml:59 src\templates\sub\server.phtml:63 +msgid "Registration Policy" +msgstr "Polityka rejestracji" + +#: src\templates\sub\server.phtml:60 +msgid "By Approval" +msgstr "Przez zatwierdzenie" + +#: src\templates\sub\server.phtml:64 +msgid "Open" +msgstr "Otwarte" From 0344c773365de516a9f574f823ef8094618f9648 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sun, 1 May 2022 20:17:13 +0200 Subject: [PATCH 11/39] added DA DK translation THX atjn --- src/lang/da_DK/LC_MESSAGES/strings.mo | Bin 0 -> 5664 bytes src/lang/da_DK/LC_MESSAGES/strings.po | 362 ++++++++++++++++++++++++++ src/settings.php | 2 +- 3 files changed, 363 insertions(+), 1 deletion(-) create mode 100644 src/lang/da_DK/LC_MESSAGES/strings.mo create mode 100644 src/lang/da_DK/LC_MESSAGES/strings.po diff --git a/src/lang/da_DK/LC_MESSAGES/strings.mo b/src/lang/da_DK/LC_MESSAGES/strings.mo new file mode 100644 index 0000000000000000000000000000000000000000..b3aa05fbd693aa5f3f5c642be4fe72893c15148d GIT binary patch literal 5664 zcmcJS&5s;M6~GI;d}JZSaY*<`jLRl=cH^C$oefT$@vh_j@Y*YTKk)8a1|(3=bWKlt zdb)?Mo^>|jKn^)0q~s4kk*y#C7bIi^2gFJs;DR`C@Bt9wf;b>V4!|Md_xfW#)@vsM zrL{G`s_N>h_g=kv_4W^kMqX1q%akW5?gy1};F}}-@JxMJsS~gQ55jBkY3M^Az6u|P zZ^IA4gC9}qlkhS48F&(Y44#Mb{TJawum&H1F_iJ&fHKdw;UV~X&L2Vf?pILezXKnE ze}bQbZ^4hlM?RXZqalB4f*+ax6ckln$om)b_6qzI{a5n#^_&sBKz{<4;7{Rsc!0@7 z-(}c>KZKu#M@E&3;Atpwz5y|X`Y{xJewOohP~`jzWJ>jqod1EJpnU)%2@gTh?`xiWcV{4fYJne_?;4c#Jh%nFp7WOwlc>Wu9aE}FDEl!FW&Bs5*v&vWXBIvVUxaf0 zUxiP>AHc)#_fW>Y1;t+fhBD7PQ0)5vPAcyYLV5pa-hLe7M(Q|4{7v>;o<)k-t4t9+ z#MZJOM=2uj0m>XjZ1XHdWG$Yjspz~Rv9EYUKapAF7vB*3$@5Hx-mlp6Im$HUvlLY5 zJ@a|(6cjziD6)?)P(;7el;V*%CeKs`HIcIlFXVNx4WU^*Pm%qTvpPc=r<5r2h<(pe zj!7eb&cI1Zg@OsyIm$)KlN8xkvAyh4gA1hh!>lxpyE-uclQ;^!vvfGyjvqL+z-UHno7n2H<92+eoR1hB+UeE; zzrO!CUGK)R36o$)M;#NUYsbd(nZ`-{D4f(Yj&8=LF)LD@U1*wmOD9d!)=@V(I#YJe zs=0bS>V}CKuHzXxwoMRq^i>o^Dz)gxrk+IcPQRvY!V)&|>sBrKL1JQE+tI0L4D0s<#he3O zQQZmrWN?(&fOVGq*d}Tz_D$&ebw~Ht-KS5>Ht-cHtBb}7lBV9MN3l_t!sterZlzT{ zm5PdVvBqU&5QD2#^J1b_BkdYnkNuAHX)%lM8khdis5Lf9t#uO}HFV!2dRs4}8-8Fc zKGuoi#1B2$F+bLY>e7sjc4AY#-#o=8y-(8=*1B7mq#0Q=(U)>SOYKH&#}D^-J42mB zH=S*xYX&cNbbos?Ei~@~gQ0a4*3D$0_Wf4snQ`b~WlKe!#JJiIMMj;UFSqc?_qbNi z_CrGS&m-G2sCfUt?=RSUIH~xI>xkgRFU0Aq)(diu@paql={spLX4CO_ z9h+@G>PjVZHMO3_n2jtJ70uj()RlpVqSqs$(T>_MPF!zl<}0ck*|w#ThBLJhb>q50 zCfBfM`huTa?AFu<0fv}YC_po@YP0EE-8X-W<3@n25upYR=t^)1>xu3}2@%hCg5sp; ztt*#p@BB>u@AKupws*S7^N=}owtX)<9=8#vgr-;|jzWn%~H z4c`RrNak8QDr*&PRWytEo4plpArOXm<4EQuidaz_S&D)nx{=lMe*Et`7eQ&+E#;=F z>d`A{*ek7A&v#4nUC)*_Bf8huN>^}OiO{7*jzLvVPgPErDwR^@S*q1%rcO@rj7m5z zZN^S$1BWZ7s^`K42b^)u_BkiH9!|QgvlDzUJ z?dL88*}D@OOdSt&TV0F0o=LNstY%dI7So9zc)Pbk&jh|#cJORiML+lw#Xn%V2wnu&~;*0TjIEmZUg_WM-(p$a8jYljxX%OvmX<(Q{SZ?<}O1TxSE- zo5r;^OLkB+;T}#m8Ff=F^IzYUMb-nSp6-HL-Mu9p%WQYZ&23w;Po8Iu_F$6rtKC=F zLF}ZR`=&dwwq%>J(~+Eq^d@E_F=S@u37xg8_nD`+d++Bo`6lm`M|>`maOlR0+8hP? zhulBalQXZkcW=ce(U`8kLzxnq{2Np2-S38)IPOj6YVW@cJ0$tye#>wg$;UnR(`A`~ z!`AnNcVDY8`oQYG-o1U@@NY@0g$DOL{`*VzZikjwwtFjZnYcJoD<%x_E>3Wo#)#e0 zgOjH|X*)YL{r8C^I!qN4TZ%j^~oBg`-d?$5s+acdc{Fd6-z3mxh%_}53$dldZ z{EOfta7%KX&hE{@WXBJBT1c`ZIZTUxhtOx>H0m_E#1cFQjcHNLw&Z`IBIhvyiAZME z5?RVqCLTz8{=Zo>&%1lpjh5d?_DOz*f@DAaxhs06K@m&M8;b$+BuSC=5UnKB!HQYZ zG2B|+AtV*Ah8kHSW7E{87_eVo&uOyh_cXcs-8{Hm?#0$TbCI1^OS`v&Y_HXS0Z&5( A6#xJL literal 0 HcmV?d00001 diff --git a/src/lang/da_DK/LC_MESSAGES/strings.po b/src/lang/da_DK/LC_MESSAGES/strings.po new file mode 100644 index 0000000..546e0ec --- /dev/null +++ b/src/lang/da_DK/LC_MESSAGES/strings.po @@ -0,0 +1,362 @@ +# +# Translators: +# Anton , 2022 +# +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" +"PO-Revision-Date: 2018-11-16 20:30+0000\n" +"Last-Translator: Anton , 2022\n" +"Language-Team: Danish (Denmark) (https://www.transifex.com/Friendica/teams/12172/da_DK/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: da_DK\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 2.2\n" + +#: src\classes\Content\Pager.php:168 src\classes\Content\Pager.php:216 +msgid "Previous" +msgstr "Forrige" + +#: src\classes\Content\Pager.php:173 src\classes\Content\Pager.php:273 +msgid "Next" +msgstr "Næste" + +#: src\classes\Content\Pager.php:211 +msgid "First" +msgstr "Første" + +#: src\classes\Content\Pager.php:278 +msgid "Last" +msgstr "Sidste" + +#: src\classes\Controllers\Web\Directory.php:73 +msgid "People" +msgstr "Mennesker" + +#: src\classes\Controllers\Web\Search.php:64 +msgctxt "field" +msgid "Language" +msgstr "Sprog" + +#: src\classes\Controllers\Web\Search.php:65 +msgctxt "field" +msgid "Locality" +msgstr "Lokalitet" + +#: src\classes\Controllers\Web\Search.php:66 +msgctxt "field" +msgid "Region" +msgstr "Region" + +#: src\classes\Controllers\Web\Search.php:67 +msgctxt "field" +msgid "Country" +msgstr "Land" + +#: src\classes\Controllers\Web\Servers.php:90 +msgid "Public Servers" +msgstr "Offentlige servere" + +#: src\templates\layout.phtml:4 src\templates\layout.phtml:18 +msgid "Friendica Directory" +msgstr "Friendica adressebog" + +#: src\templates\layout.phtml:23 src\templates\layout.phtml:25 +#: src\templates\layout.phtml:43 src\templates\layout.phtml:45 +#: src\templates\search.phtml:4 src\templates\search.phtml:12 +msgid "Search terms" +msgstr "Søgetermer" + +#: src\templates\layout.phtml:24 src\templates\layout.phtml:45 +#: src\templates\search.phtml:11 +msgctxt "noun" +msgid "Search" +msgstr "Søg" + +#: src\templates\layout.phtml:27 src\templates\layout.phtml:47 +#: src\templates\search.phtml:14 +msgctxt "verb" +msgid "Search" +msgstr "Søg" + +#: src\templates\layout.phtml:33 +msgid "Toggle navigation" +msgstr "Skift navigation" + +#: src\templates\layout.phtml:55 +msgid "Directory" +msgstr "Adressebog" + +#: src\templates\layout.phtml:60 +msgid "Public servers" +msgstr "Offentlige servere" + +#: src\templates\search.phtml:19 +msgid "%d result for \"%s\"" +msgid_plural "%d results for \"%s\"" +msgstr[0] "%d resultat for \"%s\"" +msgstr[1] "%d resultater for \"%s\"" + +#: src\templates\servers.phtml:2 +msgid "Top servers pagination" +msgstr "Top servere sideopdeling" + +#: src\templates\servers.phtml:12 +msgid "Bottom servers pagination" +msgstr "Bundservere sideopdeling" + +#: src\templates\sub\profile.phtml:5 +msgid "Filter by locality" +msgstr "Filtrer efter lokalitet" + +#: src\templates\sub\profile.phtml:11 +msgid "Filter by region" +msgstr "Filtrer efter region" + +#: src\templates\sub\profile.phtml:17 +msgid "Filter by country" +msgstr "Filtrer efter land" + +#: src\templates\sub\profile.phtml:31 +msgctxt "verb" +msgid "Follow" +msgstr "Følg" + +#: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47 +msgid "Language" +msgstr "Sprog" + +#: src\templates\sub\profile.phtml:50 +msgid "Filter by language" +msgstr "Filtrer efter sprog" + +#: src\templates\sub\profile.phtml:56 +msgid "Location" +msgstr "Placering" + +#: src\templates\sub\profile.phtml:69 +msgid "Search Tag" +msgstr "Søgetag" + +#: src\templates\sub\profiles.phtml:1 +msgid "Account type tabs" +msgstr "Kontotypefaner" + +#: src\templates\sub\profiles.phtml:4 src\templates\sub\profiles.phtml:7 +msgid "Top %s pagination" +msgstr "Top %s sideopdeling" + +#: src\templates\sub\profiles.phtml:13 src\templates\sub\profiles.phtml:16 +msgid "Bottom %s pagination" +msgstr "Bund %s sideopdeling" + +#: src\templates\statistics.phtml:66 src\templates\sub\server.phtml:15 +msgid "Stable Version" +msgstr "Stabil version" + +#: src\templates\statistics.phtml:68 src\templates\sub\server.phtml:17 +msgid "Develop Version" +msgstr "Udviklingsversion" + +#: src\templates\sub\server.phtml:19 +msgid "Outdated Version" +msgstr "Forældet version" + +#: src\templates\sub\server.phtml:72 +msgid "Admin" +msgstr "Admin" + +#: src\templates\sub\server.phtml:79 +msgid "No description provided" +msgstr "Ingen beskrivelse givet" + +#: src\templates\sub\server.phtml:82 +msgid "Visit Server" +msgstr "Besøg server" + +#: src\templates\widget\popularcountries.phtml:2 +msgid "Popular Countries" +msgstr "Populære lande" + +#: src\templates\widget\popularlanguages.phtml:2 +msgid "Popular Languages" +msgstr "Populære sprog" + +#: src\templates\widget\populartags.phtml:2 +msgid "Popular Tags" +msgstr "Populære tags" + +#: src\templates\sub\server.phtml:44 src\templates\sub\server.phtml:45 +msgid "Default Language" +msgstr "Standard sprog" + +#: src\templates\sub\server.phtml:49 +msgid "Known Users" +msgstr "Kendte brugere" + +#: src\classes\Views\Widget\AccountTypeTabs.php:48 +msgctxt "account-type" +msgid "All" +msgstr "Alle" + +#: src\classes\Views\Widget\AccountTypeTabs.php:56 +msgctxt "account-type" +msgid "People (%d)" +msgid_plural "People (%d)" +msgstr[0] "Mennesker (%d)" +msgstr[1] "Mennesker (%d)" + +#: src\classes\Views\Widget\AccountTypeTabs.php:59 +msgctxt "account-type" +msgid "Forum (%d)" +msgid_plural "Forums (%d)" +msgstr[0] "Forummer (%d)" +msgstr[1] "Forummer (%d)" + +#: src\templates\layout.phtml:97 +msgid "Stats" +msgstr "Statistik" + +#: src\templates\statistics.phtml:4 +msgid "Directory statistics" +msgstr "Adressebog statistik" + +#: src\templates\statistics.phtml:5 +msgid "Profiles" +msgstr "Profiler" + +#: src\templates\statistics.phtml:6 +msgid "" +"This directory knows about %s distinct potential profile " +"URLs." +msgstr "" +"Denne adressebog kender til %s særskilte potentielle profil-" +"URL'er." + +#: src\templates\statistics.phtml:16 src\templates\statistics.phtml:46 +msgid "Languages" +msgstr "Sprog" + +#: src\templates\statistics.phtml:17 +msgid "" +"Out of %s profiles reporting their language there are:" +msgstr "" +"Ud af %s profiler som rapporterer deres sprog, er der:" + +#: src\templates\statistics.phtml:27 +msgid "Servers" +msgstr "Servere" + +#: src\templates\statistics.phtml:28 +msgid "" +"This directory knows about %s distinct potential server " +"URLs." +msgstr "" +"Denne adressebog kender til %s særskilte potentielle server-" +"URL'er." + +#: src\templates\statistics.phtml:29 +msgid "" +"Out of those, there are %s domains (%s) that have been a " +"Friendica server at least once." +msgstr "" +"Ud af dem er der %s domæner (%s) som har været en Friendica" +" server mindst én gang." + +#: src\templates\statistics.phtml:33 +msgid "Out of those, there are:" +msgstr "Ud af dem er der:" + +#: src\templates\statistics.phtml:47 +msgid "Out of %s servers reporting their language there are:" +msgstr "" +"Ud af %s servere som rapporterer deres sprog, er der:" + +#: src\templates\statistics.phtml:57 +msgid "Versions" +msgstr "Versioner" + +#: src\templates\statistics.phtml:58 +msgid "Out of %s servers reporting their version there are:" +msgstr "" +"Ud af %s servere som rapporterer deres version, er der:" + +#: src\templates\statistics.phtml:7 +msgid "" +"Out of those, there are %s profiles (%s) that opted in the " +"public directory at least once." +msgstr "" +"Ud af dem er der %s profiler (%s) som tilvalgte den " +"offentlige adressebog mindst én gang." + +#: src\templates\statistics.phtml:35 +msgid "%s available servers (%s)" +msgstr "%s tilgængelige servere (%s)" + +#: src\templates\layout.phtml:91 +msgid "Friendica Directory version %s" +msgstr "Friendica adressebogsversion %s" + +#: src\templates\layout.phtml:94 +msgid "Source Code on GitHub" +msgstr "Kildekode på GitHub" + +#: src\templates\statistics.phtml:11 +msgid "" +"Out of those, there currently are %s available profiles " +"(%s). Check them out!" +msgstr "" +"Ud af dem er der i øjeblikket %s tilgængelige profiler " +"(%s). Tjek dem ud!" + +#: src\templates\statistics.phtml:39 +msgid "" +"%s public servers (%s) currently open for registration. Check them out!" +msgstr "" +"%s offentlige servere (%s) åben for registrering lige nu. " +"Tjek dem ud!" + +#: src\classes\Views\Widget\AccountTypeTabs.php:57 +msgctxt "account-type" +msgid "News (%d)" +msgid_plural "News (%d)" +msgstr[0] "Nyheder (%d)" +msgstr[1] "Nyheder (%d)" + +#: src\classes\Views\Widget\AccountTypeTabs.php:58 +msgctxt "account-type" +msgid "Organization (%d)" +msgid_plural "Organizations (%d)" +msgstr[0] "Organisationer (%d)" +msgstr[1] "Organisationer (%d)" + +#: src\templates\sub\server.phtml:40 +msgid "Health Score" +msgstr "Sundhedsscore" + +#: src\templates\sub\server.phtml:52 +msgid "%s User" +msgid_plural "%s Users" +msgstr[0] "%s bruger" +msgstr[1] "%s brugere" + +#: src\templates\sub\server.phtml:54 +msgid "None" +msgstr "Ingen" + +#: src\templates\sub\server.phtml:59 src\templates\sub\server.phtml:63 +msgid "Registration Policy" +msgstr "Registreringspolitik" + +#: src\templates\sub\server.phtml:60 +msgid "By Approval" +msgstr "Ved godkendelse" + +#: src\templates\sub\server.phtml:64 +msgid "Open" +msgstr "Åben" diff --git a/src/settings.php b/src/settings.php index 6141cdf..a1dd220 100644 --- a/src/settings.php +++ b/src/settings.php @@ -19,7 +19,7 @@ $settings = [ 'displayErrorDetails' => false, // set to false in production 'addContentLengthHeader' => false, // Allow the web server to send the content-length header 'i18n' => [ - 'locales' => ['en_US', 'fr_FR', 'cs_CZ', 'de_DE', 'pl_PL', 'ja_JP', 'en_GB', 'it_IT', 'fr_FR', 'et_EE', 'nl_NL', 'th_TH', 'zh_CN', 'ar', 'gd', 'hu', 'sv'], + 'locales' => ['en_US', 'fr_FR', 'cs_CZ', 'de_DE', 'pl_PL', 'ja_JP', 'en_GB', 'it_IT', 'fr_FR', 'et_EE', 'nl_NL', 'th_TH', 'zh_CN', 'ar', 'gd', 'hu', 'sv', 'da_DK'], 'default' => 'en_US', 'path' => __DIR__ . '/lang' ], From 1ebddb042fe610110415db231ab2970251068526 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Tue, 3 May 2022 09:17:55 +0200 Subject: [PATCH 12/39] PL translation updated THX strebski --- src/lang/pl/LC_MESSAGES/strings.mo | Bin 6018 -> 6031 bytes src/lang/pl/LC_MESSAGES/strings.po | 52 ++++++++++++++--------------- 2 files changed, 25 insertions(+), 27 deletions(-) diff --git a/src/lang/pl/LC_MESSAGES/strings.mo b/src/lang/pl/LC_MESSAGES/strings.mo index a5c8819d42b44ccbd0a130e7d9355de81a8db0fc..ec9d60c90fc7b9841685496040d8cca7a146d623 100644 GIT binary patch delta 882 zcmY+>O=uHA6bJAZO+Rc9chh`WD|Iii)D}~3ro}^IM5NM41MNX8Oq!%_K6c{n#@M~A z&8Z;hVFdLic<|#SOKRd;B~R zeK|mM3{Gl9SKtzi!ELx7zK2ox8IHjpa1=&#B24K>;4B4Eu44Q$AlARA-DD<cmgOvkl_D{aclh9!)aST`-PRue|b`Lm=>BogYEmO8jn zu^lYi((A~Y>__to6Md7$_?zb#K zi)O`W$+EDdAzP-?rkpM6RB$_}l5;$vyy0&ubGw6bJB^*xHz)?WXx*tl&~ewLh?U@K8apZK#E6j3zflnP#_fl67aVRz4T}(i*74|tA7BE0f?2o=hu|K>AWb7W0!LsBo`Gur98AFi%s>MU!<8^z z)u_FHVGRoyv>qP#2oEFv4prix@F0vK=z{~H8Q72b1Uv*MpepDr?1A%8onM4`Sc2!_ zDpVi7ooEwPFv+6aWq1!F7kz^U`~{QnIvy&K1JNv6f$H2th$Hj@ssi3ZmGE7-zZtp> zG3ZAa??Kc+18ww2T^NC?wc}7F$ip}+!veeoOYk+splJF};-l~w;z_7FbP=li1*m?- zO*jdwa1K5W{R}4%PansRQLS2l>IIjfYJEA3mqIyI1vz1SxBIHc?~hh|IXd`cR@ffX zJ>O~Sb>@0L%@}vMO?hG2OwToRhgG@FDmAvh-8i@-$ugyUeJ-8s6qp$M&hfO_hY% zLKhBiG-=jlb-LoUP@PFd5il9VhGi%5rF&y27l{|$z^}0iH!XQTInzf)S1fZ&eoZFj zZgNhZOm%vh;hGKkCe=>-_d#Xhh?cyN&Sy8eE&Wu^7^8XN{yS&#dHO-bl)22<0kP!E WtC`b@t!I{L1g6bRDh16ttI==clBvxA diff --git a/src/lang/pl/LC_MESSAGES/strings.po b/src/lang/pl/LC_MESSAGES/strings.po index ed4d666..8ee2cf1 100644 --- a/src/lang/pl/LC_MESSAGES/strings.po +++ b/src/lang/pl/LC_MESSAGES/strings.po @@ -1,7 +1,5 @@ # # Translators: -# Karol Kosek, 2018 -# Waldemar Stoczkowski, 2020 # Piotr Strębski , 2022 # msgid "" @@ -21,23 +19,23 @@ msgstr "" #: src\classes\Content\Pager.php:168 src\classes\Content\Pager.php:216 msgid "Previous" -msgstr "Poprzedni" +msgstr "Poprzednia" #: src\classes\Content\Pager.php:173 src\classes\Content\Pager.php:273 msgid "Next" -msgstr "Następny" +msgstr "Następna" #: src\classes\Content\Pager.php:211 msgid "First" -msgstr "Pierwszy" +msgstr "Pierwsza" #: src\classes\Content\Pager.php:278 msgid "Last" -msgstr "Ostatni" +msgstr "Ostatnia" #: src\classes\Controllers\Web\Directory.php:73 msgid "People" -msgstr "Przyjaciele" +msgstr "Ludzie" #: src\classes\Controllers\Web\Search.php:64 msgctxt "field" @@ -71,7 +69,7 @@ msgstr "Katalog Friendica" #: src\templates\layout.phtml:43 src\templates\layout.phtml:45 #: src\templates\search.phtml:4 src\templates\search.phtml:12 msgid "Search terms" -msgstr "Wyszukiwane hasła" +msgstr "Wyszukiwanie hasła" #: src\templates\layout.phtml:24 src\templates\layout.phtml:45 #: src\templates\search.phtml:11 @@ -91,7 +89,7 @@ msgstr "Przełącz nawigację" #: src\templates\layout.phtml:55 msgid "Directory" -msgstr "Katalogi" +msgstr "Katalog" #: src\templates\layout.phtml:60 msgid "Public servers" @@ -107,15 +105,15 @@ msgstr[3] "%d wyników dla \"%s\"" #: src\templates\servers.phtml:2 msgid "Top servers pagination" -msgstr "Topowa paginacja serwerów" +msgstr "Górna paginacja serwerów" #: src\templates\servers.phtml:12 msgid "Bottom servers pagination" -msgstr "Dolny podział na serwery" +msgstr "Dolna paginacja serwerów" #: src\templates\sub\profile.phtml:5 msgid "Filter by locality" -msgstr "Filtruj według lokalizacji" +msgstr "Filtruj według położenia" #: src\templates\sub\profile.phtml:11 msgid "Filter by region" @@ -128,7 +126,7 @@ msgstr "Filtruj według kraju" #: src\templates\sub\profile.phtml:31 msgctxt "verb" msgid "Follow" -msgstr "Śledzenie" +msgstr "Obserwuj" #: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47 msgid "Language" @@ -140,7 +138,7 @@ msgstr "Filtruj według języka" #: src\templates\sub\profile.phtml:56 msgid "Location" -msgstr "Lokalizacja" +msgstr "Położenie" #: src\templates\sub\profile.phtml:69 msgid "Search Tag" @@ -148,15 +146,15 @@ msgstr "Wyszukaj znacznik" #: src\templates\sub\profiles.phtml:1 msgid "Account type tabs" -msgstr "Konta typu karty" +msgstr "Karty rodzajów kont" #: src\templates\sub\profiles.phtml:4 src\templates\sub\profiles.phtml:7 msgid "Top %s pagination" -msgstr "Górna %s paginacja" +msgstr "Górna paginacja %s" #: src\templates\sub\profiles.phtml:13 src\templates\sub\profiles.phtml:16 msgid "Bottom %s pagination" -msgstr "Dolna %s paginacja" +msgstr "Dolna paginacja %s" #: src\templates\statistics.phtml:66 src\templates\sub\server.phtml:15 msgid "Stable Version" @@ -164,7 +162,7 @@ msgstr "Wersja stabilna" #: src\templates\statistics.phtml:68 src\templates\sub\server.phtml:17 msgid "Develop Version" -msgstr "Rozwój wersji" +msgstr "Wersja rozwojowa" #: src\templates\sub\server.phtml:19 msgid "Outdated Version" @@ -172,7 +170,7 @@ msgstr "Przestarzała wersja" #: src\templates\sub\server.phtml:72 msgid "Admin" -msgstr "Admin" +msgstr "Administrator" #: src\templates\sub\server.phtml:79 msgid "No description provided" @@ -214,16 +212,16 @@ msgid_plural "People (%d)" msgstr[0] "Osoba (%d)" msgstr[1] "Osoby (%d)" msgstr[2] "Osób (%d)" -msgstr[3] "Osoby (%d)" +msgstr[3] "Osób (%d)" #: src\classes\Views\Widget\AccountTypeTabs.php:59 msgctxt "account-type" msgid "Forum (%d)" msgid_plural "Forums (%d)" msgstr[0] "Forum (%d)" -msgstr[1] "Forów (%d)" +msgstr[1] "Fora (%d)" msgstr[2] "Forów (%d)" -msgstr[3] "Fora (%d)" +msgstr[3] "Forów (%d)" #: src\templates\layout.phtml:97 msgid "Stats" @@ -242,7 +240,7 @@ msgid "" "This directory knows about %s distinct potential profile " "URLs." msgstr "" -"Ten katalog zna %s różne adresy URL potencjalnych adresów." +"Ten katalog zna %s różne adresy URL potencjalnych profilów." #: src\templates\statistics.phtml:16 src\templates\statistics.phtml:46 msgid "Languages" @@ -270,7 +268,7 @@ msgid "" "Out of those, there are %s domains (%s) that have been a " "Friendica server at least once." msgstr "" -"Spośród nich są %s domeny (%s) które były serwerem " +"Spośród nich są %s domeny (%s), które były serwerem " "Friendica co najmniej raz." #: src\templates\statistics.phtml:33 @@ -341,7 +339,7 @@ msgid_plural "Organizations (%d)" msgstr[0] "Organizacja (%d)" msgstr[1] "Organizacje (%d)" msgstr[2] "Organizacji (%d)" -msgstr[3] "Organizacje (%d)" +msgstr[3] "Organizacji (%d)" #: src\templates\sub\server.phtml:40 msgid "Health Score" @@ -353,7 +351,7 @@ msgid_plural "%s Users" msgstr[0] "%s użytkownik" msgstr[1] "%s użytkowników" msgstr[2] "%s użytkowników" -msgstr[3] "%s użytkownicy" +msgstr[3] "%s użytkowników" #: src\templates\sub\server.phtml:54 msgid "None" @@ -369,4 +367,4 @@ msgstr "Przez zatwierdzenie" #: src\templates\sub\server.phtml:64 msgid "Open" -msgstr "Otwarte" +msgstr "Otwarta" From 2aba91d42cc79e5946f8b3ec8a97f0803e27dda3 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Mon, 25 Apr 2022 21:39:38 -0400 Subject: [PATCH 13/39] Add HTML link to profile to account name - Normalize white space in HTML --- src/templates/sub/profile.phtml | 35 ++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/src/templates/sub/profile.phtml b/src/templates/sub/profile.phtml index 5a651b3..08afd46 100644 --- a/src/templates/sub/profile.phtml +++ b/src/templates/sub/profile.phtml @@ -26,12 +26,19 @@ if (!empty($profile['country'])) {
- + p__('verb', 'Follow')?> - - escapeHtml($profile['name']) ?> + + + + p__('verb', 'Follow')?> + + + + escapeHtml($profile['name']) ?> +

@@ -42,7 +49,7 @@ if (!empty($profile['country'])) {

escapeHtml($profile['pdesc']) ?>

- +
e(Friendica\Directory\Utils\L10n::localeToLanguageString($profile['language'])) ?> @@ -50,26 +57,26 @@ if (!empty($profile['country'])) {
- +
- + - - + +
- +
- + escapeHtml($tag) ?> - +
- + From cd809f7646b451efa415685e48f40af8cbd0a952 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 1 May 2022 08:32:04 -0400 Subject: [PATCH 14/39] Remove mention of non-existent console parameters in Install and UpdateDb --- src/classes/Controllers/Console/Install.php | 4 ++-- src/classes/Controllers/Console/UpdateDb.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/classes/Controllers/Console/Install.php b/src/classes/Controllers/Console/Install.php index 4de2e05..3e3fb3c 100644 --- a/src/classes/Controllers/Console/Install.php +++ b/src/classes/Controllers/Console/Install.php @@ -31,9 +31,9 @@ class Install extends \Asika\SimpleConsole\Console protected function getHelp() { $help = << [-h|--help|-?] [-v] + bin/console install [-h|--help|-?] [-v] Description Install directory diff --git a/src/classes/Controllers/Console/UpdateDb.php b/src/classes/Controllers/Console/UpdateDb.php index 0f2c32e..d3ba7a3 100644 --- a/src/classes/Controllers/Console/UpdateDb.php +++ b/src/classes/Controllers/Console/UpdateDb.php @@ -37,7 +37,7 @@ class UpdateDb extends \Asika\SimpleConsole\Console $help = << [-h|--help|-?] [-v] + bin/console updatedb [-h|--help|-?] [-v] Description Update database schema From b0142f6ab2fb262b1195aa2a10e02e95fd26ac0a Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 1 May 2022 09:28:13 -0400 Subject: [PATCH 15/39] Add optional version parameter to console updatedb --- src/classes/Controllers/Console/UpdateDb.php | 34 +++++++++++++++++--- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/src/classes/Controllers/Console/UpdateDb.php b/src/classes/Controllers/Console/UpdateDb.php index d3ba7a3..9ac7c76 100644 --- a/src/classes/Controllers/Console/UpdateDb.php +++ b/src/classes/Controllers/Console/UpdateDb.php @@ -37,12 +37,14 @@ class UpdateDb extends \Asika\SimpleConsole\Console $help = <<] [-h|--help|-?] [-v] Description Update database schema Options + Optional target version number, default is the latest version. + Do not use this parameter if you're not sure what you're doing, it will result in data loss! -h|--help|-? Show help information -v Show more debug information. HELP; @@ -56,16 +58,38 @@ HELP; return 0; } - if (count($this->args) > 1) { + if (count($this->args) > 2) { throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments'); } - $this->out('Updating database schema to latest version...'); + $currentVersion = $this->migration->getCurrentVersion()['version']; - $this->migration->up(); + $this->out('Database schema currently in version ' . $currentVersion); - $this->out('Database schema migrated to version ' . $this->migration->getCurrentVersion()['version']); + if (count($this->args) == 1) { + $this->out('Updating database schema to latest version...'); + $this->migration->up(); + $this->out('Database schema migrated to version ' . $this->migration->getCurrentVersion()['version']); + return 0; + } + $target = $this->getArgument(1); + + if ($target > $currentVersion) { + $this->out('Updating database schema to version ' . $target); + $this->migration->up($target); + $this->out('Database schema migrated up to version ' . $this->migration->getCurrentVersion()['version']); + return 0; + } + + if ($target < $currentVersion) { + $this->out('Downgrading database schema to version ' . $target); + $this->migration->down($target); + $this->out('Database schema migrated down to version ' . $this->migration->getCurrentVersion()['version']); + return 0; + } + + $this->out('Target version equal to current version, exiting.'); return 0; } } From 7d5012e72e886c24ec51789607d6e4b0d1422e7f Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 1 May 2022 09:27:57 -0400 Subject: [PATCH 16/39] [Database v0009] Add server.subscribe_url field --- src/sql/migrations/down/0008.sql | 3 +++ src/sql/migrations/up/0009.sql | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 src/sql/migrations/down/0008.sql create mode 100644 src/sql/migrations/up/0009.sql diff --git a/src/sql/migrations/down/0008.sql b/src/sql/migrations/down/0008.sql new file mode 100644 index 0000000..f69fc74 --- /dev/null +++ b/src/sql/migrations/down/0008.sql @@ -0,0 +1,3 @@ +BEGIN; +ALTER TABLE `server` DROP `subscribe_url`; +COMMIT; \ No newline at end of file diff --git a/src/sql/migrations/up/0009.sql b/src/sql/migrations/up/0009.sql new file mode 100644 index 0000000..d0cc568 --- /dev/null +++ b/src/sql/migrations/up/0009.sql @@ -0,0 +1,3 @@ +BEGIN; +ALTER TABLE `server` ADD `subscribe_url` VARCHAR(250) NULL AFTER `noscrape_url`; +COMMIT; From 8988ad9f9dd5030c0cdaa826c986b98096205a75 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 7 May 2022 16:04:12 -0400 Subject: [PATCH 17/39] Add subscribe URL retrieval to server poll --- src/classes/Pollers/Server.php | 40 ++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/src/classes/Pollers/Server.php b/src/classes/Pollers/Server.php index e6c160c..96ef29b 100644 --- a/src/classes/Pollers/Server.php +++ b/src/classes/Pollers/Server.php @@ -147,6 +147,10 @@ class Server $addons = $probe_result['data']['plugins']; } + if ($probe_result['data']['admin']['profile']) { + $subscribe = $this->getSubscribeUrl($probe_result['data']['url'], $probe_result['data']['admin']['profile']); + } + $this->atlas->perform( 'UPDATE `server` SET `available` = 1, @@ -161,6 +165,7 @@ class Server `admin_name` = :admin_name, `admin_profile` = :admin_profile, `noscrape_url` = :noscrape_url, + `subscribe_url` = :subscribe_url, `ssl_state` = :ssl_state WHERE `id` = :server_id', [ @@ -175,6 +180,7 @@ class Server 'admin_name' => $probe_result['data']['admin']['name'], 'admin_profile' => $probe_result['data']['admin']['profile'], 'noscrape_url' => $probe_result['data']['no_scrape_url'] ?? null, + 'subscribe_url' => $subscribe ?? null, 'ssl_state' => $probe_result['ssl_state'] ] ); @@ -452,4 +458,38 @@ class Server } } } + + public function getSubscribeUrl($base_url, $profile) + { + $xrdRequest = new WebRequest($base_url . '/xrd'); + $xrdRequest->addRequestHeader('Accept', 'application/jrd+json'); + $xrdJsonData = $xrdRequest->get(['uri' => $profile]); + + $this->logger->debug('WebRequest: ' . $xrdRequest->getLastFetchedUrl() . ' Status: ' . $xrdRequest->getLastStatus()); + + if ($xrdRequest->getLastStatus() != 200) { + $this->logger->info('Unsuccessful XRD request: ' . $xrdRequest->getLastFetchedUrl()); + return null; + } + + try { + $xrdData = json_decode($xrdJsonData); + } catch (\Throwable $e) { + $this->logger->notice('Invalid JSON string for XRD URL: ' . $xrdRequest->getLastFetchedUrl()); + return null; + } + + if (!isset($xrdData->links)) { + $this->logger->notice('Invalid JSON structure for XRD URL: ' . $xrdRequest->getLastFetchedUrl()); + return null; + } + + foreach ($xrdData->links as $link) { + if ($link->rel == 'http://ostatus.org/schema/1.0/subscribe') { + return $link->template ?? null; + } + } + + return null; + } } From 2627b54349951eb14b5e3c188f807587ad139ba7 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 7 May 2022 15:52:55 -0400 Subject: [PATCH 18/39] Replace dfrn_request by subscribe URL when available for the follow link - Falls back to the `/remote_follow` module available since Friendica version 2020.03 - Falls back to the profile URL - Remove unused atlas dependency in a couple API controllers --- docs/Protocol.md | 4 +++- src/classes/Controllers/Api/MatchSearch.php | 14 +++++++------- src/classes/Controllers/Api/Search.php | 14 +++++++------- src/classes/Controllers/Web/Directory.php | 21 ++++++++++++++++----- src/classes/Controllers/Web/Search.php | 15 +++++++++++++-- src/classes/Models/Profile.php | 10 ++++++++-- src/classes/Models/Server.php | 16 ++++++++++++++++ src/classes/Routes/Http/MatchSearch.php | 1 - src/classes/Routes/Http/Search.php | 1 - src/classes/Routes/Web/Directory.php | 1 + src/classes/Routes/Web/Search.php | 1 + src/templates/sub/profile.phtml | 13 ++++++++----- 12 files changed, 80 insertions(+), 31 deletions(-) diff --git a/docs/Protocol.md b/docs/Protocol.md index 35d397b..f83bf59 100644 --- a/docs/Protocol.md +++ b/docs/Protocol.md @@ -47,7 +47,9 @@ Example: "dfrn_request": "https://friendica.mrpetovan.com/dfrn_request/hypolite", "photo": "https://friendica.mrpetovan.com/photo/27330388315ae4ed2b03e3c116980490-4.jpg?ts=1541567135", "tags": "videogame gaming boardgame politics philosophy development programming php", - "last_activity": "2018-45" + "last_activity": "2018-45", + "remote_follow": "https://friendica.mrpetovan.com/remote_follow/hypolite", + "subscribe": null }, ... ] diff --git a/src/classes/Controllers/Api/MatchSearch.php b/src/classes/Controllers/Api/MatchSearch.php index 28971ae..ba97311 100644 --- a/src/classes/Controllers/Api/MatchSearch.php +++ b/src/classes/Controllers/Api/MatchSearch.php @@ -11,10 +11,6 @@ use Psr\Http\Message\ServerRequestInterface; */ class MatchSearch { - /** - * @var \Atlas\Pdo\Connection - */ - private $atlas; /** * @var \Friendica\Directory\Models\Profile */ @@ -25,12 +21,10 @@ class MatchSearch private $l10n; public function __construct( - \Atlas\Pdo\Connection $atlas, \Friendica\Directory\Models\Profile $profileModel, \Gettext\TranslatorInterface $l10n ) { - $this->atlas = $atlas; $this->profileModel = $profileModel; $this->l10n = $l10n; } @@ -53,7 +47,13 @@ class MatchSearch $values = ['query' => $query]; - $profiles = $this->profileModel->getListForDisplay($pager->getItemsPerPage(), $pager->getStart(), $sql_where, $values); + $profiles = $this->profileModel->getListForDisplay( + null, + $pager->getItemsPerPage(), + $pager->getStart(), + $sql_where, + $values, + ); $results = []; foreach ($profiles as $profile) { diff --git a/src/classes/Controllers/Api/Search.php b/src/classes/Controllers/Api/Search.php index a27fa82..ea39dd7 100644 --- a/src/classes/Controllers/Api/Search.php +++ b/src/classes/Controllers/Api/Search.php @@ -11,10 +11,6 @@ use Psr\Http\Message\ServerRequestInterface; */ class Search { - /** - * @var \Atlas\Pdo\Connection - */ - private $atlas; /** * @var \Friendica\Directory\Models\Profile */ @@ -25,12 +21,10 @@ class Search private $l10n; public function __construct( - \Atlas\Pdo\Connection $atlas, \Friendica\Directory\Models\Profile $profileModel, \Gettext\TranslatorInterface $l10n ) { - $this->atlas = $atlas; $this->profileModel = $profileModel; $this->l10n = $l10n; } @@ -64,7 +58,13 @@ AND `account_type` = :account_type'; $values['account_type'] = $account_type; } - $profiles = $this->profileModel->getListForDisplay($pager->getItemsPerPage(), $pager->getStart(), $sql_where, $values); + $profiles = $this->profileModel->getListForDisplay( + null, + $pager->getItemsPerPage(), + $pager->getStart(), + $sql_where, + $values, + ); $count = $this->profileModel->getCountForDisplay($sql_where, $values); diff --git a/src/classes/Controllers/Web/Directory.php b/src/classes/Controllers/Web/Directory.php index f4aaaec..84c5a1f 100644 --- a/src/classes/Controllers/Web/Directory.php +++ b/src/classes/Controllers/Web/Directory.php @@ -18,6 +18,10 @@ class Directory extends BaseController * @var \Atlas\Pdo\Connection */ private $atlas; + /** + * @var \Friendica\Directory\Models\Server + */ + private $serverModel; /** * @var \Friendica\Directory\Models\Profile */ @@ -37,6 +41,7 @@ class Directory extends BaseController public function __construct( \Atlas\Pdo\Connection $atlas, + \Friendica\Directory\Models\Server $serverModel, \Friendica\Directory\Models\Profile $profileModel, \Friendica\Directory\Views\Widget\AccountTypeTabs $accountTypeTabs, \Friendica\Directory\Views\PhpRenderer $renderer, @@ -44,6 +49,7 @@ class Directory extends BaseController ) { $this->atlas = $atlas; + $this->serverModel = $serverModel; $this->profileModel = $profileModel; $this->accountTypeTabs = $accountTypeTabs; $this->renderer = $renderer; @@ -58,16 +64,22 @@ class Directory extends BaseController $pager = new Pager($this->l10n, $request, 20); - $condition = ''; + $sql_where = ''; $values = []; if (!empty($args['account_type'])) { - $condition = '`account_type` = :account_type'; + $sql_where = '`account_type` = :account_type'; $values = ['account_type' => $args['account_type']]; } - $profiles = $this->profileModel->getListForDisplay($pager->getItemsPerPage(), $pager->getStart(), $condition, $values); + $profiles = $this->profileModel->getListForDisplay( + $this->serverModel->getSubscribeUrlByProfile($request->getQueryParam('zrl', '')), + $pager->getItemsPerPage(), + $pager->getStart(), + $sql_where, + $values, + ); - $count = $this->profileModel->getCountForDisplay($condition, $values); + $count = $this->profileModel->getCountForDisplay($sql_where, $values); $vars = [ 'title' => $this->l10n->gettext('People'), @@ -82,7 +94,6 @@ class Directory extends BaseController $content = $this->renderer->fetch('directory.phtml', $vars); - // Render index view return ['content' => $content]; } } diff --git a/src/classes/Controllers/Web/Search.php b/src/classes/Controllers/Web/Search.php index d70925a..fc6f5ff 100644 --- a/src/classes/Controllers/Web/Search.php +++ b/src/classes/Controllers/Web/Search.php @@ -13,6 +13,10 @@ class Search extends BaseController * @var \Atlas\Pdo\Connection */ private $atlas; + /** + * @var \Friendica\Directory\Models\Server + */ + private $serverModel; /** * @var \Friendica\Directory\Models\Profile */ @@ -32,6 +36,7 @@ class Search extends BaseController public function __construct( \Atlas\Pdo\Connection $atlas, + \Friendica\Directory\Models\Server $serverModel, \Friendica\Directory\Models\Profile $profileModel, \Friendica\Directory\Views\Widget\AccountTypeTabs $accountTypeTabs, \Friendica\Directory\Views\PhpRenderer $renderer, @@ -39,6 +44,7 @@ class Search extends BaseController ) { $this->atlas = $atlas; + $this->serverModel = $serverModel; $this->profileModel = $profileModel; $this->accountTypeTabs = $accountTypeTabs; $this->renderer = $renderer; @@ -89,7 +95,13 @@ AND `account_type` = :account_type'; $values['account_type'] = $account_type; } - $profiles = $this->profileModel->getListForDisplay($pager->getItemsPerPage(), $pager->getStart(), $sql_where, $values); + $profiles = $this->profileModel->getListForDisplay( + $this->serverModel->getSubscribeUrlByProfile($request->getQueryParam('zrl', '')), + $pager->getItemsPerPage(), + $pager->getStart(), + $sql_where, + $values, + ); $count = $this->profileModel->getCountForDisplay($sql_where, $values); @@ -106,7 +118,6 @@ AND `account_type` = :account_type'; $content = $this->renderer->fetch('search.phtml', $vars); - // Render index view return ['content' => $content, 'noNavSearch' => true]; } } diff --git a/src/classes/Models/Profile.php b/src/classes/Models/Profile.php index e8e5324..5f31792 100644 --- a/src/classes/Models/Profile.php +++ b/src/classes/Models/Profile.php @@ -74,7 +74,7 @@ class Profile extends \Friendica\Directory\Model ]; } - public function getListForDisplay(int $limit = 30, int $start = 0, string $condition = '', array $values = []): array + public function getListForDisplay(string $subscribeUrl = null, int $limit = 30, int $start = 0, string $condition = '', array $values = []): array { if ($condition) { $condition = 'AND ' . $condition; @@ -87,7 +87,7 @@ class Profile extends \Friendica\Directory\Model $stmt = 'SELECT p.`id`, p.`name`, p.`username`, p.`addr`, p.`account_type`, p.`language`, p.`pdesc`, p.`locality`, p.`region`, p.`country`, p.`profile_url`, p.`dfrn_request`, - p.`photo`, p.`tags`, p.`last_activity` + p.`photo`, p.`tags`, p.`last_activity`, s.`version` FROM `profile` p JOIN `server` s ON s.`id` = p.`server_id` AND s.`available` AND NOT s.`hidden` WHERE p.`available` @@ -98,6 +98,12 @@ class Profile extends \Friendica\Directory\Model LIMIT :start, :limit'; $profiles = $this->atlas->fetchAll($stmt, $values); + array_walk($profiles, function (array &$profile) use ($subscribeUrl) { + $profile['remote_follow'] = version_compare($profile['version'], '2020.03', '>=') ? str_replace('/profile/', '/remote_follow/', $profile['profile_url']) : null; + $profile['subscribe'] = $subscribeUrl ? str_replace('{uri}', urlencode($profile['profile_url']), $subscribeUrl): null; + unset($profile['version']); + }); + return $profiles; } diff --git a/src/classes/Models/Server.php b/src/classes/Models/Server.php index 9f1ec5c..3e89603 100644 --- a/src/classes/Models/Server.php +++ b/src/classes/Models/Server.php @@ -41,4 +41,20 @@ class Server extends \Friendica\Directory\Model 'alias' => strtolower($server_alias) ]); } + + /** + * Returns the complete subscribe URL of the given profile URL if we have it for the related server + * + * @param string $profile_url + * @return mixed|null + */ + public function getSubscribeUrlByProfile(string $profile_url) + { + if (preg_match('#^(.+)/profile/#', $profile_url, $matches)) { + $server = $this->getByUrlAlias($matches[1]); + return $server['subscribe_url'] ?? null; + } + + return null; + } } diff --git a/src/classes/Routes/Http/MatchSearch.php b/src/classes/Routes/Http/MatchSearch.php index 7590b71..1c70ba6 100644 --- a/src/classes/Routes/Http/MatchSearch.php +++ b/src/classes/Routes/Http/MatchSearch.php @@ -10,7 +10,6 @@ class MatchSearch extends BaseRoute public function __invoke(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args): \Slim\Http\Response { return (new \Friendica\Directory\Controllers\Api\MatchSearch( - $this->container->atlas, $this->container->get(\Friendica\Directory\Models\Profile::class), $this->container->l10n ))->render($request, $response, $args); diff --git a/src/classes/Routes/Http/Search.php b/src/classes/Routes/Http/Search.php index b9db49d..ba4a533 100644 --- a/src/classes/Routes/Http/Search.php +++ b/src/classes/Routes/Http/Search.php @@ -10,7 +10,6 @@ class Search extends BaseRoute public function __invoke(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args): \Slim\Http\Response { return (new \Friendica\Directory\Controllers\Api\Search( - $this->container->atlas, $this->container->get(\Friendica\Directory\Models\Profile::class), $this->container->l10n ))->render($request, $response, $args); diff --git a/src/classes/Routes/Web/Directory.php b/src/classes/Routes/Web/Directory.php index 5d70edc..f5228b2 100644 --- a/src/classes/Routes/Web/Directory.php +++ b/src/classes/Routes/Web/Directory.php @@ -13,6 +13,7 @@ class Directory extends BaseRoute $this->controller = new \Friendica\Directory\Controllers\Web\Directory( $this->container->atlas, + $this->container->get(\Friendica\Directory\Models\Server::class), $this->container->get(\Friendica\Directory\Models\Profile::class), $this->container->get(\Friendica\Directory\Views\Widget\AccountTypeTabs::class), $this->container->renderer, diff --git a/src/classes/Routes/Web/Search.php b/src/classes/Routes/Web/Search.php index d758053..324c5ba 100644 --- a/src/classes/Routes/Web/Search.php +++ b/src/classes/Routes/Web/Search.php @@ -13,6 +13,7 @@ class Search extends BaseRoute $this->controller = new \Friendica\Directory\Controllers\Web\Search( $this->container->atlas, + $this->container->get(\Friendica\Directory\Models\Server::class), $this->container->get(\Friendica\Directory\Models\Profile::class), $this->container->get(\Friendica\Directory\Views\Widget\AccountTypeTabs::class), $this->container->renderer, diff --git a/src/templates/sub/profile.phtml b/src/templates/sub/profile.phtml index 08afd46..68c67c0 100644 --- a/src/templates/sub/profile.phtml +++ b/src/templates/sub/profile.phtml @@ -26,13 +26,16 @@ if (!empty($profile['country'])) {
- - + + p__('verb', 'Follow')?> - - - + + + p__('verb', 'Follow')?> + + + p__('verb', 'Follow')?> From a5700cb2c9e26b2b6f555eeadf681d9112b8da39 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 7 May 2022 16:01:11 -0400 Subject: [PATCH 19/39] Remove references to dfrn_request --- docs/Protocol.md | 1 - src/classes/Models/Profile.php | 2 +- src/classes/Pollers/Profile.php | 10 ---------- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/docs/Protocol.md b/docs/Protocol.md index f83bf59..dcefc7f 100644 --- a/docs/Protocol.md +++ b/docs/Protocol.md @@ -44,7 +44,6 @@ Example: "region": "New York", "country": "USA", "profile_url": "https://friendica.mrpetovan.com/profile/hypolite", - "dfrn_request": "https://friendica.mrpetovan.com/dfrn_request/hypolite", "photo": "https://friendica.mrpetovan.com/photo/27330388315ae4ed2b03e3c116980490-4.jpg?ts=1541567135", "tags": "videogame gaming boardgame politics philosophy development programming php", "last_activity": "2018-45", diff --git a/src/classes/Models/Profile.php b/src/classes/Models/Profile.php index 5f31792..131a070 100644 --- a/src/classes/Models/Profile.php +++ b/src/classes/Models/Profile.php @@ -86,7 +86,7 @@ class Profile extends \Friendica\Directory\Model ]); $stmt = 'SELECT p.`id`, p.`name`, p.`username`, p.`addr`, p.`account_type`, p.`language`, - p.`pdesc`, p.`locality`, p.`region`, p.`country`, p.`profile_url`, p.`dfrn_request`, + p.`pdesc`, p.`locality`, p.`region`, p.`country`, p.`profile_url`, p.`photo`, p.`tags`, p.`last_activity`, s.`version` FROM `profile` p JOIN `server` s ON s.`id` = p.`server_id` AND s.`available` AND NOT s.`hidden` diff --git a/src/classes/Pollers/Profile.php b/src/classes/Pollers/Profile.php index 70db56e..9dd546f 100644 --- a/src/classes/Pollers/Profile.php +++ b/src/classes/Pollers/Profile.php @@ -9,7 +9,6 @@ use Friendica\Directory\Utils\Network; */ class Profile { - const PROFILE_MISSING_REQUEST = 1; const PROFILE_MISSING_CONFIRM = 2; const PROFILE_MISSING_NOTIFY = 4; const PROFILE_MISSING_POLL = 8; @@ -177,9 +176,6 @@ class Profile // This is most likely a problem with the site configuration. Ignore. if ($error = self::validateParams($params)) { $this->logger->warning('Poll aborted, parameters invalid.', ['params' => $params]); - if ($error & Profile::PROFILE_MISSING_REQUEST) { - $this->logger->notice('dfrn-request parameter is empty.'); - } if ($error & Profile::PROFILE_MISSING_CONFIRM) { $this->logger->notice('dfrn-confirm parameter is empty.'); } @@ -232,7 +228,6 @@ class Profile 'region' => $params['region'] ?? '', 'country' => $params['country-name'] ?? '', 'profile_url' => $profile_uri, - 'dfrn_request' => $params['dfrn-request'] ?? null, 'photo' => $params['photo'], 'tags' => implode(' ', $tags), 'addr' => $addr, @@ -254,7 +249,6 @@ class Profile `region` = :region, `country` = :country, `profile_url` = :profile_url, - `dfrn_request` = :dfrn_request, `photo` = :photo, `tags` = :tags, `addr` = :addr, @@ -274,7 +268,6 @@ class Profile `region` = :region, `country` = :country, `profile_url` = :profile_url, - `dfrn_request` = :dfrn_request, `photo` = :photo, `tags` = :tags, `addr` = :addr, @@ -361,9 +354,6 @@ class Profile private static function validateParams(array $params): int { $errors = 0; - if (empty($params['dfrn-request'])) { - $errors &= self::PROFILE_MISSING_REQUEST; - } if (empty($params['dfrn-confirm'])) { $errors &= self::PROFILE_MISSING_CONFIRM; } From e65bb660ce9ad3e2cac8fb21db3e23b475b5e90b Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 7 May 2022 16:02:03 -0400 Subject: [PATCH 20/39] [Database v0010] Drop unused column profile.dfrn_request --- src/sql/migrations/down/0009.sql | 3 +++ src/sql/migrations/up/0010.sql | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 src/sql/migrations/down/0009.sql create mode 100644 src/sql/migrations/up/0010.sql diff --git a/src/sql/migrations/down/0009.sql b/src/sql/migrations/down/0009.sql new file mode 100644 index 0000000..fd6ce4a --- /dev/null +++ b/src/sql/migrations/down/0009.sql @@ -0,0 +1,3 @@ +BEGIN; +ALTER TABLE `profile` ADD `dfrn_request` VARCHAR(250) DEFAULT NULL AFTER `profile_url`; +COMMIT; \ No newline at end of file diff --git a/src/sql/migrations/up/0010.sql b/src/sql/migrations/up/0010.sql new file mode 100644 index 0000000..3875c11 --- /dev/null +++ b/src/sql/migrations/up/0010.sql @@ -0,0 +1,3 @@ +BEGIN; +ALTER TABLE `profile` DROP `dfrn_request`; +COMMIT; \ No newline at end of file From df660b66c98fa5d753d3246d460c2e3a5f4b0414 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 12 May 2022 09:13:26 -0400 Subject: [PATCH 21/39] [v2.4.0] Bump version number for release --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index cc6c9a4..197c4d5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.3.5 +2.4.0 From 7fdbaa36788832925a6d03b4810a8409fe03d47e Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 12 May 2022 14:18:19 -0400 Subject: [PATCH 22/39] Don't encode the zrl parameter in external links - Fix a "Forbidden" issue with /remote_follow links --- src/classes/Views/PhpRenderer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/classes/Views/PhpRenderer.php b/src/classes/Views/PhpRenderer.php index 3df40ac..43205ad 100644 --- a/src/classes/Views/PhpRenderer.php +++ b/src/classes/Views/PhpRenderer.php @@ -206,7 +206,7 @@ class PhpRenderer extends \Slim\Views\PhpRenderer { if ($this->getAttribute('zrl')) { $uri = new \ByJG\Util\Uri($url); - $uri->withQueryKeyValue('zrl', $this->getAttribute('zrl')); + $uri->withQueryKeyValue('zrl', $this->getAttribute('zrl'), false); $url = $uri->__toString(); } From 91aa66ed77bcd82819928d23f14a1b05140fce97 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 12 May 2022 14:18:43 -0400 Subject: [PATCH 23/39] [v2.4.1] Bump version number for release --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 197c4d5..005119b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.4.0 +2.4.1 From 5829108c0ea8c4ebe0ec0a582c48f2a4a9e51913 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Mon, 6 Jun 2022 01:32:00 -0400 Subject: [PATCH 24/39] [Composer] Require guzzlehttp/guzzle:^6.5 --- composer.json | 1 + composer.lock | 577 +++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 577 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index df85fd1..90814d1 100644 --- a/composer.json +++ b/composer.json @@ -25,6 +25,7 @@ "byjg/webrequest": "^1.0", "gettext/gettext": "^4.6", "gofabian/negotiation-middleware": "^0.1.3", + "guzzlehttp/guzzle": "^6.5", "laminas/laminas-escaper": "^2.6", "masterminds/html5": "^2.3", "monolog/monolog": "^1.17", diff --git a/composer.lock b/composer.lock index 972e764..3d0b44d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "a8bc1750aa6136e10ea28799a0974f6b", + "content-hash": "0792b37056e28caaa1deb1ef92ce9002", "packages": [ { "name": "asika/simple-console", @@ -783,6 +783,303 @@ ], "time": "2017-02-22T18:45:01+00:00" }, + { + "name": "guzzlehttp/guzzle", + "version": "6.5.6", + "source": { + "type": "git", + "url": "https://github.com/guzzle/guzzle.git", + "reference": "f092dd734083473658de3ee4bef093ed77d2689c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/f092dd734083473658de3ee4bef093ed77d2689c", + "reference": "f092dd734083473658de3ee4bef093ed77d2689c", + "shasum": "" + }, + "require": { + "ext-json": "*", + "guzzlehttp/promises": "^1.0", + "guzzlehttp/psr7": "^1.6.1", + "php": ">=5.5", + "symfony/polyfill-intl-idn": "^1.17.0" + }, + "require-dev": { + "ext-curl": "*", + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0", + "psr/log": "^1.1" + }, + "suggest": { + "psr/log": "Required for using the Log middleware" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "6.5-dev" + } + }, + "autoload": { + "files": [ + "src/functions_include.php" + ], + "psr-4": { + "GuzzleHttp\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + }, + { + "name": "Jeremy Lindblom", + "email": "jeremeamia@gmail.com", + "homepage": "https://github.com/jeremeamia" + }, + { + "name": "George Mponos", + "email": "gmponos@gmail.com", + "homepage": "https://github.com/gmponos" + }, + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com", + "homepage": "https://github.com/Nyholm" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com", + "homepage": "https://github.com/sagikazarmark" + }, + { + "name": "Tobias Schultze", + "email": "webmaster@tubo-world.de", + "homepage": "https://github.com/Tobion" + } + ], + "description": "Guzzle is a PHP HTTP client library", + "homepage": "http://guzzlephp.org/", + "keywords": [ + "client", + "curl", + "framework", + "http", + "http client", + "rest", + "web service" + ], + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://github.com/Nyholm", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/guzzle", + "type": "tidelift" + } + ], + "time": "2022-05-25T13:19:12+00:00" + }, + { + "name": "guzzlehttp/promises", + "version": "1.5.1", + "source": { + "type": "git", + "url": "https://github.com/guzzle/promises.git", + "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da", + "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da", + "shasum": "" + }, + "require": { + "php": ">=5.5" + }, + "require-dev": { + "symfony/phpunit-bridge": "^4.4 || ^5.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.5-dev" + } + }, + "autoload": { + "files": [ + "src/functions_include.php" + ], + "psr-4": { + "GuzzleHttp\\Promise\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + }, + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com", + "homepage": "https://github.com/Nyholm" + }, + { + "name": "Tobias Schultze", + "email": "webmaster@tubo-world.de", + "homepage": "https://github.com/Tobion" + } + ], + "description": "Guzzle promises library", + "keywords": [ + "promise" + ], + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://github.com/Nyholm", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/promises", + "type": "tidelift" + } + ], + "time": "2021-10-22T20:56:57+00:00" + }, + { + "name": "guzzlehttp/psr7", + "version": "1.8.5", + "source": { + "type": "git", + "url": "https://github.com/guzzle/psr7.git", + "reference": "337e3ad8e5716c15f9657bd214d16cc5e69df268" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/337e3ad8e5716c15f9657bd214d16cc5e69df268", + "reference": "337e3ad8e5716c15f9657bd214d16cc5e69df268", + "shasum": "" + }, + "require": { + "php": ">=5.4.0", + "psr/http-message": "~1.0", + "ralouphie/getallheaders": "^2.0.5 || ^3.0.0" + }, + "provide": { + "psr/http-message-implementation": "1.0" + }, + "require-dev": { + "ext-zlib": "*", + "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.10" + }, + "suggest": { + "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.7-dev" + } + }, + "autoload": { + "files": [ + "src/functions_include.php" + ], + "psr-4": { + "GuzzleHttp\\Psr7\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + }, + { + "name": "George Mponos", + "email": "gmponos@gmail.com", + "homepage": "https://github.com/gmponos" + }, + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com", + "homepage": "https://github.com/Nyholm" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com", + "homepage": "https://github.com/sagikazarmark" + }, + { + "name": "Tobias Schultze", + "email": "webmaster@tubo-world.de", + "homepage": "https://github.com/Tobion" + } + ], + "description": "PSR-7 message implementation that also provides common utility methods", + "keywords": [ + "http", + "message", + "psr-7", + "request", + "response", + "stream", + "uri", + "url" + ], + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://github.com/Nyholm", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/psr7", + "type": "tidelift" + } + ], + "time": "2022-03-20T21:51:18+00:00" + }, { "name": "laminas/laminas-escaper", "version": "2.6.1", @@ -1581,6 +1878,46 @@ ], "time": "2017-10-23T01:57:42+00:00" }, + { + "name": "ralouphie/getallheaders", + "version": "3.0.3", + "source": { + "type": "git", + "url": "https://github.com/ralouphie/getallheaders.git", + "reference": "120b605dfeb996808c31b6477290a714d356e822" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822", + "reference": "120b605dfeb996808c31b6477290a714d356e822", + "shasum": "" + }, + "require": { + "php": ">=5.6" + }, + "require-dev": { + "php-coveralls/php-coveralls": "^2.1", + "phpunit/phpunit": "^5 || ^6.5" + }, + "type": "library", + "autoload": { + "files": [ + "src/getallheaders.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ralph Khattar", + "email": "ralph.khattar@gmail.com" + } + ], + "description": "A polyfill for getallheaders.", + "time": "2019-03-08T08:55:37+00:00" + }, { "name": "sarahman/simple-filesystem-cache", "version": "1.0.2", @@ -1797,6 +2134,244 @@ ], "time": "2019-11-28T17:40:33+00:00" }, + { + "name": "symfony/polyfill-intl-idn", + "version": "v1.26.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-intl-idn.git", + "reference": "59a8d271f00dd0e4c2e518104cc7963f655a1aa8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/59a8d271f00dd0e4c2e518104cc7963f655a1aa8", + "reference": "59a8d271f00dd0e4c2e518104cc7963f655a1aa8", + "shasum": "" + }, + "require": { + "php": ">=7.1", + "symfony/polyfill-intl-normalizer": "^1.10", + "symfony/polyfill-php72": "^1.10" + }, + "suggest": { + "ext-intl": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.26-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Idn\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Laurent Bassin", + "email": "laurent@bassin.info" + }, + { + "name": "Trevor Rowbotham", + "email": "trevor.rowbotham@pm.me" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for intl's idn_to_ascii and idn_to_utf8 functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "idn", + "intl", + "polyfill", + "portable", + "shim" + ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-05-24T11:49:31+00:00" + }, + { + "name": "symfony/polyfill-intl-normalizer", + "version": "v1.26.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-intl-normalizer.git", + "reference": "219aa369ceff116e673852dce47c3a41794c14bd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/219aa369ceff116e673852dce47c3a41794c14bd", + "reference": "219aa369ceff116e673852dce47c3a41794c14bd", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "suggest": { + "ext-intl": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.26-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Normalizer\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for intl's Normalizer class and related functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "intl", + "normalizer", + "polyfill", + "portable", + "shim" + ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-05-24T11:49:31+00:00" + }, + { + "name": "symfony/polyfill-php72", + "version": "v1.26.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php72.git", + "reference": "bf44a9fd41feaac72b074de600314a93e2ae78e2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/bf44a9fd41feaac72b074de600314a93e2ae78e2", + "reference": "bf44a9fd41feaac72b074de600314a93e2ae78e2", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.26-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php72\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-05-24T11:49:31+00:00" + }, { "name": "willdurand/negotiation", "version": "v2.3.1", From 0ee5bf55b14af19227c8843f900bd1dd00e08a99 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Mon, 6 Jun 2022 01:52:21 -0400 Subject: [PATCH 25/39] Replace direct curl uses with Guzzle HTTP client - Add http dependency with custom User Agent - Simplify profile poll to remove the second profile call to check availability - Remove obsolete Network::fetchURL and Network::testURL --- src/classes/Pollers/Directory.php | 38 ++------------ src/classes/Pollers/Profile.php | 31 ++++++----- src/classes/Pollers/Server.php | 85 +++++++++++++------------------ src/classes/Utils/Network.php | 50 ------------------ src/classes/Utils/Scrape.php | 10 ++-- src/dependencies.php | 14 ++++- 6 files changed, 76 insertions(+), 152 deletions(-) diff --git a/src/classes/Pollers/Directory.php b/src/classes/Pollers/Directory.php index 53c0f9e..68a9f38 100644 --- a/src/classes/Pollers/Directory.php +++ b/src/classes/Pollers/Directory.php @@ -10,9 +10,9 @@ use Friendica\Directory\Utils\Network; class Directory { /** - * @var \Atlas\Pdo\Connection + * @var \GuzzleHttp\ClientInterface */ - private $atlas; + private $http; /** * @var \Friendica\Directory\Models\ProfilePollQueue */ @@ -30,12 +30,12 @@ class Directory ]; public function __construct( - \Atlas\Pdo\Connection $atlas, + \GuzzleHttp\ClientInterface $http, \Friendica\Directory\Models\ProfilePollQueue $profilePollQueueModel, \Psr\Log\LoggerInterface $logger, array $settings) { - $this->atlas = $atlas; + $this->http = $http; $this->profilePollQueueModel = $profilePollQueueModel; $this->logger = $logger; $this->settings = array_merge($this->settings, $settings); @@ -82,35 +82,7 @@ class Directory $path = '/sync/pull/since/' . $last_polled; } - //Prepare the CURL call. - $handle = curl_init(); - $options = array( - //Timeouts - CURLOPT_TIMEOUT => max($this->settings['probe_timeout'], 1), //Minimum of 1 second timeout. - CURLOPT_CONNECTTIMEOUT => 1, - //Redirecting - CURLOPT_FOLLOWLOCATION => true, - CURLOPT_MAXREDIRS => 8, - //SSL - CURLOPT_SSL_VERIFYPEER => true, - // CURLOPT_VERBOSE => true, - // CURLOPT_CERTINFO => true, - CURLOPT_SSL_VERIFYHOST => 2, - CURLOPT_PROTOCOLS => CURLPROTO_HTTP | CURLPROTO_HTTPS, - //Basic request - CURLOPT_USERAGENT => Network::USER_AGENT, - CURLOPT_RETURNTRANSFER => true, - CURLOPT_URL => $directory_url . $path - ); - curl_setopt_array($handle, $options); - - $this->logger->info('Pulling profiles from directory URL: ' . $directory_url . $path); - - //Probe the site. - $pull_data = curl_exec($handle); - - //Done with CURL now. - curl_close($handle); + $pull_data = $this->http->get($directory_url . $path, ['timeout' => max($this->settings['probe_timeout'], 1)])->getBody()->getContents(); $data = json_decode($pull_data, true); diff --git a/src/classes/Pollers/Profile.php b/src/classes/Pollers/Profile.php index 9dd546f..f9d66ef 100644 --- a/src/classes/Pollers/Profile.php +++ b/src/classes/Pollers/Profile.php @@ -18,6 +18,11 @@ class Profile */ private $atlas; + /** + * @var \GuzzleHttp\ClientInterface + */ + private $http; + /** * @var \Friendica\Directory\Models\Server */ @@ -43,6 +48,7 @@ class Profile public function __construct( \Atlas\Pdo\Connection $atlas, + \GuzzleHttp\ClientInterface $http, \Friendica\Directory\Models\Server $serverModel, \Friendica\Directory\Models\Profile $profileModel, \Psr\Log\LoggerInterface $logger, @@ -50,6 +56,7 @@ class Profile ) { $this->atlas = $atlas; + $this->http = $http; $this->serverModel = $serverModel; $this->profileModel = $profileModel; $this->logger = $logger; @@ -122,25 +129,23 @@ class Profile ); } - //Skip the profile scrape? - $noscrape = $server['noscrape_url']; + $available = false; $params = []; - if ($noscrape) { + + //Skip the profile scrape? + if ($server['noscrape_url']) { $this->logger->debug('Calling ' . $server['noscrape_url'] . '/' . $username); - $params = \Friendica\Directory\Utils\Scrape::retrieveNoScrapeData($server['noscrape_url'] . '/' . $username); - $noscrape = !!$params; //If the result was false, do a scrape after all. + $params = \Friendica\Directory\Utils\Scrape::retrieveNoScrapeData($this->http, $server['noscrape_url'] . '/' . $username); + $available = !!$params; //If the result was false, do a scrape after all. } - $available = true; - - if ($noscrape) { - $available = Network::testURL($profile_uri); - $this->logger->debug('Testing ' . $profile_uri . ': ' . ($available?'Success':'Failure')); - } else { + if (!$available) { $this->logger->notice('Parsing profile page ' . $profile_uri); - $params = \Friendica\Directory\Utils\Scrape::retrieveProfileData($profile_uri); + $params = \Friendica\Directory\Utils\Scrape::retrieveProfileData($this->http, $profile_uri); $params['language'] = $server['language']; + + $available = !empty($params['fn']); } // Empty result is due to an offline site. @@ -301,7 +306,7 @@ class Profile $status = false; if ($profile_id) { - $img_str = \Friendica\Directory\Utils\Network::fetchURL($params['photo'], true); + $img_str = $this->http->get($params['photo'])->getBody()->getContents(); $img = new \Friendica\Directory\Utils\Photo($img_str); if ($img->getImage()) { $img->scaleImageSquare(80); diff --git a/src/classes/Pollers/Server.php b/src/classes/Pollers/Server.php index 96ef29b..3be6131 100644 --- a/src/classes/Pollers/Server.php +++ b/src/classes/Pollers/Server.php @@ -3,7 +3,8 @@ namespace Friendica\Directory\Pollers; use ByJG\Util\WebRequest; -use Friendica\Directory\Utils\Network; +use GuzzleHttp\Exception\RequestException; +use GuzzleHttp\TransferStats; /** * @author Hypolite Petovan @@ -14,6 +15,10 @@ class Server * @var \Atlas\Pdo\Connection */ private $atlas; + /** + * @var \GuzzleHttp\ClientInterface + */ + private $http; /** * @var \Friendica\Directory\Models\ProfilePollQueue */ @@ -41,6 +46,7 @@ class Server public function __construct( \Atlas\Pdo\Connection $atlas, + \GuzzleHttp\ClientInterface $http, \Friendica\Directory\Models\ProfilePollQueue $profilePollQueueModel, \Friendica\Directory\Models\Server $serverModel, \Psr\SimpleCache\CacheInterface $simplecache, @@ -48,6 +54,7 @@ class Server array $settings) { $this->atlas = $atlas; + $this->http = $http; $this->profilePollQueueModel = $profilePollQueueModel; $this->serverModel = $serverModel; $this->simplecache = $simplecache; @@ -247,65 +254,41 @@ class Server private function getProbeResult(string $base_url): array { - //Prepare the CURL call. - $handle = curl_init(); - $options = array( - //Timeouts - CURLOPT_TIMEOUT => max($this->settings['probe_timeout'], 1), //Minimum of 1 second timeout. - CURLOPT_CONNECTTIMEOUT => 1, - //Redirecting - CURLOPT_FOLLOWLOCATION => true, - CURLOPT_MAXREDIRS => 8, - //SSL - CURLOPT_SSL_VERIFYPEER => true, - // CURLOPT_VERBOSE => true, - // CURLOPT_CERTINFO => true, - CURLOPT_SSL_VERIFYHOST => 2, - CURLOPT_PROTOCOLS => CURLPROTO_HTTP | CURLPROTO_HTTPS, - //Basic request - CURLOPT_USERAGENT => Network::USER_AGENT, - CURLOPT_RETURNTRANSFER => true, - CURLOPT_URL => $base_url . '/friendica/json' - ); - curl_setopt_array($handle, $options); + $curl_info = null; - //Probe the site. - $probe_start = microtime(true); - $probe_data = curl_exec($handle); - $probe_end = microtime(true); + $options = [ + 'timeout' => max($this->settings['probe_timeout'], 1), + 'on_stats' => function (TransferStats $transferStats) use (&$curl_info) { + $curl_info = $transferStats->getHandlerStats(); + } + ]; - //Check for SSL problems. - $curl_statuscode = curl_errno($handle); - $sslcert_issues = in_array($curl_statuscode, array( - 60, //Could not authenticate certificate with known CA's - 83 //Issuer check failed - )); + $sslcert_issues = false; - //When it's the certificate that doesn't work. - if ($sslcert_issues) { - //Probe again, without strict SSL. - $options[CURLOPT_SSL_VERIFYPEER] = false; - - //Replace the handle. - curl_close($handle); - $handle = curl_init(); - curl_setopt_array($handle, $options); - - //Probe. + try { + //Probe the site. $probe_start = microtime(true); - $probe_data = curl_exec($handle); + $probe_data = $this->http->get($base_url . '/friendica/json', $options)->getBody()->getContents(); $probe_end = microtime(true); + } catch (RequestException $e) { + if (!in_array($e->getHandlerContext()['errno'], [ + 60, //Could not authenticate certificate with known CA's + 83 //Issuer check failed + ])) { + throw $e; + } - //Store new status. - $curl_statuscode = curl_errno($handle); + $sslcert_issues = true; + + //When it's the certificate that doesn't work, we probe again without strict SSL. + $options['verify'] = false; + + $probe_start = microtime(true); + $probe_data = $this->http->get($base_url . '/friendica/json', $options)->getBody()->getContents(); + $probe_end = microtime(true); } - //Gather more meta. $time = round(($probe_end - $probe_start) * 1000); - $curl_info = curl_getinfo($handle); - - //Done with CURL now. - curl_close($handle); try { $data = json_decode($probe_data, true); diff --git a/src/classes/Utils/Network.php b/src/classes/Utils/Network.php index 14b0c13..1542fc8 100644 --- a/src/classes/Utils/Network.php +++ b/src/classes/Utils/Network.php @@ -15,56 +15,6 @@ namespace Friendica\Directory\Utils; */ class Network { - const USER_AGENT = 'friendica-directory-probe-1.0'; - - public static function fetchURL(string $url, bool $binary = false, int $timeout = 20): string - { - $ch = curl_init($url); - if (!$ch) { - return false; - } - - curl_setopt($ch, CURLOPT_HEADER, 0); - curl_setopt($ch, CURLOPT_TIMEOUT, max($timeout, 1)); //Minimum of 1 second timeout. - curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); - curl_setopt($ch, CURLOPT_MAXREDIRS, 8); - curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); - curl_setopt($ch, CURLOPT_USERAGENT, self::USER_AGENT); - if ($binary) { - curl_setopt($ch, CURLOPT_BINARYTRANSFER, 1); - } - curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); - $s = curl_exec($ch); - curl_close($ch); - return $s; - } - - public static function testURL(string $url, int $timeout = 20): bool - { - $ch = curl_init($url); - if (!$ch) { - return false; - } - - curl_setopt($ch, CURLOPT_HEADER , 0); - curl_setopt($ch, CURLOPT_TIMEOUT , max($timeout, 1)); //Minimum of 1 second timeout. - curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); - curl_setopt($ch, CURLOPT_MAXREDIRS , 8); - curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true); - curl_setopt($ch, CURLOPT_NOBODY , true); - curl_setopt($ch, CURLOPT_USERAGENT , self::USER_AGENT); - - curl_exec($ch); - - $responseCode = intval(curl_getinfo($ch, CURLINFO_RESPONSE_CODE)); - - $testSuccess = curl_errno($ch) === 0 && $responseCode < 400; - - curl_close($ch); - - return $testSuccess; - } - /** * Check if a hostname is public and non-reserved * diff --git a/src/classes/Utils/Scrape.php b/src/classes/Utils/Scrape.php index 2189b58..f9f31ac 100644 --- a/src/classes/Utils/Scrape.php +++ b/src/classes/Utils/Scrape.php @@ -2,6 +2,8 @@ namespace Friendica\Directory\Utils; +use GuzzleHttp\ClientInterface; + /** * @author Hypolite Petovan */ @@ -12,10 +14,10 @@ class Scrape * @param string $url * @return array|false */ - public static function retrieveNoScrapeData(string $url) + public static function retrieveNoScrapeData(ClientInterface $http, string $url) { $submit_noscrape_start = microtime(true); - $data = Network::fetchURL($url); + $data = $http->get($url)->getBody()->getContents(); $submit_noscrape_request_end = microtime(true); if (empty($data)) { @@ -42,7 +44,7 @@ class Scrape return $params; } - public static function retrieveProfileData(string $url, int $max_nodes = 3500): array + public static function retrieveProfileData(ClientInterface $http, string $url, int $max_nodes = 3500): array { $minNodes = 100; //Lets do at least 100 nodes per type. @@ -56,7 +58,7 @@ class Scrape $scrape_start = microtime(true); $params = []; - $html = Network::fetchURL($url, false, $timeout); + $html = $http->get($url, ['timeout' => $timeout])->getBody()->getContents();; $scrape_fetch_end = microtime(true); diff --git a/src/dependencies.php b/src/dependencies.php index 162ace8..ec6c5a0 100644 --- a/src/dependencies.php +++ b/src/dependencies.php @@ -89,6 +89,16 @@ $container['migration'] = function (ContainerInterface $c): ByJG\DbMigration\Mig return $migration; }; +$container['http'] = function (ContainerInterface $c): GuzzleHttp\ClientInterface { + $version = file_get_contents(__DIR__ . '/../VERSION'); + + if (!$version || !preg_match('/^\s*\d\.\d\.\d\s*$/', $version)) { + $version = '0.0.0'; + } + + return new GuzzleHttp\Client(['timeout' => 20, 'headers' => ['User-Agent' => 'FriendicaDirectory/' . trim($version) . ' ' . \GuzzleHttp\default_user_agent()]]); +}; + // Internal Dependency Injection $container[\Friendica\Directory\Models\Profile::class] = function (ContainerInterface $c): Friendica\Directory\Models\Profile { @@ -106,7 +116,7 @@ $container[\Friendica\Directory\Models\Server::class] = function (ContainerInter $container[\Friendica\Directory\Pollers\Directory::class] = function (ContainerInterface $c): Friendica\Directory\Pollers\Directory { $settings = $c->get('settings')['poller']; return new Friendica\Directory\Pollers\Directory( - $c->get('atlas'), + $c->get('http'), $c->get(\Friendica\Directory\Models\ProfilePollQueue::class), $c->get('logger'), $settings ?: [] @@ -117,6 +127,7 @@ $container[\Friendica\Directory\Pollers\Profile::class] = function (ContainerInt $settings = $c->get('settings')['poller']; return new Friendica\Directory\Pollers\Profile( $c->get('atlas'), + $c->get('http'), $c->get(\Friendica\Directory\Models\Server::class), $c->get(\Friendica\Directory\Models\Profile::class), $c->get('logger'), @@ -128,6 +139,7 @@ $container[\Friendica\Directory\Pollers\Server::class] = function (ContainerInte $settings = $c->get('settings')['poller']; return new Friendica\Directory\Pollers\Server( $c->get('atlas'), + $c->get('http'), $c->get(\Friendica\Directory\Models\ProfilePollQueue::class), $c->get(\Friendica\Directory\Models\Server::class), $c->get('simplecache'), From 9ff681a460b70a80f16d636793a6d64d3dd19916 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Mon, 6 Jun 2022 01:52:47 -0400 Subject: [PATCH 26/39] Fix database error with false bolean value in profile table --- src/classes/Pollers/Profile.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/classes/Pollers/Profile.php b/src/classes/Pollers/Profile.php index f9d66ef..b07bbd2 100644 --- a/src/classes/Pollers/Profile.php +++ b/src/classes/Pollers/Profile.php @@ -240,7 +240,7 @@ class Profile 'language' => $params['language'] ?? null, 'filled_fields'=> $filled_fields, 'last_activity'=> $params['last-activity'] ?? null, - 'available' => $available, + 'available' => [$available, \PDO::PARAM_BOOL], ]; $this->logger->debug(var_export($values, true)); From d1a72232b359696c2422b2305b8605f7acf0b29d Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Mon, 6 Jun 2022 02:21:31 -0400 Subject: [PATCH 27/39] Replace ByJG\WebRequest by GuzzleHttp\ClientInterface --- src/classes/Pollers/Server.php | 37 +++++++++++++++++----------------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/src/classes/Pollers/Server.php b/src/classes/Pollers/Server.php index 3be6131..6da2a89 100644 --- a/src/classes/Pollers/Server.php +++ b/src/classes/Pollers/Server.php @@ -2,7 +2,7 @@ namespace Friendica\Directory\Pollers; -use ByJG\Util\WebRequest; +use GuzzleHttp\Psr7\Uri; use GuzzleHttp\Exception\RequestException; use GuzzleHttp\TransferStats; @@ -402,27 +402,26 @@ class Server function discoverPoco($base_url): void { - $pocoUrl = $base_url . '/poco'; + $uri = Uri::withQueryValues(new Uri($base_url . '/poco'), ['fields' => 'urls', 'count' => 1000]); - $webrequest = new WebRequest($pocoUrl); - $pocoJsonData = $webrequest->get(['fields' => 'urls', 'count' => 1000]); + $response = $this->http->request('GET', $uri); - $this->logger->debug('WebRequest: ' . $webrequest->getLastFetchedUrl() . ' Status: ' . $webrequest->getLastStatus()); + $this->logger->debug('WebRequest: ' . $uri . ' Status: ' . $response->getStatusCode()); - if ($webrequest->getLastStatus() != 200) { - $this->logger->info('Unsuccessful poco request: ' . $webrequest->getLastFetchedUrl()); + if ($response->getStatusCode() != 200) { + $this->logger->info('Unsuccessful poco request: ' . $uri); return; } try { - $pocoFetchData = json_decode($pocoJsonData); + $pocoFetchData = json_decode($response->getBody()->getContents()); } catch (\Throwable $e) { - $this->logger->notice('Invalid JSON string for PoCo URL: ' . $webrequest->getLastFetchedUrl()); + $this->logger->notice('Invalid JSON string for PoCo URL: ' . $uri); return; } if (!isset($pocoFetchData->entry)) { - $this->logger->notice('Invalid JSON structure for PoCo URL: ' . $webrequest->getLastFetchedUrl()); + $this->logger->notice('Invalid JSON structure for PoCo URL: ' . $uri); return; } @@ -444,26 +443,28 @@ class Server public function getSubscribeUrl($base_url, $profile) { - $xrdRequest = new WebRequest($base_url . '/xrd'); - $xrdRequest->addRequestHeader('Accept', 'application/jrd+json'); - $xrdJsonData = $xrdRequest->get(['uri' => $profile]); + $uri = Uri::withQueryValues(new Uri($base_url . '/xrd'), ['uri' => $profile]); - $this->logger->debug('WebRequest: ' . $xrdRequest->getLastFetchedUrl() . ' Status: ' . $xrdRequest->getLastStatus()); + $response = $this->http->request('GET', $uri, ['headers' => ['Accept' => 'application/jrd+json']]); - if ($xrdRequest->getLastStatus() != 200) { - $this->logger->info('Unsuccessful XRD request: ' . $xrdRequest->getLastFetchedUrl()); + $xrdJsonData = $response->getBody()->getContents(); + + $this->logger->debug('WebRequest: ' . $uri . ' Status: ' . $response->getStatusCode()); + + if ($response->getStatusCode() != 200) { + $this->logger->info('Unsuccessful XRD request: ' . $uri); return null; } try { $xrdData = json_decode($xrdJsonData); } catch (\Throwable $e) { - $this->logger->notice('Invalid JSON string for XRD URL: ' . $xrdRequest->getLastFetchedUrl()); + $this->logger->notice('Invalid JSON string for XRD URL: ' . $uri); return null; } if (!isset($xrdData->links)) { - $this->logger->notice('Invalid JSON structure for XRD URL: ' . $xrdRequest->getLastFetchedUrl()); + $this->logger->notice('Invalid JSON structure for XRD URL: ' . $uri); return null; } From 30f6e6f5de2533d74964691e0b074a5f9713b759 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Mon, 6 Jun 2022 02:23:57 -0400 Subject: [PATCH 28/39] [Composer] Remove unused dependency byjg/webrequest --- composer.json | 1 - composer.lock | 66 ++++++++++----------------------------------------- 2 files changed, 13 insertions(+), 54 deletions(-) diff --git a/composer.json b/composer.json index 90814d1..25f2f80 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,6 @@ "boronczyk/localization-middleware": "^1.4", "byjg/migration": "^4.0", "byjg/uri": "^1.0.4", - "byjg/webrequest": "^1.0", "gettext/gettext": "^4.6", "gofabian/negotiation-middleware": "^0.1.3", "guzzlehttp/guzzle": "^6.5", diff --git a/composer.lock b/composer.lock index 3d0b44d..f98ae44 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "0792b37056e28caaa1deb1ef92ce9002", + "content-hash": "8966ff83bb5be2c08214c3982105c898", "packages": [ { "name": "asika/simple-console", @@ -447,46 +447,6 @@ "description": "An implementation of PSR UriInterface ", "time": "2018-03-09T01:56:58+00:00" }, - { - "name": "byjg/webrequest", - "version": "1.0.7", - "source": { - "type": "git", - "url": "https://github.com/byjg/webrequest.git", - "reference": "a307e4e21525c9dc0f116b5cf8657318ef2a44e8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/byjg/webrequest/zipball/a307e4e21525c9dc0f116b5cf8657318ef2a44e8", - "reference": "a307e4e21525c9dc0f116b5cf8657318ef2a44e8", - "shasum": "" - }, - "require": { - "ext-curl": "*", - "php": ">=5.4.0" - }, - "require-dev": { - "phpunit/phpunit": ">5.7" - }, - "type": "library", - "autoload": { - "psr-4": { - "ByJG\\Util\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "João Gilberto Magalhães", - "email": "joao@byjg.com.br" - } - ], - "description": "A lightweight and highly customized CURL wrapper for making RESt calls and a wrapper for call dynamically SOAP requests.", - "time": "2018-03-09T02:53:33+00:00" - }, { "name": "byjg/xmlutil", "version": "1.0.6", @@ -2742,12 +2702,12 @@ }, "type": "library", "autoload": { - "psr-4": { - "DeepCopy\\": "src/DeepCopy/" - }, "files": [ "src/DeepCopy/deep_copy.php" - ] + ], + "psr-4": { + "DeepCopy\\": "src/DeepCopy/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3594,14 +3554,14 @@ }, "type": "library", "autoload": { - "psr-4": { - "Sabre\\Event\\": "lib/" - }, "files": [ "lib/coroutine.php", "lib/Loop/functions.php", "lib/Promise/functions.php" - ] + ], + "psr-4": { + "Sabre\\Event\\": "lib/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -4303,12 +4263,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Ctype\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Ctype\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ From f854d7d5f7d20ce2192c0c6f3f4bf78570d6c2dc Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 12 Mar 2023 17:49:44 -0400 Subject: [PATCH 29/39] Fix several PHP messages - Add logging for exceptions --- src/classes/Controllers/Web/Servers.php | 4 +- src/classes/Pollers/Profile.php | 57 ++++++++++++++++--------- src/classes/Pollers/Server.php | 55 ++++++++++++++---------- 3 files changed, 72 insertions(+), 44 deletions(-) diff --git a/src/classes/Controllers/Web/Servers.php b/src/classes/Controllers/Web/Servers.php index a4c1d78..580edb9 100644 --- a/src/classes/Controllers/Web/Servers.php +++ b/src/classes/Controllers/Web/Servers.php @@ -66,7 +66,7 @@ class Servers extends BaseController $sql_where = ''; $values = []; - if ($args['language']) { + if (!empty($args['language'])) { $sql_where .= ' AND LEFT(`language`, 2) = LEFT(:language, 2)'; $values['language'] = $args['language']; @@ -104,7 +104,7 @@ AND NOT `hidden` $vars = [ 'title' => $this->l10n->gettext('Public Servers'), 'total' => $count, - 'language' => $args['language'], + 'language' => $args['language'] ?? null, 'servers' => $servers, 'pager' => $pager->renderFull($count), 'stable_version' => $stable_version, diff --git a/src/classes/Pollers/Profile.php b/src/classes/Pollers/Profile.php index b07bbd2..aa3c3dc 100644 --- a/src/classes/Pollers/Profile.php +++ b/src/classes/Pollers/Profile.php @@ -2,7 +2,7 @@ namespace Friendica\Directory\Pollers; -use Friendica\Directory\Utils\Network; +use GuzzleHttp\Exception\RequestException; /** * @author Hypolite Petovan @@ -136,13 +136,28 @@ class Profile //Skip the profile scrape? if ($server['noscrape_url']) { $this->logger->debug('Calling ' . $server['noscrape_url'] . '/' . $username); - $params = \Friendica\Directory\Utils\Scrape::retrieveNoScrapeData($this->http, $server['noscrape_url'] . '/' . $username); + try { + $params = \Friendica\Directory\Utils\Scrape::retrieveNoScrapeData($this->http, $server['noscrape_url'] . '/' . $username); + } catch (RequestException $e) { + $this->logger->info('Request failed with error code ' . $e->getCode()); + } catch (\Throwable $e) { + $this->logger->warning('Request failed with exception ' . get_class($e)); + $this->logger->warning(var_export($e, true)); + } + $available = !!$params; //If the result was false, do a scrape after all. } if (!$available) { - $this->logger->notice('Parsing profile page ' . $profile_uri); - $params = \Friendica\Directory\Utils\Scrape::retrieveProfileData($this->http, $profile_uri); + $this->logger->info('Parsing profile page ' . $profile_uri); + try { + $params = \Friendica\Directory\Utils\Scrape::retrieveProfileData($this->http, $profile_uri); + } catch (RequestException $e) { + $this->logger->info('Request failed with error code ' . $e->getCode()); + } catch (\Throwable $e) { + $this->logger->warning('Request failed with exception ' . get_class($e)); + $this->logger->warning(var_export($e, true)); + } $params['language'] = $server['language']; $available = !empty($params['fn']); @@ -306,23 +321,27 @@ class Profile $status = false; if ($profile_id) { - $img_str = $this->http->get($params['photo'])->getBody()->getContents(); - $img = new \Friendica\Directory\Utils\Photo($img_str); - if ($img->getImage()) { - $img->scaleImageSquare(80); + try { + $img_str = $this->http->get($params['photo'])->getBody()->getContents(); + $img = new \Friendica\Directory\Utils\Photo($img_str); + if ($img->getImage()) { + $img->scaleImageSquare(80); - $this->atlas->perform('INSERT INTO `photo` SET - `profile_id` = :profile_id, - `data` = :data - ON DUPLICATE KEY UPDATE - `data` = :data', - [ - 'profile_id' => $profile_id, - 'data' => $img->imageString() - ] - ); + $this->atlas->perform('INSERT INTO `photo` SET + `profile_id` = :profile_id, + `data` = :data + ON DUPLICATE KEY UPDATE + `data` = :data', + [ + 'profile_id' => $profile_id, + 'data' => $img->imageString() + ] + ); + } + $status = true; + } catch (RequestException $e) { + $this->logger->info('Photo retrieval unsuccessful', ['url' => $params['photo'], 'code' => $e->getCode()]); } - $status = true; } $submit_end = microtime(true); diff --git a/src/classes/Pollers/Server.php b/src/classes/Pollers/Server.php index 6da2a89..290b9b4 100644 --- a/src/classes/Pollers/Server.php +++ b/src/classes/Pollers/Server.php @@ -154,7 +154,7 @@ class Server $addons = $probe_result['data']['plugins']; } - if ($probe_result['data']['admin']['profile']) { + if (!empty($probe_result['data']['admin']['profile'])) { $subscribe = $this->getSubscribeUrl($probe_result['data']['url'], $probe_result['data']['admin']['profile']); } @@ -178,14 +178,14 @@ class Server [ 'server_id' => $server['id'], 'base_url' => strtolower($probe_result['data']['url']), - 'name' => $probe_result['data']['site_name'], + 'name' => substr($probe_result['data']['site_name'], 0, 255), 'language' => $probe_result['data']['language'] ?? null, 'version' => $probe_result['data']['version'], 'addons' => implode(',', $addons), 'reg_policy' => $probe_result['data']['register_policy'], 'info' => $probe_result['data']['info'], - 'admin_name' => $probe_result['data']['admin']['name'], - 'admin_profile' => $probe_result['data']['admin']['profile'], + 'admin_name' => $probe_result['data']['admin']['name'] ?? null, + 'admin_profile' => $probe_result['data']['admin']['profile'] ?? null, 'noscrape_url' => $probe_result['data']['no_scrape_url'] ?? null, 'subscribe_url' => $subscribe ?? null, 'ssl_state' => $probe_result['ssl_state'] @@ -265,29 +265,35 @@ class Server $sslcert_issues = false; + $probe_start = microtime(true); + $probe_data = null; try { //Probe the site. - $probe_start = microtime(true); $probe_data = $this->http->get($base_url . '/friendica/json', $options)->getBody()->getContents(); - $probe_end = microtime(true); } catch (RequestException $e) { - if (!in_array($e->getHandlerContext()['errno'], [ + if (in_array($e->getHandlerContext()['errno'] ?? 0, [ 60, //Could not authenticate certificate with known CA's 83 //Issuer check failed ])) { - throw $e; + $sslcert_issues = true; + + //When it's the certificate that doesn't work, we probe again without strict SSL. + $options['verify'] = false; + + $probe_start = microtime(true); + try { + $probe_data = $this->http->get($base_url . '/friendica/json', $options)->getBody()->getContents(); + } catch(RequestException $e) { + // Collects 404, 500 errors + $this->logger->info('SSL-non-verified URL probe failed with error code: ' . $e->getCode()); + } + } else { + $this->logger->info('SSL-verified URL probe failed with error code: ' . $e->getCode()); } - - $sslcert_issues = true; - - //When it's the certificate that doesn't work, we probe again without strict SSL. - $options['verify'] = false; - - $probe_start = microtime(true); - $probe_data = $this->http->get($base_url . '/friendica/json', $options)->getBody()->getContents(); - $probe_end = microtime(true); } + $probe_end = microtime(true); + $time = round(($probe_end - $probe_start) * 1000); try { @@ -404,11 +410,9 @@ class Server { $uri = Uri::withQueryValues(new Uri($base_url . '/poco'), ['fields' => 'urls', 'count' => 1000]); - $response = $this->http->request('GET', $uri); - - $this->logger->debug('WebRequest: ' . $uri . ' Status: ' . $response->getStatusCode()); - - if ($response->getStatusCode() != 200) { + try { + $response = $this->http->request('GET', $uri); + } catch (RequestException $e) { $this->logger->info('Unsuccessful poco request: ' . $uri); return; } @@ -445,7 +449,12 @@ class Server { $uri = Uri::withQueryValues(new Uri($base_url . '/xrd'), ['uri' => $profile]); - $response = $this->http->request('GET', $uri, ['headers' => ['Accept' => 'application/jrd+json']]); + try { + $response = $this->http->request('GET', $uri, ['headers' => ['Accept' => 'application/jrd+json']]); + } catch (RequestException $e) { + $this->logger->info('Unsuccessful xrd request: ' . $uri); + return null; + } $xrdJsonData = $response->getBody()->getContents(); From aade2ec534d5aea7fb0e6f74625451e39c58d6db Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 4 Jun 2023 00:16:38 -0400 Subject: [PATCH 30/39] Rename "forum" to "group" - This reflects a change in Friendica Core --- docs/Protocol.md | 2 +- src/classes/Models/Profile.php | 7 +++ src/classes/Pollers/Profile.php | 40 +++++++----- src/classes/Views/Widget/AccountTypeTabs.php | 4 +- src/lang/en/LC_MESSAGES/strings.po | 65 ++++++++++++-------- 5 files changed, 73 insertions(+), 45 deletions(-) diff --git a/docs/Protocol.md b/docs/Protocol.md index dcefc7f..2e1c74f 100644 --- a/docs/Protocol.md +++ b/docs/Protocol.md @@ -16,7 +16,7 @@ Accept: application/json ``` URI Parameter: -- `account_type` (optional): An arbitrary account type string. Expected values are `all`, `people`, `news`, `organization` and `forum`. Default is `all`. +- `account_type` (optional): An arbitrary account type string. Expected values are `all`, `people`, `news`, `organization` and `group`. Default is `all`. Query parameters: - `q`: The search query. - `page` (optional): The page number, default is 1. diff --git a/src/classes/Models/Profile.php b/src/classes/Models/Profile.php index 131a070..f2cc6a3 100644 --- a/src/classes/Models/Profile.php +++ b/src/classes/Models/Profile.php @@ -7,6 +7,13 @@ namespace Friendica\Directory\Models; */ class Profile extends \Friendica\Directory\Model { + const ACCOUNT_TYPE_PERSON = 0; + const ACCOUNT_TYPE_ORGANISATION = 1; + const ACCOUNT_TYPE_NEWS = 2; + const ACCOUNT_TYPE_COMMUNITY = 3; + const ACCOUNT_TYPE_RELAY = 4; + const ACCOUNT_TYPE_DELETED = 127; + public function deleteById(int $profile_id): bool { $this->atlas->perform('DELETE FROM `photo` WHERE `profile_id` = :profile_id', diff --git a/src/classes/Pollers/Profile.php b/src/classes/Pollers/Profile.php index aa3c3dc..4d35d60 100644 --- a/src/classes/Pollers/Profile.php +++ b/src/classes/Pollers/Profile.php @@ -2,6 +2,8 @@ namespace Friendica\Directory\Pollers; +use Friendica\Directory\Models; +use Friendica\Directory\Utils; use GuzzleHttp\Exception\RequestException; /** @@ -24,12 +26,12 @@ class Profile private $http; /** - * @var \Friendica\Directory\Models\Server + * @var Models\Server */ private $serverModel; /** - * @var \Friendica\Directory\Models\Profile + * @var Models\Profile */ private $profileModel; @@ -49,8 +51,8 @@ class Profile public function __construct( \Atlas\Pdo\Connection $atlas, \GuzzleHttp\ClientInterface $http, - \Friendica\Directory\Models\Server $serverModel, - \Friendica\Directory\Models\Profile $profileModel, + Models\Server $serverModel, + Models\Profile $profileModel, \Psr\Log\LoggerInterface $logger, array $settings ) @@ -81,12 +83,12 @@ class Profile return false; } - if (!\Friendica\Directory\Utils\Network::isPublicHost($host)) { + if (!Utils\Network::isPublicHost($host)) { $this->logger->warning('Private/reserved IP in polled profile URL: ' . $profile_uri); return false; } - $profileUriInfo = \Friendica\Directory\Models\Profile::extractInfoFromProfileUrl($profile_uri); + $profileUriInfo = Models\Profile::extractInfoFromProfileUrl($profile_uri); if (!$profileUriInfo) { $this->logger->warning('Profile URI invalid'); return false; @@ -137,7 +139,7 @@ class Profile if ($server['noscrape_url']) { $this->logger->debug('Calling ' . $server['noscrape_url'] . '/' . $username); try { - $params = \Friendica\Directory\Utils\Scrape::retrieveNoScrapeData($this->http, $server['noscrape_url'] . '/' . $username); + $params = Utils\Scrape::retrieveNoScrapeData($this->http, $server['noscrape_url'] . '/' . $username); } catch (RequestException $e) { $this->logger->info('Request failed with error code ' . $e->getCode()); } catch (\Throwable $e) { @@ -151,7 +153,7 @@ class Profile if (!$available) { $this->logger->info('Parsing profile page ' . $profile_uri); try { - $params = \Friendica\Directory\Utils\Scrape::retrieveProfileData($this->http, $profile_uri); + $params = Utils\Scrape::retrieveProfileData($this->http, $profile_uri); } catch (RequestException $e) { $this->logger->info('Request failed with error code ' . $e->getCode()); } catch (\Throwable $e) { @@ -209,16 +211,22 @@ class Profile return false; } - switch ($params['account-type'] ?? 0) { - case 1: $account_type = 'News'; break; - case 2: $account_type = 'Organization'; break; - case 3: $account_type = 'Forum'; break; - case 0: - default: + switch ($params['account-type'] ?? Models\Profile::ACCOUNT_TYPE_PERSON) { + case Models\Profile::ACCOUNT_TYPE_ORGANISATION: $account_type = 'Organization'; break; + case Models\Profile::ACCOUNT_TYPE_NEWS : $account_type = 'News'; break; + case Models\Profile::ACCOUNT_TYPE_COMMUNITY : $account_type = 'Group'; break; + case Models\Profile::ACCOUNT_TYPE_RELAY : $account_type = 'Relay'; break; + case Models\Profile::ACCOUNT_TYPE_DELETED : $account_type = 'Deleted'; break; + + case Models\Profile::ACCOUNT_TYPE_PERSON: { $account_type = 'People'; if (!empty($params['comm'])) { - $account_type = 'Forum'; + $account_type = 'Group'; } + break; + } + + default: $account_type = 'Unknown'; break; } $tags = []; @@ -323,7 +331,7 @@ class Profile if ($profile_id) { try { $img_str = $this->http->get($params['photo'])->getBody()->getContents(); - $img = new \Friendica\Directory\Utils\Photo($img_str); + $img = new Utils\Photo($img_str); if ($img->getImage()) { $img->scaleImageSquare(80); diff --git a/src/classes/Views/Widget/AccountTypeTabs.php b/src/classes/Views/Widget/AccountTypeTabs.php index b0b6c09..0dc234d 100644 --- a/src/classes/Views/Widget/AccountTypeTabs.php +++ b/src/classes/Views/Widget/AccountTypeTabs.php @@ -56,7 +56,9 @@ class AccountTypeTabs case 'People' : $title = $this->renderer->np__('account-type', 'People (%d)' , 'People (%d)' , $account_type['count']); break; case 'News' : $title = $this->renderer->np__('account-type', 'News (%d)' , 'News (%d)' , $account_type['count']); break; case 'Organization': $title = $this->renderer->np__('account-type', 'Organization (%d)', 'Organizations (%d)', $account_type['count']); break; - case 'Forum' : $title = $this->renderer->np__('account-type', 'Forum (%d)' , 'Forums (%d)' , $account_type['count']); break; + // Kept for backward compatibility + case 'Forum' : + case 'Group' : $title = $this->renderer->np__('account-type', 'Group (%d)' , 'Groups (%d)' , $account_type['count']); break; default: $title = $this->renderer->np__('account-type', $account_type['account_type']. ' (%d)', $account_type['account_type']. ' (%d)', $account_type['count']); } diff --git a/src/lang/en/LC_MESSAGES/strings.po b/src/lang/en/LC_MESSAGES/strings.po index 2742946..70625d7 100644 --- a/src/lang/en/LC_MESSAGES/strings.po +++ b/src/lang/en/LC_MESSAGES/strings.po @@ -31,31 +31,31 @@ msgstr "" msgid "Last" msgstr "" -#: src\classes\Controllers\Web\Directory.php:73 +#: src\classes\Controllers\Web\Directory.php:85 msgid "People" msgstr "" -#: src\classes\Controllers\Web\Search.php:64 +#: src\classes\Controllers\Web\Search.php:72 msgctxt "field" msgid "Language" msgstr "" -#: src\classes\Controllers\Web\Search.php:65 +#: src\classes\Controllers\Web\Search.php:73 msgctxt "field" msgid "Locality" msgstr "" -#: src\classes\Controllers\Web\Search.php:66 +#: src\classes\Controllers\Web\Search.php:74 msgctxt "field" msgid "Region" msgstr "" -#: src\classes\Controllers\Web\Search.php:67 +#: src\classes\Controllers\Web\Search.php:75 msgctxt "field" msgid "Country" msgstr "" -#: src\classes\Controllers\Web\Servers.php:90 +#: src\classes\Controllers\Web\Servers.php:105 msgid "Public Servers" msgstr "" @@ -105,11 +105,11 @@ msgid_plural "%d results for \"%s\"" msgstr[0] "" msgstr[1] "" -#: src\templates\servers.phtml:2 +#: src\templates\servers.phtml:7 msgid "Top servers pagination" msgstr "" -#: src\templates\servers.phtml:12 +#: src\templates\servers.phtml:17 msgid "Bottom servers pagination" msgstr "" @@ -126,24 +126,27 @@ msgid "Filter by country" msgstr "" #: src\templates\sub\profile.phtml:31 +#: src\templates\sub\profile.phtml:35 +#: src\templates\sub\profile.phtml:39 msgctxt "verb" msgid "Follow" msgstr "" #: src\templates\layout.phtml:65 -#: src\templates\sub\profile.phtml:47 +#: src\templates\sub\profile.phtml:57 msgid "Language" msgstr "" -#: src\templates\sub\profile.phtml:50 +#: src\templates\sub\profile.phtml:60 +#: src\templates\widget\popularserverlanguages.phtml:2 msgid "Filter by language" msgstr "" -#: src\templates\sub\profile.phtml:56 +#: src\templates\sub\profile.phtml:66 msgid "Location" msgstr "" -#: src\templates\sub\profile.phtml:69 +#: src\templates\sub\profile.phtml:79 msgid "Search Tag" msgstr "" @@ -175,15 +178,15 @@ msgstr "" msgid "Outdated Version" msgstr "" -#: src\templates\sub\server.phtml:72 +#: src\templates\sub\server.phtml:69 msgid "Admin" msgstr "" -#: src\templates\sub\server.phtml:79 +#: src\templates\sub\server.phtml:76 msgid "No description provided" msgstr "" -#: src\templates\sub\server.phtml:82 +#: src\templates\sub\server.phtml:79 msgid "Visit Server" msgstr "" @@ -191,7 +194,7 @@ msgstr "" msgid "Popular Countries" msgstr "" -#: src\templates\widget\popularlanguages.phtml:2 +#: src\templates\widget\popularprofilelanguages.phtml:2 msgid "Popular Languages" msgstr "" @@ -220,13 +223,6 @@ msgid_plural "People (%d)" msgstr[0] "" msgstr[1] "" -#: src\classes\Views\Widget\AccountTypeTabs.php:59 -msgctxt "account-type" -msgid "Forum (%d)" -msgid_plural "Forums (%d)" -msgstr[0] "" -msgstr[1] "" - #: src\templates\layout.phtml:97 msgid "Stats" msgstr "" @@ -332,15 +328,30 @@ msgstr[1] "" msgid "None" msgstr "" -#: src\templates\sub\server.phtml:59 -#: src\templates\sub\server.phtml:63 +#: src\templates\sub\server.phtml:58 +#: src\templates\sub\server.phtml:62 msgid "Registration Policy" msgstr "" -#: src\templates\sub\server.phtml:60 +#: src\templates\sub\server.phtml:59 msgid "By Approval" msgstr "" -#: src\templates\sub\server.phtml:64 +#: src\templates\sub\server.phtml:63 msgid "Open" msgstr "" + +#: src\classes\Views\Widget\AccountTypeTabs.php:61 +msgctxt "account-type" +msgid "Group (%d)" +msgid_plural "Groups (%d)" +msgstr[0] "" +msgstr[1] "" + +#: src\templates\servers.phtml:3 +msgid "Filtered by language:" +msgstr "" + +#: src\templates\servers.phtml:3 +msgid "Clear language filter" +msgstr "" From 95ffadb19fe22b5e5272a9ed4142cf3abde05f37 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Mon, 31 Jul 2023 01:10:37 +0200 Subject: [PATCH 31/39] Fix ternary operator ambiguity deprecation in Utils\L10n --- src/classes/Utils/L10n.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/classes/Utils/L10n.php b/src/classes/Utils/L10n.php index 849b8f9..b2b37a9 100644 --- a/src/classes/Utils/L10n.php +++ b/src/classes/Utils/L10n.php @@ -165,12 +165,12 @@ class L10n $foundLang = $language; } if (strtolower($key) == strtolower(str_replace('-', '_', $locale))) { - $foundLocale = true; + $foundLocale = $language; break; } } - return $foundLocale ? $language : $foundLang ?: $locale; + return $foundLocale ?: $foundLang ?: $locale; } /** From 064fd922e715d454b9d4b6cbcc55776ddb30d884 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Mon, 31 Jul 2023 01:11:33 +0200 Subject: [PATCH 32/39] Add default profile picture path dependency - Update default profile picture --- public/assets/images/default-profile-sm.jpg | Bin 325 -> 2669 bytes src/classes/Controllers/Api/Photo.php | 10 ++++++++-- src/classes/Routes/Http/Photo.php | 3 ++- src/dependencies.php | 2 ++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/public/assets/images/default-profile-sm.jpg b/public/assets/images/default-profile-sm.jpg index ea0030ede0245aeb76f658c20bad85d093df3f7f..5733602f320b427d02fbf0faf176dc3e1dc75073 100644 GIT binary patch delta 2506 zcmV;*2{rb`0__x#secgw0uccN5dr_i03HAV009I80RaF200000000002muKS3j+iP z1qT1b05cE(00sdB00jaB1qA>A000010s{mE1_uBL2@whs6Cp7aaTXUMQ57;Xk?>K+rS+5D$?6 z`~AEB0H6{327-VfA=n5AeD(qY9S^|!e)45dZ-B5%~SI7?yLl z;#IBj?P-J6NrtZKOd)lK3ns*;W1A|@6i$LxbUj2VR}+ib?Mc9ji%z1wz z<~wVZ#HpmSsXM+@v)Si*aH)LY!3hR%%~d&x85qeC1VBBctAC<$CZQEf>8w(j6$o;i zij?32Lnd;Fl;toOqEi$^1Ox;Jq0n;Z8U}%&XddFnD#ck^ZgR%YF65gY zUEF=dT$r-&X@3x_JG|t_YDgktEgb&hs%56d$TcTXQudgqDWUYOe1#3nw7P9qAJuDg zxa>hH_Ei`s4!lx0~ixx#bErC&=W2${2F*W}UEO?5B?%sLk|cvY-|P zAHAr`*y?VY*lM;|fJu1eohIGmX*lH{Fnk+Wu&!9A=Zr;+^IkrDq?H>iQEK@Lr15f~ zo26^^=znH&k%WGWbyr2SlXlNY+DV}nR2n};!(mY3keEZ$v<(A5&|6oS{8wPjd{}SW z8&ui5lC#fklP9~c#V}0kJ(roSz^`eJhiHmmW2)j^+$vGXrcfVH?utR^1VjS?Uj~Y> z1m!a(7EDnYg?4?CLI4#4^dTRAGcZ!QhqI|ntjihx%&MD1SD+`cxMUJuL;H!i>~tU;wj74 z3>6mOaaKvaYF@Dzq5!LXkv;B8JDVF7SQ3ZM=AF=Lg@?cG~Zca3u;V+aCOi zCV%=K!1g6MsaOYzssN&H>+dAhgmRg`ro4KDD2Yk}Aw2XA13=Jqp0!EyM=abVlI`6h zqjv}_0%TS}Vv1`dsYCgbQ6m_KDEkwAps;Y?d>NFvi1*hkpze#V57y(t$$$0h&=R}Ns=nCqN*HN$OeOCjvmW+`#a+N zf0*$-nm*@^a&1Bi??|=9oaSRWT(B`o{A<+6sYtpCnFUHmO&pOoY+aFdPZCMfb(1JZ z?n3uA=VqHG+~()wtW;WqQZ)hbRd5ZgB3IaB6NNAr^! zSl)4a#`Ea~(Z}|9%57Tjy*}j zb0rcNZ=K^iXjvkqRjBSKAIa|hr9EeI5YP98akg$v(@Dt|=(Uru$35Niqk0hmUUiZk3(fZG${*p5p0tHQe8et{CO~gMaJB z8pjg5MsleD5a$&m9}8!t1b@I4Fd|~4Vkjj!LlCbHlgRNC1CF6;c4}2B|<#%1zqBcS>qjxX=wKB-Ue@t+@S5c zPMa)?hRdc^kZ^*jtb)j#0K`=#lQEM~Ba}eIP=+x~Q3C+S

>d0Exc!6YL5T+}^?A-wd70Ti6As-;7i;)49{&KXUEW2WxZp5;zzV zMlFm?L~7!h+a&8RDCNovs~X$sgDjf-3^iH~BDGwKVFh1+jb#l93l!BBF_955tIy7Ko(Tvww65RFXw95P{HWKE8pVXg?it$Fxj{#Td)=GN*QoY_HTej<;6f zY|IdF0#OGDG@D}i1Q!DlGXltvig}VueBYqG1UKClz;VWYskraf5WyOC;aWc>R^MDjaUe)ktnp5wA2c$_q-ggdgnxrjg#1l!$8lK`EAC&8 zefqY7Hutt*_A$hcMXW`PC0lXWM#?B2k(wZ)Q%NRq@1Hh%6a0CjA~!^e%QbGh1~XB! z&5{e~=qPTyrtiMG9{Ty~ulD}{pW8uU4YgvQqVWszU6ouQWtLxLn<|Tpc(D`{G>x}D zv#@&2x~3oiB7f>b3InA`1Nxk{6A$Vkz=3}a13=I;4FmlC+6xa)V*^L{jdAu*jYL`! z&Bi6pHprp?DUw(4o^6b05@(=80ajI+?WZD2C_@~i6i5d0rkD^fz#hOKV9-;ebYLEh z*bhPR-?004&~@MMpoSRx85$3NJEO}VP6?%uwzslssef1U6aepW{!QNtnFNTZkPLHu z6~YhH0WpjTk+)({C={VIbPWSQ&@>GMHI&AmQOGSPFMTaUcMyaWHl?4Ff>XGz|w-SvD7?kQ5RZglu+XawHE}tyEDplx_-tH>7ov UO;Z!UD4c~60T2NI?Px#$*++b7asU7T literal 325 zcmex=atlas = $atlas; + $this->defaultProfilePictureSmallPath = $defaultProfilePictureSmallPath; } public function render(Request $request, Response $response, array $args): Response @@ -30,7 +36,7 @@ class Photo ); if (!$data) { - $data = file_get_contents('public/images/default-profile-sm.jpg'); + $data = file_get_contents($this->defaultProfilePictureSmallPath); } //Try and cache our result. diff --git a/src/classes/Routes/Http/Photo.php b/src/classes/Routes/Http/Photo.php index 6afb643..8b1e6e1 100644 --- a/src/classes/Routes/Http/Photo.php +++ b/src/classes/Routes/Http/Photo.php @@ -10,7 +10,8 @@ class Photo extends BaseRoute public function __invoke(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args): \Slim\Http\Response { return (new \Friendica\Directory\Controllers\Api\Photo( - $this->container->atlas + $this->container->atlas, + $this->container->get('defaultProfilePictureSmallPath') ))->render($request, $response, $args); } } diff --git a/src/dependencies.php b/src/dependencies.php index ec6c5a0..5ab5608 100644 --- a/src/dependencies.php +++ b/src/dependencies.php @@ -99,6 +99,8 @@ $container['http'] = function (ContainerInterface $c): GuzzleHttp\ClientInterfac return new GuzzleHttp\Client(['timeout' => 20, 'headers' => ['User-Agent' => 'FriendicaDirectory/' . trim($version) . ' ' . \GuzzleHttp\default_user_agent()]]); }; +$container['defaultProfilePictureSmallPath'] = __DIR__ . '/../public/assets/images/default-profile-sm.jpg'; + // Internal Dependency Injection $container[\Friendica\Directory\Models\Profile::class] = function (ContainerInterface $c): Friendica\Directory\Models\Profile { From bf85c8f986222224948880b42180d2b9106c33fa Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Mon, 31 Jul 2023 01:17:33 +0200 Subject: [PATCH 33/39] Catch rare exception receiving line folding characters in header value of redirected request --- src/classes/Pollers/Server.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/classes/Pollers/Server.php b/src/classes/Pollers/Server.php index 290b9b4..2b3d9be 100644 --- a/src/classes/Pollers/Server.php +++ b/src/classes/Pollers/Server.php @@ -290,6 +290,9 @@ class Server } else { $this->logger->info('SSL-verified URL probe failed with error code: ' . $e->getCode()); } + } catch (\InvalidArgumentException $e) { + $this->logger->error('Invalid argument provided to HTTP client', ['base_url' => $base_url, 'exception' => $e]); + return ['data' => false, 'time' => 0, 'curl_info' => [], 'ssl_state' => null]; } $probe_end = microtime(true); From 9d296b9f5d4f025981f56121c142fd1711815e46 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Mon, 31 Jul 2023 01:24:50 +0200 Subject: [PATCH 34/39] [Composer] Change gofabian/negotiation-middleware dependency requirement to support PHP 8 - Add now-explicit laminas/laminas-zendframework-bridge dependency - Bump PHP version requirement to 7.3.0 - Updating willdurand/negotiation (v2.3.1 => 3.1.0) (PHP 8 compatibility) - Updating psr/http-message (1.0.1 => 1.1) - Removing gofabian/negotiation-middleware (v0.1.3) - Installing gofabian/negotiation-middleware (dev-master 4d3cda5) - Updating gettext/languages (2.9.0 => 2.10.0) - Updating gettext/gettext (v4.8.6 => v4.8.8) - Updating guzzlehttp/psr7 (1.8.5 => 1.9.1) - Updating guzzlehttp/promises (1.5.1 => 1.5.3) - Updating symfony/polyfill-php72 (v1.26.0 => v1.27.0) - Updating symfony/polyfill-intl-normalizer (v1.26.0 => v1.27.0) - Updating symfony/polyfill-intl-idn (v1.26.0 => v1.27.0) - Updating guzzlehttp/guzzle (6.5.6 => 6.5.8) - Updating laminas/laminas-escaper (2.6.1 => 2.9.0) - Updating laminas/laminas-zendframework-bridge (1.1.1 => 1.4.1) - Updating masterminds/html5 (2.7.5 => 2.8.0) - Updating monolog/monolog (1.26.1 => 1.27.1) - Updating psr/container (1.0.0 => 1.1.1) - Updating pimple/pimple (v3.2.3 => v3.5.0) - Updating slim/slim (3.12.3 => 3.12.5) - Updating pear/pear-core-minimal (v1.10.11 => v1.10.13) --- composer.json | 5 +- composer.lock | 526 ++++++++++++++++++++++++++------------------------ 2 files changed, 272 insertions(+), 259 deletions(-) diff --git a/composer.json b/composer.json index 25f2f80..6331252 100644 --- a/composer.json +++ b/composer.json @@ -23,9 +23,10 @@ "byjg/migration": "^4.0", "byjg/uri": "^1.0.4", "gettext/gettext": "^4.6", - "gofabian/negotiation-middleware": "^0.1.3", + "gofabian/negotiation-middleware": "dev-master", "guzzlehttp/guzzle": "^6.5", "laminas/laminas-escaper": "^2.6", + "laminas/laminas-zendframework-bridge": "^1.4", "masterminds/html5": "^2.3", "monolog/monolog": "^1.17", "mrpetovan/net_ping": "^1.2", @@ -55,7 +56,7 @@ }, "config": { "platform": { - "php": "7.1.0" + "php": "7.3.0" }, "process-timeout" : 0, "autoloader-suffix": "FriendicaDirectory", diff --git a/composer.lock b/composer.lock index f98ae44..15ccbdf 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "8966ff83bb5be2c08214c3982105c898", + "content-hash": "e695909f6c6a475770dfc28266571d9a", "packages": [ { "name": "asika/simple-console", @@ -547,16 +547,16 @@ }, { "name": "gettext/gettext", - "version": "v4.8.6", + "version": "v4.8.8", "source": { "type": "git", "url": "https://github.com/php-gettext/Gettext.git", - "reference": "bbeb8f4d3077663739aecb4551b22e720c0e9efe" + "reference": "302a00aa9d6762c92c884d879c15d3ed05d6a37d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-gettext/Gettext/zipball/bbeb8f4d3077663739aecb4551b22e720c0e9efe", - "reference": "bbeb8f4d3077663739aecb4551b22e720c0e9efe", + "url": "https://api.github.com/repos/php-gettext/Gettext/zipball/302a00aa9d6762c92c884d879c15d3ed05d6a37d", + "reference": "302a00aa9d6762c92c884d879c15d3ed05d6a37d", "shasum": "" }, "require": { @@ -619,20 +619,20 @@ "type": "patreon" } ], - "time": "2021-10-19T10:44:53+00:00" + "time": "2022-12-08T11:59:50+00:00" }, { "name": "gettext/languages", - "version": "2.9.0", + "version": "2.10.0", "source": { "type": "git", "url": "https://github.com/php-gettext/Languages.git", - "reference": "ed56dd2c7f4024cc953ed180d25f02f2640e3ffa" + "reference": "4d61d67fe83a2ad85959fe6133d6d9ba7dddd1ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-gettext/Languages/zipball/ed56dd2c7f4024cc953ed180d25f02f2640e3ffa", - "reference": "ed56dd2c7f4024cc953ed180d25f02f2640e3ffa", + "url": "https://api.github.com/repos/php-gettext/Languages/zipball/4d61d67fe83a2ad85959fe6133d6d9ba7dddd1ab", + "reference": "4d61d67fe83a2ad85959fe6133d6d9ba7dddd1ab", "shasum": "" }, "require": { @@ -689,30 +689,30 @@ "type": "github" } ], - "time": "2021-11-11T17:30:39+00:00" + "time": "2022-10-18T15:00:10+00:00" }, { "name": "gofabian/negotiation-middleware", - "version": "v0.1.3", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/gofabian/negotiation-middleware.git", - "reference": "23d80fa1b00bbadded515df837c5a84517374b50" + "reference": "4d3cda5425eb2b74709a6510815f6c40d6c74ff7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/gofabian/negotiation-middleware/zipball/23d80fa1b00bbadded515df837c5a84517374b50", - "reference": "23d80fa1b00bbadded515df837c5a84517374b50", + "url": "https://api.github.com/repos/gofabian/negotiation-middleware/zipball/4d3cda5425eb2b74709a6510815f6c40d6c74ff7", + "reference": "4d3cda5425eb2b74709a6510815f6c40d6c74ff7", "shasum": "" }, "require": { - "php": ">=5.4.0", + "php": ">=7.3", "psr/http-message": "^1.0", - "willdurand/negotiation": "^2.0" + "willdurand/negotiation": "^3.0" }, "require-dev": { - "phpunit/phpunit": "^4.8", - "satooshi/php-coveralls": "0.6.1" + "php-coveralls/php-coveralls": "^2.4.3", + "phpunit/phpunit": "^9.5" }, "suggest": { "slim/slim": "The negotiation middleware is compatible to Slim 3.x" @@ -741,28 +741,28 @@ "psr-7", "slim" ], - "time": "2017-02-22T18:45:01+00:00" + "time": "2021-05-16T18:42:02+00:00" }, { "name": "guzzlehttp/guzzle", - "version": "6.5.6", + "version": "6.5.8", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "f092dd734083473658de3ee4bef093ed77d2689c" + "reference": "a52f0440530b54fa079ce76e8c5d196a42cad981" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/f092dd734083473658de3ee4bef093ed77d2689c", - "reference": "f092dd734083473658de3ee4bef093ed77d2689c", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/a52f0440530b54fa079ce76e8c5d196a42cad981", + "reference": "a52f0440530b54fa079ce76e8c5d196a42cad981", "shasum": "" }, "require": { "ext-json": "*", "guzzlehttp/promises": "^1.0", - "guzzlehttp/psr7": "^1.6.1", + "guzzlehttp/psr7": "^1.9", "php": ">=5.5", - "symfony/polyfill-intl-idn": "^1.17.0" + "symfony/polyfill-intl-idn": "^1.17" }, "require-dev": { "ext-curl": "*", @@ -852,20 +852,20 @@ "type": "tidelift" } ], - "time": "2022-05-25T13:19:12+00:00" + "time": "2022-06-20T22:16:07+00:00" }, { "name": "guzzlehttp/promises", - "version": "1.5.1", + "version": "1.5.3", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da" + "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da", - "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da", + "url": "https://api.github.com/repos/guzzle/promises/zipball/67ab6e18aaa14d753cc148911d273f6e6cb6721e", + "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e", "shasum": "" }, "require": { @@ -875,11 +875,6 @@ "symfony/phpunit-bridge": "^4.4 || ^5.1" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.5-dev" - } - }, "autoload": { "files": [ "src/functions_include.php" @@ -932,20 +927,20 @@ "type": "tidelift" } ], - "time": "2021-10-22T20:56:57+00:00" + "time": "2023-05-21T12:31:43+00:00" }, { "name": "guzzlehttp/psr7", - "version": "1.8.5", + "version": "1.9.1", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "337e3ad8e5716c15f9657bd214d16cc5e69df268" + "reference": "e4490cabc77465aaee90b20cfc9a770f8c04be6b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/337e3ad8e5716c15f9657bd214d16cc5e69df268", - "reference": "337e3ad8e5716c15f9657bd214d16cc5e69df268", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/e4490cabc77465aaee90b20cfc9a770f8c04be6b", + "reference": "e4490cabc77465aaee90b20cfc9a770f8c04be6b", "shasum": "" }, "require": { @@ -964,11 +959,6 @@ "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.7-dev" - } - }, "autoload": { "files": [ "src/functions_include.php" @@ -1038,40 +1028,39 @@ "type": "tidelift" } ], - "time": "2022-03-20T21:51:18+00:00" + "time": "2023-04-17T16:00:37+00:00" }, { "name": "laminas/laminas-escaper", - "version": "2.6.1", + "version": "2.9.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-escaper.git", - "reference": "25f2a053eadfa92ddacb609dcbbc39362610da70" + "reference": "891ad70986729e20ed2e86355fcf93c9dc238a5f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-escaper/zipball/25f2a053eadfa92ddacb609dcbbc39362610da70", - "reference": "25f2a053eadfa92ddacb609dcbbc39362610da70", + "url": "https://api.github.com/repos/laminas/laminas-escaper/zipball/891ad70986729e20ed2e86355fcf93c9dc238a5f", + "reference": "891ad70986729e20ed2e86355fcf93c9dc238a5f", "shasum": "" }, "require": { - "laminas/laminas-zendframework-bridge": "^1.0", - "php": "^5.6 || ^7.0" + "php": "^7.3 || ~8.0.0 || ~8.1.0" }, - "replace": { - "zendframework/zend-escaper": "self.version" + "conflict": { + "zendframework/zend-escaper": "*" }, "require-dev": { - "laminas/laminas-coding-standard": "~1.0.0", - "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2" + "laminas/laminas-coding-standard": "~2.3.0", + "phpunit/phpunit": "^9.3", + "psalm/plugin-phpunit": "^0.12.2", + "vimeo/psalm": "^3.16" + }, + "suggest": { + "ext-iconv": "*", + "ext-mbstring": "*" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.6.x-dev", - "dev-develop": "2.7.x-dev" - } - }, "autoload": { "psr-4": { "Laminas\\Escaper\\": "src/" @@ -1087,28 +1076,36 @@ "escaper", "laminas" ], - "time": "2019-12-31T16:43:30+00:00" + "funding": [ + { + "url": "https://funding.communitybridge.org/projects/laminas-project", + "type": "community_bridge" + } + ], + "time": "2021-09-02T17:10:53+00:00" }, { "name": "laminas/laminas-zendframework-bridge", - "version": "1.1.1", + "version": "1.4.1", "source": { "type": "git", "url": "https://github.com/laminas/laminas-zendframework-bridge.git", - "reference": "6ede70583e101030bcace4dcddd648f760ddf642" + "reference": "88bf037259869891afce6504cacc4f8a07b24d0f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/6ede70583e101030bcace4dcddd648f760ddf642", - "reference": "6ede70583e101030bcace4dcddd648f760ddf642", + "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/88bf037259869891afce6504cacc4f8a07b24d0f", + "reference": "88bf037259869891afce6504cacc4f8a07b24d0f", "shasum": "" }, "require": { - "php": "^5.6 || ^7.0 || ^8.0" + "php": "^7.3 || ~8.0.0 || ~8.1.0" }, "require-dev": { - "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.1 || ^9.3", - "squizlabs/php_codesniffer": "^3.5" + "phpunit/phpunit": "^9.3", + "psalm/plugin-phpunit": "^0.15.1", + "squizlabs/php_codesniffer": "^3.5", + "vimeo/psalm": "^4.6" }, "type": "library", "extra": { @@ -1141,30 +1138,28 @@ "type": "community_bridge" } ], - "time": "2020-09-14T14:23:00+00:00" + "time": "2021-12-21T14:34:37+00:00" }, { "name": "masterminds/html5", - "version": "2.7.5", + "version": "2.8.0", "source": { "type": "git", "url": "https://github.com/Masterminds/html5-php.git", - "reference": "f640ac1bdddff06ea333a920c95bbad8872429ab" + "reference": "3c5d5a56d56f48a1ca08a0670f0f80c1dad368f3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/f640ac1bdddff06ea333a920c95bbad8872429ab", - "reference": "f640ac1bdddff06ea333a920c95bbad8872429ab", + "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/3c5d5a56d56f48a1ca08a0670f0f80c1dad368f3", + "reference": "3c5d5a56d56f48a1ca08a0670f0f80c1dad368f3", "shasum": "" }, "require": { - "ext-ctype": "*", "ext-dom": "*", - "ext-libxml": "*", "php": ">=5.3.0" }, "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7.21 || ^6 || ^7" + "phpunit/phpunit": "^4.8.35 || ^5.7.21 || ^6 || ^7 || ^8" }, "type": "library", "extra": { @@ -1206,20 +1201,20 @@ "serializer", "xml" ], - "time": "2021-07-01T14:25:37+00:00" + "time": "2023-04-26T07:27:39+00:00" }, { "name": "monolog/monolog", - "version": "1.26.1", + "version": "1.27.1", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "c6b00f05152ae2c9b04a448f99c7590beb6042f5" + "reference": "904713c5929655dc9b97288b69cfeedad610c9a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/c6b00f05152ae2c9b04a448f99c7590beb6042f5", - "reference": "c6b00f05152ae2c9b04a448f99c7590beb6042f5", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/904713c5929655dc9b97288b69cfeedad610c9a1", + "reference": "904713c5929655dc9b97288b69cfeedad610c9a1", "shasum": "" }, "require": { @@ -1288,7 +1283,7 @@ "type": "tidelift" } ], - "time": "2021-05-28T08:32:12+00:00" + "time": "2022-06-09T08:53:42+00:00" }, { "name": "mrpetovan/net_ping", @@ -1451,16 +1446,16 @@ }, { "name": "pear/pear-core-minimal", - "version": "v1.10.11", + "version": "v1.10.13", "source": { "type": "git", "url": "https://github.com/pear/pear-core-minimal.git", - "reference": "68d0d32ada737153b7e93b8d3c710ebe70ac867d" + "reference": "aed862e95fd286c53cc546734868dc38ff4b5b1d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/68d0d32ada737153b7e93b8d3c710ebe70ac867d", - "reference": "68d0d32ada737153b7e93b8d3c710ebe70ac867d", + "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/aed862e95fd286c53cc546734868dc38ff4b5b1d", + "reference": "aed862e95fd286c53cc546734868dc38ff4b5b1d", "shasum": "" }, "require": { @@ -1491,7 +1486,7 @@ } ], "description": "Minimal set of PEAR core files to be used as composer dependency", - "time": "2021-08-10T22:31:03+00:00" + "time": "2023-04-19T19:15:47+00:00" }, { "name": "pear/pear_exception", @@ -1550,29 +1545,29 @@ }, { "name": "pimple/pimple", - "version": "v3.2.3", + "version": "v3.5.0", "source": { "type": "git", "url": "https://github.com/silexphp/Pimple.git", - "reference": "9e403941ef9d65d20cba7d54e29fe906db42cf32" + "reference": "a94b3a4db7fb774b3d78dad2315ddc07629e1bed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/silexphp/Pimple/zipball/9e403941ef9d65d20cba7d54e29fe906db42cf32", - "reference": "9e403941ef9d65d20cba7d54e29fe906db42cf32", + "url": "https://api.github.com/repos/silexphp/Pimple/zipball/a94b3a4db7fb774b3d78dad2315ddc07629e1bed", + "reference": "a94b3a4db7fb774b3d78dad2315ddc07629e1bed", "shasum": "" }, "require": { - "php": ">=5.3.0", - "psr/container": "^1.0" + "php": ">=7.2.5", + "psr/container": "^1.1 || ^2.0" }, "require-dev": { - "symfony/phpunit-bridge": "^3.2" + "symfony/phpunit-bridge": "^5.4@dev" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2.x-dev" + "dev-master": "3.4.x-dev" } }, "autoload": { @@ -1591,12 +1586,12 @@ } ], "description": "Pimple, a simple Dependency Injection Container", - "homepage": "http://pimple.sensiolabs.org", + "homepage": "https://pimple.symfony.com", "keywords": [ "container", "dependency injection" ], - "time": "2018-01-21T07:42:36+00:00" + "time": "2021-10-28T11:13:42+00:00" }, { "name": "psr/cache", @@ -1646,27 +1641,22 @@ }, { "name": "psr/container", - "version": "1.0.0", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/php-fig/container.git", - "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f" + "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f", - "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf", + "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": ">=7.2.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, "autoload": { "psr-4": { "Psr\\Container\\": "src/" @@ -1679,7 +1669,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common Container Interface (PHP FIG PSR-11)", @@ -1691,29 +1681,29 @@ "container-interop", "psr" ], - "time": "2017-02-14T16:28:37+00:00" + "time": "2021-03-05T17:36:06+00:00" }, { "name": "psr/http-message", - "version": "1.0.1", + "version": "1.1", "source": { "type": "git", "url": "https://github.com/php-fig/http-message.git", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363" + "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba", + "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": "^7.2 || ^8.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.1.x-dev" } }, "autoload": { @@ -1741,7 +1731,7 @@ "request", "response" ], - "time": "2016-08-06T14:39:51+00:00" + "time": "2023-04-04T09:50:52+00:00" }, { "name": "psr/log", @@ -2023,16 +2013,16 @@ }, { "name": "slim/slim", - "version": "3.12.3", + "version": "3.12.5", "source": { "type": "git", "url": "https://github.com/slimphp/Slim.git", - "reference": "1c9318a84ffb890900901136d620b4f03a59da38" + "reference": "565632b2d9b64ecedf89546edbbf4f3648089f0c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slimphp/Slim/zipball/1c9318a84ffb890900901136d620b4f03a59da38", - "reference": "1c9318a84ffb890900901136d620b4f03a59da38", + "url": "https://api.github.com/repos/slimphp/Slim/zipball/565632b2d9b64ecedf89546edbbf4f3648089f0c", + "reference": "565632b2d9b64ecedf89546edbbf4f3648089f0c", "shasum": "" }, "require": { @@ -2050,7 +2040,7 @@ }, "require-dev": { "phpunit/phpunit": "^4.0", - "squizlabs/php_codesniffer": "^2.5" + "squizlabs/php_codesniffer": "^3.6.0" }, "type": "library", "autoload": { @@ -2092,20 +2082,30 @@ "micro", "router" ], - "time": "2019-11-28T17:40:33+00:00" + "funding": [ + { + "url": "https://opencollective.com/slimphp", + "type": "open_collective" + }, + { + "url": "https://tidelift.com/funding/github/packagist/slim/slim", + "type": "tidelift" + } + ], + "time": "2023-07-23T04:32:51+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "59a8d271f00dd0e4c2e518104cc7963f655a1aa8" + "reference": "639084e360537a19f9ee352433b84ce831f3d2da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/59a8d271f00dd0e4c2e518104cc7963f655a1aa8", - "reference": "59a8d271f00dd0e4c2e518104cc7963f655a1aa8", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/639084e360537a19f9ee352433b84ce831f3d2da", + "reference": "639084e360537a19f9ee352433b84ce831f3d2da", "shasum": "" }, "require": { @@ -2119,7 +2119,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -2176,20 +2176,20 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "219aa369ceff116e673852dce47c3a41794c14bd" + "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/219aa369ceff116e673852dce47c3a41794c14bd", - "reference": "219aa369ceff116e673852dce47c3a41794c14bd", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/19bd1e4fcd5b91116f14d8533c57831ed00571b6", + "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6", "shasum": "" }, "require": { @@ -2201,7 +2201,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -2257,20 +2257,20 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-php72", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "bf44a9fd41feaac72b074de600314a93e2ae78e2" + "reference": "869329b1e9894268a8a61dabb69153029b7a8c97" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/bf44a9fd41feaac72b074de600314a93e2ae78e2", - "reference": "bf44a9fd41feaac72b074de600314a93e2ae78e2", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/869329b1e9894268a8a61dabb69153029b7a8c97", + "reference": "869329b1e9894268a8a61dabb69153029b7a8c97", "shasum": "" }, "require": { @@ -2279,7 +2279,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -2330,32 +2330,32 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "willdurand/negotiation", - "version": "v2.3.1", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/willdurand/Negotiation.git", - "reference": "03436ededa67c6e83b9b12defac15384cb399dc9" + "reference": "68e9ea0553ef6e2ee8db5c1d98829f111e623ec2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/willdurand/Negotiation/zipball/03436ededa67c6e83b9b12defac15384cb399dc9", - "reference": "03436ededa67c6e83b9b12defac15384cb399dc9", + "url": "https://api.github.com/repos/willdurand/Negotiation/zipball/68e9ea0553ef6e2ee8db5c1d98829f111e623ec2", + "reference": "68e9ea0553ef6e2ee8db5c1d98829f111e623ec2", "shasum": "" }, "require": { - "php": ">=5.4.0" + "php": ">=7.1.0" }, "require-dev": { - "phpunit/phpunit": "~4.5" + "symfony/phpunit-bridge": "^5.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.3-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -2382,22 +2382,22 @@ "header", "negotiation" ], - "time": "2017-05-14T17:21:12+00:00" + "time": "2022-01-30T20:08:53+00:00" } ], "packages-dev": [ { "name": "bower-asset/bootstrap", - "version": "v4.6.1", + "version": "v4.6.2", "source": { "type": "git", "url": "https://github.com/twbs/bootstrap.git", - "reference": "043a03c95a2ad6738f85b65e53b9dbdfb03b8d10" + "reference": "e5643aaa89eb67327a5b4abe7db976f0ea276b70" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twbs/bootstrap/zipball/043a03c95a2ad6738f85b65e53b9dbdfb03b8d10", - "reference": "043a03c95a2ad6738f85b65e53b9dbdfb03b8d10", + "url": "https://api.github.com/repos/twbs/bootstrap/zipball/e5643aaa89eb67327a5b4abe7db976f0ea276b70", + "reference": "e5643aaa89eb67327a5b4abe7db976f0ea276b70", "shasum": "" }, "type": "bower-asset-library" @@ -2463,29 +2463,30 @@ }, { "name": "doctrine/instantiator", - "version": "1.4.0", + "version": "1.5.0", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b" + "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/d56bf6102915de5702778fe20f2de3b2fe570b5b", - "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b", + "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b", "shasum": "" }, "require": { "php": "^7.1 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^8.0", + "doctrine/coding-standard": "^9 || ^11", "ext-pdo": "*", "ext-phar": "*", - "phpbench/phpbench": "^0.13 || 1.0.0-alpha2", - "phpstan/phpstan": "^0.12", - "phpstan/phpstan-phpunit": "^0.12", - "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" + "phpbench/phpbench": "^0.16 || ^1", + "phpstan/phpstan": "^1.4", + "phpstan/phpstan-phpunit": "^1", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "vimeo/psalm": "^4.30 || ^5.4" }, "type": "library", "autoload": { @@ -2524,7 +2525,7 @@ "type": "tidelift" } ], - "time": "2020-11-10T18:47:58+00:00" + "time": "2022-12-30T00:15:36+00:00" }, { "name": "felixfbecker/advanced-json-rpc", @@ -2569,16 +2570,16 @@ }, { "name": "felixfbecker/language-server-protocol", - "version": "1.5.1", + "version": "v1.5.2", "source": { "type": "git", "url": "https://github.com/felixfbecker/php-language-server-protocol.git", - "reference": "9d846d1f5cf101deee7a61c8ba7caa0a975cd730" + "reference": "6e82196ffd7c62f7794d778ca52b69feec9f2842" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/felixfbecker/php-language-server-protocol/zipball/9d846d1f5cf101deee7a61c8ba7caa0a975cd730", - "reference": "9d846d1f5cf101deee7a61c8ba7caa0a975cd730", + "url": "https://api.github.com/repos/felixfbecker/php-language-server-protocol/zipball/6e82196ffd7c62f7794d778ca52b69feec9f2842", + "reference": "6e82196ffd7c62f7794d778ca52b69feec9f2842", "shasum": "" }, "require": { @@ -2617,7 +2618,7 @@ "php", "server" ], - "time": "2021-02-22T14:02:09+00:00" + "time": "2022-03-02T22:36:06+00:00" }, { "name": "muglug/package-versions-56", @@ -2677,28 +2678,29 @@ }, { "name": "myclabs/deep-copy", - "version": "1.10.2", + "version": "1.11.1", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220" + "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/776f831124e9c62e1a2c601ecc52e776d8bb7220", - "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", + "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", "shasum": "" }, "require": { "php": "^7.1 || ^8.0" }, - "replace": { - "myclabs/deep-copy": "self.version" + "conflict": { + "doctrine/collections": "<1.6.8", + "doctrine/common": "<2.13.3 || >=3,<3.2.2" }, "require-dev": { - "doctrine/collections": "^1.0", - "doctrine/common": "^2.6", - "phpunit/phpunit": "^7.1" + "doctrine/collections": "^1.6.8", + "doctrine/common": "^2.13.3 || ^3.2.2", + "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13" }, "type": "library", "autoload": { @@ -2727,7 +2729,7 @@ "type": "tidelift" } ], - "time": "2020-11-13T09:40:50+00:00" + "time": "2023-03-08T13:26:56+00:00" }, { "name": "netresearch/jsonmapper", @@ -2777,16 +2779,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.13.2", + "version": "v4.16.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "210577fe3cf7badcc5814d99455df46564f3c077" + "reference": "19526a33fb561ef417e822e85f08a00db4059c17" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/210577fe3cf7badcc5814d99455df46564f3c077", - "reference": "210577fe3cf7badcc5814d99455df46564f3c077", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/19526a33fb561ef417e822e85f08a00db4059c17", + "reference": "19526a33fb561ef417e822e85f08a00db4059c17", "shasum": "" }, "require": { @@ -2825,7 +2827,7 @@ "parser", "php" ], - "time": "2021-11-30T19:35:32+00:00" + "time": "2023-06-25T14:52:30+00:00" }, { "name": "openlss/lib-array2xml", @@ -2925,29 +2927,30 @@ "keywords": [ "diff" ], + "abandoned": true, "time": "2020-10-14T08:39:05+00:00" }, { "name": "phpdocumentor/reflection-common", - "version": "2.1.0", + "version": "2.2.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionCommon.git", - "reference": "6568f4687e5b41b054365f9ae03fcb1ed5f2069b" + "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/6568f4687e5b41b054365f9ae03fcb1ed5f2069b", - "reference": "6568f4687e5b41b054365f9ae03fcb1ed5f2069b", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b", + "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b", "shasum": "" }, "require": { - "php": ">=7.1" + "php": "^7.2 || ^8.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.x-dev" + "dev-2.x": "2.x-dev" } }, "autoload": { @@ -2974,45 +2977,42 @@ "reflection", "static analysis" ], - "time": "2020-04-27T09:25:28+00:00" + "time": "2020-06-27T09:03:43+00:00" }, { "name": "phpdocumentor/reflection-docblock", - "version": "4.3.4", + "version": "5.1.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "da3fd972d6bafd628114f7e7e036f45944b62e9c" + "reference": "cd72d394ca794d3466a3b2fc09d5a6c1dc86b47e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/da3fd972d6bafd628114f7e7e036f45944b62e9c", - "reference": "da3fd972d6bafd628114f7e7e036f45944b62e9c", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/cd72d394ca794d3466a3b2fc09d5a6c1dc86b47e", + "reference": "cd72d394ca794d3466a3b2fc09d5a6c1dc86b47e", "shasum": "" }, "require": { - "php": "^7.0", - "phpdocumentor/reflection-common": "^1.0.0 || ^2.0.0", - "phpdocumentor/type-resolver": "~0.4 || ^1.0.0", - "webmozart/assert": "^1.0" + "ext-filter": "^7.1", + "php": "^7.2", + "phpdocumentor/reflection-common": "^2.0", + "phpdocumentor/type-resolver": "^1.0", + "webmozart/assert": "^1" }, "require-dev": { - "doctrine/instantiator": "^1.0.5", - "mockery/mockery": "^1.0", - "phpdocumentor/type-resolver": "0.4.*", - "phpunit/phpunit": "^6.4" + "doctrine/instantiator": "^1", + "mockery/mockery": "^1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.x-dev" + "dev-master": "5.x-dev" } }, "autoload": { "psr-4": { - "phpDocumentor\\Reflection\\": [ - "src/" - ] + "phpDocumentor\\Reflection\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -3023,38 +3023,41 @@ { "name": "Mike van Riel", "email": "me@mikevanriel.com" + }, + { + "name": "Jaap van Otterdijk", + "email": "account@ijaap.nl" } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2019-12-28T18:55:12+00:00" + "time": "2020-02-22T12:28:44+00:00" }, { "name": "phpdocumentor/type-resolver", - "version": "1.0.1", + "version": "1.6.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "2e32a6d48972b2c1976ed5d8967145b6cec4a4a9" + "reference": "77a32518733312af16a44300404e945338981de3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/2e32a6d48972b2c1976ed5d8967145b6cec4a4a9", - "reference": "2e32a6d48972b2c1976ed5d8967145b6cec4a4a9", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/77a32518733312af16a44300404e945338981de3", + "reference": "77a32518733312af16a44300404e945338981de3", "shasum": "" }, "require": { - "php": "^7.1", + "php": "^7.2 || ^8.0", "phpdocumentor/reflection-common": "^2.0" }, "require-dev": { - "ext-tokenizer": "^7.1", - "mockery/mockery": "~1", - "phpunit/phpunit": "^7.0" + "ext-tokenizer": "*", + "psalm/phar": "^4.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.x-dev" + "dev-1.x": "1.x-dev" } }, "autoload": { @@ -3073,7 +3076,7 @@ } ], "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", - "time": "2019-08-22T18:11:29+00:00" + "time": "2022-03-15T21:29:03+00:00" }, { "name": "phpspec/prophecy", @@ -3593,23 +3596,23 @@ }, { "name": "sabre/uri", - "version": "2.2.2", + "version": "2.2.4", "source": { "type": "git", "url": "https://github.com/sabre-io/uri.git", - "reference": "7cb0f489578afad5006e85cd60f18ff33f2d440d" + "reference": "c0c9af9f7754e60a49ebd760e1708adc6d1510c0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sabre-io/uri/zipball/7cb0f489578afad5006e85cd60f18ff33f2d440d", - "reference": "7cb0f489578afad5006e85cd60f18ff33f2d440d", + "url": "https://api.github.com/repos/sabre-io/uri/zipball/c0c9af9f7754e60a49ebd760e1708adc6d1510c0", + "reference": "c0c9af9f7754e60a49ebd760e1708adc6d1510c0", "shasum": "" }, "require": { "php": "^7.1 || ^8.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "~2.17.1", + "friendsofphp/php-cs-fixer": "~2.19.3", "phpstan/phpstan": "^0.12", "phpunit/phpunit": "^7.5 || ^8.5 || ^9.0" }, @@ -3641,20 +3644,20 @@ "uri", "url" ], - "time": "2021-11-04T09:29:58+00:00" + "time": "2022-09-19T12:25:28+00:00" }, { "name": "scssphp/scssphp", - "version": "v1.9.0", + "version": "v1.11.0", "source": { "type": "git", "url": "https://github.com/scssphp/scssphp.git", - "reference": "bc8bece4e5e176973a832f3763049ddbba16e6fd" + "reference": "33749d12c2569bb24071f94e9af828662dabb068" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/scssphp/scssphp/zipball/bc8bece4e5e176973a832f3763049ddbba16e6fd", - "reference": "bc8bece4e5e176973a832f3763049ddbba16e6fd", + "url": "https://api.github.com/repos/scssphp/scssphp/zipball/33749d12c2569bb24071f94e9af828662dabb068", + "reference": "33749d12c2569bb24071f94e9af828662dabb068", "shasum": "" }, "require": { @@ -3670,7 +3673,7 @@ "symfony/phpunit-bridge": "^5.1", "thoughtbot/bourbon": "^7.0", "twbs/bootstrap": "~5.0", - "twbs/bootstrap4": "4.6.0", + "twbs/bootstrap4": "4.6.1", "zurb/foundation": "~6.5" }, "suggest": { @@ -3681,6 +3684,12 @@ "bin/pscss" ], "type": "library", + "extra": { + "bamarni-bin": { + "forward-command": false, + "bin-links": false + } + }, "autoload": { "psr-4": { "ScssPhp\\ScssPhp\\": "src/" @@ -3711,7 +3720,7 @@ "scss", "stylesheet" ], - "time": "2021-12-13T11:55:16+00:00" + "time": "2022-09-02T21:24:55+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -4234,28 +4243,31 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.23.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce" + "reference": "5bbc823adecdae860bb64756d639ecfec17b050a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce", - "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a", + "reference": "5bbc823adecdae860bb64756d639ecfec17b050a", "shasum": "" }, "require": { "php": ">=7.1" }, + "provide": { + "ext-ctype": "*" + }, "suggest": { "ext-ctype": "For best performance" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4306,31 +4318,31 @@ "type": "tidelift" } ], - "time": "2021-02-19T12:13:01+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/yaml", - "version": "v3.4.47", + "version": "v4.4.45", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "88289caa3c166321883f67fe5130188ebbb47094" + "reference": "aeccc4dc52a9e634f1d1eebeb21eacfdcff1053d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/88289caa3c166321883f67fe5130188ebbb47094", - "reference": "88289caa3c166321883f67fe5130188ebbb47094", + "url": "https://api.github.com/repos/symfony/yaml/zipball/aeccc4dc52a9e634f1d1eebeb21eacfdcff1053d", + "reference": "aeccc4dc52a9e634f1d1eebeb21eacfdcff1053d", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8", + "php": ">=7.1.3", "symfony/polyfill-ctype": "~1.8" }, "conflict": { "symfony/console": "<3.4" }, "require-dev": { - "symfony/console": "~3.4|~4.0" + "symfony/console": "^3.4|^4.0|^5.0" }, "suggest": { "symfony/console": "For validating YAML files using the lint command" @@ -4358,7 +4370,7 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Yaml Component", + "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "funding": [ { @@ -4374,7 +4386,7 @@ "type": "tidelift" } ], - "time": "2020-10-24T10:57:07+00:00" + "time": "2022-08-02T15:47:23+00:00" }, { "name": "vimeo/psalm", @@ -4503,26 +4515,24 @@ }, { "name": "webmozart/glob", - "version": "4.1.0", + "version": "4.6.0", "source": { "type": "git", "url": "https://github.com/webmozarts/glob.git", - "reference": "3cbf63d4973cf9d780b93d2da8eec7e4a9e63bbe" + "reference": "3c17f7dec3d9d0e87b575026011f2e75a56ed655" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozarts/glob/zipball/3cbf63d4973cf9d780b93d2da8eec7e4a9e63bbe", - "reference": "3cbf63d4973cf9d780b93d2da8eec7e4a9e63bbe", + "url": "https://api.github.com/repos/webmozarts/glob/zipball/3c17f7dec3d9d0e87b575026011f2e75a56ed655", + "reference": "3c17f7dec3d9d0e87b575026011f2e75a56ed655", "shasum": "" }, "require": { - "php": "^5.3.3|^7.0", - "webmozart/path-util": "^2.2" + "php": "^7.3 || ^8.0.0" }, "require-dev": { - "phpunit/phpunit": "^4.6", - "sebastian/version": "^1.0.1", - "symfony/filesystem": "^2.5" + "phpunit/phpunit": "^9.5", + "symfony/filesystem": "^5.3" }, "type": "library", "extra": { @@ -4546,7 +4556,7 @@ } ], "description": "A PHP implementation of Ant's glob.", - "time": "2015-12-29T11:14:33+00:00" + "time": "2022-05-24T19:45:58+00:00" }, { "name": "webmozart/path-util", @@ -4598,7 +4608,9 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": { + "gofabian/negotiation-middleware": 20 + }, "prefer-stable": false, "prefer-lowest": false, "platform": { @@ -4610,7 +4622,7 @@ }, "platform-dev": [], "platform-overrides": { - "php": "7.1.0" + "php": "7.3.0" }, "plugin-api-version": "1.1.0" } From 9d77067e79646402c105bf85dd72e26b997055a8 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 7 Mar 2024 09:21:03 -0500 Subject: [PATCH 35/39] Update source code link to point to Friendica's Forgejo --- src/lang/ar/LC_MESSAGES/strings.po | 163 ++++++++++---------- src/lang/ca/LC_MESSAGES/strings.po | 204 +++++++++++++++---------- src/lang/cs/LC_MESSAGES/strings.po | 210 +++++++++++++++---------- src/lang/da_DK/LC_MESSAGES/strings.po | 183 +++++++++++----------- src/lang/de/LC_MESSAGES/strings.po | 212 +++++++++++++++----------- src/lang/en/LC_MESSAGES/strings.po | 8 +- src/lang/en_GB/LC_MESSAGES/strings.po | 212 +++++++++++++++----------- src/lang/et/LC_MESSAGES/strings.po | 184 ++++++++++++++-------- src/lang/fr/LC_MESSAGES/strings.po | 185 +++++++++++++--------- src/lang/gd/LC_MESSAGES/strings.po | 184 +++++++++++----------- src/lang/hu/LC_MESSAGES/strings.po | 183 +++++++++++----------- src/lang/it/LC_MESSAGES/strings.po | 210 ++++++++++++++----------- src/lang/ja/LC_MESSAGES/strings.po | 185 +++++++++++++--------- src/lang/nl/LC_MESSAGES/strings.po | 184 ++++++++++++++-------- src/lang/pl/LC_MESSAGES/strings.po | 177 +++++++++++---------- src/lang/ru/LC_MESSAGES/strings.po | 194 ++++++++++++++--------- src/lang/sv/LC_MESSAGES/strings.po | 150 +++++++++--------- src/lang/th/LC_MESSAGES/strings.po | 179 ++++++++++++++-------- src/lang/zh_CN/LC_MESSAGES/strings.po | 179 ++++++++++++++-------- src/templates/layout.phtml | 2 +- 20 files changed, 1965 insertions(+), 1423 deletions(-) diff --git a/src/lang/ar/LC_MESSAGES/strings.po b/src/lang/ar/LC_MESSAGES/strings.po index 3c9e69d..0526737 100644 --- a/src/lang/ar/LC_MESSAGES/strings.po +++ b/src/lang/ar/LC_MESSAGES/strings.po @@ -1,28 +1,25 @@ -# -# Translators: -# ButterflyOfFire, 2019 -# abidin toumi , 2021 -# msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" -"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Last-Translator: abidin toumi , 2021\n" "Language-Team: Arabic (https://www.transifex.com/Friendica/teams/12172/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" +"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Language: ar\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" "X-Generator: Poedit 2.2\n" -#: src\classes\Content\Pager.php:168 src\classes\Content\Pager.php:216 +#: src\classes\Content\Pager.php:168 +#: src\classes\Content\Pager.php:216 msgid "Previous" msgstr "السابقة" -#: src\classes\Content\Pager.php:173 src\classes\Content\Pager.php:273 +#: src\classes\Content\Pager.php:173 +#: src\classes\Content\Pager.php:273 msgid "Next" msgstr "التالية" @@ -34,51 +31,57 @@ msgstr "الأولى" msgid "Last" msgstr "الأخيرة" -#: src\classes\Controllers\Web\Directory.php:73 +#: src\classes\Controllers\Web\Directory.php:85 msgid "People" msgstr "أشخاص" -#: src\classes\Controllers\Web\Search.php:64 +#: src\classes\Controllers\Web\Search.php:72 msgctxt "field" msgid "Language" msgstr "اللغة" -#: src\classes\Controllers\Web\Search.php:65 +#: src\classes\Controllers\Web\Search.php:73 msgctxt "field" msgid "Locality" msgstr "المنطقة" -#: src\classes\Controllers\Web\Search.php:66 +#: src\classes\Controllers\Web\Search.php:74 msgctxt "field" msgid "Region" msgstr "الإقليم" -#: src\classes\Controllers\Web\Search.php:67 +#: src\classes\Controllers\Web\Search.php:75 msgctxt "field" msgid "Country" msgstr "البلد" -#: src\classes\Controllers\Web\Servers.php:90 +#: src\classes\Controllers\Web\Servers.php:105 msgid "Public Servers" msgstr "الخوادم العمومية" -#: src\templates\layout.phtml:4 src\templates\layout.phtml:18 +#: src\templates\layout.phtml:4 +#: src\templates\layout.phtml:18 msgid "Friendica Directory" msgstr "دليل فرنديكا" -#: src\templates\layout.phtml:23 src\templates\layout.phtml:25 -#: src\templates\layout.phtml:43 src\templates\layout.phtml:45 -#: src\templates\search.phtml:4 src\templates\search.phtml:12 +#: src\templates\layout.phtml:23 +#: src\templates\layout.phtml:25 +#: src\templates\layout.phtml:43 +#: src\templates\layout.phtml:45 +#: src\templates\search.phtml:4 +#: src\templates\search.phtml:12 msgid "Search terms" msgstr "مصطلحات البحث" -#: src\templates\layout.phtml:24 src\templates\layout.phtml:45 +#: src\templates\layout.phtml:24 +#: src\templates\layout.phtml:45 #: src\templates\search.phtml:11 msgctxt "noun" msgid "Search" msgstr "ابحث" -#: src\templates\layout.phtml:27 src\templates\layout.phtml:47 +#: src\templates\layout.phtml:27 +#: src\templates\layout.phtml:47 #: src\templates\search.phtml:14 msgctxt "verb" msgid "Search" @@ -106,11 +109,11 @@ msgstr[3] "%d نتائج لـ \"%s\"" msgstr[4] "%d نتيجة لـ \"%s\"" msgstr[5] "%dنتيجة لـ \"%s\"" -#: src\templates\servers.phtml:2 +#: src\templates\servers.phtml:7 msgid "Top servers pagination" msgstr "" -#: src\templates\servers.phtml:12 +#: src\templates\servers.phtml:17 msgid "Bottom servers pagination" msgstr "" @@ -127,23 +130,27 @@ msgid "Filter by country" msgstr "رشح حسب الدولة" #: src\templates\sub\profile.phtml:31 +#: src\templates\sub\profile.phtml:35 +#: src\templates\sub\profile.phtml:39 msgctxt "verb" msgid "Follow" msgstr "تابع" -#: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47 +#: src\templates\layout.phtml:65 +#: src\templates\sub\profile.phtml:57 msgid "Language" msgstr "اللغة" -#: src\templates\sub\profile.phtml:50 +#: src\templates\sub\profile.phtml:60 +#: src\templates\widget\popularserverlanguages.phtml:2 msgid "Filter by language" msgstr "رشح حسب اللغة" -#: src\templates\sub\profile.phtml:56 +#: src\templates\sub\profile.phtml:66 msgid "Location" msgstr "الموقع" -#: src\templates\sub\profile.phtml:69 +#: src\templates\sub\profile.phtml:79 msgid "Search Tag" msgstr "ابحث عن وسم" @@ -151,19 +158,23 @@ msgstr "ابحث عن وسم" msgid "Account type tabs" msgstr "ألسنة نوع الحساب" -#: src\templates\sub\profiles.phtml:4 src\templates\sub\profiles.phtml:7 +#: src\templates\sub\profiles.phtml:4 +#: src\templates\sub\profiles.phtml:7 msgid "Top %s pagination" msgstr "" -#: src\templates\sub\profiles.phtml:13 src\templates\sub\profiles.phtml:16 +#: src\templates\sub\profiles.phtml:13 +#: src\templates\sub\profiles.phtml:16 msgid "Bottom %s pagination" msgstr "" -#: src\templates\statistics.phtml:66 src\templates\sub\server.phtml:15 +#: src\templates\statistics.phtml:66 +#: src\templates\sub\server.phtml:15 msgid "Stable Version" msgstr "الإصدار المستقر" -#: src\templates\statistics.phtml:68 src\templates\sub\server.phtml:17 +#: src\templates\statistics.phtml:68 +#: src\templates\sub\server.phtml:17 msgid "Develop Version" msgstr "الإصدار الاختباري" @@ -171,15 +182,15 @@ msgstr "الإصدار الاختباري" msgid "Outdated Version" msgstr "إصدار قديم" -#: src\templates\sub\server.phtml:72 +#: src\templates\sub\server.phtml:69 msgid "Admin" msgstr "المدير" -#: src\templates\sub\server.phtml:79 +#: src\templates\sub\server.phtml:76 msgid "No description provided" msgstr "لم يقدم أي وصف" -#: src\templates\sub\server.phtml:82 +#: src\templates\sub\server.phtml:79 msgid "Visit Server" msgstr "زُر الخادم" @@ -187,7 +198,7 @@ msgstr "زُر الخادم" msgid "Popular Countries" msgstr "البلدان الشائعة" -#: src\templates\widget\popularlanguages.phtml:2 +#: src\templates\widget\popularprofilelanguages.phtml:2 msgid "Popular Languages" msgstr "اللغات الشائعة" @@ -195,7 +206,8 @@ msgstr "اللغات الشائعة" msgid "Popular Tags" msgstr "الوسوم الشائعة" -#: src\templates\sub\server.phtml:44 src\templates\sub\server.phtml:45 +#: src\templates\sub\server.phtml:44 +#: src\templates\sub\server.phtml:45 msgid "Default Language" msgstr "اللغة الافتراضية" @@ -219,17 +231,6 @@ msgstr[3] "أشخاص (%d)" msgstr[4] "أشخاص (%d)" msgstr[5] "أشخاص (%d)" -#: src\classes\Views\Widget\AccountTypeTabs.php:59 -msgctxt "account-type" -msgid "Forum (%d)" -msgid_plural "Forums (%d)" -msgstr[0] "منتديات (%d)" -msgstr[1] "منتديات (%d)" -msgstr[2] "منتديات (%d)" -msgstr[3] "منتديات (%d)" -msgstr[4] "منتديات (%d)" -msgstr[5] "منتديات (%d)" - #: src\templates\layout.phtml:97 msgid "Stats" msgstr "الإحصائيات" @@ -243,18 +244,16 @@ msgid "Profiles" msgstr "الملفات الشخصية" #: src\templates\statistics.phtml:6 -msgid "" -"This directory knows about %s distinct potential profile " -"URLs." +msgid "This directory knows about %s distinct potential profile URLs." msgstr "" -#: src\templates\statistics.phtml:16 src\templates\statistics.phtml:46 +#: src\templates\statistics.phtml:16 +#: src\templates\statistics.phtml:46 msgid "Languages" msgstr "اللغات" #: src\templates\statistics.phtml:17 -msgid "" -"Out of %s profiles reporting their language there are:" +msgid "Out of %s profiles reporting their language there are:" msgstr "من بين %s ملفا شخصيا عرف عن لغته هناك:" #: src\templates\statistics.phtml:27 @@ -262,15 +261,11 @@ msgid "Servers" msgstr "الخوادم" #: src\templates\statistics.phtml:28 -msgid "" -"This directory knows about %s distinct potential server " -"URLs." +msgid "This directory knows about %s distinct potential server URLs." msgstr "" #: src\templates\statistics.phtml:29 -msgid "" -"Out of those, there are %s domains (%s) that have been a " -"Friendica server at least once." +msgid "Out of those, there are %s domains (%s) that have been a Friendica server at least once." msgstr "" #: src\templates\statistics.phtml:33 @@ -290,9 +285,7 @@ msgid "Out of %s servers reporting their version there are:" msgstr "من بين %s خادما عرف عن إصداره هناك:" #: src\templates\statistics.phtml:7 -msgid "" -"Out of those, there are %s profiles (%s) that opted in the " -"public directory at least once." +msgid "Out of those, there are %s profiles (%s) that opted in the public directory at least once." msgstr "" #: src\templates\statistics.phtml:35 @@ -303,23 +296,13 @@ msgstr "%s خادم متوفر (%s)" msgid "Friendica Directory version %s" msgstr "إصدار دليل فرنديكا %s" -#: src\templates\layout.phtml:94 -msgid "Source Code on GitHub" -msgstr "الشفرة المصدرية على غيت هب" - #: src\templates\statistics.phtml:11 -msgid "" -"Out of those, there currently are %s available profiles " -"(%s). Check them out!" +msgid "Out of those, there currently are %s available profiles (%s). Check them out!" msgstr "" #: src\templates\statistics.phtml:39 -msgid "" -"%s public servers (%s) currently open for registration. Check them out!" -msgstr "" -"يوجد %s خادم عمومي (%s) مفتوح للستجيل. ألق " -"نظرة عليهم!" +msgid "%s public servers (%s) currently open for registration. Check them out!" +msgstr "يوجد %s خادم عمومي (%s) مفتوح للستجيل. ألق نظرة عليهم!" #: src\classes\Views\Widget\AccountTypeTabs.php:57 msgctxt "account-type" @@ -361,14 +344,38 @@ msgstr[5] "%s مستخدم" msgid "None" msgstr "لا شيء" -#: src\templates\sub\server.phtml:59 src\templates\sub\server.phtml:63 +#: src\templates\sub\server.phtml:58 +#: src\templates\sub\server.phtml:62 msgid "Registration Policy" msgstr "سياسة التسجيل" -#: src\templates\sub\server.phtml:60 +#: src\templates\sub\server.phtml:59 msgid "By Approval" msgstr "يحتاج الموافقة" -#: src\templates\sub\server.phtml:64 +#: src\templates\sub\server.phtml:63 msgid "Open" msgstr "مفتوح" + +#: src\classes\Views\Widget\AccountTypeTabs.php:61 +msgctxt "account-type" +msgid "Group (%d)" +msgid_plural "Groups (%d)" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + +#: src\templates\servers.phtml:3 +msgid "Filtered by language:" +msgstr "" + +#: src\templates\servers.phtml:3 +msgid "Clear language filter" +msgstr "" + +#: src\templates\layout.phtml:94 +msgid "Source Code on Friendica's Forgejo" +msgstr "" diff --git a/src/lang/ca/LC_MESSAGES/strings.po b/src/lang/ca/LC_MESSAGES/strings.po index 518c6fd..c9ab323 100644 --- a/src/lang/ca/LC_MESSAGES/strings.po +++ b/src/lang/ca/LC_MESSAGES/strings.po @@ -1,27 +1,25 @@ -# -# Translators: -# Joan Bar , 2019 -# msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" -"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Last-Translator: Joan Bar , 2019\n" "Language-Team: Catalan (https://www.transifex.com/Friendica/teams/12172/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" +"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Language: ca\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.2\n" -#: src\classes\Content\Pager.php:168 src\classes\Content\Pager.php:216 +#: src\classes\Content\Pager.php:168 +#: src\classes\Content\Pager.php:216 msgid "Previous" msgstr "prèvia" -#: src\classes\Content\Pager.php:173 src\classes\Content\Pager.php:273 +#: src\classes\Content\Pager.php:173 +#: src\classes\Content\Pager.php:273 msgid "Next" msgstr "següent" @@ -33,51 +31,57 @@ msgstr "Primer" msgid "Last" msgstr "Ultim" -#: src\classes\Controllers\Web\Directory.php:73 +#: src\classes\Controllers\Web\Directory.php:85 msgid "People" msgstr "gent" -#: src\classes\Controllers\Web\Search.php:64 +#: src\classes\Controllers\Web\Search.php:72 msgctxt "field" msgid "Language" msgstr "Llengua" -#: src\classes\Controllers\Web\Search.php:65 +#: src\classes\Controllers\Web\Search.php:73 msgctxt "field" msgid "Locality" msgstr "Localitat" -#: src\classes\Controllers\Web\Search.php:66 +#: src\classes\Controllers\Web\Search.php:74 msgctxt "field" msgid "Region" msgstr "Regió" -#: src\classes\Controllers\Web\Search.php:67 +#: src\classes\Controllers\Web\Search.php:75 msgctxt "field" msgid "Country" msgstr "País" -#: src\classes\Controllers\Web\Servers.php:90 +#: src\classes\Controllers\Web\Servers.php:105 msgid "Public Servers" msgstr "Servidors públics" -#: src\templates\layout.phtml:4 src\templates\layout.phtml:18 +#: src\templates\layout.phtml:4 +#: src\templates\layout.phtml:18 msgid "Friendica Directory" msgstr "Directori de Friendica" -#: src\templates\layout.phtml:23 src\templates\layout.phtml:25 -#: src\templates\layout.phtml:43 src\templates\layout.phtml:45 -#: src\templates\search.phtml:4 src\templates\search.phtml:12 +#: src\templates\layout.phtml:23 +#: src\templates\layout.phtml:25 +#: src\templates\layout.phtml:43 +#: src\templates\layout.phtml:45 +#: src\templates\search.phtml:4 +#: src\templates\search.phtml:12 msgid "Search terms" msgstr "Termes de cerca" -#: src\templates\layout.phtml:24 src\templates\layout.phtml:45 +#: src\templates\layout.phtml:24 +#: src\templates\layout.phtml:45 #: src\templates\search.phtml:11 msgctxt "noun" msgid "Search" msgstr "Buscar" -#: src\templates\layout.phtml:27 src\templates\layout.phtml:47 +#: src\templates\layout.phtml:27 +#: src\templates\layout.phtml:47 #: src\templates\search.phtml:14 msgctxt "verb" msgid "Search" @@ -101,11 +105,11 @@ msgid_plural "%d results for \"%s\"" msgstr[0] "" msgstr[1] "" -#: src\templates\servers.phtml:2 +#: src\templates\servers.phtml:7 msgid "Top servers pagination" msgstr "Paginació dels servidors principals" -#: src\templates\servers.phtml:12 +#: src\templates\servers.phtml:17 msgid "Bottom servers pagination" msgstr "Paginació dels servidors principals" @@ -122,23 +126,27 @@ msgid "Filter by country" msgstr "Filtra per País" #: src\templates\sub\profile.phtml:31 +#: src\templates\sub\profile.phtml:35 +#: src\templates\sub\profile.phtml:39 msgctxt "verb" msgid "Follow" msgstr "seguir" -#: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47 +#: src\templates\layout.phtml:65 +#: src\templates\sub\profile.phtml:57 msgid "Language" msgstr "Llenguatge " -#: src\templates\sub\profile.phtml:50 +#: src\templates\sub\profile.phtml:60 +#: src\templates\widget\popularserverlanguages.phtml:2 msgid "Filter by language" msgstr "" -#: src\templates\sub\profile.phtml:56 +#: src\templates\sub\profile.phtml:66 msgid "Location" msgstr "Localitat" -#: src\templates\sub\profile.phtml:69 +#: src\templates\sub\profile.phtml:79 msgid "Search Tag" msgstr "Etiqueta de cerca" @@ -146,19 +154,23 @@ msgstr "Etiqueta de cerca" msgid "Account type tabs" msgstr "Pestanyes tipus compte" -#: src\templates\sub\profiles.phtml:4 src\templates\sub\profiles.phtml:7 +#: src\templates\sub\profiles.phtml:4 +#: src\templates\sub\profiles.phtml:7 msgid "Top %s pagination" msgstr "Superior%s Paginació" -#: src\templates\sub\profiles.phtml:13 src\templates\sub\profiles.phtml:16 +#: src\templates\sub\profiles.phtml:13 +#: src\templates\sub\profiles.phtml:16 msgid "Bottom %s pagination" msgstr "" -#: src\templates\statistics.phtml:66 src\templates\sub\server.phtml:15 +#: src\templates\statistics.phtml:66 +#: src\templates\sub\server.phtml:15 msgid "Stable Version" msgstr "" -#: src\templates\statistics.phtml:68 src\templates\sub\server.phtml:17 +#: src\templates\statistics.phtml:68 +#: src\templates\sub\server.phtml:17 msgid "Develop Version" msgstr "Desenvolupar la versió" @@ -166,15 +178,15 @@ msgstr "Desenvolupar la versió" msgid "Outdated Version" msgstr "Versió obsoleta" -#: src\templates\sub\server.phtml:55 +#: src\templates\sub\server.phtml:69 msgid "Admin" msgstr "Administrador" -#: src\templates\sub\server.phtml:62 +#: src\templates\sub\server.phtml:76 msgid "No description provided" msgstr "No es proporciona cap descripció" -#: src\templates\sub\server.phtml:65 +#: src\templates\sub\server.phtml:79 msgid "Visit Server" msgstr "Visita servidor" @@ -182,7 +194,7 @@ msgstr "Visita servidor" msgid "Popular Countries" msgstr "Països populars" -#: src\templates\widget\popularlanguages.phtml:2 +#: src\templates\widget\popularprofilelanguages.phtml:2 msgid "Popular Languages" msgstr "Idiomes populars" @@ -190,7 +202,8 @@ msgstr "Idiomes populars" msgid "Popular Tags" msgstr "Etiquetes populars" -#: src\templates\sub\server.phtml:44 src\templates\sub\server.phtml:45 +#: src\templates\sub\server.phtml:44 +#: src\templates\sub\server.phtml:45 msgid "Default Language" msgstr "Idioma per defecte" @@ -210,13 +223,6 @@ msgid_plural "People (%d)" msgstr[0] "" msgstr[1] "" -#: src\classes\Views\Widget\AccountTypeTabs.php:57 -msgctxt "account-type" -msgid "Forum (%d)" -msgid_plural "Forums (%d)" -msgstr[0] "" -msgstr[1] "" - #: src\templates\layout.phtml:97 msgid "Stats" msgstr "Estadístiques" @@ -230,39 +236,29 @@ msgid "Profiles" msgstr "perfil" #: src\templates\statistics.phtml:6 -msgid "" -"This directory knows about %s distinct potential profile " -"URLs." +msgid "This directory knows about %s distinct potential profile URLs." msgstr "Aquest directori en sap %s URL de perfil diferents." -#: src\templates\statistics.phtml:16 src\templates\statistics.phtml:46 +#: src\templates\statistics.phtml:16 +#: src\templates\statistics.phtml:46 msgid "Languages" msgstr "Idiomes" #: src\templates\statistics.phtml:17 -msgid "" -"Out of %s profiles reporting their language there are:" -msgstr "" -"Fora de%s Els perfils que informen el seu idioma hi ha:" +msgid "Out of %s profiles reporting their language there are:" +msgstr "Fora de%s Els perfils que informen el seu idioma hi ha:" #: src\templates\statistics.phtml:27 msgid "Servers" msgstr "Servidors" #: src\templates\statistics.phtml:28 -msgid "" -"This directory knows about %s distinct potential server " -"URLs." -msgstr "" -"Aquest directori en sap %s URL de servidor diferents." +msgid "This directory knows about %s distinct potential server URLs." +msgstr "Aquest directori en sap %s URL de servidor diferents." #: src\templates\statistics.phtml:29 -msgid "" -"Out of those, there are %s domains (%s) that have been a " -"Friendica server at least once." -msgstr "" -"D’aquests, n’hi ha %s dominis (%s) que han estat un " -"servidor Friendica com a mínim una vegada." +msgid "Out of those, there are %s domains (%s) that have been a Friendica server at least once." +msgstr "D’aquests, n’hi ha %s dominis (%s) que han estat un servidor Friendica com a mínim una vegada." #: src\templates\statistics.phtml:33 msgid "Out of those, there are:" @@ -270,8 +266,7 @@ msgstr "D'aquests, hi ha:" #: src\templates\statistics.phtml:47 msgid "Out of %s servers reporting their language there are:" -msgstr "" -"Fora de %s hi ha servidors que informen del seu idioma:" +msgstr "Fora de %s hi ha servidors que informen del seu idioma:" #: src\templates\statistics.phtml:57 msgid "Versions" @@ -279,16 +274,11 @@ msgstr "Versions" #: src\templates\statistics.phtml:58 msgid "Out of %s servers reporting their version there are:" -msgstr "" -"Fora de%s Hi ha servidors que informen de la seva versió:" +msgstr "Fora de%s Hi ha servidors que informen de la seva versió:" #: src\templates\statistics.phtml:7 -msgid "" -"Out of those, there are %s profiles (%s) that opted in the " -"public directory at least once." -msgstr "" -"D’aquests, n’hi ha %s perfil (%s) que va optar al directori" -" públic almenys una vegada." +msgid "Out of those, there are %s profiles (%s) that opted in the public directory at least once." +msgstr "D’aquests, n’hi ha %s perfil (%s) que va optar al directori públic almenys una vegada." #: src\templates\statistics.phtml:35 msgid "%s available servers (%s)" @@ -298,18 +288,70 @@ msgstr "%s servidors disponibles (%s)" msgid "Friendica Directory version %s" msgstr "Versió del directori Friendica" -#: src\templates\layout.phtml:94 -msgid "Source Code on GitHub" -msgstr "Codi font a GitHub" - #: src\templates\statistics.phtml:11 -msgid "" -"Out of those, there currently are %s available profiles " -"(%s). Check them out!" +msgid "Out of those, there currently are %s available profiles (%s). Check them out!" msgstr "" #: src\templates\statistics.phtml:39 -msgid "" -"%s public servers (%s) currently open for registration. Check them out!" +msgid "%s public servers (%s) currently open for registration. Check them out!" +msgstr "" + +#: src\classes\Views\Widget\AccountTypeTabs.php:57 +msgctxt "account-type" +msgid "News (%d)" +msgid_plural "News (%d)" +msgstr[0] "" +msgstr[1] "" + +#: src\classes\Views\Widget\AccountTypeTabs.php:58 +msgctxt "account-type" +msgid "Organization (%d)" +msgid_plural "Organizations (%d)" +msgstr[0] "" +msgstr[1] "" + +#: src\classes\Views\Widget\AccountTypeTabs.php:61 +msgctxt "account-type" +msgid "Group (%d)" +msgid_plural "Groups (%d)" +msgstr[0] "" +msgstr[1] "" + +#: src\templates\servers.phtml:3 +msgid "Filtered by language:" +msgstr "" + +#: src\templates\servers.phtml:3 +msgid "Clear language filter" +msgstr "" + +#: src\templates\sub\server.phtml:40 +msgid "Health Score" +msgstr "" + +#: src\templates\sub\server.phtml:52 +msgid "%s User" +msgid_plural "%s Users" +msgstr[0] "" +msgstr[1] "" + +#: src\templates\sub\server.phtml:54 +msgid "None" +msgstr "" + +#: src\templates\sub\server.phtml:58 +#: src\templates\sub\server.phtml:62 +msgid "Registration Policy" +msgstr "" + +#: src\templates\sub\server.phtml:59 +msgid "By Approval" +msgstr "" + +#: src\templates\sub\server.phtml:63 +msgid "Open" +msgstr "" + +#: src\templates\layout.phtml:94 +msgid "Source Code on Friendica's Forgejo" msgstr "" diff --git a/src/lang/cs/LC_MESSAGES/strings.po b/src/lang/cs/LC_MESSAGES/strings.po index 737b6ed..082c5b4 100644 --- a/src/lang/cs/LC_MESSAGES/strings.po +++ b/src/lang/cs/LC_MESSAGES/strings.po @@ -1,27 +1,25 @@ -# -# Translators: -# Aditoo, 2019 -# msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" -"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Last-Translator: Aditoo, 2019\n" "Language-Team: Czech (https://www.transifex.com/Friendica/teams/12172/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" +"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Language: cs\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" "X-Generator: Poedit 2.2\n" -#: src\classes\Content\Pager.php:168 src\classes\Content\Pager.php:216 +#: src\classes\Content\Pager.php:168 +#: src\classes\Content\Pager.php:216 msgid "Previous" msgstr "Předchozí" -#: src\classes\Content\Pager.php:173 src\classes\Content\Pager.php:273 +#: src\classes\Content\Pager.php:173 +#: src\classes\Content\Pager.php:273 msgid "Next" msgstr "Další" @@ -33,51 +31,57 @@ msgstr "První" msgid "Last" msgstr "Poslední" -#: src\classes\Controllers\Web\Directory.php:73 +#: src\classes\Controllers\Web\Directory.php:85 msgid "People" msgstr "Lidé" -#: src\classes\Controllers\Web\Search.php:64 +#: src\classes\Controllers\Web\Search.php:72 msgctxt "field" msgid "Language" msgstr "Jazyk" -#: src\classes\Controllers\Web\Search.php:65 +#: src\classes\Controllers\Web\Search.php:73 msgctxt "field" msgid "Locality" msgstr "Poloha" -#: src\classes\Controllers\Web\Search.php:66 +#: src\classes\Controllers\Web\Search.php:74 msgctxt "field" msgid "Region" msgstr "Region/kraj" -#: src\classes\Controllers\Web\Search.php:67 +#: src\classes\Controllers\Web\Search.php:75 msgctxt "field" msgid "Country" msgstr "Země" -#: src\classes\Controllers\Web\Servers.php:90 +#: src\classes\Controllers\Web\Servers.php:105 msgid "Public Servers" msgstr "Veřejné servery" -#: src\templates\layout.phtml:4 src\templates\layout.phtml:18 +#: src\templates\layout.phtml:4 +#: src\templates\layout.phtml:18 msgid "Friendica Directory" msgstr "Adresář Friendica" -#: src\templates\layout.phtml:23 src\templates\layout.phtml:25 -#: src\templates\layout.phtml:43 src\templates\layout.phtml:45 -#: src\templates\search.phtml:4 src\templates\search.phtml:12 +#: src\templates\layout.phtml:23 +#: src\templates\layout.phtml:25 +#: src\templates\layout.phtml:43 +#: src\templates\layout.phtml:45 +#: src\templates\search.phtml:4 +#: src\templates\search.phtml:12 msgid "Search terms" msgstr "Termíny vyhledávání" -#: src\templates\layout.phtml:24 src\templates\layout.phtml:45 +#: src\templates\layout.phtml:24 +#: src\templates\layout.phtml:45 #: src\templates\search.phtml:11 msgctxt "noun" msgid "Search" msgstr "Hledání" -#: src\templates\layout.phtml:27 src\templates\layout.phtml:47 +#: src\templates\layout.phtml:27 +#: src\templates\layout.phtml:47 #: src\templates\search.phtml:14 msgctxt "verb" msgid "Search" @@ -103,11 +107,11 @@ msgstr[1] "%d výsledky pro „%s“" msgstr[2] "%d výsledku pro „%s“" msgstr[3] "%d výsledků pro „%s“" -#: src\templates\servers.phtml:2 +#: src\templates\servers.phtml:7 msgid "Top servers pagination" msgstr "Horní stránkování serverů" -#: src\templates\servers.phtml:12 +#: src\templates\servers.phtml:17 msgid "Bottom servers pagination" msgstr "Spodní stránkování serverů" @@ -124,23 +128,27 @@ msgid "Filter by country" msgstr "Filtrovat dle země" #: src\templates\sub\profile.phtml:31 +#: src\templates\sub\profile.phtml:35 +#: src\templates\sub\profile.phtml:39 msgctxt "verb" msgid "Follow" msgstr "Sledovat" -#: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47 +#: src\templates\layout.phtml:65 +#: src\templates\sub\profile.phtml:57 msgid "Language" msgstr "Jazyk" -#: src\templates\sub\profile.phtml:50 +#: src\templates\sub\profile.phtml:60 +#: src\templates\widget\popularserverlanguages.phtml:2 msgid "Filter by language" msgstr "Filtrovat dle jazyka" -#: src\templates\sub\profile.phtml:56 +#: src\templates\sub\profile.phtml:66 msgid "Location" msgstr "Poloha" -#: src\templates\sub\profile.phtml:69 +#: src\templates\sub\profile.phtml:79 msgid "Search Tag" msgstr "Hledat podle štítku" @@ -148,19 +156,23 @@ msgstr "Hledat podle štítku" msgid "Account type tabs" msgstr "Záložky typů účtů" -#: src\templates\sub\profiles.phtml:4 src\templates\sub\profiles.phtml:7 +#: src\templates\sub\profiles.phtml:4 +#: src\templates\sub\profiles.phtml:7 msgid "Top %s pagination" msgstr "Horní stránkování %s" -#: src\templates\sub\profiles.phtml:13 src\templates\sub\profiles.phtml:16 +#: src\templates\sub\profiles.phtml:13 +#: src\templates\sub\profiles.phtml:16 msgid "Bottom %s pagination" msgstr "Spodní stránkování %s" -#: src\templates\statistics.phtml:66 src\templates\sub\server.phtml:15 +#: src\templates\statistics.phtml:66 +#: src\templates\sub\server.phtml:15 msgid "Stable Version" msgstr "Stabilní verze" -#: src\templates\statistics.phtml:68 src\templates\sub\server.phtml:17 +#: src\templates\statistics.phtml:68 +#: src\templates\sub\server.phtml:17 msgid "Develop Version" msgstr "Vývojová verze" @@ -168,15 +180,15 @@ msgstr "Vývojová verze" msgid "Outdated Version" msgstr "Neaktuální verze" -#: src\templates\sub\server.phtml:55 +#: src\templates\sub\server.phtml:69 msgid "Admin" msgstr "Administrátor" -#: src\templates\sub\server.phtml:62 +#: src\templates\sub\server.phtml:76 msgid "No description provided" msgstr "Není zadán žádný popis" -#: src\templates\sub\server.phtml:65 +#: src\templates\sub\server.phtml:79 msgid "Visit Server" msgstr "Navštívit server" @@ -184,7 +196,7 @@ msgstr "Navštívit server" msgid "Popular Countries" msgstr "Populární země" -#: src\templates\widget\popularlanguages.phtml:2 +#: src\templates\widget\popularprofilelanguages.phtml:2 msgid "Popular Languages" msgstr "Populární jazyky" @@ -192,7 +204,8 @@ msgstr "Populární jazyky" msgid "Popular Tags" msgstr "Populární štítky" -#: src\templates\sub\server.phtml:44 src\templates\sub\server.phtml:45 +#: src\templates\sub\server.phtml:44 +#: src\templates\sub\server.phtml:45 msgid "Default Language" msgstr "Výchozí jazyk" @@ -214,15 +227,6 @@ msgstr[1] "Lidé (%d)" msgstr[2] "Lidé (%d)" msgstr[3] "Lidé (%d)" -#: src\classes\Views\Widget\AccountTypeTabs.php:57 -msgctxt "account-type" -msgid "Forum (%d)" -msgid_plural "Forums (%d)" -msgstr[0] "Fóra (%d)" -msgstr[1] "Fóra (%d)" -msgstr[2] "Fóra (%d)" -msgstr[3] "Fóra (%d)" - #: src\templates\layout.phtml:97 msgid "Stats" msgstr "Statistika" @@ -236,20 +240,16 @@ msgid "Profiles" msgstr "Profily" #: src\templates\statistics.phtml:6 -msgid "" -"This directory knows about %s distinct potential profile " -"URLs." -msgstr "" -"Tento adresář ví o %s zřetelných potenciálních profilových URL " -"adresách." +msgid "This directory knows about %s distinct potential profile URLs." +msgstr "Tento adresář ví o %s zřetelných potenciálních profilových URL adresách." -#: src\templates\statistics.phtml:16 src\templates\statistics.phtml:46 +#: src\templates\statistics.phtml:16 +#: src\templates\statistics.phtml:46 msgid "Languages" msgstr "Jazyky" #: src\templates\statistics.phtml:17 -msgid "" -"Out of %s profiles reporting their language there are:" +msgid "Out of %s profiles reporting their language there are:" msgstr "Ze všech %s profilů hlásících svůj jazyk je tu:" #: src\templates\statistics.phtml:27 @@ -257,20 +257,12 @@ msgid "Servers" msgstr "Servery" #: src\templates\statistics.phtml:28 -msgid "" -"This directory knows about %s distinct potential server " -"URLs." -msgstr "" -"Tento adresář ví o %s zřetelných potenciálních serverových URL " -"adresách." +msgid "This directory knows about %s distinct potential server URLs." +msgstr "Tento adresář ví o %s zřetelných potenciálních serverových URL adresách." #: src\templates\statistics.phtml:29 -msgid "" -"Out of those, there are %s domains (%s) that have been a " -"Friendica server at least once." -msgstr "" -"Z těch je tu %s domén (%s), které byly alespoň jednou " -"serverem Friendica." +msgid "Out of those, there are %s domains (%s) that have been a Friendica server at least once." +msgstr "Z těch je tu %s domén (%s), které byly alespoň jednou serverem Friendica." #: src\templates\statistics.phtml:33 msgid "Out of those, there are:" @@ -289,12 +281,8 @@ msgid "Out of %s servers reporting their version there are:" msgstr "Ze všech %s serverů hlásících svou verzi je tu:" #: src\templates\statistics.phtml:7 -msgid "" -"Out of those, there are %s profiles (%s) that opted in the " -"public directory at least once." -msgstr "" -"Z těch je tu %s profilů (%s), které byly alespoň jednou " -"publikovány ve veřejném adresáři." +msgid "Out of those, there are %s profiles (%s) that opted in the public directory at least once." +msgstr "Z těch je tu %s profilů (%s), které byly alespoň jednou publikovány ve veřejném adresáři." #: src\templates\statistics.phtml:35 msgid "%s available servers (%s)" @@ -304,18 +292,78 @@ msgstr "%s dostupných serverů (%s)" msgid "Friendica Directory version %s" msgstr "Adresář Friendica, verze %s" -#: src\templates\layout.phtml:94 -msgid "Source Code on GitHub" -msgstr "Zdrojový kód na GitHubu" - #: src\templates\statistics.phtml:11 -msgid "" -"Out of those, there currently are %s available profiles " -"(%s). Check them out!" +msgid "Out of those, there currently are %s available profiles (%s). Check them out!" msgstr "" #: src\templates\statistics.phtml:39 -msgid "" -"%s public servers (%s) currently open for registration. Check them out!" +msgid "%s public servers (%s) currently open for registration. Check them out!" +msgstr "" + +#: src\classes\Views\Widget\AccountTypeTabs.php:57 +msgctxt "account-type" +msgid "News (%d)" +msgid_plural "News (%d)" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: src\classes\Views\Widget\AccountTypeTabs.php:58 +msgctxt "account-type" +msgid "Organization (%d)" +msgid_plural "Organizations (%d)" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: src\classes\Views\Widget\AccountTypeTabs.php:61 +msgctxt "account-type" +msgid "Group (%d)" +msgid_plural "Groups (%d)" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: src\templates\servers.phtml:3 +msgid "Filtered by language:" +msgstr "" + +#: src\templates\servers.phtml:3 +msgid "Clear language filter" +msgstr "" + +#: src\templates\sub\server.phtml:40 +msgid "Health Score" +msgstr "" + +#: src\templates\sub\server.phtml:52 +msgid "%s User" +msgid_plural "%s Users" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: src\templates\sub\server.phtml:54 +msgid "None" +msgstr "" + +#: src\templates\sub\server.phtml:58 +#: src\templates\sub\server.phtml:62 +msgid "Registration Policy" +msgstr "" + +#: src\templates\sub\server.phtml:59 +msgid "By Approval" +msgstr "" + +#: src\templates\sub\server.phtml:63 +msgid "Open" +msgstr "" + +#: src\templates\layout.phtml:94 +msgid "Source Code on Friendica's Forgejo" msgstr "" diff --git a/src/lang/da_DK/LC_MESSAGES/strings.po b/src/lang/da_DK/LC_MESSAGES/strings.po index 546e0ec..5e5a60e 100644 --- a/src/lang/da_DK/LC_MESSAGES/strings.po +++ b/src/lang/da_DK/LC_MESSAGES/strings.po @@ -1,27 +1,25 @@ -# -# Translators: -# Anton , 2022 -# msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" -"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Last-Translator: Anton , 2022\n" "Language-Team: Danish (Denmark) (https://www.transifex.com/Friendica/teams/12172/da_DK/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" +"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Language: da_DK\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.2\n" -#: src\classes\Content\Pager.php:168 src\classes\Content\Pager.php:216 +#: src\classes\Content\Pager.php:168 +#: src\classes\Content\Pager.php:216 msgid "Previous" msgstr "Forrige" -#: src\classes\Content\Pager.php:173 src\classes\Content\Pager.php:273 +#: src\classes\Content\Pager.php:173 +#: src\classes\Content\Pager.php:273 msgid "Next" msgstr "Næste" @@ -33,51 +31,57 @@ msgstr "Første" msgid "Last" msgstr "Sidste" -#: src\classes\Controllers\Web\Directory.php:73 +#: src\classes\Controllers\Web\Directory.php:85 msgid "People" msgstr "Mennesker" -#: src\classes\Controllers\Web\Search.php:64 +#: src\classes\Controllers\Web\Search.php:72 msgctxt "field" msgid "Language" msgstr "Sprog" -#: src\classes\Controllers\Web\Search.php:65 +#: src\classes\Controllers\Web\Search.php:73 msgctxt "field" msgid "Locality" msgstr "Lokalitet" -#: src\classes\Controllers\Web\Search.php:66 +#: src\classes\Controllers\Web\Search.php:74 msgctxt "field" msgid "Region" msgstr "Region" -#: src\classes\Controllers\Web\Search.php:67 +#: src\classes\Controllers\Web\Search.php:75 msgctxt "field" msgid "Country" msgstr "Land" -#: src\classes\Controllers\Web\Servers.php:90 +#: src\classes\Controllers\Web\Servers.php:105 msgid "Public Servers" msgstr "Offentlige servere" -#: src\templates\layout.phtml:4 src\templates\layout.phtml:18 +#: src\templates\layout.phtml:4 +#: src\templates\layout.phtml:18 msgid "Friendica Directory" msgstr "Friendica adressebog" -#: src\templates\layout.phtml:23 src\templates\layout.phtml:25 -#: src\templates\layout.phtml:43 src\templates\layout.phtml:45 -#: src\templates\search.phtml:4 src\templates\search.phtml:12 +#: src\templates\layout.phtml:23 +#: src\templates\layout.phtml:25 +#: src\templates\layout.phtml:43 +#: src\templates\layout.phtml:45 +#: src\templates\search.phtml:4 +#: src\templates\search.phtml:12 msgid "Search terms" msgstr "Søgetermer" -#: src\templates\layout.phtml:24 src\templates\layout.phtml:45 +#: src\templates\layout.phtml:24 +#: src\templates\layout.phtml:45 #: src\templates\search.phtml:11 msgctxt "noun" msgid "Search" msgstr "Søg" -#: src\templates\layout.phtml:27 src\templates\layout.phtml:47 +#: src\templates\layout.phtml:27 +#: src\templates\layout.phtml:47 #: src\templates\search.phtml:14 msgctxt "verb" msgid "Search" @@ -101,11 +105,11 @@ msgid_plural "%d results for \"%s\"" msgstr[0] "%d resultat for \"%s\"" msgstr[1] "%d resultater for \"%s\"" -#: src\templates\servers.phtml:2 +#: src\templates\servers.phtml:7 msgid "Top servers pagination" msgstr "Top servere sideopdeling" -#: src\templates\servers.phtml:12 +#: src\templates\servers.phtml:17 msgid "Bottom servers pagination" msgstr "Bundservere sideopdeling" @@ -122,23 +126,27 @@ msgid "Filter by country" msgstr "Filtrer efter land" #: src\templates\sub\profile.phtml:31 +#: src\templates\sub\profile.phtml:35 +#: src\templates\sub\profile.phtml:39 msgctxt "verb" msgid "Follow" msgstr "Følg" -#: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47 +#: src\templates\layout.phtml:65 +#: src\templates\sub\profile.phtml:57 msgid "Language" msgstr "Sprog" -#: src\templates\sub\profile.phtml:50 +#: src\templates\sub\profile.phtml:60 +#: src\templates\widget\popularserverlanguages.phtml:2 msgid "Filter by language" msgstr "Filtrer efter sprog" -#: src\templates\sub\profile.phtml:56 +#: src\templates\sub\profile.phtml:66 msgid "Location" msgstr "Placering" -#: src\templates\sub\profile.phtml:69 +#: src\templates\sub\profile.phtml:79 msgid "Search Tag" msgstr "Søgetag" @@ -146,19 +154,23 @@ msgstr "Søgetag" msgid "Account type tabs" msgstr "Kontotypefaner" -#: src\templates\sub\profiles.phtml:4 src\templates\sub\profiles.phtml:7 +#: src\templates\sub\profiles.phtml:4 +#: src\templates\sub\profiles.phtml:7 msgid "Top %s pagination" msgstr "Top %s sideopdeling" -#: src\templates\sub\profiles.phtml:13 src\templates\sub\profiles.phtml:16 +#: src\templates\sub\profiles.phtml:13 +#: src\templates\sub\profiles.phtml:16 msgid "Bottom %s pagination" msgstr "Bund %s sideopdeling" -#: src\templates\statistics.phtml:66 src\templates\sub\server.phtml:15 +#: src\templates\statistics.phtml:66 +#: src\templates\sub\server.phtml:15 msgid "Stable Version" msgstr "Stabil version" -#: src\templates\statistics.phtml:68 src\templates\sub\server.phtml:17 +#: src\templates\statistics.phtml:68 +#: src\templates\sub\server.phtml:17 msgid "Develop Version" msgstr "Udviklingsversion" @@ -166,15 +178,15 @@ msgstr "Udviklingsversion" msgid "Outdated Version" msgstr "Forældet version" -#: src\templates\sub\server.phtml:72 +#: src\templates\sub\server.phtml:69 msgid "Admin" msgstr "Admin" -#: src\templates\sub\server.phtml:79 +#: src\templates\sub\server.phtml:76 msgid "No description provided" msgstr "Ingen beskrivelse givet" -#: src\templates\sub\server.phtml:82 +#: src\templates\sub\server.phtml:79 msgid "Visit Server" msgstr "Besøg server" @@ -182,7 +194,7 @@ msgstr "Besøg server" msgid "Popular Countries" msgstr "Populære lande" -#: src\templates\widget\popularlanguages.phtml:2 +#: src\templates\widget\popularprofilelanguages.phtml:2 msgid "Popular Languages" msgstr "Populære sprog" @@ -190,7 +202,8 @@ msgstr "Populære sprog" msgid "Popular Tags" msgstr "Populære tags" -#: src\templates\sub\server.phtml:44 src\templates\sub\server.phtml:45 +#: src\templates\sub\server.phtml:44 +#: src\templates\sub\server.phtml:45 msgid "Default Language" msgstr "Standard sprog" @@ -210,13 +223,6 @@ msgid_plural "People (%d)" msgstr[0] "Mennesker (%d)" msgstr[1] "Mennesker (%d)" -#: src\classes\Views\Widget\AccountTypeTabs.php:59 -msgctxt "account-type" -msgid "Forum (%d)" -msgid_plural "Forums (%d)" -msgstr[0] "Forummer (%d)" -msgstr[1] "Forummer (%d)" - #: src\templates\layout.phtml:97 msgid "Stats" msgstr "Statistik" @@ -230,42 +236,29 @@ msgid "Profiles" msgstr "Profiler" #: src\templates\statistics.phtml:6 -msgid "" -"This directory knows about %s distinct potential profile " -"URLs." -msgstr "" -"Denne adressebog kender til %s særskilte potentielle profil-" -"URL'er." +msgid "This directory knows about %s distinct potential profile URLs." +msgstr "Denne adressebog kender til %s særskilte potentielle profil-URL'er." -#: src\templates\statistics.phtml:16 src\templates\statistics.phtml:46 +#: src\templates\statistics.phtml:16 +#: src\templates\statistics.phtml:46 msgid "Languages" msgstr "Sprog" #: src\templates\statistics.phtml:17 -msgid "" -"Out of %s profiles reporting their language there are:" -msgstr "" -"Ud af %s profiler som rapporterer deres sprog, er der:" +msgid "Out of %s profiles reporting their language there are:" +msgstr "Ud af %s profiler som rapporterer deres sprog, er der:" #: src\templates\statistics.phtml:27 msgid "Servers" msgstr "Servere" #: src\templates\statistics.phtml:28 -msgid "" -"This directory knows about %s distinct potential server " -"URLs." -msgstr "" -"Denne adressebog kender til %s særskilte potentielle server-" -"URL'er." +msgid "This directory knows about %s distinct potential server URLs." +msgstr "Denne adressebog kender til %s særskilte potentielle server-URL'er." #: src\templates\statistics.phtml:29 -msgid "" -"Out of those, there are %s domains (%s) that have been a " -"Friendica server at least once." -msgstr "" -"Ud af dem er der %s domæner (%s) som har været en Friendica" -" server mindst én gang." +msgid "Out of those, there are %s domains (%s) that have been a Friendica server at least once." +msgstr "Ud af dem er der %s domæner (%s) som har været en Friendica server mindst én gang." #: src\templates\statistics.phtml:33 msgid "Out of those, there are:" @@ -273,8 +266,7 @@ msgstr "Ud af dem er der:" #: src\templates\statistics.phtml:47 msgid "Out of %s servers reporting their language there are:" -msgstr "" -"Ud af %s servere som rapporterer deres sprog, er der:" +msgstr "Ud af %s servere som rapporterer deres sprog, er der:" #: src\templates\statistics.phtml:57 msgid "Versions" @@ -282,16 +274,11 @@ msgstr "Versioner" #: src\templates\statistics.phtml:58 msgid "Out of %s servers reporting their version there are:" -msgstr "" -"Ud af %s servere som rapporterer deres version, er der:" +msgstr "Ud af %s servere som rapporterer deres version, er der:" #: src\templates\statistics.phtml:7 -msgid "" -"Out of those, there are %s profiles (%s) that opted in the " -"public directory at least once." -msgstr "" -"Ud af dem er der %s profiler (%s) som tilvalgte den " -"offentlige adressebog mindst én gang." +msgid "Out of those, there are %s profiles (%s) that opted in the public directory at least once." +msgstr "Ud af dem er der %s profiler (%s) som tilvalgte den offentlige adressebog mindst én gang." #: src\templates\statistics.phtml:35 msgid "%s available servers (%s)" @@ -301,25 +288,13 @@ msgstr "%s tilgængelige servere (%s)" msgid "Friendica Directory version %s" msgstr "Friendica adressebogsversion %s" -#: src\templates\layout.phtml:94 -msgid "Source Code on GitHub" -msgstr "Kildekode på GitHub" - #: src\templates\statistics.phtml:11 -msgid "" -"Out of those, there currently are %s available profiles " -"(%s). Check them out!" -msgstr "" -"Ud af dem er der i øjeblikket %s tilgængelige profiler " -"(%s). Tjek dem ud!" +msgid "Out of those, there currently are %s available profiles (%s). Check them out!" +msgstr "Ud af dem er der i øjeblikket %s tilgængelige profiler (%s). Tjek dem ud!" #: src\templates\statistics.phtml:39 -msgid "" -"%s public servers (%s) currently open for registration. Check them out!" -msgstr "" -"%s offentlige servere (%s) åben for registrering lige nu. " -"Tjek dem ud!" +msgid "%s public servers (%s) currently open for registration. Check them out!" +msgstr "%s offentlige servere (%s) åben for registrering lige nu. Tjek dem ud!" #: src\classes\Views\Widget\AccountTypeTabs.php:57 msgctxt "account-type" @@ -349,14 +324,34 @@ msgstr[1] "%s brugere" msgid "None" msgstr "Ingen" -#: src\templates\sub\server.phtml:59 src\templates\sub\server.phtml:63 +#: src\templates\sub\server.phtml:58 +#: src\templates\sub\server.phtml:62 msgid "Registration Policy" msgstr "Registreringspolitik" -#: src\templates\sub\server.phtml:60 +#: src\templates\sub\server.phtml:59 msgid "By Approval" msgstr "Ved godkendelse" -#: src\templates\sub\server.phtml:64 +#: src\templates\sub\server.phtml:63 msgid "Open" msgstr "Åben" + +#: src\classes\Views\Widget\AccountTypeTabs.php:61 +msgctxt "account-type" +msgid "Group (%d)" +msgid_plural "Groups (%d)" +msgstr[0] "" +msgstr[1] "" + +#: src\templates\servers.phtml:3 +msgid "Filtered by language:" +msgstr "" + +#: src\templates\servers.phtml:3 +msgid "Clear language filter" +msgstr "" + +#: src\templates\layout.phtml:94 +msgid "Source Code on Friendica's Forgejo" +msgstr "" diff --git a/src/lang/de/LC_MESSAGES/strings.po b/src/lang/de/LC_MESSAGES/strings.po index e4016e4..4b40c88 100644 --- a/src/lang/de/LC_MESSAGES/strings.po +++ b/src/lang/de/LC_MESSAGES/strings.po @@ -1,29 +1,25 @@ -# -# Translators: -# Andreas H., 2018 -# Ulf Rompe , 2019 -# Tobias Diekershoff , 2020 -# msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" -"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Last-Translator: Tobias Diekershoff , 2020\n" "Language-Team: German (https://www.transifex.com/Friendica/teams/12172/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" +"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.2\n" -#: src\classes\Content\Pager.php:168 src\classes\Content\Pager.php:216 +#: src\classes\Content\Pager.php:168 +#: src\classes\Content\Pager.php:216 msgid "Previous" msgstr "Vorherige" -#: src\classes\Content\Pager.php:173 src\classes\Content\Pager.php:273 +#: src\classes\Content\Pager.php:173 +#: src\classes\Content\Pager.php:273 msgid "Next" msgstr "Nächste" @@ -35,51 +31,57 @@ msgstr "Erste" msgid "Last" msgstr "Letzte" -#: src\classes\Controllers\Web\Directory.php:73 +#: src\classes\Controllers\Web\Directory.php:85 msgid "People" msgstr "Leute" -#: src\classes\Controllers\Web\Search.php:64 +#: src\classes\Controllers\Web\Search.php:72 msgctxt "field" msgid "Language" msgstr "Sprache" -#: src\classes\Controllers\Web\Search.php:65 +#: src\classes\Controllers\Web\Search.php:73 msgctxt "field" msgid "Locality" msgstr "Wohnort" -#: src\classes\Controllers\Web\Search.php:66 +#: src\classes\Controllers\Web\Search.php:74 msgctxt "field" msgid "Region" msgstr "Region" -#: src\classes\Controllers\Web\Search.php:67 +#: src\classes\Controllers\Web\Search.php:75 msgctxt "field" msgid "Country" msgstr "Land" -#: src\classes\Controllers\Web\Servers.php:90 +#: src\classes\Controllers\Web\Servers.php:105 msgid "Public Servers" msgstr "Öffentlicher Server" -#: src\templates\layout.phtml:4 src\templates\layout.phtml:18 +#: src\templates\layout.phtml:4 +#: src\templates\layout.phtml:18 msgid "Friendica Directory" msgstr "Friendica Verzeichnis" -#: src\templates\layout.phtml:23 src\templates\layout.phtml:25 -#: src\templates\layout.phtml:43 src\templates\layout.phtml:45 -#: src\templates\search.phtml:4 src\templates\search.phtml:12 +#: src\templates\layout.phtml:23 +#: src\templates\layout.phtml:25 +#: src\templates\layout.phtml:43 +#: src\templates\layout.phtml:45 +#: src\templates\search.phtml:4 +#: src\templates\search.phtml:12 msgid "Search terms" msgstr "Suchbegriff" -#: src\templates\layout.phtml:24 src\templates\layout.phtml:45 +#: src\templates\layout.phtml:24 +#: src\templates\layout.phtml:45 #: src\templates\search.phtml:11 msgctxt "noun" msgid "Search" msgstr "Suche" -#: src\templates\layout.phtml:27 src\templates\layout.phtml:47 +#: src\templates\layout.phtml:27 +#: src\templates\layout.phtml:47 #: src\templates\search.phtml:14 msgctxt "verb" msgid "Search" @@ -103,11 +105,11 @@ msgid_plural "%d results for \"%s\"" msgstr[0] "%d Ergebnisse für \"%s\"" msgstr[1] "%d Ergebnisse für \"%s\"" -#: src\templates\servers.phtml:2 +#: src\templates\servers.phtml:7 msgid "Top servers pagination" msgstr "Höchste Serverwertung" -#: src\templates\servers.phtml:12 +#: src\templates\servers.phtml:17 msgid "Bottom servers pagination" msgstr "Niedrigste Serverwertung" @@ -124,23 +126,27 @@ msgid "Filter by country" msgstr "Filter nach Land" #: src\templates\sub\profile.phtml:31 +#: src\templates\sub\profile.phtml:35 +#: src\templates\sub\profile.phtml:39 msgctxt "verb" msgid "Follow" msgstr "Folge" -#: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47 +#: src\templates\layout.phtml:65 +#: src\templates\sub\profile.phtml:57 msgid "Language" msgstr "Sprache" -#: src\templates\sub\profile.phtml:50 +#: src\templates\sub\profile.phtml:60 +#: src\templates\widget\popularserverlanguages.phtml:2 msgid "Filter by language" msgstr "Filter nach Sprache" -#: src\templates\sub\profile.phtml:56 +#: src\templates\sub\profile.phtml:66 msgid "Location" msgstr "Ort" -#: src\templates\sub\profile.phtml:69 +#: src\templates\sub\profile.phtml:79 msgid "Search Tag" msgstr "Suchbegriff" @@ -148,19 +154,23 @@ msgstr "Suchbegriff" msgid "Account type tabs" msgstr "Konto-Typ Register" -#: src\templates\sub\profiles.phtml:4 src\templates\sub\profiles.phtml:7 +#: src\templates\sub\profiles.phtml:4 +#: src\templates\sub\profiles.phtml:7 msgid "Top %s pagination" msgstr "Top %s pagination" -#: src\templates\sub\profiles.phtml:13 src\templates\sub\profiles.phtml:16 +#: src\templates\sub\profiles.phtml:13 +#: src\templates\sub\profiles.phtml:16 msgid "Bottom %s pagination" msgstr "Bottom %s pagination" -#: src\templates\statistics.phtml:66 src\templates\sub\server.phtml:15 +#: src\templates\statistics.phtml:66 +#: src\templates\sub\server.phtml:15 msgid "Stable Version" msgstr "Stabile Version" -#: src\templates\statistics.phtml:68 src\templates\sub\server.phtml:17 +#: src\templates\statistics.phtml:68 +#: src\templates\sub\server.phtml:17 msgid "Develop Version" msgstr "Entwickler Version" @@ -168,15 +178,15 @@ msgstr "Entwickler Version" msgid "Outdated Version" msgstr "Abgelaufene Version" -#: src\templates\sub\server.phtml:55 +#: src\templates\sub\server.phtml:69 msgid "Admin" msgstr "Admin" -#: src\templates\sub\server.phtml:62 +#: src\templates\sub\server.phtml:76 msgid "No description provided" msgstr "Keine Beschreibung angeboten" -#: src\templates\sub\server.phtml:65 +#: src\templates\sub\server.phtml:79 msgid "Visit Server" msgstr "Besuche den Server" @@ -184,7 +194,7 @@ msgstr "Besuche den Server" msgid "Popular Countries" msgstr "Häufige Länder" -#: src\templates\widget\popularlanguages.phtml:2 +#: src\templates\widget\popularprofilelanguages.phtml:2 msgid "Popular Languages" msgstr "Häufige Sprachen" @@ -192,7 +202,8 @@ msgstr "Häufige Sprachen" msgid "Popular Tags" msgstr "Beliebte Tags" -#: src\templates\sub\server.phtml:44 src\templates\sub\server.phtml:45 +#: src\templates\sub\server.phtml:44 +#: src\templates\sub\server.phtml:45 msgid "Default Language" msgstr "Standard Sprache" @@ -212,13 +223,6 @@ msgid_plural "People (%d)" msgstr[0] "Personen (%d)" msgstr[1] "Personen (%d)" -#: src\classes\Views\Widget\AccountTypeTabs.php:57 -msgctxt "account-type" -msgid "Forum (%d)" -msgid_plural "Forums (%d)" -msgstr[0] "Foren (%d)" -msgstr[1] "Foren (%d)" - #: src\templates\layout.phtml:97 msgid "Stats" msgstr "Statistik" @@ -232,20 +236,16 @@ msgid "Profiles" msgstr "Profile" #: src\templates\statistics.phtml:6 -msgid "" -"This directory knows about %s distinct potential profile " -"URLs." -msgstr "" -"Dieses Verzeichnis kennt %s unterschiedliche, potentielle Profil " -"URLs" +msgid "This directory knows about %s distinct potential profile URLs." +msgstr "Dieses Verzeichnis kennt %s unterschiedliche, potentielle Profil URLs" -#: src\templates\statistics.phtml:16 src\templates\statistics.phtml:46 +#: src\templates\statistics.phtml:16 +#: src\templates\statistics.phtml:46 msgid "Languages" msgstr "Sprachen" #: src\templates\statistics.phtml:17 -msgid "" -"Out of %s profiles reporting their language there are:" +msgid "Out of %s profiles reporting their language there are:" msgstr "Von den %s Profilen, die ihre Sprache angeben, sind:" #: src\templates\statistics.phtml:27 @@ -253,20 +253,12 @@ msgid "Servers" msgstr "Server" #: src\templates\statistics.phtml:28 -msgid "" -"This directory knows about %s distinct potential server " -"URLs." -msgstr "" -"Dieses Verzeichnis kennt %s unterschiedliche, potentielle Server " -"URLs" +msgid "This directory knows about %s distinct potential server URLs." +msgstr "Dieses Verzeichnis kennt %s unterschiedliche, potentielle Server URLs" #: src\templates\statistics.phtml:29 -msgid "" -"Out of those, there are %s domains (%s) that have been a " -"Friendica server at least once." -msgstr "" -"Von diesen gibt es %sDomänen(%s), die zumindest einmal " -"Friendica Knoten gewesen sind." +msgid "Out of those, there are %s domains (%s) that have been a Friendica server at least once." +msgstr "Von diesen gibt es %sDomänen(%s), die zumindest einmal Friendica Knoten gewesen sind." #: src\templates\statistics.phtml:33 msgid "Out of those, there are:" @@ -274,9 +266,7 @@ msgstr "Von diesen sind:" #: src\templates\statistics.phtml:47 msgid "Out of %s servers reporting their language there are:" -msgstr "" -"Von den %s Servern, die ihre Spracheinstellung angeben, " -"sind:" +msgstr "Von den %s Servern, die ihre Spracheinstellung angeben, sind:" #: src\templates\statistics.phtml:57 msgid "Versions" @@ -287,12 +277,8 @@ msgid "Out of %s servers reporting their version there are:" msgstr "Von den %s Servern, die ihre Version angeben, sind:" #: src\templates\statistics.phtml:7 -msgid "" -"Out of those, there are %s profiles (%s) that opted in the " -"public directory at least once." -msgstr "" -"Von diesen gibt es %sProfile (%s) die sich, zumindest " -"einmal, für die Aufnahme in das öffentliche Verzeichnis entschlossen haben." +msgid "Out of those, there are %s profiles (%s) that opted in the public directory at least once." +msgstr "Von diesen gibt es %sProfile (%s) die sich, zumindest einmal, für die Aufnahme in das öffentliche Verzeichnis entschlossen haben." #: src\templates\statistics.phtml:35 msgid "%s available servers (%s)" @@ -302,22 +288,70 @@ msgstr "%sverfügbare Server (%s)" msgid "Friendica Directory version %s" msgstr "Friendica Verzeichnis Version %s" -#: src\templates\layout.phtml:94 -msgid "Source Code on GitHub" -msgstr "Quellcode auf GitHub" - #: src\templates\statistics.phtml:11 -msgid "" -"Out of those, there currently are %s available profiles " -"(%s). Check them out!" -msgstr "" -"Von diesen sind derzeit %sverfügbare Profile (%s). Schaue sie dir an!" +msgid "Out of those, there currently are %s available profiles (%s). Check them out!" +msgstr "Von diesen sind derzeit %sverfügbare Profile (%s). Schaue sie dir an!" #: src\templates\statistics.phtml:39 -msgid "" -"%s public servers (%s) currently open for registration. Check them out!" +msgid "%s public servers (%s) currently open for registration. Check them out!" +msgstr "%s öffentliche Server (%s) erlauben derzeit die Anmeldung. Schau sie dir an!" + +#: src\classes\Views\Widget\AccountTypeTabs.php:57 +msgctxt "account-type" +msgid "News (%d)" +msgid_plural "News (%d)" +msgstr[0] "" +msgstr[1] "" + +#: src\classes\Views\Widget\AccountTypeTabs.php:58 +msgctxt "account-type" +msgid "Organization (%d)" +msgid_plural "Organizations (%d)" +msgstr[0] "" +msgstr[1] "" + +#: src\classes\Views\Widget\AccountTypeTabs.php:61 +msgctxt "account-type" +msgid "Group (%d)" +msgid_plural "Groups (%d)" +msgstr[0] "" +msgstr[1] "" + +#: src\templates\servers.phtml:3 +msgid "Filtered by language:" +msgstr "" + +#: src\templates\servers.phtml:3 +msgid "Clear language filter" +msgstr "" + +#: src\templates\sub\server.phtml:40 +msgid "Health Score" +msgstr "" + +#: src\templates\sub\server.phtml:52 +msgid "%s User" +msgid_plural "%s Users" +msgstr[0] "" +msgstr[1] "" + +#: src\templates\sub\server.phtml:54 +msgid "None" +msgstr "" + +#: src\templates\sub\server.phtml:58 +#: src\templates\sub\server.phtml:62 +msgid "Registration Policy" +msgstr "" + +#: src\templates\sub\server.phtml:59 +msgid "By Approval" +msgstr "" + +#: src\templates\sub\server.phtml:63 +msgid "Open" +msgstr "" + +#: src\templates\layout.phtml:94 +msgid "Source Code on Friendica's Forgejo" msgstr "" -"%s öffentliche Server (%s) erlauben derzeit die Anmeldung. " -"Schau sie dir an!" diff --git a/src/lang/en/LC_MESSAGES/strings.po b/src/lang/en/LC_MESSAGES/strings.po index 70625d7..5aa9f2b 100644 --- a/src/lang/en/LC_MESSAGES/strings.po +++ b/src/lang/en/LC_MESSAGES/strings.po @@ -288,10 +288,6 @@ msgstr "" msgid "Friendica Directory version %s" msgstr "" -#: src\templates\layout.phtml:94 -msgid "Source Code on GitHub" -msgstr "" - #: src\templates\statistics.phtml:11 msgid "Out of those, there currently are %s available profiles (%s). Check them out!" msgstr "" @@ -355,3 +351,7 @@ msgstr "" #: src\templates\servers.phtml:3 msgid "Clear language filter" msgstr "" + +#: src\templates\layout.phtml:94 +msgid "Source Code on Friendica's Forgejo" +msgstr "" diff --git a/src/lang/en_GB/LC_MESSAGES/strings.po b/src/lang/en_GB/LC_MESSAGES/strings.po index 2638e34..7738ced 100644 --- a/src/lang/en_GB/LC_MESSAGES/strings.po +++ b/src/lang/en_GB/LC_MESSAGES/strings.po @@ -1,27 +1,25 @@ -# -# Translators: -# Andy H3 , 2020 -# msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" -"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Last-Translator: Andy H3 , 2020\n" "Language-Team: English (United Kingdom) (https://www.transifex.com/Friendica/teams/12172/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" +"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Language: en_GB\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.2\n" -#: src\classes\Content\Pager.php:168 src\classes\Content\Pager.php:216 +#: src\classes\Content\Pager.php:168 +#: src\classes\Content\Pager.php:216 msgid "Previous" msgstr "Previous" -#: src\classes\Content\Pager.php:173 src\classes\Content\Pager.php:273 +#: src\classes\Content\Pager.php:173 +#: src\classes\Content\Pager.php:273 msgid "Next" msgstr "Next" @@ -33,51 +31,57 @@ msgstr "First" msgid "Last" msgstr "Last" -#: src\classes\Controllers\Web\Directory.php:73 +#: src\classes\Controllers\Web\Directory.php:85 msgid "People" msgstr "People" -#: src\classes\Controllers\Web\Search.php:64 +#: src\classes\Controllers\Web\Search.php:72 msgctxt "field" msgid "Language" msgstr "Language" -#: src\classes\Controllers\Web\Search.php:65 +#: src\classes\Controllers\Web\Search.php:73 msgctxt "field" msgid "Locality" msgstr "Locality" -#: src\classes\Controllers\Web\Search.php:66 +#: src\classes\Controllers\Web\Search.php:74 msgctxt "field" msgid "Region" msgstr "Region" -#: src\classes\Controllers\Web\Search.php:67 +#: src\classes\Controllers\Web\Search.php:75 msgctxt "field" msgid "Country" msgstr "Country" -#: src\classes\Controllers\Web\Servers.php:90 +#: src\classes\Controllers\Web\Servers.php:105 msgid "Public Servers" msgstr "Public servers" -#: src\templates\layout.phtml:4 src\templates\layout.phtml:18 +#: src\templates\layout.phtml:4 +#: src\templates\layout.phtml:18 msgid "Friendica Directory" msgstr "Friendica directory" -#: src\templates\layout.phtml:23 src\templates\layout.phtml:25 -#: src\templates\layout.phtml:43 src\templates\layout.phtml:45 -#: src\templates\search.phtml:4 src\templates\search.phtml:12 +#: src\templates\layout.phtml:23 +#: src\templates\layout.phtml:25 +#: src\templates\layout.phtml:43 +#: src\templates\layout.phtml:45 +#: src\templates\search.phtml:4 +#: src\templates\search.phtml:12 msgid "Search terms" msgstr "Search terms" -#: src\templates\layout.phtml:24 src\templates\layout.phtml:45 +#: src\templates\layout.phtml:24 +#: src\templates\layout.phtml:45 #: src\templates\search.phtml:11 msgctxt "noun" msgid "Search" msgstr "Search" -#: src\templates\layout.phtml:27 src\templates\layout.phtml:47 +#: src\templates\layout.phtml:27 +#: src\templates\layout.phtml:47 #: src\templates\search.phtml:14 msgctxt "verb" msgid "Search" @@ -101,11 +105,11 @@ msgid_plural "%d results for \"%s\"" msgstr[0] "%d result for \"%s\"" msgstr[1] "%d results for \"%s\"" -#: src\templates\servers.phtml:2 +#: src\templates\servers.phtml:7 msgid "Top servers pagination" msgstr "Top servers pagination" -#: src\templates\servers.phtml:12 +#: src\templates\servers.phtml:17 msgid "Bottom servers pagination" msgstr "Bottom servers pagination" @@ -122,23 +126,27 @@ msgid "Filter by country" msgstr "Filter by country" #: src\templates\sub\profile.phtml:31 +#: src\templates\sub\profile.phtml:35 +#: src\templates\sub\profile.phtml:39 msgctxt "verb" msgid "Follow" msgstr "Follow" -#: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47 +#: src\templates\layout.phtml:65 +#: src\templates\sub\profile.phtml:57 msgid "Language" msgstr "Language" -#: src\templates\sub\profile.phtml:50 +#: src\templates\sub\profile.phtml:60 +#: src\templates\widget\popularserverlanguages.phtml:2 msgid "Filter by language" msgstr "Filter by language" -#: src\templates\sub\profile.phtml:56 +#: src\templates\sub\profile.phtml:66 msgid "Location" msgstr "Location" -#: src\templates\sub\profile.phtml:69 +#: src\templates\sub\profile.phtml:79 msgid "Search Tag" msgstr "Search tag" @@ -146,19 +154,23 @@ msgstr "Search tag" msgid "Account type tabs" msgstr "Account type tabs" -#: src\templates\sub\profiles.phtml:4 src\templates\sub\profiles.phtml:7 +#: src\templates\sub\profiles.phtml:4 +#: src\templates\sub\profiles.phtml:7 msgid "Top %s pagination" msgstr "Top %s pagination" -#: src\templates\sub\profiles.phtml:13 src\templates\sub\profiles.phtml:16 +#: src\templates\sub\profiles.phtml:13 +#: src\templates\sub\profiles.phtml:16 msgid "Bottom %s pagination" msgstr "Bottom %s pagination" -#: src\templates\statistics.phtml:66 src\templates\sub\server.phtml:15 +#: src\templates\statistics.phtml:66 +#: src\templates\sub\server.phtml:15 msgid "Stable Version" msgstr "Stable version" -#: src\templates\statistics.phtml:68 src\templates\sub\server.phtml:17 +#: src\templates\statistics.phtml:68 +#: src\templates\sub\server.phtml:17 msgid "Develop Version" msgstr "Develop version" @@ -166,15 +178,15 @@ msgstr "Develop version" msgid "Outdated Version" msgstr "Outdated version" -#: src\templates\sub\server.phtml:55 +#: src\templates\sub\server.phtml:69 msgid "Admin" msgstr "Admin" -#: src\templates\sub\server.phtml:62 +#: src\templates\sub\server.phtml:76 msgid "No description provided" msgstr "No description provided" -#: src\templates\sub\server.phtml:65 +#: src\templates\sub\server.phtml:79 msgid "Visit Server" msgstr "Visit server" @@ -182,7 +194,7 @@ msgstr "Visit server" msgid "Popular Countries" msgstr "Popular countries" -#: src\templates\widget\popularlanguages.phtml:2 +#: src\templates\widget\popularprofilelanguages.phtml:2 msgid "Popular Languages" msgstr "Popular languages" @@ -190,7 +202,8 @@ msgstr "Popular languages" msgid "Popular Tags" msgstr "Popular tags" -#: src\templates\sub\server.phtml:44 src\templates\sub\server.phtml:45 +#: src\templates\sub\server.phtml:44 +#: src\templates\sub\server.phtml:45 msgid "Default Language" msgstr "Default language" @@ -210,13 +223,6 @@ msgid_plural "People (%d)" msgstr[0] "People (%d)" msgstr[1] "People (%d)" -#: src\classes\Views\Widget\AccountTypeTabs.php:57 -msgctxt "account-type" -msgid "Forum (%d)" -msgid_plural "Forums (%d)" -msgstr[0] "Forum (%d)" -msgstr[1] "Forums (%d)" - #: src\templates\layout.phtml:97 msgid "Stats" msgstr "Stats" @@ -230,42 +236,29 @@ msgid "Profiles" msgstr "Profiles" #: src\templates\statistics.phtml:6 -msgid "" -"This directory knows about %s distinct potential profile " -"URLs." -msgstr "" -"This directory knows about %s distinct potential profile " -"URLs." +msgid "This directory knows about %s distinct potential profile URLs." +msgstr "This directory knows about %s distinct potential profile URLs." -#: src\templates\statistics.phtml:16 src\templates\statistics.phtml:46 +#: src\templates\statistics.phtml:16 +#: src\templates\statistics.phtml:46 msgid "Languages" msgstr "Languages" #: src\templates\statistics.phtml:17 -msgid "" -"Out of %s profiles reporting their language there are:" -msgstr "" -"Out of %s profiles reporting their language there are:" +msgid "Out of %s profiles reporting their language there are:" +msgstr "Out of %s profiles reporting their language there are:" #: src\templates\statistics.phtml:27 msgid "Servers" msgstr "Servers" #: src\templates\statistics.phtml:28 -msgid "" -"This directory knows about %s distinct potential server " -"URLs." -msgstr "" -"This directory knows about %s distinct potential server " -"URLs." +msgid "This directory knows about %s distinct potential server URLs." +msgstr "This directory knows about %s distinct potential server URLs." #: src\templates\statistics.phtml:29 -msgid "" -"Out of those, there are %s domains (%s) that have been a " -"Friendica server at least once." -msgstr "" -"Out of those, there are %s domains (%s) that have been a " -"Friendica server at least once." +msgid "Out of those, there are %s domains (%s) that have been a Friendica server at least once." +msgstr "Out of those, there are %s domains (%s) that have been a Friendica server at least once." #: src\templates\statistics.phtml:33 msgid "Out of those, there are:" @@ -273,8 +266,7 @@ msgstr "Out of those, there are:" #: src\templates\statistics.phtml:47 msgid "Out of %s servers reporting their language there are:" -msgstr "" -"Out of %s servers reporting their language there are:" +msgstr "Out of %s servers reporting their language there are:" #: src\templates\statistics.phtml:57 msgid "Versions" @@ -285,12 +277,8 @@ msgid "Out of %s servers reporting their version there are:" msgstr "Out of %s servers reporting their version there are:" #: src\templates\statistics.phtml:7 -msgid "" -"Out of those, there are %s profiles (%s) that opted in the " -"public directory at least once." -msgstr "" -"Out of those, there are %s profiles (%s) that opted in the " -"public directory at least once." +msgid "Out of those, there are %s profiles (%s) that opted in the public directory at least once." +msgstr "Out of those, there are %s profiles (%s) that opted in the public directory at least once." #: src\templates\statistics.phtml:35 msgid "%s available servers (%s)" @@ -300,22 +288,70 @@ msgstr "%s available servers (%s)" msgid "Friendica Directory version %s" msgstr "Friendica directory version %s" -#: src\templates\layout.phtml:94 -msgid "Source Code on GitHub" -msgstr "Source code on GitHub" - #: src\templates\statistics.phtml:11 -msgid "" -"Out of those, there currently are %s available profiles " -"(%s). Check them out!" -msgstr "" -"Out of those, there currently are %s available profiles " -"(%s). Check them out!" +msgid "Out of those, there currently are %s available profiles (%s). Check them out!" +msgstr "Out of those, there currently are %s available profiles (%s). Check them out!" #: src\templates\statistics.phtml:39 -msgid "" -"%s public servers (%s) currently open for registration. Check them out!" +msgid "%s public servers (%s) currently open for registration. Check them out!" +msgstr "%s public servers (%s) currently open for registration. Check them out!" + +#: src\classes\Views\Widget\AccountTypeTabs.php:57 +msgctxt "account-type" +msgid "News (%d)" +msgid_plural "News (%d)" +msgstr[0] "" +msgstr[1] "" + +#: src\classes\Views\Widget\AccountTypeTabs.php:58 +msgctxt "account-type" +msgid "Organization (%d)" +msgid_plural "Organizations (%d)" +msgstr[0] "" +msgstr[1] "" + +#: src\classes\Views\Widget\AccountTypeTabs.php:61 +msgctxt "account-type" +msgid "Group (%d)" +msgid_plural "Groups (%d)" +msgstr[0] "" +msgstr[1] "" + +#: src\templates\servers.phtml:3 +msgid "Filtered by language:" +msgstr "" + +#: src\templates\servers.phtml:3 +msgid "Clear language filter" +msgstr "" + +#: src\templates\sub\server.phtml:40 +msgid "Health Score" +msgstr "" + +#: src\templates\sub\server.phtml:52 +msgid "%s User" +msgid_plural "%s Users" +msgstr[0] "" +msgstr[1] "" + +#: src\templates\sub\server.phtml:54 +msgid "None" +msgstr "" + +#: src\templates\sub\server.phtml:58 +#: src\templates\sub\server.phtml:62 +msgid "Registration Policy" +msgstr "" + +#: src\templates\sub\server.phtml:59 +msgid "By Approval" +msgstr "" + +#: src\templates\sub\server.phtml:63 +msgid "Open" +msgstr "" + +#: src\templates\layout.phtml:94 +msgid "Source Code on Friendica's Forgejo" msgstr "" -"%s public servers (%s) currently open for registration. Check them out!" diff --git a/src/lang/et/LC_MESSAGES/strings.po b/src/lang/et/LC_MESSAGES/strings.po index 34142c5..1cc51e4 100644 --- a/src/lang/et/LC_MESSAGES/strings.po +++ b/src/lang/et/LC_MESSAGES/strings.po @@ -1,27 +1,25 @@ -# -# Translators: -# Rain Hawk, 2019 -# msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" -"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Last-Translator: Rain Hawk, 2019\n" "Language-Team: Estonian (https://www.transifex.com/Friendica/teams/12172/et/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" +"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Language: et\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.2\n" -#: src\classes\Content\Pager.php:168 src\classes\Content\Pager.php:216 +#: src\classes\Content\Pager.php:168 +#: src\classes\Content\Pager.php:216 msgid "Previous" msgstr "Eelmine" -#: src\classes\Content\Pager.php:173 src\classes\Content\Pager.php:273 +#: src\classes\Content\Pager.php:173 +#: src\classes\Content\Pager.php:273 msgid "Next" msgstr "Järgmine" @@ -33,51 +31,57 @@ msgstr "Esimene" msgid "Last" msgstr "Viimane" -#: src\classes\Controllers\Web\Directory.php:73 +#: src\classes\Controllers\Web\Directory.php:85 msgid "People" msgstr "Inimesed" -#: src\classes\Controllers\Web\Search.php:64 +#: src\classes\Controllers\Web\Search.php:72 msgctxt "field" msgid "Language" msgstr "Keel" -#: src\classes\Controllers\Web\Search.php:65 +#: src\classes\Controllers\Web\Search.php:73 msgctxt "field" msgid "Locality" msgstr "Asukoht" -#: src\classes\Controllers\Web\Search.php:66 +#: src\classes\Controllers\Web\Search.php:74 msgctxt "field" msgid "Region" msgstr "Regioon" -#: src\classes\Controllers\Web\Search.php:67 +#: src\classes\Controllers\Web\Search.php:75 msgctxt "field" msgid "Country" msgstr "Riik" -#: src\classes\Controllers\Web\Servers.php:90 +#: src\classes\Controllers\Web\Servers.php:105 msgid "Public Servers" msgstr "Avalikud serverid" -#: src\templates\layout.phtml:4 src\templates\layout.phtml:18 +#: src\templates\layout.phtml:4 +#: src\templates\layout.phtml:18 msgid "Friendica Directory" msgstr "Friendica Kataloog" -#: src\templates\layout.phtml:23 src\templates\layout.phtml:25 -#: src\templates\layout.phtml:43 src\templates\layout.phtml:45 -#: src\templates\search.phtml:4 src\templates\search.phtml:12 +#: src\templates\layout.phtml:23 +#: src\templates\layout.phtml:25 +#: src\templates\layout.phtml:43 +#: src\templates\layout.phtml:45 +#: src\templates\search.phtml:4 +#: src\templates\search.phtml:12 msgid "Search terms" msgstr "Otsingu tingimused" -#: src\templates\layout.phtml:24 src\templates\layout.phtml:45 +#: src\templates\layout.phtml:24 +#: src\templates\layout.phtml:45 #: src\templates\search.phtml:11 msgctxt "noun" msgid "Search" msgstr "Otsi" -#: src\templates\layout.phtml:27 src\templates\layout.phtml:47 +#: src\templates\layout.phtml:27 +#: src\templates\layout.phtml:47 #: src\templates\search.phtml:14 msgctxt "verb" msgid "Search" @@ -101,11 +105,11 @@ msgid_plural "%d results for \"%s\"" msgstr[0] "" msgstr[1] "" -#: src\templates\servers.phtml:2 +#: src\templates\servers.phtml:7 msgid "Top servers pagination" msgstr "" -#: src\templates\servers.phtml:12 +#: src\templates\servers.phtml:17 msgid "Bottom servers pagination" msgstr "" @@ -122,23 +126,27 @@ msgid "Filter by country" msgstr "Filtreeri riigi järgi" #: src\templates\sub\profile.phtml:31 +#: src\templates\sub\profile.phtml:35 +#: src\templates\sub\profile.phtml:39 msgctxt "verb" msgid "Follow" msgstr "Järgi" -#: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47 +#: src\templates\layout.phtml:65 +#: src\templates\sub\profile.phtml:57 msgid "Language" msgstr "Keel" -#: src\templates\sub\profile.phtml:50 +#: src\templates\sub\profile.phtml:60 +#: src\templates\widget\popularserverlanguages.phtml:2 msgid "Filter by language" msgstr "Filtreeri keele järgi" -#: src\templates\sub\profile.phtml:56 +#: src\templates\sub\profile.phtml:66 msgid "Location" msgstr "Asukoht" -#: src\templates\sub\profile.phtml:69 +#: src\templates\sub\profile.phtml:79 msgid "Search Tag" msgstr "Otsingu tag" @@ -146,19 +154,23 @@ msgstr "Otsingu tag" msgid "Account type tabs" msgstr "Konto tüübi sakid" -#: src\templates\sub\profiles.phtml:4 src\templates\sub\profiles.phtml:7 +#: src\templates\sub\profiles.phtml:4 +#: src\templates\sub\profiles.phtml:7 msgid "Top %s pagination" msgstr "" -#: src\templates\sub\profiles.phtml:13 src\templates\sub\profiles.phtml:16 +#: src\templates\sub\profiles.phtml:13 +#: src\templates\sub\profiles.phtml:16 msgid "Bottom %s pagination" msgstr "" -#: src\templates\statistics.phtml:66 src\templates\sub\server.phtml:15 +#: src\templates\statistics.phtml:66 +#: src\templates\sub\server.phtml:15 msgid "Stable Version" msgstr "Stabiilne versioon" -#: src\templates\statistics.phtml:68 src\templates\sub\server.phtml:17 +#: src\templates\statistics.phtml:68 +#: src\templates\sub\server.phtml:17 msgid "Develop Version" msgstr "Arendusversioon" @@ -166,15 +178,15 @@ msgstr "Arendusversioon" msgid "Outdated Version" msgstr "Aegunud versioon" -#: src\templates\sub\server.phtml:55 +#: src\templates\sub\server.phtml:69 msgid "Admin" msgstr "Adminn" -#: src\templates\sub\server.phtml:62 +#: src\templates\sub\server.phtml:76 msgid "No description provided" msgstr "Kirjeldus pole saadaval" -#: src\templates\sub\server.phtml:65 +#: src\templates\sub\server.phtml:79 msgid "Visit Server" msgstr "Külasta serverit" @@ -182,7 +194,7 @@ msgstr "Külasta serverit" msgid "Popular Countries" msgstr "Populaarsed riigid" -#: src\templates\widget\popularlanguages.phtml:2 +#: src\templates\widget\popularprofilelanguages.phtml:2 msgid "Popular Languages" msgstr "Populaarsed keeled" @@ -190,7 +202,8 @@ msgstr "Populaarsed keeled" msgid "Popular Tags" msgstr "Polulaarsed tag`id" -#: src\templates\sub\server.phtml:44 src\templates\sub\server.phtml:45 +#: src\templates\sub\server.phtml:44 +#: src\templates\sub\server.phtml:45 msgid "Default Language" msgstr "Peamine keel" @@ -210,13 +223,6 @@ msgid_plural "People (%d)" msgstr[0] "Inimesed ( %d )" msgstr[1] "Inimesed (%d)" -#: src\classes\Views\Widget\AccountTypeTabs.php:57 -msgctxt "account-type" -msgid "Forum (%d)" -msgid_plural "Forums (%d)" -msgstr[0] "Foorumid ( %d ) " -msgstr[1] "Foorumid ( %d )" - #: src\templates\layout.phtml:97 msgid "Stats" msgstr "Statistika" @@ -230,18 +236,16 @@ msgid "Profiles" msgstr "Profiilid" #: src\templates\statistics.phtml:6 -msgid "" -"This directory knows about %s distinct potential profile " -"URLs." +msgid "This directory knows about %s distinct potential profile URLs." msgstr "" -#: src\templates\statistics.phtml:16 src\templates\statistics.phtml:46 +#: src\templates\statistics.phtml:16 +#: src\templates\statistics.phtml:46 msgid "Languages" msgstr "Keeled" #: src\templates\statistics.phtml:17 -msgid "" -"Out of %s profiles reporting their language there are:" +msgid "Out of %s profiles reporting their language there are:" msgstr "" #: src\templates\statistics.phtml:27 @@ -249,15 +253,11 @@ msgid "Servers" msgstr "Serverid" #: src\templates\statistics.phtml:28 -msgid "" -"This directory knows about %s distinct potential server " -"URLs." +msgid "This directory knows about %s distinct potential server URLs." msgstr "" #: src\templates\statistics.phtml:29 -msgid "" -"Out of those, there are %s domains (%s) that have been a " -"Friendica server at least once." +msgid "Out of those, there are %s domains (%s) that have been a Friendica server at least once." msgstr "" #: src\templates\statistics.phtml:33 @@ -277,9 +277,7 @@ msgid "Out of %s servers reporting their version there are:" msgstr "" #: src\templates\statistics.phtml:7 -msgid "" -"Out of those, there are %s profiles (%s) that opted in the " -"public directory at least once." +msgid "Out of those, there are %s profiles (%s) that opted in the public directory at least once." msgstr "" #: src\templates\statistics.phtml:35 @@ -290,18 +288,70 @@ msgstr "" msgid "Friendica Directory version %s" msgstr "" -#: src\templates\layout.phtml:94 -msgid "Source Code on GitHub" -msgstr "" - #: src\templates\statistics.phtml:11 -msgid "" -"Out of those, there currently are %s available profiles " -"(%s). Check them out!" +msgid "Out of those, there currently are %s available profiles (%s). Check them out!" msgstr "" #: src\templates\statistics.phtml:39 -msgid "" -"%s public servers (%s) currently open for registration. Check them out!" +msgid "%s public servers (%s) currently open for registration. Check them out!" +msgstr "" + +#: src\classes\Views\Widget\AccountTypeTabs.php:57 +msgctxt "account-type" +msgid "News (%d)" +msgid_plural "News (%d)" +msgstr[0] "" +msgstr[1] "" + +#: src\classes\Views\Widget\AccountTypeTabs.php:58 +msgctxt "account-type" +msgid "Organization (%d)" +msgid_plural "Organizations (%d)" +msgstr[0] "" +msgstr[1] "" + +#: src\classes\Views\Widget\AccountTypeTabs.php:61 +msgctxt "account-type" +msgid "Group (%d)" +msgid_plural "Groups (%d)" +msgstr[0] "" +msgstr[1] "" + +#: src\templates\servers.phtml:3 +msgid "Filtered by language:" +msgstr "" + +#: src\templates\servers.phtml:3 +msgid "Clear language filter" +msgstr "" + +#: src\templates\sub\server.phtml:40 +msgid "Health Score" +msgstr "" + +#: src\templates\sub\server.phtml:52 +msgid "%s User" +msgid_plural "%s Users" +msgstr[0] "" +msgstr[1] "" + +#: src\templates\sub\server.phtml:54 +msgid "None" +msgstr "" + +#: src\templates\sub\server.phtml:58 +#: src\templates\sub\server.phtml:62 +msgid "Registration Policy" +msgstr "" + +#: src\templates\sub\server.phtml:59 +msgid "By Approval" +msgstr "" + +#: src\templates\sub\server.phtml:63 +msgid "Open" +msgstr "" + +#: src\templates\layout.phtml:94 +msgid "Source Code on Friendica's Forgejo" msgstr "" diff --git a/src/lang/fr/LC_MESSAGES/strings.po b/src/lang/fr/LC_MESSAGES/strings.po index 4a7ef93..7b8b4af 100644 --- a/src/lang/fr/LC_MESSAGES/strings.po +++ b/src/lang/fr/LC_MESSAGES/strings.po @@ -1,28 +1,25 @@ -# -# Translators: -# Tobias Diekershoff , 2018 -# Vladimir Núñez , 2018 -# msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" -"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Last-Translator: Vladimir Núñez , 2018\n" "Language-Team: French (https://www.transifex.com/Friendica/teams/12172/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" +"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Poedit 2.2\n" -#: src\classes\Content\Pager.php:168 src\classes\Content\Pager.php:216 +#: src\classes\Content\Pager.php:168 +#: src\classes\Content\Pager.php:216 msgid "Previous" msgstr "Précédent" -#: src\classes\Content\Pager.php:173 src\classes\Content\Pager.php:273 +#: src\classes\Content\Pager.php:173 +#: src\classes\Content\Pager.php:273 msgid "Next" msgstr "Suivant" @@ -34,51 +31,57 @@ msgstr "Début" msgid "Last" msgstr "Fin" -#: src\classes\Controllers\Web\Directory.php:73 +#: src\classes\Controllers\Web\Directory.php:85 msgid "People" msgstr "Utilisateurs" -#: src\classes\Controllers\Web\Search.php:64 +#: src\classes\Controllers\Web\Search.php:72 msgctxt "field" msgid "Language" msgstr "Langue" -#: src\classes\Controllers\Web\Search.php:65 +#: src\classes\Controllers\Web\Search.php:73 msgctxt "field" msgid "Locality" msgstr "Localité" -#: src\classes\Controllers\Web\Search.php:66 +#: src\classes\Controllers\Web\Search.php:74 msgctxt "field" msgid "Region" msgstr "Région" -#: src\classes\Controllers\Web\Search.php:67 +#: src\classes\Controllers\Web\Search.php:75 msgctxt "field" msgid "Country" msgstr "Pays" -#: src\classes\Controllers\Web\Servers.php:90 +#: src\classes\Controllers\Web\Servers.php:105 msgid "Public Servers" msgstr "Serveurs publics" -#: src\templates\layout.phtml:4 src\templates\layout.phtml:18 +#: src\templates\layout.phtml:4 +#: src\templates\layout.phtml:18 msgid "Friendica Directory" msgstr "Répertoire Friendica" -#: src\templates\layout.phtml:23 src\templates\layout.phtml:25 -#: src\templates\layout.phtml:43 src\templates\layout.phtml:45 -#: src\templates\search.phtml:4 src\templates\search.phtml:12 +#: src\templates\layout.phtml:23 +#: src\templates\layout.phtml:25 +#: src\templates\layout.phtml:43 +#: src\templates\layout.phtml:45 +#: src\templates\search.phtml:4 +#: src\templates\search.phtml:12 msgid "Search terms" msgstr "Mots-clés" -#: src\templates\layout.phtml:24 src\templates\layout.phtml:45 +#: src\templates\layout.phtml:24 +#: src\templates\layout.phtml:45 #: src\templates\search.phtml:11 msgctxt "noun" msgid "Search" msgstr "Recherche" -#: src\templates\layout.phtml:27 src\templates\layout.phtml:47 +#: src\templates\layout.phtml:27 +#: src\templates\layout.phtml:47 #: src\templates\search.phtml:14 msgctxt "verb" msgid "Search" @@ -102,11 +105,11 @@ msgid_plural "%d results for \"%s\"" msgstr[0] "%d résultat pour \"%s\"" msgstr[1] "%d résultats pour \"%s\"" -#: src\templates\servers.phtml:2 +#: src\templates\servers.phtml:7 msgid "Top servers pagination" msgstr "Pagination des serveurs haute" -#: src\templates\servers.phtml:12 +#: src\templates\servers.phtml:17 msgid "Bottom servers pagination" msgstr "Pagination des serveurs basse" @@ -123,23 +126,27 @@ msgid "Filter by country" msgstr "Filtrer par pays" #: src\templates\sub\profile.phtml:31 +#: src\templates\sub\profile.phtml:35 +#: src\templates\sub\profile.phtml:39 msgctxt "verb" msgid "Follow" msgstr "Suivre" -#: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47 +#: src\templates\layout.phtml:65 +#: src\templates\sub\profile.phtml:57 msgid "Language" msgstr "Langue" -#: src\templates\sub\profile.phtml:50 +#: src\templates\sub\profile.phtml:60 +#: src\templates\widget\popularserverlanguages.phtml:2 msgid "Filter by language" msgstr "Filtrer par langue" -#: src\templates\sub\profile.phtml:56 +#: src\templates\sub\profile.phtml:66 msgid "Location" msgstr "Localisation" -#: src\templates\sub\profile.phtml:69 +#: src\templates\sub\profile.phtml:79 msgid "Search Tag" msgstr "Rechercher ce tag" @@ -147,19 +154,23 @@ msgstr "Rechercher ce tag" msgid "Account type tabs" msgstr "Onglets de type de compte" -#: src\templates\sub\profiles.phtml:4 src\templates\sub\profiles.phtml:7 +#: src\templates\sub\profiles.phtml:4 +#: src\templates\sub\profiles.phtml:7 msgid "Top %s pagination" msgstr "Pagination %s haute" -#: src\templates\sub\profiles.phtml:13 src\templates\sub\profiles.phtml:16 +#: src\templates\sub\profiles.phtml:13 +#: src\templates\sub\profiles.phtml:16 msgid "Bottom %s pagination" msgstr "Pagination %s basse" -#: src\templates\statistics.phtml:66 src\templates\sub\server.phtml:15 +#: src\templates\statistics.phtml:66 +#: src\templates\sub\server.phtml:15 msgid "Stable Version" msgstr "Version stable" -#: src\templates\statistics.phtml:68 src\templates\sub\server.phtml:17 +#: src\templates\statistics.phtml:68 +#: src\templates\sub\server.phtml:17 msgid "Develop Version" msgstr "Version instable" @@ -167,15 +178,15 @@ msgstr "Version instable" msgid "Outdated Version" msgstr "Version périmée" -#: src\templates\sub\server.phtml:55 +#: src\templates\sub\server.phtml:69 msgid "Admin" msgstr "Administrateur" -#: src\templates\sub\server.phtml:62 +#: src\templates\sub\server.phtml:76 msgid "No description provided" msgstr "Pas de description fournie" -#: src\templates\sub\server.phtml:65 +#: src\templates\sub\server.phtml:79 msgid "Visit Server" msgstr "Visiter ce serveur" @@ -183,7 +194,7 @@ msgstr "Visiter ce serveur" msgid "Popular Countries" msgstr "Pays populaires" -#: src\templates\widget\popularlanguages.phtml:2 +#: src\templates\widget\popularprofilelanguages.phtml:2 msgid "Popular Languages" msgstr "Language populaires" @@ -191,7 +202,8 @@ msgstr "Language populaires" msgid "Popular Tags" msgstr "Tags populaires" -#: src\templates\sub\server.phtml:44 src\templates\sub\server.phtml:45 +#: src\templates\sub\server.phtml:44 +#: src\templates\sub\server.phtml:45 msgid "Default Language" msgstr "Langage de base" @@ -211,13 +223,6 @@ msgid_plural "People (%d)" msgstr[0] "" msgstr[1] "" -#: src\classes\Views\Widget\AccountTypeTabs.php:57 -msgctxt "account-type" -msgid "Forum (%d)" -msgid_plural "Forums (%d)" -msgstr[0] "" -msgstr[1] "" - #: src\templates\layout.phtml:97 msgid "Stats" msgstr "Statistiques" @@ -231,18 +236,16 @@ msgid "Profiles" msgstr "Profils" #: src\templates\statistics.phtml:6 -msgid "" -"This directory knows about %s distinct potential profile " -"URLs." +msgid "This directory knows about %s distinct potential profile URLs." msgstr "" -#: src\templates\statistics.phtml:16 src\templates\statistics.phtml:46 +#: src\templates\statistics.phtml:16 +#: src\templates\statistics.phtml:46 msgid "Languages" msgstr "Langages" #: src\templates\statistics.phtml:17 -msgid "" -"Out of %s profiles reporting their language there are:" +msgid "Out of %s profiles reporting their language there are:" msgstr "parmi %sprofil mentionnant leur langage il y a:" #: src\templates\statistics.phtml:27 @@ -250,15 +253,11 @@ msgid "Servers" msgstr "Serveurs" #: src\templates\statistics.phtml:28 -msgid "" -"This directory knows about %s distinct potential server " -"URLs." +msgid "This directory knows about %s distinct potential server URLs." msgstr "" #: src\templates\statistics.phtml:29 -msgid "" -"Out of those, there are %s domains (%s) that have been a " -"Friendica server at least once." +msgid "Out of those, there are %s domains (%s) that have been a Friendica server at least once." msgstr "" #: src\templates\statistics.phtml:33 @@ -278,9 +277,7 @@ msgid "Out of %s servers reporting their version there are:" msgstr "Parmi %s serveurs mentionnant leur version il y a:" #: src\templates\statistics.phtml:7 -msgid "" -"Out of those, there are %s profiles (%s) that opted in the " -"public directory at least once." +msgid "Out of those, there are %s profiles (%s) that opted in the public directory at least once." msgstr "" #: src\templates\statistics.phtml:35 @@ -291,18 +288,70 @@ msgstr "%sserveurs disponibles(%s)" msgid "Friendica Directory version %s" msgstr "Friendica Annuaire version %s" -#: src\templates\layout.phtml:94 -msgid "Source Code on GitHub" -msgstr "Code source sur GitHub" - #: src\templates\statistics.phtml:11 -msgid "" -"Out of those, there currently are %s available profiles " -"(%s). Check them out!" +msgid "Out of those, there currently are %s available profiles (%s). Check them out!" msgstr "" #: src\templates\statistics.phtml:39 -msgid "" -"%s public servers (%s) currently open for registration. Check them out!" +msgid "%s public servers (%s) currently open for registration. Check them out!" +msgstr "" + +#: src\classes\Views\Widget\AccountTypeTabs.php:57 +msgctxt "account-type" +msgid "News (%d)" +msgid_plural "News (%d)" +msgstr[0] "" +msgstr[1] "" + +#: src\classes\Views\Widget\AccountTypeTabs.php:58 +msgctxt "account-type" +msgid "Organization (%d)" +msgid_plural "Organizations (%d)" +msgstr[0] "" +msgstr[1] "" + +#: src\classes\Views\Widget\AccountTypeTabs.php:61 +msgctxt "account-type" +msgid "Group (%d)" +msgid_plural "Groups (%d)" +msgstr[0] "" +msgstr[1] "" + +#: src\templates\servers.phtml:3 +msgid "Filtered by language:" +msgstr "" + +#: src\templates\servers.phtml:3 +msgid "Clear language filter" +msgstr "" + +#: src\templates\sub\server.phtml:40 +msgid "Health Score" +msgstr "" + +#: src\templates\sub\server.phtml:52 +msgid "%s User" +msgid_plural "%s Users" +msgstr[0] "" +msgstr[1] "" + +#: src\templates\sub\server.phtml:54 +msgid "None" +msgstr "" + +#: src\templates\sub\server.phtml:58 +#: src\templates\sub\server.phtml:62 +msgid "Registration Policy" +msgstr "" + +#: src\templates\sub\server.phtml:59 +msgid "By Approval" +msgstr "" + +#: src\templates\sub\server.phtml:63 +msgid "Open" +msgstr "" + +#: src\templates\layout.phtml:94 +msgid "Source Code on Friendica's Forgejo" msgstr "" diff --git a/src/lang/gd/LC_MESSAGES/strings.po b/src/lang/gd/LC_MESSAGES/strings.po index f5cb24a..75d4baf 100644 --- a/src/lang/gd/LC_MESSAGES/strings.po +++ b/src/lang/gd/LC_MESSAGES/strings.po @@ -1,27 +1,25 @@ -# -# Translators: -# GunChleoc, 2021 -# msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" -"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Last-Translator: GunChleoc, 2021\n" "Language-Team: Gaelic, Scottish (https://www.transifex.com/Friendica/teams/12172/gd/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" +"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Language: gd\n" "Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : (n > 2 && n < 20) ? 2 : 3;\n" "X-Generator: Poedit 2.2\n" -#: src\classes\Content\Pager.php:168 src\classes\Content\Pager.php:216 +#: src\classes\Content\Pager.php:168 +#: src\classes\Content\Pager.php:216 msgid "Previous" msgstr "Air ais" -#: src\classes\Content\Pager.php:173 src\classes\Content\Pager.php:273 +#: src\classes\Content\Pager.php:173 +#: src\classes\Content\Pager.php:273 msgid "Next" msgstr "Air adhart" @@ -33,51 +31,57 @@ msgstr "Toiseach" msgid "Last" msgstr "Deireadh" -#: src\classes\Controllers\Web\Directory.php:73 +#: src\classes\Controllers\Web\Directory.php:85 msgid "People" msgstr "Daoine" -#: src\classes\Controllers\Web\Search.php:64 +#: src\classes\Controllers\Web\Search.php:72 msgctxt "field" msgid "Language" msgstr "Cànan" -#: src\classes\Controllers\Web\Search.php:65 +#: src\classes\Controllers\Web\Search.php:73 msgctxt "field" msgid "Locality" msgstr "Ionad" -#: src\classes\Controllers\Web\Search.php:66 +#: src\classes\Controllers\Web\Search.php:74 msgctxt "field" msgid "Region" msgstr "Sgìre" -#: src\classes\Controllers\Web\Search.php:67 +#: src\classes\Controllers\Web\Search.php:75 msgctxt "field" msgid "Country" msgstr "Dùthaich" -#: src\classes\Controllers\Web\Servers.php:90 +#: src\classes\Controllers\Web\Servers.php:105 msgid "Public Servers" msgstr "Frithealaichean poblach" -#: src\templates\layout.phtml:4 src\templates\layout.phtml:18 +#: src\templates\layout.phtml:4 +#: src\templates\layout.phtml:18 msgid "Friendica Directory" msgstr "Eòlaire Friendica" -#: src\templates\layout.phtml:23 src\templates\layout.phtml:25 -#: src\templates\layout.phtml:43 src\templates\layout.phtml:45 -#: src\templates\search.phtml:4 src\templates\search.phtml:12 +#: src\templates\layout.phtml:23 +#: src\templates\layout.phtml:25 +#: src\templates\layout.phtml:43 +#: src\templates\layout.phtml:45 +#: src\templates\search.phtml:4 +#: src\templates\search.phtml:12 msgid "Search terms" msgstr "Faclan-luirg" -#: src\templates\layout.phtml:24 src\templates\layout.phtml:45 +#: src\templates\layout.phtml:24 +#: src\templates\layout.phtml:45 #: src\templates\search.phtml:11 msgctxt "noun" msgid "Search" msgstr "Lorg" -#: src\templates\layout.phtml:27 src\templates\layout.phtml:47 +#: src\templates\layout.phtml:27 +#: src\templates\layout.phtml:47 #: src\templates\search.phtml:14 msgctxt "verb" msgid "Search" @@ -103,11 +107,11 @@ msgstr[1] "%d thoradh airson “%s”" msgstr[2] "%d thoraidhean airson “%s”" msgstr[3] "%d toradh airson “%s”" -#: src\templates\servers.phtml:2 +#: src\templates\servers.phtml:7 msgid "Top servers pagination" msgstr "Duilleagachadh fhrithealaichean aig a’ bhàrr" -#: src\templates\servers.phtml:12 +#: src\templates\servers.phtml:17 msgid "Bottom servers pagination" msgstr "Duilleagachadh fhrithealaichean aig a’ bhonn" @@ -124,23 +128,27 @@ msgid "Filter by country" msgstr "Criathraich a-rèir dùthcha" #: src\templates\sub\profile.phtml:31 +#: src\templates\sub\profile.phtml:35 +#: src\templates\sub\profile.phtml:39 msgctxt "verb" msgid "Follow" msgstr "Lean air" -#: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47 +#: src\templates\layout.phtml:65 +#: src\templates\sub\profile.phtml:57 msgid "Language" msgstr "Cànan" -#: src\templates\sub\profile.phtml:50 +#: src\templates\sub\profile.phtml:60 +#: src\templates\widget\popularserverlanguages.phtml:2 msgid "Filter by language" msgstr "Criathraich a-rèir cànain" -#: src\templates\sub\profile.phtml:56 +#: src\templates\sub\profile.phtml:66 msgid "Location" msgstr "Ionad" -#: src\templates\sub\profile.phtml:69 +#: src\templates\sub\profile.phtml:79 msgid "Search Tag" msgstr "Taga luirg" @@ -148,19 +156,23 @@ msgstr "Taga luirg" msgid "Account type tabs" msgstr "Tabaichean seòrsa a’ chunntais" -#: src\templates\sub\profiles.phtml:4 src\templates\sub\profiles.phtml:7 +#: src\templates\sub\profiles.phtml:4 +#: src\templates\sub\profiles.phtml:7 msgid "Top %s pagination" msgstr "Duilleagachadh %s aig a’ bhàrr" -#: src\templates\sub\profiles.phtml:13 src\templates\sub\profiles.phtml:16 +#: src\templates\sub\profiles.phtml:13 +#: src\templates\sub\profiles.phtml:16 msgid "Bottom %s pagination" msgstr "Duilleagachadh %s aig a’ bhonn" -#: src\templates\statistics.phtml:66 src\templates\sub\server.phtml:15 +#: src\templates\statistics.phtml:66 +#: src\templates\sub\server.phtml:15 msgid "Stable Version" msgstr "Tionndadh seasmhach" -#: src\templates\statistics.phtml:68 src\templates\sub\server.phtml:17 +#: src\templates\statistics.phtml:68 +#: src\templates\sub\server.phtml:17 msgid "Develop Version" msgstr "Tionndadh leasachaidh" @@ -168,15 +180,15 @@ msgstr "Tionndadh leasachaidh" msgid "Outdated Version" msgstr "Seann-tionndadh" -#: src\templates\sub\server.phtml:72 +#: src\templates\sub\server.phtml:69 msgid "Admin" msgstr "Rianaire" -#: src\templates\sub\server.phtml:79 +#: src\templates\sub\server.phtml:76 msgid "No description provided" msgstr "Cha deach tuairisgeul a sholarachadh" -#: src\templates\sub\server.phtml:82 +#: src\templates\sub\server.phtml:79 msgid "Visit Server" msgstr "Tadhail air frithealaiche" @@ -184,7 +196,7 @@ msgstr "Tadhail air frithealaiche" msgid "Popular Countries" msgstr "Dùthchannan fèillmhor" -#: src\templates\widget\popularlanguages.phtml:2 +#: src\templates\widget\popularprofilelanguages.phtml:2 msgid "Popular Languages" msgstr "Cànanan fèillmhor" @@ -192,7 +204,8 @@ msgstr "Cànanan fèillmhor" msgid "Popular Tags" msgstr "Tagaichean fèillmhor" -#: src\templates\sub\server.phtml:44 src\templates\sub\server.phtml:45 +#: src\templates\sub\server.phtml:44 +#: src\templates\sub\server.phtml:45 msgid "Default Language" msgstr "An cànan tùsail" @@ -214,15 +227,6 @@ msgstr[1] "Daoine (%d)" msgstr[2] "Daoine (%d)" msgstr[3] "Daoine (%d)" -#: src\classes\Views\Widget\AccountTypeTabs.php:59 -msgctxt "account-type" -msgid "Forum (%d)" -msgid_plural "Forums (%d)" -msgstr[0] "Fòraman (%d)" -msgstr[1] "Fòraman (%d)" -msgstr[2] "Fòraman (%d)" -msgstr[3] "Fòraman (%d)" - #: src\templates\layout.phtml:97 msgid "Stats" msgstr "Stadastaireachd" @@ -236,19 +240,16 @@ msgid "Profiles" msgstr "Pròifilean" #: src\templates\statistics.phtml:6 -msgid "" -"This directory knows about %s distinct potential profile " -"URLs." -msgstr "" -"Fhuair an t-eòlaire lorg air %s URL gu pròifilean fa leth." +msgid "This directory knows about %s distinct potential profile URLs." +msgstr "Fhuair an t-eòlaire lorg air %s URL gu pròifilean fa leth." -#: src\templates\statistics.phtml:16 src\templates\statistics.phtml:46 +#: src\templates\statistics.phtml:16 +#: src\templates\statistics.phtml:46 msgid "Languages" msgstr "Cànanan" #: src\templates\statistics.phtml:17 -msgid "" -"Out of %s profiles reporting their language there are:" +msgid "Out of %s profiles reporting their language there are:" msgstr "Am measg %s pròifil a dh’innseas an cànan, tha:" #: src\templates\statistics.phtml:27 @@ -256,20 +257,12 @@ msgid "Servers" msgstr "Frithealaichean" #: src\templates\statistics.phtml:28 -msgid "" -"This directory knows about %s distinct potential server " -"URLs." -msgstr "" -"Fhuair an t-eòlaire lorg air %s URL gu frithealaichean fa " -"leth." +msgid "This directory knows about %s distinct potential server URLs." +msgstr "Fhuair an t-eòlaire lorg air %s URL gu frithealaichean fa leth." #: src\templates\statistics.phtml:29 -msgid "" -"Out of those, there are %s domains (%s) that have been a " -"Friendica server at least once." -msgstr "" -"Tha %s àrainn (%s) ’nam measg a tha ’nam frithealaichean " -"Friendica no a bha uair." +msgid "Out of those, there are %s domains (%s) that have been a Friendica server at least once." +msgstr "Tha %s àrainn (%s) ’nam measg a tha ’nam frithealaichean Friendica no a bha uair." #: src\templates\statistics.phtml:33 msgid "Out of those, there are:" @@ -277,8 +270,7 @@ msgstr "Am measg an fheadhainn sin, tha:" #: src\templates\statistics.phtml:47 msgid "Out of %s servers reporting their language there are:" -msgstr "" -"Am measg %s frithealaiche a dh’innseas an cànan, tha:" +msgstr "Am measg %s frithealaiche a dh’innseas an cànan, tha:" #: src\templates\statistics.phtml:57 msgid "Versions" @@ -286,17 +278,11 @@ msgstr "Tionndaidhean" #: src\templates\statistics.phtml:58 msgid "Out of %s servers reporting their version there are:" -msgstr "" -"Am measg %s frithealaiche a dh’innseas an tionndadh, tha:" +msgstr "Am measg %s frithealaiche a dh’innseas an tionndadh, tha:" #: src\templates\statistics.phtml:7 -msgid "" -"Out of those, there are %s profiles (%s) that opted in the " -"public directory at least once." -msgstr "" -"Am measg an fhadhainn sin, tha %s pròifil (%s) a tha ag " -"aontachadh ri gabhail a-steach dhan eòlaire poblach no a dh’aontaich ris " -"uair." +msgid "Out of those, there are %s profiles (%s) that opted in the public directory at least once." +msgstr "Am measg an fhadhainn sin, tha %s pròifil (%s) a tha ag aontachadh ri gabhail a-steach dhan eòlaire poblach no a dh’aontaich ris uair." #: src\templates\statistics.phtml:35 msgid "%s available servers (%s)" @@ -306,25 +292,13 @@ msgstr "%s frithealaiche ri fhaighinn (%s)" msgid "Friendica Directory version %s" msgstr "Eòlaire Friendica tionndadh %s" -#: src\templates\layout.phtml:94 -msgid "Source Code on GitHub" -msgstr "Bun-tùs air GitHub" - #: src\templates\statistics.phtml:11 -msgid "" -"Out of those, there currently are %s available profiles " -"(%s). Check them out!" -msgstr "" -"Am measg an fheadhainn sin, tha %s pròifilean rim faighinn " -"(%s). Nach doir thu sùil orra?" +msgid "Out of those, there currently are %s available profiles (%s). Check them out!" +msgstr "Am measg an fheadhainn sin, tha %s pròifilean rim faighinn (%s). Nach doir thu sùil orra?" #: src\templates\statistics.phtml:39 -msgid "" -"%s public servers (%s) currently open for registration. Check them out!" -msgstr "" -"Tha %s frithealaichean poblach (%s) fosgailte airson " -"clàradh. Nach doir thu sùil orra?" +msgid "%s public servers (%s) currently open for registration. Check them out!" +msgstr "Tha %s frithealaichean poblach (%s) fosgailte airson clàradh. Nach doir thu sùil orra?" #: src\classes\Views\Widget\AccountTypeTabs.php:57 msgctxt "account-type" @@ -360,14 +334,36 @@ msgstr[3] "%s cleachdaiche" msgid "None" msgstr "Chan eil gin" -#: src\templates\sub\server.phtml:59 src\templates\sub\server.phtml:63 +#: src\templates\sub\server.phtml:58 +#: src\templates\sub\server.phtml:62 msgid "Registration Policy" msgstr "Poileasaidh clàraidh" -#: src\templates\sub\server.phtml:60 +#: src\templates\sub\server.phtml:59 msgid "By Approval" msgstr "Le aontachadh" -#: src\templates\sub\server.phtml:64 +#: src\templates\sub\server.phtml:63 msgid "Open" msgstr "Fosgailte" + +#: src\classes\Views\Widget\AccountTypeTabs.php:61 +msgctxt "account-type" +msgid "Group (%d)" +msgid_plural "Groups (%d)" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: src\templates\servers.phtml:3 +msgid "Filtered by language:" +msgstr "" + +#: src\templates\servers.phtml:3 +msgid "Clear language filter" +msgstr "" + +#: src\templates\layout.phtml:94 +msgid "Source Code on Friendica's Forgejo" +msgstr "" diff --git a/src/lang/hu/LC_MESSAGES/strings.po b/src/lang/hu/LC_MESSAGES/strings.po index 84a06c1..541e26a 100644 --- a/src/lang/hu/LC_MESSAGES/strings.po +++ b/src/lang/hu/LC_MESSAGES/strings.po @@ -1,27 +1,25 @@ -# -# Translators: -# Balázs Úr, 2021 -# msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" -"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Last-Translator: Balázs Úr, 2021\n" "Language-Team: Hungarian (https://www.transifex.com/Friendica/teams/12172/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" +"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Language: hu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.2\n" -#: src\classes\Content\Pager.php:168 src\classes\Content\Pager.php:216 +#: src\classes\Content\Pager.php:168 +#: src\classes\Content\Pager.php:216 msgid "Previous" msgstr "Előző" -#: src\classes\Content\Pager.php:173 src\classes\Content\Pager.php:273 +#: src\classes\Content\Pager.php:173 +#: src\classes\Content\Pager.php:273 msgid "Next" msgstr "Következő" @@ -33,51 +31,57 @@ msgstr "Első" msgid "Last" msgstr "Utolsó" -#: src\classes\Controllers\Web\Directory.php:73 +#: src\classes\Controllers\Web\Directory.php:85 msgid "People" msgstr "Emberek" -#: src\classes\Controllers\Web\Search.php:64 +#: src\classes\Controllers\Web\Search.php:72 msgctxt "field" msgid "Language" msgstr "Nyelv" -#: src\classes\Controllers\Web\Search.php:65 +#: src\classes\Controllers\Web\Search.php:73 msgctxt "field" msgid "Locality" msgstr "Helység" -#: src\classes\Controllers\Web\Search.php:66 +#: src\classes\Controllers\Web\Search.php:74 msgctxt "field" msgid "Region" msgstr "Régió" -#: src\classes\Controllers\Web\Search.php:67 +#: src\classes\Controllers\Web\Search.php:75 msgctxt "field" msgid "Country" msgstr "Ország" -#: src\classes\Controllers\Web\Servers.php:90 +#: src\classes\Controllers\Web\Servers.php:105 msgid "Public Servers" msgstr "Nyilvános kiszolgálók" -#: src\templates\layout.phtml:4 src\templates\layout.phtml:18 +#: src\templates\layout.phtml:4 +#: src\templates\layout.phtml:18 msgid "Friendica Directory" msgstr "Friendica könyvtár" -#: src\templates\layout.phtml:23 src\templates\layout.phtml:25 -#: src\templates\layout.phtml:43 src\templates\layout.phtml:45 -#: src\templates\search.phtml:4 src\templates\search.phtml:12 +#: src\templates\layout.phtml:23 +#: src\templates\layout.phtml:25 +#: src\templates\layout.phtml:43 +#: src\templates\layout.phtml:45 +#: src\templates\search.phtml:4 +#: src\templates\search.phtml:12 msgid "Search terms" msgstr "Kifejezések keresése" -#: src\templates\layout.phtml:24 src\templates\layout.phtml:45 +#: src\templates\layout.phtml:24 +#: src\templates\layout.phtml:45 #: src\templates\search.phtml:11 msgctxt "noun" msgid "Search" msgstr "Keresés" -#: src\templates\layout.phtml:27 src\templates\layout.phtml:47 +#: src\templates\layout.phtml:27 +#: src\templates\layout.phtml:47 #: src\templates\search.phtml:14 msgctxt "verb" msgid "Search" @@ -101,11 +105,11 @@ msgid_plural "%d results for \"%s\"" msgstr[0] "%d találat erre: „%s”" msgstr[1] "%d találat erre: „%s”" -#: src\templates\servers.phtml:2 +#: src\templates\servers.phtml:7 msgid "Top servers pagination" msgstr "Kiszolgálók lapszámozása felül" -#: src\templates\servers.phtml:12 +#: src\templates\servers.phtml:17 msgid "Bottom servers pagination" msgstr "Kiszolgálók lapszámozása alul" @@ -122,23 +126,27 @@ msgid "Filter by country" msgstr "Szűrés ország szerint" #: src\templates\sub\profile.phtml:31 +#: src\templates\sub\profile.phtml:35 +#: src\templates\sub\profile.phtml:39 msgctxt "verb" msgid "Follow" msgstr "Követés" -#: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47 +#: src\templates\layout.phtml:65 +#: src\templates\sub\profile.phtml:57 msgid "Language" msgstr "Nyelv" -#: src\templates\sub\profile.phtml:50 +#: src\templates\sub\profile.phtml:60 +#: src\templates\widget\popularserverlanguages.phtml:2 msgid "Filter by language" msgstr "Szűrés nyelv szerint" -#: src\templates\sub\profile.phtml:56 +#: src\templates\sub\profile.phtml:66 msgid "Location" msgstr "Hely" -#: src\templates\sub\profile.phtml:69 +#: src\templates\sub\profile.phtml:79 msgid "Search Tag" msgstr "Címke keresése" @@ -146,19 +154,23 @@ msgstr "Címke keresése" msgid "Account type tabs" msgstr "Fióktípus lapok" -#: src\templates\sub\profiles.phtml:4 src\templates\sub\profiles.phtml:7 +#: src\templates\sub\profiles.phtml:4 +#: src\templates\sub\profiles.phtml:7 msgid "Top %s pagination" msgstr "%s lapszámozása felül" -#: src\templates\sub\profiles.phtml:13 src\templates\sub\profiles.phtml:16 +#: src\templates\sub\profiles.phtml:13 +#: src\templates\sub\profiles.phtml:16 msgid "Bottom %s pagination" msgstr "%s lapszámozása alul" -#: src\templates\statistics.phtml:66 src\templates\sub\server.phtml:15 +#: src\templates\statistics.phtml:66 +#: src\templates\sub\server.phtml:15 msgid "Stable Version" msgstr "Stabil verzió" -#: src\templates\statistics.phtml:68 src\templates\sub\server.phtml:17 +#: src\templates\statistics.phtml:68 +#: src\templates\sub\server.phtml:17 msgid "Develop Version" msgstr "Fejlesztői verzió" @@ -166,15 +178,15 @@ msgstr "Fejlesztői verzió" msgid "Outdated Version" msgstr "Elavult verzió" -#: src\templates\sub\server.phtml:72 +#: src\templates\sub\server.phtml:69 msgid "Admin" msgstr "Adminisztrátor" -#: src\templates\sub\server.phtml:79 +#: src\templates\sub\server.phtml:76 msgid "No description provided" msgstr "Nincs leírás megadva" -#: src\templates\sub\server.phtml:82 +#: src\templates\sub\server.phtml:79 msgid "Visit Server" msgstr "Kiszolgáló meglátogatása" @@ -182,7 +194,7 @@ msgstr "Kiszolgáló meglátogatása" msgid "Popular Countries" msgstr "Népszerű országok" -#: src\templates\widget\popularlanguages.phtml:2 +#: src\templates\widget\popularprofilelanguages.phtml:2 msgid "Popular Languages" msgstr "Népszerű nyelvek" @@ -190,7 +202,8 @@ msgstr "Népszerű nyelvek" msgid "Popular Tags" msgstr "Népszerű címkék" -#: src\templates\sub\server.phtml:44 src\templates\sub\server.phtml:45 +#: src\templates\sub\server.phtml:44 +#: src\templates\sub\server.phtml:45 msgid "Default Language" msgstr "Alapértelmezett nyelv" @@ -210,13 +223,6 @@ msgid_plural "People (%d)" msgstr[0] "Emberek (%d)" msgstr[1] "Emberek (%d)" -#: src\classes\Views\Widget\AccountTypeTabs.php:59 -msgctxt "account-type" -msgid "Forum (%d)" -msgid_plural "Forums (%d)" -msgstr[0] "Fórum (%d)" -msgstr[1] "Fórumok (%d)" - #: src\templates\layout.phtml:97 msgid "Stats" msgstr "Statisztikák" @@ -230,42 +236,29 @@ msgid "Profiles" msgstr "Profilok" #: src\templates\statistics.phtml:6 -msgid "" -"This directory knows about %s distinct potential profile " -"URLs." -msgstr "" -"Ez a könyvtár körülbelül %s különböző lehetséges profil " -"URL-t ismer." +msgid "This directory knows about %s distinct potential profile URLs." +msgstr "Ez a könyvtár körülbelül %s különböző lehetséges profil URL-t ismer." -#: src\templates\statistics.phtml:16 src\templates\statistics.phtml:46 +#: src\templates\statistics.phtml:16 +#: src\templates\statistics.phtml:46 msgid "Languages" msgstr "Nyelvek" #: src\templates\statistics.phtml:17 -msgid "" -"Out of %s profiles reporting their language there are:" -msgstr "" -"A nyelvüket jelentő %s profil közül ezek az alábbiak:" +msgid "Out of %s profiles reporting their language there are:" +msgstr "A nyelvüket jelentő %s profil közül ezek az alábbiak:" #: src\templates\statistics.phtml:27 msgid "Servers" msgstr "Kiszolgálók" #: src\templates\statistics.phtml:28 -msgid "" -"This directory knows about %s distinct potential server " -"URLs." -msgstr "" -"Ez a könyvtár körülbelül %s különböző lehetséges kiszolgáló " -"URL-t ismer." +msgid "This directory knows about %s distinct potential server URLs." +msgstr "Ez a könyvtár körülbelül %s különböző lehetséges kiszolgáló URL-t ismer." #: src\templates\statistics.phtml:29 -msgid "" -"Out of those, there are %s domains (%s) that have been a " -"Friendica server at least once." -msgstr "" -"Ezek közül %s tartomány (%s) van, amelyek legalább egyszer " -"Friendica kiszolgálók voltak." +msgid "Out of those, there are %s domains (%s) that have been a Friendica server at least once." +msgstr "Ezek közül %s tartomány (%s) van, amelyek legalább egyszer Friendica kiszolgálók voltak." #: src\templates\statistics.phtml:33 msgid "Out of those, there are:" @@ -273,8 +266,7 @@ msgstr "Ezek közül ezek az alábbiak:" #: src\templates\statistics.phtml:47 msgid "Out of %s servers reporting their language there are:" -msgstr "" -"A nyelvüket jelentő %s kiszolgáló közül ezek az alábbiak:" +msgstr "A nyelvüket jelentő %s kiszolgáló közül ezek az alábbiak:" #: src\templates\statistics.phtml:57 msgid "Versions" @@ -282,16 +274,11 @@ msgstr "Verziók" #: src\templates\statistics.phtml:58 msgid "Out of %s servers reporting their version there are:" -msgstr "" -"A verziójukat jelentő %s kiszolgáló közül ezek az alábbiak:" +msgstr "A verziójukat jelentő %s kiszolgáló közül ezek az alábbiak:" #: src\templates\statistics.phtml:7 -msgid "" -"Out of those, there are %s profiles (%s) that opted in the " -"public directory at least once." -msgstr "" -"Ezek közül %s profil (%s) van, amelyek legalább egyszer " -"beléptek a nyilvános könyvtárba." +msgid "Out of those, there are %s profiles (%s) that opted in the public directory at least once." +msgstr "Ezek közül %s profil (%s) van, amelyek legalább egyszer beléptek a nyilvános könyvtárba." #: src\templates\statistics.phtml:35 msgid "%s available servers (%s)" @@ -301,25 +288,13 @@ msgstr "%s elérhető kiszolgáló (%s)" msgid "Friendica Directory version %s" msgstr "Friendica könyvtár verzió: %s" -#: src\templates\layout.phtml:94 -msgid "Source Code on GitHub" -msgstr "Forráskód a GitHubon" - #: src\templates\statistics.phtml:11 -msgid "" -"Out of those, there currently are %s available profiles " -"(%s). Check them out!" -msgstr "" -"Ezek közül jelenleg %s elérhető profil (%s) van. Nézze meg őket!" +msgid "Out of those, there currently are %s available profiles (%s). Check them out!" +msgstr "Ezek közül jelenleg %s elérhető profil (%s) van. Nézze meg őket!" #: src\templates\statistics.phtml:39 -msgid "" -"%s public servers (%s) currently open for registration. Check them out!" -msgstr "" -"%s nyilvános kiszolgáló (%s) jelenleg nyitott a " -"regisztrációra. Nézze meg azokat!" +msgid "%s public servers (%s) currently open for registration. Check them out!" +msgstr "%s nyilvános kiszolgáló (%s) jelenleg nyitott a regisztrációra. Nézze meg azokat!" #: src\classes\Views\Widget\AccountTypeTabs.php:57 msgctxt "account-type" @@ -349,14 +324,34 @@ msgstr[1] "%s felhasználó" msgid "None" msgstr "Nincs" -#: src\templates\sub\server.phtml:59 src\templates\sub\server.phtml:63 +#: src\templates\sub\server.phtml:58 +#: src\templates\sub\server.phtml:62 msgid "Registration Policy" msgstr "Regisztrációs irányelv" -#: src\templates\sub\server.phtml:60 +#: src\templates\sub\server.phtml:59 msgid "By Approval" msgstr "Jóváhagyás által" -#: src\templates\sub\server.phtml:64 +#: src\templates\sub\server.phtml:63 msgid "Open" msgstr "Nyitott" + +#: src\classes\Views\Widget\AccountTypeTabs.php:61 +msgctxt "account-type" +msgid "Group (%d)" +msgid_plural "Groups (%d)" +msgstr[0] "" +msgstr[1] "" + +#: src\templates\servers.phtml:3 +msgid "Filtered by language:" +msgstr "" + +#: src\templates\servers.phtml:3 +msgid "Clear language filter" +msgstr "" + +#: src\templates\layout.phtml:94 +msgid "Source Code on Friendica's Forgejo" +msgstr "" diff --git a/src/lang/it/LC_MESSAGES/strings.po b/src/lang/it/LC_MESSAGES/strings.po index 0bbdbad..0abaa1f 100644 --- a/src/lang/it/LC_MESSAGES/strings.po +++ b/src/lang/it/LC_MESSAGES/strings.po @@ -1,28 +1,25 @@ -# -# Translators: -# fabrixxm , 2019 -# Sylke Vicious , 2020 -# msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" -"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Last-Translator: Sylke Vicious , 2020\n" "Language-Team: Italian (https://www.transifex.com/Friendica/teams/12172/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" +"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.2\n" -#: src\classes\Content\Pager.php:168 src\classes\Content\Pager.php:216 +#: src\classes\Content\Pager.php:168 +#: src\classes\Content\Pager.php:216 msgid "Previous" msgstr "Precedente" -#: src\classes\Content\Pager.php:173 src\classes\Content\Pager.php:273 +#: src\classes\Content\Pager.php:173 +#: src\classes\Content\Pager.php:273 msgid "Next" msgstr "Successivo" @@ -34,51 +31,57 @@ msgstr "Primo" msgid "Last" msgstr "Ultimo" -#: src\classes\Controllers\Web\Directory.php:73 +#: src\classes\Controllers\Web\Directory.php:85 msgid "People" msgstr "Persone" -#: src\classes\Controllers\Web\Search.php:64 +#: src\classes\Controllers\Web\Search.php:72 msgctxt "field" msgid "Language" msgstr "Lingua" -#: src\classes\Controllers\Web\Search.php:65 +#: src\classes\Controllers\Web\Search.php:73 msgctxt "field" msgid "Locality" msgstr "Località" -#: src\classes\Controllers\Web\Search.php:66 +#: src\classes\Controllers\Web\Search.php:74 msgctxt "field" msgid "Region" msgstr "Regione" -#: src\classes\Controllers\Web\Search.php:67 +#: src\classes\Controllers\Web\Search.php:75 msgctxt "field" msgid "Country" msgstr "Nazione" -#: src\classes\Controllers\Web\Servers.php:90 +#: src\classes\Controllers\Web\Servers.php:105 msgid "Public Servers" msgstr "Server Pubblici" -#: src\templates\layout.phtml:4 src\templates\layout.phtml:18 +#: src\templates\layout.phtml:4 +#: src\templates\layout.phtml:18 msgid "Friendica Directory" msgstr "Directory Friendica" -#: src\templates\layout.phtml:23 src\templates\layout.phtml:25 -#: src\templates\layout.phtml:43 src\templates\layout.phtml:45 -#: src\templates\search.phtml:4 src\templates\search.phtml:12 +#: src\templates\layout.phtml:23 +#: src\templates\layout.phtml:25 +#: src\templates\layout.phtml:43 +#: src\templates\layout.phtml:45 +#: src\templates\search.phtml:4 +#: src\templates\search.phtml:12 msgid "Search terms" msgstr "Termini di ricerca" -#: src\templates\layout.phtml:24 src\templates\layout.phtml:45 +#: src\templates\layout.phtml:24 +#: src\templates\layout.phtml:45 #: src\templates\search.phtml:11 msgctxt "noun" msgid "Search" msgstr "Cerca" -#: src\templates\layout.phtml:27 src\templates\layout.phtml:47 +#: src\templates\layout.phtml:27 +#: src\templates\layout.phtml:47 #: src\templates\search.phtml:14 msgctxt "verb" msgid "Search" @@ -102,11 +105,11 @@ msgid_plural "%d results for \"%s\"" msgstr[0] "%drisultato per \"%s\"" msgstr[1] "%d risultati per \"%s\"" -#: src\templates\servers.phtml:2 +#: src\templates\servers.phtml:7 msgid "Top servers pagination" msgstr "Paginazione superiore server" -#: src\templates\servers.phtml:12 +#: src\templates\servers.phtml:17 msgid "Bottom servers pagination" msgstr "Paginazione inferiore server" @@ -123,23 +126,27 @@ msgid "Filter by country" msgstr "Filtra per nazioen" #: src\templates\sub\profile.phtml:31 +#: src\templates\sub\profile.phtml:35 +#: src\templates\sub\profile.phtml:39 msgctxt "verb" msgid "Follow" msgstr "Segui" -#: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47 +#: src\templates\layout.phtml:65 +#: src\templates\sub\profile.phtml:57 msgid "Language" msgstr "Lingua" -#: src\templates\sub\profile.phtml:50 +#: src\templates\sub\profile.phtml:60 +#: src\templates\widget\popularserverlanguages.phtml:2 msgid "Filter by language" msgstr "Filtra per lingua" -#: src\templates\sub\profile.phtml:56 +#: src\templates\sub\profile.phtml:66 msgid "Location" msgstr "Posizione" -#: src\templates\sub\profile.phtml:69 +#: src\templates\sub\profile.phtml:79 msgid "Search Tag" msgstr "Cerca Tag" @@ -147,19 +154,23 @@ msgstr "Cerca Tag" msgid "Account type tabs" msgstr "Tab tipo account" -#: src\templates\sub\profiles.phtml:4 src\templates\sub\profiles.phtml:7 +#: src\templates\sub\profiles.phtml:4 +#: src\templates\sub\profiles.phtml:7 msgid "Top %s pagination" msgstr "Paginazione superiore %s" -#: src\templates\sub\profiles.phtml:13 src\templates\sub\profiles.phtml:16 +#: src\templates\sub\profiles.phtml:13 +#: src\templates\sub\profiles.phtml:16 msgid "Bottom %s pagination" msgstr "Paginazione inferiore %s" -#: src\templates\statistics.phtml:66 src\templates\sub\server.phtml:15 +#: src\templates\statistics.phtml:66 +#: src\templates\sub\server.phtml:15 msgid "Stable Version" msgstr "Versione Stabile" -#: src\templates\statistics.phtml:68 src\templates\sub\server.phtml:17 +#: src\templates\statistics.phtml:68 +#: src\templates\sub\server.phtml:17 msgid "Develop Version" msgstr "Versione di Sviluppo" @@ -167,15 +178,15 @@ msgstr "Versione di Sviluppo" msgid "Outdated Version" msgstr "Versione Obsoleta" -#: src\templates\sub\server.phtml:55 +#: src\templates\sub\server.phtml:69 msgid "Admin" msgstr "Amministratore" -#: src\templates\sub\server.phtml:62 +#: src\templates\sub\server.phtml:76 msgid "No description provided" msgstr "Nessuna descrizione fornita" -#: src\templates\sub\server.phtml:65 +#: src\templates\sub\server.phtml:79 msgid "Visit Server" msgstr "Visita il Server" @@ -183,7 +194,7 @@ msgstr "Visita il Server" msgid "Popular Countries" msgstr "Nazioni Popolari" -#: src\templates\widget\popularlanguages.phtml:2 +#: src\templates\widget\popularprofilelanguages.phtml:2 msgid "Popular Languages" msgstr "Lingue Popolari" @@ -191,7 +202,8 @@ msgstr "Lingue Popolari" msgid "Popular Tags" msgstr "Tag Popolari" -#: src\templates\sub\server.phtml:44 src\templates\sub\server.phtml:45 +#: src\templates\sub\server.phtml:44 +#: src\templates\sub\server.phtml:45 msgid "Default Language" msgstr "Lingua di Default" @@ -211,13 +223,6 @@ msgid_plural "People (%d)" msgstr[0] "Persona (%d)" msgstr[1] "Persone (%d)" -#: src\classes\Views\Widget\AccountTypeTabs.php:57 -msgctxt "account-type" -msgid "Forum (%d)" -msgid_plural "Forums (%d)" -msgstr[0] "Forum (%d)" -msgstr[1] "Forum (%d)" - #: src\templates\layout.phtml:97 msgid "Stats" msgstr "Statistiche" @@ -231,20 +236,16 @@ msgid "Profiles" msgstr "Profili" #: src\templates\statistics.phtml:6 -msgid "" -"This directory knows about %s distinct potential profile " -"URLs." -msgstr "" -"Questa directory conosce %s distinti URL profili " -"potenziali." +msgid "This directory knows about %s distinct potential profile URLs." +msgstr "Questa directory conosce %s distinti URL profili potenziali." -#: src\templates\statistics.phtml:16 src\templates\statistics.phtml:46 +#: src\templates\statistics.phtml:16 +#: src\templates\statistics.phtml:46 msgid "Languages" msgstr "Lingue" #: src\templates\statistics.phtml:17 -msgid "" -"Out of %s profiles reporting their language there are:" +msgid "Out of %s profiles reporting their language there are:" msgstr "Di %s profili che riportano la loro lingua, ci sono:" #: src\templates\statistics.phtml:27 @@ -252,20 +253,12 @@ msgid "Servers" msgstr "Server" #: src\templates\statistics.phtml:28 -msgid "" -"This directory knows about %s distinct potential server " -"URLs." -msgstr "" -"Questa directory conosce %s distinti URL di server " -"potenziali." +msgid "This directory knows about %s distinct potential server URLs." +msgstr "Questa directory conosce %s distinti URL di server potenziali." #: src\templates\statistics.phtml:29 -msgid "" -"Out of those, there are %s domains (%s) that have been a " -"Friendica server at least once." -msgstr "" -"Di questi, ci sono %s domini (%s) che sono stati un server " -"Friendica almeno una volta." +msgid "Out of those, there are %s domains (%s) that have been a Friendica server at least once." +msgstr "Di questi, ci sono %s domini (%s) che sono stati un server Friendica almeno una volta." #: src\templates\statistics.phtml:33 msgid "Out of those, there are:" @@ -281,16 +274,11 @@ msgstr "Versioni" #: src\templates\statistics.phtml:58 msgid "Out of %s servers reporting their version there are:" -msgstr "" -"Di %s server che riportano la loro versione, ci sono:" +msgstr "Di %s server che riportano la loro versione, ci sono:" #: src\templates\statistics.phtml:7 -msgid "" -"Out of those, there are %s profiles (%s) that opted in the " -"public directory at least once." -msgstr "" -"Di questi, ci sono %s profili (%s che hanno deciso di venir" -" pubblicati nella directory pubblica almeno una volta." +msgid "Out of those, there are %s profiles (%s) that opted in the public directory at least once." +msgstr "Di questi, ci sono %s profili (%s che hanno deciso di venir pubblicati nella directory pubblica almeno una volta." #: src\templates\statistics.phtml:35 msgid "%s available servers (%s)" @@ -300,22 +288,70 @@ msgstr "%s server disponibili (%s)" msgid "Friendica Directory version %s" msgstr "Friendica Directory versione %s" -#: src\templates\layout.phtml:94 -msgid "Source Code on GitHub" -msgstr "Codice Sorgente su GitHub" - #: src\templates\statistics.phtml:11 -msgid "" -"Out of those, there currently are %s available profiles " -"(%s). Check them out!" -msgstr "" -"Di questi, ci sono %s profili disponibili (%s). Dacci un'occhiata!" +msgid "Out of those, there currently are %s available profiles (%s). Check them out!" +msgstr "Di questi, ci sono %s profili disponibili (%s). Dacci un'occhiata!" #: src\templates\statistics.phtml:39 -msgid "" -"%s public servers (%s) currently open for registration. Check them out!" +msgid "%s public servers (%s) currently open for registration. Check them out!" +msgstr "%s server pubblici (%s) attualmente con registrazione libera. Dacci un'occhiata!" + +#: src\classes\Views\Widget\AccountTypeTabs.php:57 +msgctxt "account-type" +msgid "News (%d)" +msgid_plural "News (%d)" +msgstr[0] "" +msgstr[1] "" + +#: src\classes\Views\Widget\AccountTypeTabs.php:58 +msgctxt "account-type" +msgid "Organization (%d)" +msgid_plural "Organizations (%d)" +msgstr[0] "" +msgstr[1] "" + +#: src\classes\Views\Widget\AccountTypeTabs.php:61 +msgctxt "account-type" +msgid "Group (%d)" +msgid_plural "Groups (%d)" +msgstr[0] "" +msgstr[1] "" + +#: src\templates\servers.phtml:3 +msgid "Filtered by language:" +msgstr "" + +#: src\templates\servers.phtml:3 +msgid "Clear language filter" +msgstr "" + +#: src\templates\sub\server.phtml:40 +msgid "Health Score" +msgstr "" + +#: src\templates\sub\server.phtml:52 +msgid "%s User" +msgid_plural "%s Users" +msgstr[0] "" +msgstr[1] "" + +#: src\templates\sub\server.phtml:54 +msgid "None" +msgstr "" + +#: src\templates\sub\server.phtml:58 +#: src\templates\sub\server.phtml:62 +msgid "Registration Policy" +msgstr "" + +#: src\templates\sub\server.phtml:59 +msgid "By Approval" +msgstr "" + +#: src\templates\sub\server.phtml:63 +msgid "Open" +msgstr "" + +#: src\templates\layout.phtml:94 +msgid "Source Code on Friendica's Forgejo" msgstr "" -"%s server pubblici (%s) attualmente con registrazione " -"libera. Dacci un'occhiata!" diff --git a/src/lang/ja/LC_MESSAGES/strings.po b/src/lang/ja/LC_MESSAGES/strings.po index ae93aad..1c20ff8 100644 --- a/src/lang/ja/LC_MESSAGES/strings.po +++ b/src/lang/ja/LC_MESSAGES/strings.po @@ -1,27 +1,25 @@ -# -# Translators: -# ozero dien , 2019 -# msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" -"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Last-Translator: ozero dien , 2019\n" "Language-Team: Japanese (https://www.transifex.com/Friendica/teams/12172/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" +"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Language: ja\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Poedit 2.2\n" -#: src\classes\Content\Pager.php:168 src\classes\Content\Pager.php:216 +#: src\classes\Content\Pager.php:168 +#: src\classes\Content\Pager.php:216 msgid "Previous" msgstr "前" -#: src\classes\Content\Pager.php:173 src\classes\Content\Pager.php:273 +#: src\classes\Content\Pager.php:173 +#: src\classes\Content\Pager.php:273 msgid "Next" msgstr "次" @@ -33,51 +31,57 @@ msgstr "最初" msgid "Last" msgstr "最終" -#: src\classes\Controllers\Web\Directory.php:73 +#: src\classes\Controllers\Web\Directory.php:85 msgid "People" msgstr "人" -#: src\classes\Controllers\Web\Search.php:64 +#: src\classes\Controllers\Web\Search.php:72 msgctxt "field" msgid "Language" msgstr "言語" -#: src\classes\Controllers\Web\Search.php:65 +#: src\classes\Controllers\Web\Search.php:73 msgctxt "field" msgid "Locality" msgstr "局所性" -#: src\classes\Controllers\Web\Search.php:66 +#: src\classes\Controllers\Web\Search.php:74 msgctxt "field" msgid "Region" msgstr "地域" -#: src\classes\Controllers\Web\Search.php:67 +#: src\classes\Controllers\Web\Search.php:75 msgctxt "field" msgid "Country" msgstr "国" -#: src\classes\Controllers\Web\Servers.php:90 +#: src\classes\Controllers\Web\Servers.php:105 msgid "Public Servers" msgstr "パブリックサーバー" -#: src\templates\layout.phtml:4 src\templates\layout.phtml:18 +#: src\templates\layout.phtml:4 +#: src\templates\layout.phtml:18 msgid "Friendica Directory" msgstr "Friendicaディレクトリ" -#: src\templates\layout.phtml:23 src\templates\layout.phtml:25 -#: src\templates\layout.phtml:43 src\templates\layout.phtml:45 -#: src\templates\search.phtml:4 src\templates\search.phtml:12 +#: src\templates\layout.phtml:23 +#: src\templates\layout.phtml:25 +#: src\templates\layout.phtml:43 +#: src\templates\layout.phtml:45 +#: src\templates\search.phtml:4 +#: src\templates\search.phtml:12 msgid "Search terms" msgstr "検索ワード" -#: src\templates\layout.phtml:24 src\templates\layout.phtml:45 +#: src\templates\layout.phtml:24 +#: src\templates\layout.phtml:45 #: src\templates\search.phtml:11 msgctxt "noun" msgid "Search" msgstr "サーチ" -#: src\templates\layout.phtml:27 src\templates\layout.phtml:47 +#: src\templates\layout.phtml:27 +#: src\templates\layout.phtml:47 #: src\templates\search.phtml:14 msgctxt "verb" msgid "Search" @@ -100,11 +104,11 @@ msgid "%d result for \"%s\"" msgid_plural "%d results for \"%s\"" msgstr[0] " \"%s\" : %d 件の結果" -#: src\templates\servers.phtml:2 +#: src\templates\servers.phtml:7 msgid "Top servers pagination" msgstr "トップサーバーのページネーション" -#: src\templates\servers.phtml:12 +#: src\templates\servers.phtml:17 msgid "Bottom servers pagination" msgstr "下部サーバーのページネーション" @@ -121,23 +125,27 @@ msgid "Filter by country" msgstr "国で絞り込む" #: src\templates\sub\profile.phtml:31 +#: src\templates\sub\profile.phtml:35 +#: src\templates\sub\profile.phtml:39 msgctxt "verb" msgid "Follow" msgstr "フォロー" -#: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47 +#: src\templates\layout.phtml:65 +#: src\templates\sub\profile.phtml:57 msgid "Language" msgstr "言語" -#: src\templates\sub\profile.phtml:50 +#: src\templates\sub\profile.phtml:60 +#: src\templates\widget\popularserverlanguages.phtml:2 msgid "Filter by language" msgstr "言語でフィルター" -#: src\templates\sub\profile.phtml:56 +#: src\templates\sub\profile.phtml:66 msgid "Location" msgstr "ロケーション" -#: src\templates\sub\profile.phtml:69 +#: src\templates\sub\profile.phtml:79 msgid "Search Tag" msgstr "検索タグ" @@ -145,19 +153,23 @@ msgstr "検索タグ" msgid "Account type tabs" msgstr "アカウントタイプタブ" -#: src\templates\sub\profiles.phtml:4 src\templates\sub\profiles.phtml:7 +#: src\templates\sub\profiles.phtml:4 +#: src\templates\sub\profiles.phtml:7 msgid "Top %s pagination" msgstr "トップ %s のページネーション" -#: src\templates\sub\profiles.phtml:13 src\templates\sub\profiles.phtml:16 +#: src\templates\sub\profiles.phtml:13 +#: src\templates\sub\profiles.phtml:16 msgid "Bottom %s pagination" msgstr "下位 %s のページネーション" -#: src\templates\statistics.phtml:66 src\templates\sub\server.phtml:15 +#: src\templates\statistics.phtml:66 +#: src\templates\sub\server.phtml:15 msgid "Stable Version" msgstr "安定版" -#: src\templates\statistics.phtml:68 src\templates\sub\server.phtml:17 +#: src\templates\statistics.phtml:68 +#: src\templates\sub\server.phtml:17 msgid "Develop Version" msgstr "バージョンを開発" @@ -165,15 +177,15 @@ msgstr "バージョンを開発" msgid "Outdated Version" msgstr "古いバージョン" -#: src\templates\sub\server.phtml:55 +#: src\templates\sub\server.phtml:69 msgid "Admin" msgstr "管理者" -#: src\templates\sub\server.phtml:62 +#: src\templates\sub\server.phtml:76 msgid "No description provided" msgstr "説明なし" -#: src\templates\sub\server.phtml:65 +#: src\templates\sub\server.phtml:79 msgid "Visit Server" msgstr "サーバーにアクセス" @@ -181,7 +193,7 @@ msgstr "サーバーにアクセス" msgid "Popular Countries" msgstr "人気の国" -#: src\templates\widget\popularlanguages.phtml:2 +#: src\templates\widget\popularprofilelanguages.phtml:2 msgid "Popular Languages" msgstr "人気のある言語" @@ -189,7 +201,8 @@ msgstr "人気のある言語" msgid "Popular Tags" msgstr "人気のタグ" -#: src\templates\sub\server.phtml:44 src\templates\sub\server.phtml:45 +#: src\templates\sub\server.phtml:44 +#: src\templates\sub\server.phtml:45 msgid "Default Language" msgstr "既定の言語" @@ -208,12 +221,6 @@ msgid "People (%d)" msgid_plural "People (%d)" msgstr[0] "個人（ %d ）" -#: src\classes\Views\Widget\AccountTypeTabs.php:57 -msgctxt "account-type" -msgid "Forum (%d)" -msgid_plural "Forums (%d)" -msgstr[0] "フォーラム（ %d ）" - #: src\templates\layout.phtml:97 msgid "Stats" msgstr "統計" @@ -227,18 +234,16 @@ msgid "Profiles" msgstr "プロフィール" #: src\templates\statistics.phtml:6 -msgid "" -"This directory knows about %s distinct potential profile " -"URLs." +msgid "This directory knows about %s distinct potential profile URLs." msgstr "このディレクトリは、 %s の異なる潜在的なプロファイルURL を認識しています。" -#: src\templates\statistics.phtml:16 src\templates\statistics.phtml:46 +#: src\templates\statistics.phtml:16 +#: src\templates\statistics.phtml:46 msgid "Languages" msgstr "言語" #: src\templates\statistics.phtml:17 -msgid "" -"Out of %s profiles reporting their language there are:" +msgid "Out of %s profiles reporting their language there are:" msgstr " %s の言語を報告するプロフィールには、次のものがあります。" #: src\templates\statistics.phtml:27 @@ -246,17 +251,12 @@ msgid "Servers" msgstr "サーバー" #: src\templates\statistics.phtml:28 -msgid "" -"This directory knows about %s distinct potential server " -"URLs." +msgid "This directory knows about %s distinct potential server URLs." msgstr "このディレクトリは、 %s の異なる潜在的なサーバーURL を認識しています。" #: src\templates\statistics.phtml:29 -msgid "" -"Out of those, there are %s domains (%s) that have been a " -"Friendica server at least once." -msgstr "" -"それらのうち、少なくとも一度はFriendicaサーバーであった %s のドメイン（ %s ）があります。" +msgid "Out of those, there are %s domains (%s) that have been a Friendica server at least once." +msgstr "それらのうち、少なくとも一度はFriendicaサーバーであった %s のドメイン（ %s ）があります。" #: src\templates\statistics.phtml:33 msgid "Out of those, there are:" @@ -275,11 +275,8 @@ msgid "Out of %s servers reporting their version there are:" msgstr "バージョンを報告している %s のサーバーのうち、次のものがあります。" #: src\templates\statistics.phtml:7 -msgid "" -"Out of those, there are %s profiles (%s) that opted in the " -"public directory at least once." -msgstr "" -"これらのうち、 %s のプロファイル（ %s ）があり、パブリックディレクトリで少なくとも1回選択しました。" +msgid "Out of those, there are %s profiles (%s) that opted in the public directory at least once." +msgstr "これらのうち、 %s のプロファイル（ %s ）があり、パブリックディレクトリで少なくとも1回選択しました。" #: src\templates\statistics.phtml:35 msgid "%s available servers (%s)" @@ -289,18 +286,66 @@ msgstr " %s のサーバが利用可能（ %s ）" msgid "Friendica Directory version %s" msgstr "Friendica Directory バージョン %s" -#: src\templates\layout.phtml:94 -msgid "Source Code on GitHub" -msgstr "GitHubのソースコード" - #: src\templates\statistics.phtml:11 -msgid "" -"Out of those, there currently are %s available profiles " -"(%s). Check them out!" +msgid "Out of those, there currently are %s available profiles (%s). Check them out!" msgstr "" #: src\templates\statistics.phtml:39 -msgid "" -"%s public servers (%s) currently open for registration. Check them out!" +msgid "%s public servers (%s) currently open for registration. Check them out!" +msgstr "" + +#: src\classes\Views\Widget\AccountTypeTabs.php:57 +msgctxt "account-type" +msgid "News (%d)" +msgid_plural "News (%d)" +msgstr[0] "" + +#: src\classes\Views\Widget\AccountTypeTabs.php:58 +msgctxt "account-type" +msgid "Organization (%d)" +msgid_plural "Organizations (%d)" +msgstr[0] "" + +#: src\classes\Views\Widget\AccountTypeTabs.php:61 +msgctxt "account-type" +msgid "Group (%d)" +msgid_plural "Groups (%d)" +msgstr[0] "" + +#: src\templates\servers.phtml:3 +msgid "Filtered by language:" +msgstr "" + +#: src\templates\servers.phtml:3 +msgid "Clear language filter" +msgstr "" + +#: src\templates\sub\server.phtml:40 +msgid "Health Score" +msgstr "" + +#: src\templates\sub\server.phtml:52 +msgid "%s User" +msgid_plural "%s Users" +msgstr[0] "" + +#: src\templates\sub\server.phtml:54 +msgid "None" +msgstr "" + +#: src\templates\sub\server.phtml:58 +#: src\templates\sub\server.phtml:62 +msgid "Registration Policy" +msgstr "" + +#: src\templates\sub\server.phtml:59 +msgid "By Approval" +msgstr "" + +#: src\templates\sub\server.phtml:63 +msgid "Open" +msgstr "" + +#: src\templates\layout.phtml:94 +msgid "Source Code on Friendica's Forgejo" msgstr "" diff --git a/src/lang/nl/LC_MESSAGES/strings.po b/src/lang/nl/LC_MESSAGES/strings.po index 59c2d72..21e426a 100644 --- a/src/lang/nl/LC_MESSAGES/strings.po +++ b/src/lang/nl/LC_MESSAGES/strings.po @@ -1,27 +1,25 @@ -# -# Translators: -# Jeroen De Meerleer , 2018 -# msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" -"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Last-Translator: Jeroen De Meerleer , 2018\n" "Language-Team: Dutch (https://www.transifex.com/Friendica/teams/12172/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" +"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.2\n" -#: src\classes\Content\Pager.php:168 src\classes\Content\Pager.php:216 +#: src\classes\Content\Pager.php:168 +#: src\classes\Content\Pager.php:216 msgid "Previous" msgstr "Vorige" -#: src\classes\Content\Pager.php:173 src\classes\Content\Pager.php:273 +#: src\classes\Content\Pager.php:173 +#: src\classes\Content\Pager.php:273 msgid "Next" msgstr "Volgende" @@ -33,51 +31,57 @@ msgstr "Eerste" msgid "Last" msgstr "Laatste" -#: src\classes\Controllers\Web\Directory.php:73 +#: src\classes\Controllers\Web\Directory.php:85 msgid "People" msgstr "Mensen" -#: src\classes\Controllers\Web\Search.php:64 +#: src\classes\Controllers\Web\Search.php:72 msgctxt "field" msgid "Language" msgstr "Taal" -#: src\classes\Controllers\Web\Search.php:65 +#: src\classes\Controllers\Web\Search.php:73 msgctxt "field" msgid "Locality" msgstr "Stad" -#: src\classes\Controllers\Web\Search.php:66 +#: src\classes\Controllers\Web\Search.php:74 msgctxt "field" msgid "Region" msgstr "Regio" -#: src\classes\Controllers\Web\Search.php:67 +#: src\classes\Controllers\Web\Search.php:75 msgctxt "field" msgid "Country" msgstr "Land" -#: src\classes\Controllers\Web\Servers.php:90 +#: src\classes\Controllers\Web\Servers.php:105 msgid "Public Servers" msgstr "Publieke servers" -#: src\templates\layout.phtml:4 src\templates\layout.phtml:18 +#: src\templates\layout.phtml:4 +#: src\templates\layout.phtml:18 msgid "Friendica Directory" msgstr "Friendica gids" -#: src\templates\layout.phtml:23 src\templates\layout.phtml:25 -#: src\templates\layout.phtml:43 src\templates\layout.phtml:45 -#: src\templates\search.phtml:4 src\templates\search.phtml:12 +#: src\templates\layout.phtml:23 +#: src\templates\layout.phtml:25 +#: src\templates\layout.phtml:43 +#: src\templates\layout.phtml:45 +#: src\templates\search.phtml:4 +#: src\templates\search.phtml:12 msgid "Search terms" msgstr "Zoektermen" -#: src\templates\layout.phtml:24 src\templates\layout.phtml:45 +#: src\templates\layout.phtml:24 +#: src\templates\layout.phtml:45 #: src\templates\search.phtml:11 msgctxt "noun" msgid "Search" msgstr "Zoeken" -#: src\templates\layout.phtml:27 src\templates\layout.phtml:47 +#: src\templates\layout.phtml:27 +#: src\templates\layout.phtml:47 #: src\templates\search.phtml:14 msgctxt "verb" msgid "Search" @@ -101,11 +105,11 @@ msgid_plural "%d results for \"%s\"" msgstr[0] "%d resultaten voor \"%s\"" msgstr[1] "%d resultaten voor \"%s\"" -#: src\templates\servers.phtml:2 +#: src\templates\servers.phtml:7 msgid "Top servers pagination" msgstr "Server pagina boven" -#: src\templates\servers.phtml:12 +#: src\templates\servers.phtml:17 msgid "Bottom servers pagination" msgstr "Server paginatie beneden" @@ -122,23 +126,27 @@ msgid "Filter by country" msgstr "Filter op land" #: src\templates\sub\profile.phtml:31 +#: src\templates\sub\profile.phtml:35 +#: src\templates\sub\profile.phtml:39 msgctxt "verb" msgid "Follow" msgstr "Volg" -#: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47 +#: src\templates\layout.phtml:65 +#: src\templates\sub\profile.phtml:57 msgid "Language" msgstr "Taal" -#: src\templates\sub\profile.phtml:50 +#: src\templates\sub\profile.phtml:60 +#: src\templates\widget\popularserverlanguages.phtml:2 msgid "Filter by language" msgstr "Filter op taal" -#: src\templates\sub\profile.phtml:56 +#: src\templates\sub\profile.phtml:66 msgid "Location" msgstr "Locatie" -#: src\templates\sub\profile.phtml:69 +#: src\templates\sub\profile.phtml:79 msgid "Search Tag" msgstr "Zoekwoord" @@ -146,19 +154,23 @@ msgstr "Zoekwoord" msgid "Account type tabs" msgstr "Accounttype tabs" -#: src\templates\sub\profiles.phtml:4 src\templates\sub\profiles.phtml:7 +#: src\templates\sub\profiles.phtml:4 +#: src\templates\sub\profiles.phtml:7 msgid "Top %s pagination" msgstr "%s paginatie boven" -#: src\templates\sub\profiles.phtml:13 src\templates\sub\profiles.phtml:16 +#: src\templates\sub\profiles.phtml:13 +#: src\templates\sub\profiles.phtml:16 msgid "Bottom %s pagination" msgstr "%s paginatie beneden" -#: src\templates\statistics.phtml:66 src\templates\sub\server.phtml:15 +#: src\templates\statistics.phtml:66 +#: src\templates\sub\server.phtml:15 msgid "Stable Version" msgstr "Stabiele versie" -#: src\templates\statistics.phtml:68 src\templates\sub\server.phtml:17 +#: src\templates\statistics.phtml:68 +#: src\templates\sub\server.phtml:17 msgid "Develop Version" msgstr "Ontwikkelingsversie" @@ -166,15 +178,15 @@ msgstr "Ontwikkelingsversie" msgid "Outdated Version" msgstr "Oude versie" -#: src\templates\sub\server.phtml:55 +#: src\templates\sub\server.phtml:69 msgid "Admin" msgstr "Administrator" -#: src\templates\sub\server.phtml:62 +#: src\templates\sub\server.phtml:76 msgid "No description provided" msgstr "Geen omschrijving toegevoegd" -#: src\templates\sub\server.phtml:65 +#: src\templates\sub\server.phtml:79 msgid "Visit Server" msgstr "Bezoek server" @@ -182,7 +194,7 @@ msgstr "Bezoek server" msgid "Popular Countries" msgstr "Populaire landen" -#: src\templates\widget\popularlanguages.phtml:2 +#: src\templates\widget\popularprofilelanguages.phtml:2 msgid "Popular Languages" msgstr "Populaire talen" @@ -190,7 +202,8 @@ msgstr "Populaire talen" msgid "Popular Tags" msgstr "Populaire tags" -#: src\templates\sub\server.phtml:44 src\templates\sub\server.phtml:45 +#: src\templates\sub\server.phtml:44 +#: src\templates\sub\server.phtml:45 msgid "Default Language" msgstr "Standaard taal" @@ -210,13 +223,6 @@ msgid_plural "People (%d)" msgstr[0] "" msgstr[1] "" -#: src\classes\Views\Widget\AccountTypeTabs.php:57 -msgctxt "account-type" -msgid "Forum (%d)" -msgid_plural "Forums (%d)" -msgstr[0] "" -msgstr[1] "" - #: src\templates\layout.phtml:97 msgid "Stats" msgstr "" @@ -230,18 +236,16 @@ msgid "Profiles" msgstr "" #: src\templates\statistics.phtml:6 -msgid "" -"This directory knows about %s distinct potential profile " -"URLs." +msgid "This directory knows about %s distinct potential profile URLs." msgstr "" -#: src\templates\statistics.phtml:16 src\templates\statistics.phtml:46 +#: src\templates\statistics.phtml:16 +#: src\templates\statistics.phtml:46 msgid "Languages" msgstr "" #: src\templates\statistics.phtml:17 -msgid "" -"Out of %s profiles reporting their language there are:" +msgid "Out of %s profiles reporting their language there are:" msgstr "" #: src\templates\statistics.phtml:27 @@ -249,15 +253,11 @@ msgid "Servers" msgstr "" #: src\templates\statistics.phtml:28 -msgid "" -"This directory knows about %s distinct potential server " -"URLs." +msgid "This directory knows about %s distinct potential server URLs." msgstr "" #: src\templates\statistics.phtml:29 -msgid "" -"Out of those, there are %s domains (%s) that have been a " -"Friendica server at least once." +msgid "Out of those, there are %s domains (%s) that have been a Friendica server at least once." msgstr "" #: src\templates\statistics.phtml:33 @@ -277,9 +277,7 @@ msgid "Out of %s servers reporting their version there are:" msgstr "" #: src\templates\statistics.phtml:7 -msgid "" -"Out of those, there are %s profiles (%s) that opted in the " -"public directory at least once." +msgid "Out of those, there are %s profiles (%s) that opted in the public directory at least once." msgstr "" #: src\templates\statistics.phtml:35 @@ -290,18 +288,70 @@ msgstr "" msgid "Friendica Directory version %s" msgstr "" -#: src\templates\layout.phtml:94 -msgid "Source Code on GitHub" -msgstr "" - #: src\templates\statistics.phtml:11 -msgid "" -"Out of those, there currently are %s available profiles " -"(%s). Check them out!" +msgid "Out of those, there currently are %s available profiles (%s). Check them out!" msgstr "" #: src\templates\statistics.phtml:39 -msgid "" -"%s public servers (%s) currently open for registration. Check them out!" +msgid "%s public servers (%s) currently open for registration. Check them out!" +msgstr "" + +#: src\classes\Views\Widget\AccountTypeTabs.php:57 +msgctxt "account-type" +msgid "News (%d)" +msgid_plural "News (%d)" +msgstr[0] "" +msgstr[1] "" + +#: src\classes\Views\Widget\AccountTypeTabs.php:58 +msgctxt "account-type" +msgid "Organization (%d)" +msgid_plural "Organizations (%d)" +msgstr[0] "" +msgstr[1] "" + +#: src\classes\Views\Widget\AccountTypeTabs.php:61 +msgctxt "account-type" +msgid "Group (%d)" +msgid_plural "Groups (%d)" +msgstr[0] "" +msgstr[1] "" + +#: src\templates\servers.phtml:3 +msgid "Filtered by language:" +msgstr "" + +#: src\templates\servers.phtml:3 +msgid "Clear language filter" +msgstr "" + +#: src\templates\sub\server.phtml:40 +msgid "Health Score" +msgstr "" + +#: src\templates\sub\server.phtml:52 +msgid "%s User" +msgid_plural "%s Users" +msgstr[0] "" +msgstr[1] "" + +#: src\templates\sub\server.phtml:54 +msgid "None" +msgstr "" + +#: src\templates\sub\server.phtml:58 +#: src\templates\sub\server.phtml:62 +msgid "Registration Policy" +msgstr "" + +#: src\templates\sub\server.phtml:59 +msgid "By Approval" +msgstr "" + +#: src\templates\sub\server.phtml:63 +msgid "Open" +msgstr "" + +#: src\templates\layout.phtml:94 +msgid "Source Code on Friendica's Forgejo" msgstr "" diff --git a/src/lang/pl/LC_MESSAGES/strings.po b/src/lang/pl/LC_MESSAGES/strings.po index 8ee2cf1..3d7bf08 100644 --- a/src/lang/pl/LC_MESSAGES/strings.po +++ b/src/lang/pl/LC_MESSAGES/strings.po @@ -1,27 +1,25 @@ -# -# Translators: -# Piotr Strębski , 2022 -# msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" -"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Last-Translator: Piotr Strębski , 2022\n" "Language-Team: Polish (https://www.transifex.com/Friendica/teams/12172/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" +"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Language: 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" "X-Generator: Poedit 2.2\n" -#: src\classes\Content\Pager.php:168 src\classes\Content\Pager.php:216 +#: src\classes\Content\Pager.php:168 +#: src\classes\Content\Pager.php:216 msgid "Previous" msgstr "Poprzednia" -#: src\classes\Content\Pager.php:173 src\classes\Content\Pager.php:273 +#: src\classes\Content\Pager.php:173 +#: src\classes\Content\Pager.php:273 msgid "Next" msgstr "Następna" @@ -33,51 +31,57 @@ msgstr "Pierwsza" msgid "Last" msgstr "Ostatnia" -#: src\classes\Controllers\Web\Directory.php:73 +#: src\classes\Controllers\Web\Directory.php:85 msgid "People" msgstr "Ludzie" -#: src\classes\Controllers\Web\Search.php:64 +#: src\classes\Controllers\Web\Search.php:72 msgctxt "field" msgid "Language" msgstr "Język" -#: src\classes\Controllers\Web\Search.php:65 +#: src\classes\Controllers\Web\Search.php:73 msgctxt "field" msgid "Locality" msgstr "Miejscowość" -#: src\classes\Controllers\Web\Search.php:66 +#: src\classes\Controllers\Web\Search.php:74 msgctxt "field" msgid "Region" msgstr "Region" -#: src\classes\Controllers\Web\Search.php:67 +#: src\classes\Controllers\Web\Search.php:75 msgctxt "field" msgid "Country" msgstr "Kraj" -#: src\classes\Controllers\Web\Servers.php:90 +#: src\classes\Controllers\Web\Servers.php:105 msgid "Public Servers" msgstr "Serwery publiczne" -#: src\templates\layout.phtml:4 src\templates\layout.phtml:18 +#: src\templates\layout.phtml:4 +#: src\templates\layout.phtml:18 msgid "Friendica Directory" msgstr "Katalog Friendica" -#: src\templates\layout.phtml:23 src\templates\layout.phtml:25 -#: src\templates\layout.phtml:43 src\templates\layout.phtml:45 -#: src\templates\search.phtml:4 src\templates\search.phtml:12 +#: src\templates\layout.phtml:23 +#: src\templates\layout.phtml:25 +#: src\templates\layout.phtml:43 +#: src\templates\layout.phtml:45 +#: src\templates\search.phtml:4 +#: src\templates\search.phtml:12 msgid "Search terms" msgstr "Wyszukiwanie hasła" -#: src\templates\layout.phtml:24 src\templates\layout.phtml:45 +#: src\templates\layout.phtml:24 +#: src\templates\layout.phtml:45 #: src\templates\search.phtml:11 msgctxt "noun" msgid "Search" msgstr "Szukaj" -#: src\templates\layout.phtml:27 src\templates\layout.phtml:47 +#: src\templates\layout.phtml:27 +#: src\templates\layout.phtml:47 #: src\templates\search.phtml:14 msgctxt "verb" msgid "Search" @@ -103,11 +107,11 @@ msgstr[1] "%d wyniki dla \"%s\"" msgstr[2] "%d wyników dla \"%s\"" msgstr[3] "%d wyników dla \"%s\"" -#: src\templates\servers.phtml:2 +#: src\templates\servers.phtml:7 msgid "Top servers pagination" msgstr "Górna paginacja serwerów" -#: src\templates\servers.phtml:12 +#: src\templates\servers.phtml:17 msgid "Bottom servers pagination" msgstr "Dolna paginacja serwerów" @@ -124,23 +128,27 @@ msgid "Filter by country" msgstr "Filtruj według kraju" #: src\templates\sub\profile.phtml:31 +#: src\templates\sub\profile.phtml:35 +#: src\templates\sub\profile.phtml:39 msgctxt "verb" msgid "Follow" msgstr "Obserwuj" -#: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47 +#: src\templates\layout.phtml:65 +#: src\templates\sub\profile.phtml:57 msgid "Language" msgstr "Język" -#: src\templates\sub\profile.phtml:50 +#: src\templates\sub\profile.phtml:60 +#: src\templates\widget\popularserverlanguages.phtml:2 msgid "Filter by language" msgstr "Filtruj według języka" -#: src\templates\sub\profile.phtml:56 +#: src\templates\sub\profile.phtml:66 msgid "Location" msgstr "Położenie" -#: src\templates\sub\profile.phtml:69 +#: src\templates\sub\profile.phtml:79 msgid "Search Tag" msgstr "Wyszukaj znacznik" @@ -148,19 +156,23 @@ msgstr "Wyszukaj znacznik" msgid "Account type tabs" msgstr "Karty rodzajów kont" -#: src\templates\sub\profiles.phtml:4 src\templates\sub\profiles.phtml:7 +#: src\templates\sub\profiles.phtml:4 +#: src\templates\sub\profiles.phtml:7 msgid "Top %s pagination" msgstr "Górna paginacja %s" -#: src\templates\sub\profiles.phtml:13 src\templates\sub\profiles.phtml:16 +#: src\templates\sub\profiles.phtml:13 +#: src\templates\sub\profiles.phtml:16 msgid "Bottom %s pagination" msgstr "Dolna paginacja %s" -#: src\templates\statistics.phtml:66 src\templates\sub\server.phtml:15 +#: src\templates\statistics.phtml:66 +#: src\templates\sub\server.phtml:15 msgid "Stable Version" msgstr "Wersja stabilna" -#: src\templates\statistics.phtml:68 src\templates\sub\server.phtml:17 +#: src\templates\statistics.phtml:68 +#: src\templates\sub\server.phtml:17 msgid "Develop Version" msgstr "Wersja rozwojowa" @@ -168,15 +180,15 @@ msgstr "Wersja rozwojowa" msgid "Outdated Version" msgstr "Przestarzała wersja" -#: src\templates\sub\server.phtml:72 +#: src\templates\sub\server.phtml:69 msgid "Admin" msgstr "Administrator" -#: src\templates\sub\server.phtml:79 +#: src\templates\sub\server.phtml:76 msgid "No description provided" msgstr "Nie podano opisu" -#: src\templates\sub\server.phtml:82 +#: src\templates\sub\server.phtml:79 msgid "Visit Server" msgstr "Odwiedź serwer" @@ -184,7 +196,7 @@ msgstr "Odwiedź serwer" msgid "Popular Countries" msgstr "Popularne kraje" -#: src\templates\widget\popularlanguages.phtml:2 +#: src\templates\widget\popularprofilelanguages.phtml:2 msgid "Popular Languages" msgstr "Popularne języki" @@ -192,7 +204,8 @@ msgstr "Popularne języki" msgid "Popular Tags" msgstr "Popularne znaczniki" -#: src\templates\sub\server.phtml:44 src\templates\sub\server.phtml:45 +#: src\templates\sub\server.phtml:44 +#: src\templates\sub\server.phtml:45 msgid "Default Language" msgstr "Domyślny język" @@ -214,15 +227,6 @@ msgstr[1] "Osoby (%d)" msgstr[2] "Osób (%d)" msgstr[3] "Osób (%d)" -#: src\classes\Views\Widget\AccountTypeTabs.php:59 -msgctxt "account-type" -msgid "Forum (%d)" -msgid_plural "Forums (%d)" -msgstr[0] "Forum (%d)" -msgstr[1] "Fora (%d)" -msgstr[2] "Forów (%d)" -msgstr[3] "Forów (%d)" - #: src\templates\layout.phtml:97 msgid "Stats" msgstr "Statystyki" @@ -236,19 +240,16 @@ msgid "Profiles" msgstr "Profile" #: src\templates\statistics.phtml:6 -msgid "" -"This directory knows about %s distinct potential profile " -"URLs." -msgstr "" -"Ten katalog zna %s różne adresy URL potencjalnych profilów." +msgid "This directory knows about %s distinct potential profile URLs." +msgstr "Ten katalog zna %s różne adresy URL potencjalnych profilów." -#: src\templates\statistics.phtml:16 src\templates\statistics.phtml:46 +#: src\templates\statistics.phtml:16 +#: src\templates\statistics.phtml:46 msgid "Languages" msgstr "Języki" #: src\templates\statistics.phtml:17 -msgid "" -"Out of %s profiles reporting their language there are:" +msgid "Out of %s profiles reporting their language there are:" msgstr "Poza %s profilami zgłaszającymi swój język są:" #: src\templates\statistics.phtml:27 @@ -256,20 +257,12 @@ msgid "Servers" msgstr "Serwery" #: src\templates\statistics.phtml:28 -msgid "" -"This directory knows about %s distinct potential server " -"URLs." -msgstr "" -"Ten katalog wie o %s różnych potencjalnych adresach URL " -"serwera." +msgid "This directory knows about %s distinct potential server URLs." +msgstr "Ten katalog wie o %s różnych potencjalnych adresach URL serwera." #: src\templates\statistics.phtml:29 -msgid "" -"Out of those, there are %s domains (%s) that have been a " -"Friendica server at least once." -msgstr "" -"Spośród nich są %s domeny (%s), które były serwerem " -"Friendica co najmniej raz." +msgid "Out of those, there are %s domains (%s) that have been a Friendica server at least once." +msgstr "Spośród nich są %s domeny (%s), które były serwerem Friendica co najmniej raz." #: src\templates\statistics.phtml:33 msgid "Out of those, there are:" @@ -288,12 +281,8 @@ msgid "Out of %s servers reporting their version there are:" msgstr "Poza %s serwerami raportującymi ich wersję są:" #: src\templates\statistics.phtml:7 -msgid "" -"Out of those, there are %s profiles (%s) that opted in the " -"public directory at least once." -msgstr "" -"Spośród nich są %s profile (%s) które wybrały katalog " -"publiczny co najmniej raz." +msgid "Out of those, there are %s profiles (%s) that opted in the public directory at least once." +msgstr "Spośród nich są %s profile (%s) które wybrały katalog publiczny co najmniej raz." #: src\templates\statistics.phtml:35 msgid "%s available servers (%s)" @@ -303,25 +292,13 @@ msgstr "%s dostępne serwery (%s)" msgid "Friendica Directory version %s" msgstr "Katalog Friendica wersja %s" -#: src\templates\layout.phtml:94 -msgid "Source Code on GitHub" -msgstr "Kod źródłowy na GitHub" - #: src\templates\statistics.phtml:11 -msgid "" -"Out of those, there currently are %s available profiles " -"(%s). Check them out!" -msgstr "" -"Spośród nich obecnie są %s dostępne profile (%s). Sprawdź je!" +msgid "Out of those, there currently are %s available profiles (%s). Check them out!" +msgstr "Spośród nich obecnie są %s dostępne profile (%s). Sprawdź je!" #: src\templates\statistics.phtml:39 -msgid "" -"%s public servers (%s) currently open for registration. Check them out!" -msgstr "" -"%s serwery publiczne (%s) obecnie otwarte do rejestracji. " -"Sprawdź je!" +msgid "%s public servers (%s) currently open for registration. Check them out!" +msgstr "%s serwery publiczne (%s) obecnie otwarte do rejestracji. Sprawdź je!" #: src\classes\Views\Widget\AccountTypeTabs.php:57 msgctxt "account-type" @@ -357,14 +334,36 @@ msgstr[3] "%s użytkowników" msgid "None" msgstr "Brak" -#: src\templates\sub\server.phtml:59 src\templates\sub\server.phtml:63 +#: src\templates\sub\server.phtml:58 +#: src\templates\sub\server.phtml:62 msgid "Registration Policy" msgstr "Polityka rejestracji" -#: src\templates\sub\server.phtml:60 +#: src\templates\sub\server.phtml:59 msgid "By Approval" msgstr "Przez zatwierdzenie" -#: src\templates\sub\server.phtml:64 +#: src\templates\sub\server.phtml:63 msgid "Open" msgstr "Otwarta" + +#: src\classes\Views\Widget\AccountTypeTabs.php:61 +msgctxt "account-type" +msgid "Group (%d)" +msgid_plural "Groups (%d)" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: src\templates\servers.phtml:3 +msgid "Filtered by language:" +msgstr "" + +#: src\templates\servers.phtml:3 +msgid "Clear language filter" +msgstr "" + +#: src\templates\layout.phtml:94 +msgid "Source Code on Friendica's Forgejo" +msgstr "" diff --git a/src/lang/ru/LC_MESSAGES/strings.po b/src/lang/ru/LC_MESSAGES/strings.po index 13be9c1..c8d57fd 100644 --- a/src/lang/ru/LC_MESSAGES/strings.po +++ b/src/lang/ru/LC_MESSAGES/strings.po @@ -1,27 +1,25 @@ -# -# Translators: -# Alexander An , 2020 -# msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" -"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Last-Translator: Alexander An , 2020\n" "Language-Team: Russian (https://www.transifex.com/Friendica/teams/12172/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" +"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Language: 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" "X-Generator: Poedit 2.2\n" -#: src\classes\Content\Pager.php:168 src\classes\Content\Pager.php:216 +#: src\classes\Content\Pager.php:168 +#: src\classes\Content\Pager.php:216 msgid "Previous" msgstr "Назад" -#: src\classes\Content\Pager.php:173 src\classes\Content\Pager.php:273 +#: src\classes\Content\Pager.php:173 +#: src\classes\Content\Pager.php:273 msgid "Next" msgstr "Вперёд" @@ -33,51 +31,57 @@ msgstr "Начало" msgid "Last" msgstr "Конец" -#: src\classes\Controllers\Web\Directory.php:73 +#: src\classes\Controllers\Web\Directory.php:85 msgid "People" msgstr "Люди" -#: src\classes\Controllers\Web\Search.php:64 +#: src\classes\Controllers\Web\Search.php:72 msgctxt "field" msgid "Language" msgstr "Язык" -#: src\classes\Controllers\Web\Search.php:65 +#: src\classes\Controllers\Web\Search.php:73 msgctxt "field" msgid "Locality" msgstr "Область" -#: src\classes\Controllers\Web\Search.php:66 +#: src\classes\Controllers\Web\Search.php:74 msgctxt "field" msgid "Region" msgstr "Регион" -#: src\classes\Controllers\Web\Search.php:67 +#: src\classes\Controllers\Web\Search.php:75 msgctxt "field" msgid "Country" msgstr "Страна" -#: src\classes\Controllers\Web\Servers.php:90 +#: src\classes\Controllers\Web\Servers.php:105 msgid "Public Servers" msgstr "Публичные серверы" -#: src\templates\layout.phtml:4 src\templates\layout.phtml:18 +#: src\templates\layout.phtml:4 +#: src\templates\layout.phtml:18 msgid "Friendica Directory" msgstr "Каталог Friendica" -#: src\templates\layout.phtml:23 src\templates\layout.phtml:25 -#: src\templates\layout.phtml:43 src\templates\layout.phtml:45 -#: src\templates\search.phtml:4 src\templates\search.phtml:12 +#: src\templates\layout.phtml:23 +#: src\templates\layout.phtml:25 +#: src\templates\layout.phtml:43 +#: src\templates\layout.phtml:45 +#: src\templates\search.phtml:4 +#: src\templates\search.phtml:12 msgid "Search terms" msgstr "Искать записи" -#: src\templates\layout.phtml:24 src\templates\layout.phtml:45 +#: src\templates\layout.phtml:24 +#: src\templates\layout.phtml:45 #: src\templates\search.phtml:11 msgctxt "noun" msgid "Search" msgstr "Искать" -#: src\templates\layout.phtml:27 src\templates\layout.phtml:47 +#: src\templates\layout.phtml:27 +#: src\templates\layout.phtml:47 #: src\templates\search.phtml:14 msgctxt "verb" msgid "Search" @@ -103,11 +107,11 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: src\templates\servers.phtml:2 +#: src\templates\servers.phtml:7 msgid "Top servers pagination" msgstr "" -#: src\templates\servers.phtml:12 +#: src\templates\servers.phtml:17 msgid "Bottom servers pagination" msgstr "" @@ -124,23 +128,27 @@ msgid "Filter by country" msgstr "Фильтр по стране" #: src\templates\sub\profile.phtml:31 +#: src\templates\sub\profile.phtml:35 +#: src\templates\sub\profile.phtml:39 msgctxt "verb" msgid "Follow" msgstr "Подписаться" -#: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47 +#: src\templates\layout.phtml:65 +#: src\templates\sub\profile.phtml:57 msgid "Language" msgstr "Язык" -#: src\templates\sub\profile.phtml:50 +#: src\templates\sub\profile.phtml:60 +#: src\templates\widget\popularserverlanguages.phtml:2 msgid "Filter by language" msgstr "Фильтр по языку" -#: src\templates\sub\profile.phtml:56 +#: src\templates\sub\profile.phtml:66 msgid "Location" msgstr "Расположение" -#: src\templates\sub\profile.phtml:69 +#: src\templates\sub\profile.phtml:79 msgid "Search Tag" msgstr "" @@ -148,19 +156,23 @@ msgstr "" msgid "Account type tabs" msgstr "" -#: src\templates\sub\profiles.phtml:4 src\templates\sub\profiles.phtml:7 +#: src\templates\sub\profiles.phtml:4 +#: src\templates\sub\profiles.phtml:7 msgid "Top %s pagination" msgstr "" -#: src\templates\sub\profiles.phtml:13 src\templates\sub\profiles.phtml:16 +#: src\templates\sub\profiles.phtml:13 +#: src\templates\sub\profiles.phtml:16 msgid "Bottom %s pagination" msgstr "" -#: src\templates\statistics.phtml:66 src\templates\sub\server.phtml:15 +#: src\templates\statistics.phtml:66 +#: src\templates\sub\server.phtml:15 msgid "Stable Version" msgstr "" -#: src\templates\statistics.phtml:68 src\templates\sub\server.phtml:17 +#: src\templates\statistics.phtml:68 +#: src\templates\sub\server.phtml:17 msgid "Develop Version" msgstr "" @@ -168,15 +180,15 @@ msgstr "" msgid "Outdated Version" msgstr "" -#: src\templates\sub\server.phtml:55 +#: src\templates\sub\server.phtml:69 msgid "Admin" msgstr "" -#: src\templates\sub\server.phtml:62 +#: src\templates\sub\server.phtml:76 msgid "No description provided" msgstr "" -#: src\templates\sub\server.phtml:65 +#: src\templates\sub\server.phtml:79 msgid "Visit Server" msgstr "" @@ -184,7 +196,7 @@ msgstr "" msgid "Popular Countries" msgstr "" -#: src\templates\widget\popularlanguages.phtml:2 +#: src\templates\widget\popularprofilelanguages.phtml:2 msgid "Popular Languages" msgstr "" @@ -192,7 +204,8 @@ msgstr "" msgid "Popular Tags" msgstr "" -#: src\templates\sub\server.phtml:44 src\templates\sub\server.phtml:45 +#: src\templates\sub\server.phtml:44 +#: src\templates\sub\server.phtml:45 msgid "Default Language" msgstr "" @@ -214,15 +227,6 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: src\classes\Views\Widget\AccountTypeTabs.php:57 -msgctxt "account-type" -msgid "Forum (%d)" -msgid_plural "Forums (%d)" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - #: src\templates\layout.phtml:97 msgid "Stats" msgstr "" @@ -236,18 +240,16 @@ msgid "Profiles" msgstr "" #: src\templates\statistics.phtml:6 -msgid "" -"This directory knows about %s distinct potential profile " -"URLs." +msgid "This directory knows about %s distinct potential profile URLs." msgstr "" -#: src\templates\statistics.phtml:16 src\templates\statistics.phtml:46 +#: src\templates\statistics.phtml:16 +#: src\templates\statistics.phtml:46 msgid "Languages" msgstr "" #: src\templates\statistics.phtml:17 -msgid "" -"Out of %s profiles reporting their language there are:" +msgid "Out of %s profiles reporting their language there are:" msgstr "" #: src\templates\statistics.phtml:27 @@ -255,15 +257,11 @@ msgid "Servers" msgstr "" #: src\templates\statistics.phtml:28 -msgid "" -"This directory knows about %s distinct potential server " -"URLs." +msgid "This directory knows about %s distinct potential server URLs." msgstr "" #: src\templates\statistics.phtml:29 -msgid "" -"Out of those, there are %s domains (%s) that have been a " -"Friendica server at least once." +msgid "Out of those, there are %s domains (%s) that have been a Friendica server at least once." msgstr "" #: src\templates\statistics.phtml:33 @@ -283,9 +281,7 @@ msgid "Out of %s servers reporting their version there are:" msgstr "" #: src\templates\statistics.phtml:7 -msgid "" -"Out of those, there are %s profiles (%s) that opted in the " -"public directory at least once." +msgid "Out of those, there are %s profiles (%s) that opted in the public directory at least once." msgstr "" #: src\templates\statistics.phtml:35 @@ -296,18 +292,78 @@ msgstr "" msgid "Friendica Directory version %s" msgstr "" -#: src\templates\layout.phtml:94 -msgid "Source Code on GitHub" -msgstr "" - #: src\templates\statistics.phtml:11 -msgid "" -"Out of those, there currently are %s available profiles " -"(%s). Check them out!" +msgid "Out of those, there currently are %s available profiles (%s). Check them out!" msgstr "" #: src\templates\statistics.phtml:39 -msgid "" -"%s public servers (%s) currently open for registration. Check them out!" +msgid "%s public servers (%s) currently open for registration. Check them out!" +msgstr "" + +#: src\classes\Views\Widget\AccountTypeTabs.php:57 +msgctxt "account-type" +msgid "News (%d)" +msgid_plural "News (%d)" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: src\classes\Views\Widget\AccountTypeTabs.php:58 +msgctxt "account-type" +msgid "Organization (%d)" +msgid_plural "Organizations (%d)" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: src\classes\Views\Widget\AccountTypeTabs.php:61 +msgctxt "account-type" +msgid "Group (%d)" +msgid_plural "Groups (%d)" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: src\templates\servers.phtml:3 +msgid "Filtered by language:" +msgstr "" + +#: src\templates\servers.phtml:3 +msgid "Clear language filter" +msgstr "" + +#: src\templates\sub\server.phtml:40 +msgid "Health Score" +msgstr "" + +#: src\templates\sub\server.phtml:52 +msgid "%s User" +msgid_plural "%s Users" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: src\templates\sub\server.phtml:54 +msgid "None" +msgstr "" + +#: src\templates\sub\server.phtml:58 +#: src\templates\sub\server.phtml:62 +msgid "Registration Policy" +msgstr "" + +#: src\templates\sub\server.phtml:59 +msgid "By Approval" +msgstr "" + +#: src\templates\sub\server.phtml:63 +msgid "Open" +msgstr "" + +#: src\templates\layout.phtml:94 +msgid "Source Code on Friendica's Forgejo" msgstr "" diff --git a/src/lang/sv/LC_MESSAGES/strings.po b/src/lang/sv/LC_MESSAGES/strings.po index 4c97bde..d7036df 100644 --- a/src/lang/sv/LC_MESSAGES/strings.po +++ b/src/lang/sv/LC_MESSAGES/strings.po @@ -1,27 +1,25 @@ -# -# Translators: -# Kristoffer Grundström , 2022 -# msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" -"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Last-Translator: Kristoffer Grundström , 2022\n" "Language-Team: Swedish (https://www.transifex.com/Friendica/teams/12172/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" +"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.2\n" -#: src\classes\Content\Pager.php:168 src\classes\Content\Pager.php:216 +#: src\classes\Content\Pager.php:168 +#: src\classes\Content\Pager.php:216 msgid "Previous" msgstr "Föregående" -#: src\classes\Content\Pager.php:173 src\classes\Content\Pager.php:273 +#: src\classes\Content\Pager.php:173 +#: src\classes\Content\Pager.php:273 msgid "Next" msgstr "Nästa" @@ -33,51 +31,57 @@ msgstr "Första" msgid "Last" msgstr "Sista" -#: src\classes\Controllers\Web\Directory.php:73 +#: src\classes\Controllers\Web\Directory.php:85 msgid "People" msgstr "Personer" -#: src\classes\Controllers\Web\Search.php:64 +#: src\classes\Controllers\Web\Search.php:72 msgctxt "field" msgid "Language" msgstr "Språk" -#: src\classes\Controllers\Web\Search.php:65 +#: src\classes\Controllers\Web\Search.php:73 msgctxt "field" msgid "Locality" msgstr "" -#: src\classes\Controllers\Web\Search.php:66 +#: src\classes\Controllers\Web\Search.php:74 msgctxt "field" msgid "Region" msgstr "Region" -#: src\classes\Controllers\Web\Search.php:67 +#: src\classes\Controllers\Web\Search.php:75 msgctxt "field" msgid "Country" msgstr "Land" -#: src\classes\Controllers\Web\Servers.php:90 +#: src\classes\Controllers\Web\Servers.php:105 msgid "Public Servers" msgstr "Publika servrar" -#: src\templates\layout.phtml:4 src\templates\layout.phtml:18 +#: src\templates\layout.phtml:4 +#: src\templates\layout.phtml:18 msgid "Friendica Directory" msgstr "Friendica-mapp" -#: src\templates\layout.phtml:23 src\templates\layout.phtml:25 -#: src\templates\layout.phtml:43 src\templates\layout.phtml:45 -#: src\templates\search.phtml:4 src\templates\search.phtml:12 +#: src\templates\layout.phtml:23 +#: src\templates\layout.phtml:25 +#: src\templates\layout.phtml:43 +#: src\templates\layout.phtml:45 +#: src\templates\search.phtml:4 +#: src\templates\search.phtml:12 msgid "Search terms" msgstr "" -#: src\templates\layout.phtml:24 src\templates\layout.phtml:45 +#: src\templates\layout.phtml:24 +#: src\templates\layout.phtml:45 #: src\templates\search.phtml:11 msgctxt "noun" msgid "Search" msgstr "Sök" -#: src\templates\layout.phtml:27 src\templates\layout.phtml:47 +#: src\templates\layout.phtml:27 +#: src\templates\layout.phtml:47 #: src\templates\search.phtml:14 msgctxt "verb" msgid "Search" @@ -101,11 +105,11 @@ msgid_plural "%d results for \"%s\"" msgstr[0] "%d resultat för \"%s\"" msgstr[1] "%d resultat för \"%s\"" -#: src\templates\servers.phtml:2 +#: src\templates\servers.phtml:7 msgid "Top servers pagination" msgstr "" -#: src\templates\servers.phtml:12 +#: src\templates\servers.phtml:17 msgid "Bottom servers pagination" msgstr "" @@ -122,23 +126,27 @@ msgid "Filter by country" msgstr "Filtrera efter land" #: src\templates\sub\profile.phtml:31 +#: src\templates\sub\profile.phtml:35 +#: src\templates\sub\profile.phtml:39 msgctxt "verb" msgid "Follow" msgstr "Följ" -#: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47 +#: src\templates\layout.phtml:65 +#: src\templates\sub\profile.phtml:57 msgid "Language" msgstr "Språk" -#: src\templates\sub\profile.phtml:50 +#: src\templates\sub\profile.phtml:60 +#: src\templates\widget\popularserverlanguages.phtml:2 msgid "Filter by language" msgstr "Filtrera efter språk" -#: src\templates\sub\profile.phtml:56 +#: src\templates\sub\profile.phtml:66 msgid "Location" msgstr "Plats" -#: src\templates\sub\profile.phtml:69 +#: src\templates\sub\profile.phtml:79 msgid "Search Tag" msgstr "Söktagg" @@ -146,19 +154,23 @@ msgstr "Söktagg" msgid "Account type tabs" msgstr "" -#: src\templates\sub\profiles.phtml:4 src\templates\sub\profiles.phtml:7 +#: src\templates\sub\profiles.phtml:4 +#: src\templates\sub\profiles.phtml:7 msgid "Top %s pagination" msgstr "" -#: src\templates\sub\profiles.phtml:13 src\templates\sub\profiles.phtml:16 +#: src\templates\sub\profiles.phtml:13 +#: src\templates\sub\profiles.phtml:16 msgid "Bottom %s pagination" msgstr "" -#: src\templates\statistics.phtml:66 src\templates\sub\server.phtml:15 +#: src\templates\statistics.phtml:66 +#: src\templates\sub\server.phtml:15 msgid "Stable Version" msgstr "Stabil version" -#: src\templates\statistics.phtml:68 src\templates\sub\server.phtml:17 +#: src\templates\statistics.phtml:68 +#: src\templates\sub\server.phtml:17 msgid "Develop Version" msgstr "Utvecklarversion" @@ -166,15 +178,15 @@ msgstr "Utvecklarversion" msgid "Outdated Version" msgstr "Utdaterad version" -#: src\templates\sub\server.phtml:72 +#: src\templates\sub\server.phtml:69 msgid "Admin" msgstr "Admin" -#: src\templates\sub\server.phtml:79 +#: src\templates\sub\server.phtml:76 msgid "No description provided" msgstr "Ingen beskrivning tillhandahölls" -#: src\templates\sub\server.phtml:82 +#: src\templates\sub\server.phtml:79 msgid "Visit Server" msgstr "Besök servern" @@ -182,7 +194,7 @@ msgstr "Besök servern" msgid "Popular Countries" msgstr "Populära länder" -#: src\templates\widget\popularlanguages.phtml:2 +#: src\templates\widget\popularprofilelanguages.phtml:2 msgid "Popular Languages" msgstr "Populära språk" @@ -190,7 +202,8 @@ msgstr "Populära språk" msgid "Popular Tags" msgstr "Populära taggar" -#: src\templates\sub\server.phtml:44 src\templates\sub\server.phtml:45 +#: src\templates\sub\server.phtml:44 +#: src\templates\sub\server.phtml:45 msgid "Default Language" msgstr "Standardspråk" @@ -210,13 +223,6 @@ msgid_plural "People (%d)" msgstr[0] "Person (%d)" msgstr[1] "Personer (%d)" -#: src\classes\Views\Widget\AccountTypeTabs.php:59 -msgctxt "account-type" -msgid "Forum (%d)" -msgid_plural "Forums (%d)" -msgstr[0] "" -msgstr[1] "" - #: src\templates\layout.phtml:97 msgid "Stats" msgstr "Statistik" @@ -230,18 +236,16 @@ msgid "Profiles" msgstr "Profiler" #: src\templates\statistics.phtml:6 -msgid "" -"This directory knows about %s distinct potential profile " -"URLs." +msgid "This directory knows about %s distinct potential profile URLs." msgstr "" -#: src\templates\statistics.phtml:16 src\templates\statistics.phtml:46 +#: src\templates\statistics.phtml:16 +#: src\templates\statistics.phtml:46 msgid "Languages" msgstr "Språk" #: src\templates\statistics.phtml:17 -msgid "" -"Out of %s profiles reporting their language there are:" +msgid "Out of %s profiles reporting their language there are:" msgstr "" #: src\templates\statistics.phtml:27 @@ -249,15 +253,11 @@ msgid "Servers" msgstr "Servrar" #: src\templates\statistics.phtml:28 -msgid "" -"This directory knows about %s distinct potential server " -"URLs." +msgid "This directory knows about %s distinct potential server URLs." msgstr "" #: src\templates\statistics.phtml:29 -msgid "" -"Out of those, there are %s domains (%s) that have been a " -"Friendica server at least once." +msgid "Out of those, there are %s domains (%s) that have been a Friendica server at least once." msgstr "" #: src\templates\statistics.phtml:33 @@ -277,9 +277,7 @@ msgid "Out of %s servers reporting their version there are:" msgstr "" #: src\templates\statistics.phtml:7 -msgid "" -"Out of those, there are %s profiles (%s) that opted in the " -"public directory at least once." +msgid "Out of those, there are %s profiles (%s) that opted in the public directory at least once." msgstr "" #: src\templates\statistics.phtml:35 @@ -290,20 +288,12 @@ msgstr "%s tillgängliga servrar (%s)" msgid "Friendica Directory version %s" msgstr "" -#: src\templates\layout.phtml:94 -msgid "Source Code on GitHub" -msgstr "Källkod på GitHub" - #: src\templates\statistics.phtml:11 -msgid "" -"Out of those, there currently are %s available profiles " -"(%s). Check them out!" +msgid "Out of those, there currently are %s available profiles (%s). Check them out!" msgstr "" #: src\templates\statistics.phtml:39 -msgid "" -"%s public servers (%s) currently open for registration. Check them out!" +msgid "%s public servers (%s) currently open for registration. Check them out!" msgstr "" #: src\classes\Views\Widget\AccountTypeTabs.php:57 @@ -334,14 +324,34 @@ msgstr[1] "%s Användare" msgid "None" msgstr "Ingen" -#: src\templates\sub\server.phtml:59 src\templates\sub\server.phtml:63 +#: src\templates\sub\server.phtml:58 +#: src\templates\sub\server.phtml:62 msgid "Registration Policy" msgstr "Registreringspolicy" -#: src\templates\sub\server.phtml:60 +#: src\templates\sub\server.phtml:59 msgid "By Approval" msgstr "Genom godkännande" -#: src\templates\sub\server.phtml:64 +#: src\templates\sub\server.phtml:63 msgid "Open" msgstr "Öppna" + +#: src\classes\Views\Widget\AccountTypeTabs.php:61 +msgctxt "account-type" +msgid "Group (%d)" +msgid_plural "Groups (%d)" +msgstr[0] "" +msgstr[1] "" + +#: src\templates\servers.phtml:3 +msgid "Filtered by language:" +msgstr "" + +#: src\templates\servers.phtml:3 +msgid "Clear language filter" +msgstr "" + +#: src\templates\layout.phtml:94 +msgid "Source Code on Friendica's Forgejo" +msgstr "" diff --git a/src/lang/th/LC_MESSAGES/strings.po b/src/lang/th/LC_MESSAGES/strings.po index fc68ff9..0b9e754 100644 --- a/src/lang/th/LC_MESSAGES/strings.po +++ b/src/lang/th/LC_MESSAGES/strings.po @@ -1,27 +1,25 @@ -# -# Translators: -# Andy H3 , 2018 -# msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" -"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Last-Translator: Andy H3 , 2018\n" "Language-Team: Thai (Thailand) (https://www.transifex.com/Friendica/teams/12172/th_TH/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" +"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Language: th_TH\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Poedit 2.2\n" -#: src\classes\Content\Pager.php:168 src\classes\Content\Pager.php:216 +#: src\classes\Content\Pager.php:168 +#: src\classes\Content\Pager.php:216 msgid "Previous" msgstr "ก่อนหน้า" -#: src\classes\Content\Pager.php:173 src\classes\Content\Pager.php:273 +#: src\classes\Content\Pager.php:173 +#: src\classes\Content\Pager.php:273 msgid "Next" msgstr "ถัดไป" @@ -33,51 +31,57 @@ msgstr "แรก" msgid "Last" msgstr "สุดท้าย" -#: src\classes\Controllers\Web\Directory.php:73 +#: src\classes\Controllers\Web\Directory.php:85 msgid "People" msgstr "คน" -#: src\classes\Controllers\Web\Search.php:64 +#: src\classes\Controllers\Web\Search.php:72 msgctxt "field" msgid "Language" msgstr "ภาษา" -#: src\classes\Controllers\Web\Search.php:65 +#: src\classes\Controllers\Web\Search.php:73 msgctxt "field" msgid "Locality" msgstr "สถาน" -#: src\classes\Controllers\Web\Search.php:66 +#: src\classes\Controllers\Web\Search.php:74 msgctxt "field" msgid "Region" msgstr "แดน" -#: src\classes\Controllers\Web\Search.php:67 +#: src\classes\Controllers\Web\Search.php:75 msgctxt "field" msgid "Country" msgstr "ประเทศ" -#: src\classes\Controllers\Web\Servers.php:90 +#: src\classes\Controllers\Web\Servers.php:105 msgid "Public Servers" msgstr "เซอร์เวอร์เปิด" -#: src\templates\layout.phtml:4 src\templates\layout.phtml:18 +#: src\templates\layout.phtml:4 +#: src\templates\layout.phtml:18 msgid "Friendica Directory" msgstr "Friendica ทำเนียบ" -#: src\templates\layout.phtml:23 src\templates\layout.phtml:25 -#: src\templates\layout.phtml:43 src\templates\layout.phtml:45 -#: src\templates\search.phtml:4 src\templates\search.phtml:12 +#: src\templates\layout.phtml:23 +#: src\templates\layout.phtml:25 +#: src\templates\layout.phtml:43 +#: src\templates\layout.phtml:45 +#: src\templates\search.phtml:4 +#: src\templates\search.phtml:12 msgid "Search terms" msgstr "ค้น หา" -#: src\templates\layout.phtml:24 src\templates\layout.phtml:45 +#: src\templates\layout.phtml:24 +#: src\templates\layout.phtml:45 #: src\templates\search.phtml:11 msgctxt "noun" msgid "Search" msgstr "ค้น" -#: src\templates\layout.phtml:27 src\templates\layout.phtml:47 +#: src\templates\layout.phtml:27 +#: src\templates\layout.phtml:47 #: src\templates\search.phtml:14 msgctxt "verb" msgid "Search" @@ -100,11 +104,11 @@ msgid "%d result for \"%s\"" msgid_plural "%d results for \"%s\"" msgstr[0] "%d ผลลัพธ์สำหรับ \"%s\"" -#: src\templates\servers.phtml:2 +#: src\templates\servers.phtml:7 msgid "Top servers pagination" msgstr "" -#: src\templates\servers.phtml:12 +#: src\templates\servers.phtml:17 msgid "Bottom servers pagination" msgstr "" @@ -121,23 +125,27 @@ msgid "Filter by country" msgstr "กรองตามประเทศ" #: src\templates\sub\profile.phtml:31 +#: src\templates\sub\profile.phtml:35 +#: src\templates\sub\profile.phtml:39 msgctxt "verb" msgid "Follow" msgstr "ตาม" -#: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47 +#: src\templates\layout.phtml:65 +#: src\templates\sub\profile.phtml:57 msgid "Language" msgstr "ภาษา" -#: src\templates\sub\profile.phtml:50 +#: src\templates\sub\profile.phtml:60 +#: src\templates\widget\popularserverlanguages.phtml:2 msgid "Filter by language" msgstr "กรองตามภาษา" -#: src\templates\sub\profile.phtml:56 +#: src\templates\sub\profile.phtml:66 msgid "Location" msgstr "สถาน" -#: src\templates\sub\profile.phtml:69 +#: src\templates\sub\profile.phtml:79 msgid "Search Tag" msgstr "ค้นหาด้วยแท็ก" @@ -145,19 +153,23 @@ msgstr "ค้นหาด้วยแท็ก" msgid "Account type tabs" msgstr "" -#: src\templates\sub\profiles.phtml:4 src\templates\sub\profiles.phtml:7 +#: src\templates\sub\profiles.phtml:4 +#: src\templates\sub\profiles.phtml:7 msgid "Top %s pagination" msgstr "" -#: src\templates\sub\profiles.phtml:13 src\templates\sub\profiles.phtml:16 +#: src\templates\sub\profiles.phtml:13 +#: src\templates\sub\profiles.phtml:16 msgid "Bottom %s pagination" msgstr "" -#: src\templates\statistics.phtml:66 src\templates\sub\server.phtml:15 +#: src\templates\statistics.phtml:66 +#: src\templates\sub\server.phtml:15 msgid "Stable Version" msgstr "เวอร์ชันเสถียร" -#: src\templates\statistics.phtml:68 src\templates\sub\server.phtml:17 +#: src\templates\statistics.phtml:68 +#: src\templates\sub\server.phtml:17 msgid "Develop Version" msgstr "เวอร์ชันพัฒนา" @@ -165,15 +177,15 @@ msgstr "เวอร์ชันพัฒนา" msgid "Outdated Version" msgstr "เวอร์ชันล้าสมัย" -#: src\templates\sub\server.phtml:55 +#: src\templates\sub\server.phtml:69 msgid "Admin" msgstr "ผู้ดูแลระบบ" -#: src\templates\sub\server.phtml:62 +#: src\templates\sub\server.phtml:76 msgid "No description provided" msgstr "ไม่มีคำอธิบาย" -#: src\templates\sub\server.phtml:65 +#: src\templates\sub\server.phtml:79 msgid "Visit Server" msgstr "ไปที่เซิร์ฟเวอร์" @@ -181,7 +193,7 @@ msgstr "ไปที่เซิร์ฟเวอร์" msgid "Popular Countries" msgstr "ประเทศยอดนิยม" -#: src\templates\widget\popularlanguages.phtml:2 +#: src\templates\widget\popularprofilelanguages.phtml:2 msgid "Popular Languages" msgstr "ภาษายอดนิยม" @@ -189,7 +201,8 @@ msgstr "ภาษายอดนิยม" msgid "Popular Tags" msgstr "แท็กยอดนิยม" -#: src\templates\sub\server.phtml:44 src\templates\sub\server.phtml:45 +#: src\templates\sub\server.phtml:44 +#: src\templates\sub\server.phtml:45 msgid "Default Language" msgstr "ภาษาเริ่มต้น" @@ -208,12 +221,6 @@ msgid "People (%d)" msgid_plural "People (%d)" msgstr[0] "" -#: src\classes\Views\Widget\AccountTypeTabs.php:57 -msgctxt "account-type" -msgid "Forum (%d)" -msgid_plural "Forums (%d)" -msgstr[0] "" - #: src\templates\layout.phtml:97 msgid "Stats" msgstr "" @@ -227,18 +234,16 @@ msgid "Profiles" msgstr "" #: src\templates\statistics.phtml:6 -msgid "" -"This directory knows about %s distinct potential profile " -"URLs." +msgid "This directory knows about %s distinct potential profile URLs." msgstr "" -#: src\templates\statistics.phtml:16 src\templates\statistics.phtml:46 +#: src\templates\statistics.phtml:16 +#: src\templates\statistics.phtml:46 msgid "Languages" msgstr "" #: src\templates\statistics.phtml:17 -msgid "" -"Out of %s profiles reporting their language there are:" +msgid "Out of %s profiles reporting their language there are:" msgstr "" #: src\templates\statistics.phtml:27 @@ -246,15 +251,11 @@ msgid "Servers" msgstr "" #: src\templates\statistics.phtml:28 -msgid "" -"This directory knows about %s distinct potential server " -"URLs." +msgid "This directory knows about %s distinct potential server URLs." msgstr "" #: src\templates\statistics.phtml:29 -msgid "" -"Out of those, there are %s domains (%s) that have been a " -"Friendica server at least once." +msgid "Out of those, there are %s domains (%s) that have been a Friendica server at least once." msgstr "" #: src\templates\statistics.phtml:33 @@ -274,9 +275,7 @@ msgid "Out of %s servers reporting their version there are:" msgstr "" #: src\templates\statistics.phtml:7 -msgid "" -"Out of those, there are %s profiles (%s) that opted in the " -"public directory at least once." +msgid "Out of those, there are %s profiles (%s) that opted in the public directory at least once." msgstr "" #: src\templates\statistics.phtml:35 @@ -287,18 +286,66 @@ msgstr "" msgid "Friendica Directory version %s" msgstr "" -#: src\templates\layout.phtml:94 -msgid "Source Code on GitHub" -msgstr "" - #: src\templates\statistics.phtml:11 -msgid "" -"Out of those, there currently are %s available profiles " -"(%s). Check them out!" +msgid "Out of those, there currently are %s available profiles (%s). Check them out!" msgstr "" #: src\templates\statistics.phtml:39 -msgid "" -"%s public servers (%s) currently open for registration. Check them out!" +msgid "%s public servers (%s) currently open for registration. Check them out!" +msgstr "" + +#: src\classes\Views\Widget\AccountTypeTabs.php:57 +msgctxt "account-type" +msgid "News (%d)" +msgid_plural "News (%d)" +msgstr[0] "" + +#: src\classes\Views\Widget\AccountTypeTabs.php:58 +msgctxt "account-type" +msgid "Organization (%d)" +msgid_plural "Organizations (%d)" +msgstr[0] "" + +#: src\classes\Views\Widget\AccountTypeTabs.php:61 +msgctxt "account-type" +msgid "Group (%d)" +msgid_plural "Groups (%d)" +msgstr[0] "" + +#: src\templates\servers.phtml:3 +msgid "Filtered by language:" +msgstr "" + +#: src\templates\servers.phtml:3 +msgid "Clear language filter" +msgstr "" + +#: src\templates\sub\server.phtml:40 +msgid "Health Score" +msgstr "" + +#: src\templates\sub\server.phtml:52 +msgid "%s User" +msgid_plural "%s Users" +msgstr[0] "" + +#: src\templates\sub\server.phtml:54 +msgid "None" +msgstr "" + +#: src\templates\sub\server.phtml:58 +#: src\templates\sub\server.phtml:62 +msgid "Registration Policy" +msgstr "" + +#: src\templates\sub\server.phtml:59 +msgid "By Approval" +msgstr "" + +#: src\templates\sub\server.phtml:63 +msgid "Open" +msgstr "" + +#: src\templates\layout.phtml:94 +msgid "Source Code on Friendica's Forgejo" msgstr "" diff --git a/src/lang/zh_CN/LC_MESSAGES/strings.po b/src/lang/zh_CN/LC_MESSAGES/strings.po index e00e241..cb0980b 100644 --- a/src/lang/zh_CN/LC_MESSAGES/strings.po +++ b/src/lang/zh_CN/LC_MESSAGES/strings.po @@ -1,27 +1,25 @@ -# -# Translators: -# 朱陈锬 , 2019 -# msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" -"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Last-Translator: 朱陈锬 , 2019\n" "Language-Team: Chinese (China) (https://www.transifex.com/Friendica/teams/12172/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"POT-Creation-Date: 2018-11-16T04:17:37+00:00\n" +"PO-Revision-Date: 2018-11-16 20:30+0000\n" "Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Poedit 2.2\n" -#: src\classes\Content\Pager.php:168 src\classes\Content\Pager.php:216 +#: src\classes\Content\Pager.php:168 +#: src\classes\Content\Pager.php:216 msgid "Previous" msgstr "上一页" -#: src\classes\Content\Pager.php:173 src\classes\Content\Pager.php:273 +#: src\classes\Content\Pager.php:173 +#: src\classes\Content\Pager.php:273 msgid "Next" msgstr "下一页" @@ -33,51 +31,57 @@ msgstr "第一页" msgid "Last" msgstr "最后一页" -#: src\classes\Controllers\Web\Directory.php:73 +#: src\classes\Controllers\Web\Directory.php:85 msgid "People" msgstr "" -#: src\classes\Controllers\Web\Search.php:64 +#: src\classes\Controllers\Web\Search.php:72 msgctxt "field" msgid "Language" msgstr "语言" -#: src\classes\Controllers\Web\Search.php:65 +#: src\classes\Controllers\Web\Search.php:73 msgctxt "field" msgid "Locality" msgstr "" -#: src\classes\Controllers\Web\Search.php:66 +#: src\classes\Controllers\Web\Search.php:74 msgctxt "field" msgid "Region" msgstr "地区" -#: src\classes\Controllers\Web\Search.php:67 +#: src\classes\Controllers\Web\Search.php:75 msgctxt "field" msgid "Country" msgstr "国家" -#: src\classes\Controllers\Web\Servers.php:90 +#: src\classes\Controllers\Web\Servers.php:105 msgid "Public Servers" msgstr "公共服务器" -#: src\templates\layout.phtml:4 src\templates\layout.phtml:18 +#: src\templates\layout.phtml:4 +#: src\templates\layout.phtml:18 msgid "Friendica Directory" msgstr "Friendica 目录" -#: src\templates\layout.phtml:23 src\templates\layout.phtml:25 -#: src\templates\layout.phtml:43 src\templates\layout.phtml:45 -#: src\templates\search.phtml:4 src\templates\search.phtml:12 +#: src\templates\layout.phtml:23 +#: src\templates\layout.phtml:25 +#: src\templates\layout.phtml:43 +#: src\templates\layout.phtml:45 +#: src\templates\search.phtml:4 +#: src\templates\search.phtml:12 msgid "Search terms" msgstr "" -#: src\templates\layout.phtml:24 src\templates\layout.phtml:45 +#: src\templates\layout.phtml:24 +#: src\templates\layout.phtml:45 #: src\templates\search.phtml:11 msgctxt "noun" msgid "Search" msgstr "搜索" -#: src\templates\layout.phtml:27 src\templates\layout.phtml:47 +#: src\templates\layout.phtml:27 +#: src\templates\layout.phtml:47 #: src\templates\search.phtml:14 msgctxt "verb" msgid "Search" @@ -100,11 +104,11 @@ msgid "%d result for \"%s\"" msgid_plural "%d results for \"%s\"" msgstr[0] "" -#: src\templates\servers.phtml:2 +#: src\templates\servers.phtml:7 msgid "Top servers pagination" msgstr "" -#: src\templates\servers.phtml:12 +#: src\templates\servers.phtml:17 msgid "Bottom servers pagination" msgstr "" @@ -121,23 +125,27 @@ msgid "Filter by country" msgstr "按国家筛选" #: src\templates\sub\profile.phtml:31 +#: src\templates\sub\profile.phtml:35 +#: src\templates\sub\profile.phtml:39 msgctxt "verb" msgid "Follow" msgstr "" -#: src\templates\layout.phtml:65 src\templates\sub\profile.phtml:47 +#: src\templates\layout.phtml:65 +#: src\templates\sub\profile.phtml:57 msgid "Language" msgstr "语言" -#: src\templates\sub\profile.phtml:50 +#: src\templates\sub\profile.phtml:60 +#: src\templates\widget\popularserverlanguages.phtml:2 msgid "Filter by language" msgstr "按语言筛选" -#: src\templates\sub\profile.phtml:56 +#: src\templates\sub\profile.phtml:66 msgid "Location" msgstr "" -#: src\templates\sub\profile.phtml:69 +#: src\templates\sub\profile.phtml:79 msgid "Search Tag" msgstr "搜索标签" @@ -145,19 +153,23 @@ msgstr "搜索标签" msgid "Account type tabs" msgstr "" -#: src\templates\sub\profiles.phtml:4 src\templates\sub\profiles.phtml:7 +#: src\templates\sub\profiles.phtml:4 +#: src\templates\sub\profiles.phtml:7 msgid "Top %s pagination" msgstr "" -#: src\templates\sub\profiles.phtml:13 src\templates\sub\profiles.phtml:16 +#: src\templates\sub\profiles.phtml:13 +#: src\templates\sub\profiles.phtml:16 msgid "Bottom %s pagination" msgstr "" -#: src\templates\statistics.phtml:66 src\templates\sub\server.phtml:15 +#: src\templates\statistics.phtml:66 +#: src\templates\sub\server.phtml:15 msgid "Stable Version" msgstr "稳定版" -#: src\templates\statistics.phtml:68 src\templates\sub\server.phtml:17 +#: src\templates\statistics.phtml:68 +#: src\templates\sub\server.phtml:17 msgid "Develop Version" msgstr "开发版" @@ -165,15 +177,15 @@ msgstr "开发版" msgid "Outdated Version" msgstr "旧稳定版" -#: src\templates\sub\server.phtml:55 +#: src\templates\sub\server.phtml:69 msgid "Admin" msgstr "管理员" -#: src\templates\sub\server.phtml:62 +#: src\templates\sub\server.phtml:76 msgid "No description provided" msgstr "没有提供说明" -#: src\templates\sub\server.phtml:65 +#: src\templates\sub\server.phtml:79 msgid "Visit Server" msgstr "访问服务" @@ -181,7 +193,7 @@ msgstr "访问服务" msgid "Popular Countries" msgstr "热门国家" -#: src\templates\widget\popularlanguages.phtml:2 +#: src\templates\widget\popularprofilelanguages.phtml:2 msgid "Popular Languages" msgstr "热门语言" @@ -189,7 +201,8 @@ msgstr "热门语言" msgid "Popular Tags" msgstr "热门标签" -#: src\templates\sub\server.phtml:44 src\templates\sub\server.phtml:45 +#: src\templates\sub\server.phtml:44 +#: src\templates\sub\server.phtml:45 msgid "Default Language" msgstr "默认语言" @@ -208,12 +221,6 @@ msgid "People (%d)" msgid_plural "People (%d)" msgstr[0] "" -#: src\classes\Views\Widget\AccountTypeTabs.php:57 -msgctxt "account-type" -msgid "Forum (%d)" -msgid_plural "Forums (%d)" -msgstr[0] "" - #: src\templates\layout.phtml:97 msgid "Stats" msgstr "" @@ -227,18 +234,16 @@ msgid "Profiles" msgstr "" #: src\templates\statistics.phtml:6 -msgid "" -"This directory knows about %s distinct potential profile " -"URLs." +msgid "This directory knows about %s distinct potential profile URLs." msgstr "" -#: src\templates\statistics.phtml:16 src\templates\statistics.phtml:46 +#: src\templates\statistics.phtml:16 +#: src\templates\statistics.phtml:46 msgid "Languages" msgstr "语言" #: src\templates\statistics.phtml:17 -msgid "" -"Out of %s profiles reporting their language there are:" +msgid "Out of %s profiles reporting their language there are:" msgstr "" #: src\templates\statistics.phtml:27 @@ -246,15 +251,11 @@ msgid "Servers" msgstr "服务器" #: src\templates\statistics.phtml:28 -msgid "" -"This directory knows about %s distinct potential server " -"URLs." +msgid "This directory knows about %s distinct potential server URLs." msgstr "" #: src\templates\statistics.phtml:29 -msgid "" -"Out of those, there are %s domains (%s) that have been a " -"Friendica server at least once." +msgid "Out of those, there are %s domains (%s) that have been a Friendica server at least once." msgstr "" #: src\templates\statistics.phtml:33 @@ -274,9 +275,7 @@ msgid "Out of %s servers reporting their version there are:" msgstr "" #: src\templates\statistics.phtml:7 -msgid "" -"Out of those, there are %s profiles (%s) that opted in the " -"public directory at least once." +msgid "Out of those, there are %s profiles (%s) that opted in the public directory at least once." msgstr "" #: src\templates\statistics.phtml:35 @@ -287,18 +286,66 @@ msgstr "" msgid "Friendica Directory version %s" msgstr "Friendica 目录版本 %s" -#: src\templates\layout.phtml:94 -msgid "Source Code on GitHub" -msgstr "源码托管于 GitHub" - #: src\templates\statistics.phtml:11 -msgid "" -"Out of those, there currently are %s available profiles " -"(%s). Check them out!" +msgid "Out of those, there currently are %s available profiles (%s). Check them out!" msgstr "" #: src\templates\statistics.phtml:39 -msgid "" -"%s public servers (%s) currently open for registration. Check them out!" +msgid "%s public servers (%s) currently open for registration. Check them out!" +msgstr "" + +#: src\classes\Views\Widget\AccountTypeTabs.php:57 +msgctxt "account-type" +msgid "News (%d)" +msgid_plural "News (%d)" +msgstr[0] "" + +#: src\classes\Views\Widget\AccountTypeTabs.php:58 +msgctxt "account-type" +msgid "Organization (%d)" +msgid_plural "Organizations (%d)" +msgstr[0] "" + +#: src\classes\Views\Widget\AccountTypeTabs.php:61 +msgctxt "account-type" +msgid "Group (%d)" +msgid_plural "Groups (%d)" +msgstr[0] "" + +#: src\templates\servers.phtml:3 +msgid "Filtered by language:" +msgstr "" + +#: src\templates\servers.phtml:3 +msgid "Clear language filter" +msgstr "" + +#: src\templates\sub\server.phtml:40 +msgid "Health Score" +msgstr "" + +#: src\templates\sub\server.phtml:52 +msgid "%s User" +msgid_plural "%s Users" +msgstr[0] "" + +#: src\templates\sub\server.phtml:54 +msgid "None" +msgstr "" + +#: src\templates\sub\server.phtml:58 +#: src\templates\sub\server.phtml:62 +msgid "Registration Policy" +msgstr "" + +#: src\templates\sub\server.phtml:59 +msgid "By Approval" +msgstr "" + +#: src\templates\sub\server.phtml:63 +msgid "Open" +msgstr "" + +#: src\templates\layout.phtml:94 +msgid "Source Code on Friendica's Forgejo" msgstr "" diff --git a/src/templates/layout.phtml b/src/templates/layout.phtml index 5ac846d..9ac9af6 100644 --- a/src/templates/layout.phtml +++ b/src/templates/layout.phtml @@ -91,7 +91,7 @@ __('Friendica Directory version %s', $version)?>

  • - __('Source Code on GitHub')?> + __("Source Code on Friendica's Forgejo")?>
  • __('Stats')?> From 08950be588c01cbbfc4667bf6e6a8c5d0d91dc10 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 7 Mar 2024 09:23:36 -0500 Subject: [PATCH 36/39] Change icon for Approval registration policy from dungeon door to stamp --- src/templates/sub/server.phtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/templates/sub/server.phtml b/src/templates/sub/server.phtml index f1cf79d..df323d4 100644 --- a/src/templates/sub/server.phtml +++ b/src/templates/sub/server.phtml @@ -56,7 +56,7 @@ $base_url_display = substr($base_url, strpos($base_url, '/') + 2); - __('By Approval')?> + __('By Approval')?> From 5f79768a6b5ecff52a9ba4ba20bace3e42ca163c Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 7 Mar 2024 09:23:51 -0500 Subject: [PATCH 37/39] Change icon for unstable version from poop to bug --- src/templates/statistics.phtml | 2 +- src/templates/sub/server.phtml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/templates/statistics.phtml b/src/templates/statistics.phtml index bf29ff5..237e143 100644 --- a/src/templates/statistics.phtml +++ b/src/templates/statistics.phtml @@ -65,7 +65,7 @@ use \Friendica\Directory\Utils\L10n; __('Stable Version')?> - __('Develop Version')?> + __('Develop Version')?>
    • diff --git a/src/templates/sub/server.phtml b/src/templates/sub/server.phtml index df323d4..b425c31 100644 --- a/src/templates/sub/server.phtml +++ b/src/templates/sub/server.phtml @@ -14,7 +14,7 @@ if ($server['health_score'] <= 0) { if ($server['version'] == $stable_version) { $version_badge = ' ' . $this->__('Stable Version') . ''; } elseif ($server['version'] == $dev_version || $server['version'] == $rc_version) { - $version_badge = ' ' . $this->__('Develop Version') . ''; + $version_badge = ' ' . $this->__('Develop Version') . ''; } else { $version_badge = ' ' . $this->__('Outdated Version') . ''; } From 2ffb0477366a029ebd77b529132275846f666af1 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 7 Mar 2024 09:42:45 -0500 Subject: [PATCH 38/39] Move Visit server link to server name --- src/templates/sub/server.phtml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/templates/sub/server.phtml b/src/templates/sub/server.phtml index f1cf79d..1545ec8 100644 --- a/src/templates/sub/server.phtml +++ b/src/templates/sub/server.phtml @@ -26,7 +26,10 @@ $base_url_display = substr($base_url, strpos($base_url, '/') + 2);
    - e($server['name']); ?> + + e($server['name']); ?> + +
    @@ -75,8 +78,6 @@ $base_url_display = substr($base_url, strpos($base_url, '/') + 2);

    <__('No description provided')?>>

    - - __('Visit Server')?>
    Date: Thu, 7 Mar 2024 09:53:46 -0500 Subject: [PATCH 39/39] [v2.4.2] Bump version number for release --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 005119b..8e8299d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.4.1 +2.4.2